From bfb8488c10a5dfccbcb7c556408b300f8901cd88 Mon Sep 17 00:00:00 2001 From: jbj Date: Sat, 20 Jul 2002 19:02:40 +0000 Subject: [PATCH] - popt: parse file into string of options (#56860). CVS patchset: 5560 CVS date: 2002/07/20 19:02:40 --- CHANGES | 1 + build/parsePrep.c | 2 - lib/package.c | 12 +-- lib/rpmds.c | 4 + macros.in | 14 +++- po/cs.po | 182 +++++++++++++++++++++++++--------------- po/da.po | 182 +++++++++++++++++++++++++--------------- po/de.po | 182 +++++++++++++++++++++++++--------------- po/en_RN.po | 182 +++++++++++++++++++++++++--------------- po/es.po | 182 +++++++++++++++++++++++++--------------- po/eu_ES.po | 182 +++++++++++++++++++++++++--------------- po/fi.po | 182 +++++++++++++++++++++++++--------------- po/fr.po | 182 +++++++++++++++++++++++++--------------- po/gl.po | 182 +++++++++++++++++++++++++--------------- po/hu.po | 182 +++++++++++++++++++++++++--------------- po/id.po | 182 +++++++++++++++++++++++++--------------- po/is.po | 182 +++++++++++++++++++++++++--------------- po/it.po | 182 +++++++++++++++++++++++++--------------- po/ja.po | 186 ++++++++++++++++++++++++---------------- po/ko.po | 182 +++++++++++++++++++++++++--------------- po/no.po | 182 +++++++++++++++++++++++++--------------- po/pl.po | 186 ++++++++++++++++++++++++---------------- po/pt.po | 182 +++++++++++++++++++++++++--------------- po/pt_BR.po | 182 +++++++++++++++++++++++++--------------- po/ro.po | 182 +++++++++++++++++++++++++--------------- po/rpm.pot | 182 +++++++++++++++++++++++++--------------- po/ru.po | 182 +++++++++++++++++++++++++--------------- po/sk.po | 186 ++++++++++++++++++++++++---------------- po/sl.po | 188 +++++++++++++++++++++++++---------------- po/sr.po | 182 +++++++++++++++++++++++++--------------- po/sv.po | 182 +++++++++++++++++++++++++--------------- po/tr.po | 182 +++++++++++++++++++++++++--------------- po/uk.po | 182 +++++++++++++++++++++++++--------------- po/wa.po | 182 +++++++++++++++++++++++++--------------- po/zh.po | 182 +++++++++++++++++++++++++--------------- po/zh_CN.GB2312.po | 182 +++++++++++++++++++++++++--------------- popt/.cvsignore | 2 + popt/Makefile.am | 5 +- 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.po | 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 +- popt/popt.c | 48 +++++------ popt/popt.h | 80 ++++++++++++++++++ popt/poptparse.c | 105 +++++++++++++++++++++++ popt/test3-data/01.answer | 10 +++ popt/test3-data/01.input | 13 +++ popt/test3-data/02.answer | 1 + popt/test3-data/02.input | 2 + popt/test3-data/03.answer | 70 ++++++++++++++++ popt/test3-data/03.input | 210 ++++++++++++++++++++++++++++++++++++++++++++++ popt/test3.c | 48 +++++++++++ popt/testit.sh | 28 +++++++ rpm.spec.in | 3 + rpmdb/dbconfig.c | 96 +++------------------ rpmdb/header.c | 5 +- rpmdb/rpmdb.c | 46 ++++++++-- 83 files changed, 4274 insertions(+), 2251 deletions(-) create mode 100644 popt/test3-data/01.answer create mode 100644 popt/test3-data/01.input create mode 100644 popt/test3-data/02.answer create mode 100644 popt/test3-data/02.input create mode 100644 popt/test3-data/03.answer create mode 100644 popt/test3-data/03.input create mode 100644 popt/test3.c diff --git a/CHANGES b/CHANGES index a85319c..cd65bc2 100644 --- a/CHANGES +++ b/CHANGES @@ -172,6 +172,7 @@ - teach gendiff about unreadable files (#42666). - python: sanity check fixes on rpmts/rpmte methods. - have rpmdb-redhat autoconfigure rpm to use %%_solve_dbpath. + - popt: parse file into string of options (#56860). 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/build/parsePrep.c b/build/parsePrep.c index 7b31724..7df115a 100644 --- a/build/parsePrep.c +++ b/build/parsePrep.c @@ -416,9 +416,7 @@ static int doSetupMacro(Spec spec, char *line) for (fm = fixmacs; *fm; fm++) { const char *fix; /*@-boundsread@*/ - /*@-nullpass@*/ fix = rpmExpand(*fm, " .", NULL); - /*@=nullpass@*/ if (fix && *fix != '%') appendLineStringBuf(spec->prep, fix); fix = _free(fix); diff --git a/lib/package.c b/lib/package.c index 8a3d586..ff2d88e 100644 --- a/lib/package.c +++ b/lib/package.c @@ -431,21 +431,21 @@ int rpmReadPackageFile(rpmts ts, FD_t fd, rpmMessage(RPMMESS_DEBUG, "%s: %s", fn, buf); rc = RPMRC_OK; break; - case RPMSIG_NOKEY: /* Key is unavailable. */ case RPMSIG_NOTTRUSTED: /* Signature is OK, but key is not trusted. */ + case RPMSIG_NOKEY: /* Key is unavailable. */ /* XXX Print NOKEY/NOTTRUSTED warning only once. */ - if (!rpmtsStashKeyid(ts)) - rpmMessage(RPMMESS_WARNING, "%s: %s", fn, buf); + { int lvl = (rpmtsStashKeyid(ts) ? RPMMESS_DEBUG : RPMMESS_WARNING); + rpmMessage(lvl, "%s: %s", fn, buf); rc = RPMRC_OK; - break; - case RPMSIG_UNKNOWN: /* Signature is unknown. */ + } break; + case RPMSIG_UNKNOWN: /* Signature is unknown type. */ rpmMessage(RPMMESS_WARNING, "%s: %s", fn, buf); rc = RPMRC_OK; break; default: case RPMSIG_BAD: /* Signature does not verify. */ rpmMessage(RPMMESS_ERROR, "%s: %s", fn, buf); - rc = RPMRC_OK; + rc = RPMRC_FAIL; break; } diff --git a/lib/rpmds.c b/lib/rpmds.c index b670709..bbcaa87 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -579,10 +579,14 @@ int rpmdsCompare(const rpmds A, const rpmds B) if (aE && *aE && bE && *bE) sense = rpmvercmp(aE, bE); else if (aE && *aE && atol(aE) > 0) { +#ifndef LEGACY_COMPATIBILITY_NEEDS_THIS /* XXX legacy epoch-less requires/conflicts compatibility */ rpmMessage(RPMMESS_DEBUG, _("the \"B\" dependency needs an epoch (assuming same as \"A\")\n\tA %s\tB %s\n"), aDepend, bDepend); sense = 0; +#else + sense = 1; +#endif } else if (bE && *bE && atol(bE) > 0) sense = -1; diff --git a/macros.in b/macros.in index 9677e3c..b2805b3 100644 --- a/macros.in +++ b/macros.in @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: /usr/lib/rpm/macros # \verbatim # -# $Id: macros.in,v 1.109 2002/07/18 21:42:19 jbj Exp $ +# $Id: macros.in,v 1.110 2002/07/20 19:02:41 jbj Exp $ # # This is a global RPM configuration file. All changes made here will # be lost when the rpm package is upgraded. Any per-system configuration @@ -564,12 +564,24 @@ libgnomeprint15>gnome-print \ nautilus>nautilus-mozilla \ tcl>postgresql-tcl +#%_dependency_whiteout_8_0 \ +# perl>perl-Parse-RecDescent \ +# XFree86-libs>XFree86-Mesa-libGL \ +# perl>perl-Filter \ +# perl>mrtg \ +# perl>mod_perl \ +# mysql>perl-DBD-MySQL \ +# ghostscript>gimp-print \ +# arts>kde2-compat \ +# perl-Date-Calc>perl-Bit-Vector \ +# glibc-debug>glibc-devel %_dependency_whiteout \ libtermcap>bash \ modutils>vixie-cron \ ypbind>yp-tools \ ghostscript-fonts>ghostscript \ + %{?_dependency_whiteout_8_0} \ %{?_dependency_whiteout_7_2} \ %{?_dependency_whiteout_7_1} \ %{?_dependency_whiteout_7_0} \ diff --git a/po/cs.po b/po/cs.po index a42f07d..1e3e718 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-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -1105,36 +1105,36 @@ msgstr " msgid "line %d: Bad %%setup option %s: %s\n" msgstr "øádek %d: ©patná volba v %%setup %s: %s\n" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "øádek %d: K %%patch -b potøebuji parametr: %s\n" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "øádek %d: K %%patch -z potøebuji parametr: %s\n" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "øádek %d: K %%patch -p potøebuji parametr: %s\n" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "øádek %d: ©patný parametr pro %%patch -p: %s\n" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "Pøíli¹ mnoho patchù!\n" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "øádek %d: ©patný parametr pro %%patch: %s\n" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "øádek %d: druhý %%prep\n" @@ -1513,7 +1513,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "(není èíslo)" @@ -2106,7 +2106,7 @@ msgstr "generovat PGP/GPG podpis" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "Datový typ %d není podporován\n" @@ -2410,16 +2410,16 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "NE " -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "ANO" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2428,13 +2428,13 @@ msgstr "" "Závislost \"B\" potøebuje období (pøedpokládáno stejné jako \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" @@ -2941,6 +2941,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, fuzzy, c-format msgid "missing %s" @@ -3010,99 +3058,99 @@ msgstr "sd msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 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:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "chybí { po %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "po %{ chybí }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "prázdný formát znaèky" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "prázdné jméno znaèky" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "neznámá znaèka" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "na konci pole oèekáváno ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "neoèekávaná ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "neoèekávaná }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "ve výrazu oèekáván ?" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "ve výrazu je po ? oèekávána {" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "ve výrazu je oèekávána }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "v podvýrazu je po ? oèekávána :" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "ve výrazu je po : oèekávána {" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "na konci výrazu je oèekáváno |" @@ -3124,17 +3172,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "generovat hlavièky balíèkù kompatibilní s RPM verze 2 a 3" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "nemohu otevøít RPM databázi v %s\n" -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "nemohu otevøít RPM databázi v %s\n" @@ -3143,145 +3191,145 @@ msgstr "nemohu otev msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "znovu vytvoøit databázi z existující databáze" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "nemohu provést dotaz %s: %s\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Nelze pøejmenovat %s na %s: %m\n" diff --git a/po/da.po b/po/da.po index ee4f795..19d4b36 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-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -1102,36 +1102,36 @@ msgstr "linie %d: Ugyldigt parameter til %%setup %c: %s\n" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "linie %d: Ugyldigt '%%setup'-tilvalg %s: %s\n" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "linie %d: Kræver parameter til %%patch -b: %s\n" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "linie %d: Kræver parameter til %%patch -z: %s\n" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "linie %d: Kræver parameter til %%patch -p: %s\n" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "linie %d: Ugyldigt parameter til %%patch -p: %s\n" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "For mange lapper (patches)!\n" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "linie %d: Ugyldigt parameter til %%patch: %s\n" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "linie %d: anden %%prep\n" @@ -1512,7 +1512,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "(ikke et tal)" @@ -2120,7 +2120,7 @@ msgstr "gener #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "Datatype %d understøttes ikke\n" @@ -2425,17 +2425,17 @@ msgstr ")" msgid "OK" msgstr "O.K." -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 #, fuzzy msgid "NO " msgstr "IKKE O.K." -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2444,13 +2444,13 @@ msgstr "" "\"B\"-afhængighed kræver en epoke (antager samme som \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" @@ -2950,6 +2950,54 @@ msgstr "%s oversprunget grundet manglende ok-flag\n" msgid "excluding directory %s\n" msgstr "ekskluderer kataloget %s\n" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -3018,99 +3066,99 @@ msgstr "delt" msgid "locked db index %s/%s\n" msgstr "låste db-index %s/%s\n" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, fuzzy, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "ukendt db-tilvalg: \"%s\" ignoreret\n" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s har ugyldig talværdi, overspringes\n" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s har for stor eller lille 'long'-værdi, overspringes\n" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s har for stor eller lille heltalsværdi, overspringes\n" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 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:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "manglende { efter %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "manglende } efter %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "tomt mærkeformat" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "tomt mærkenavn" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "ukendt mærke" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "] forventet ved slutningen af tabel" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "uventet ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "uventet }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "? forventet i udtryk" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "{ forventet efter ? i udtryk" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "} forventet i udtryk" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr ": forventet efter ?-underudtryk" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "{ forventet efter : i udtryk" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "| forventet ved slutningen af udtryk" @@ -3133,17 +3181,17 @@ msgstr "" "generér hoveder, der er kompatible med (gamle) rpm[23]-indpakningsversioner" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: ukendt mærkenavn: \"%s\" ignoreret\n" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, 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:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "kan ikke åbne '%s'-indeks\n" @@ -3152,149 +3200,149 @@ msgstr "kan ikke msgid "no dbpath has been set\n" msgstr "der er ikke sat nogen dbpath\n" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, 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:1423 +#: rpmdb/rpmdb.c:1451 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "fejl(%d) ved gemning af post %s i %s\n" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, 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:2342 +#: rpmdb/rpmdb.c:2370 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "fjerner \"%s\" fra %s-indekset.\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "fjerne %d indgange fra %s-indekset.\n" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "fejl(%d) ved gemning af post %s i %s\n" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "fejl(%d) ved fjernelse af post %s fra %s\n" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "fejl(%d) under allokering af ny pakkeinstans\n" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" "tilføjer \"%s\" til '%s'-indekset.\n" "\n" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "tilføjer %d indgange til '%s'-indekset.\n" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, 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:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "fjerner %s efter vellykket genopbygning af db3.\n" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "der ikke sat nogen dbpath" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "genopbygger database %s over i %s\n" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "den midlertidige database %s eksisterer allerede\n" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "" "opretter kataloget %s\n" "\n" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "opretter kataloget %s: %s\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "åbner gammel database med dbapi %d\n" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "åbner ny database med dbapi %d\n" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, 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:3437 +#: rpmdb/rpmdb.c:3469 #, 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:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunne ikke genopbygge database: original-databasen beholdes\n" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "kunne ikke erstatte gammel database med ny database!\n" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, 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:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "fjerner kataloget %s\n" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunne ikke fjerne katalog %s: %s\n" diff --git a/po/de.po b/po/de.po index 0c3a0e5..2899e63 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-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -1211,40 +1211,40 @@ msgid "line %d: Bad %%setup option %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, fuzzy, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "" # , c-format -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, fuzzy, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "" @@ -1644,7 +1644,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "(keine Zahl)" @@ -2280,7 +2280,7 @@ msgstr "PGP-Signatur generieren" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2594,29 +2594,29 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" @@ -3133,6 +3133,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, fuzzy, c-format msgid "missing %s" @@ -3201,102 +3249,102 @@ msgstr "geteilt" msgid "locked db index %s/%s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "fehlende { nach %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "fehlende } nach %{" # »Tag« übersetzen??? -ke- #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "leeres »Tag«-Format" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "leerer »Tag«-Name" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "unbekannter »Tag«" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "] am Ende des Arrays erwartet" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "unerwartete ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "unerwartete }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "? im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 #, fuzzy msgid "{ expected after ? in expression" msgstr "{ nach ? im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "} im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr ": nach ? Unterausdruck erwartet" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 #, fuzzy msgid "{ expected after : in expression" msgstr "{ nach : im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "| am Ende des Ausdrucks erwartet" @@ -3319,17 +3367,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "kann Datei %s nicht öffnen: " -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "Fehler: kann %s nicht öffnen\n" @@ -3339,151 +3387,151 @@ msgstr "Fehler: kann %s nicht msgid "no dbpath has been set\n" msgstr "»dbpath« ist nicht gesetzt" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "Fehler beim Eintrag %s von %s" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "Fehler bei Schreiben des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "Fehler beim Eintrag %s von %s" # FIXME -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" # FIXME -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "Fehler beim Eintrag %s von %s" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, 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:2520 +#: rpmdb/rpmdb.c:2548 #, 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:2667 +#: rpmdb/rpmdb.c:2695 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # FIXME -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "Fehler bei Schreiben des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "»dbpath« ist nicht gesetzt" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "die temporäre Datenbank %s existiert schon" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, 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:3437 +#: rpmdb/rpmdb.c:3469 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" # , c-format -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" diff --git a/po/en_RN.po b/po/en_RN.po index c9774ea..a5e7be8 100644 --- a/po/en_RN.po +++ b/po/en_RN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1086,36 +1086,36 @@ msgstr "" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "" @@ -1480,7 +1480,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "" @@ -2046,7 +2046,7 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2346,29 +2346,29 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2859,6 +2859,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -2927,99 +2975,99 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "" @@ -3040,17 +3088,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "" @@ -3059,145 +3107,145 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/es.po b/po/es.po index c9774ea..a5e7be8 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1086,36 +1086,36 @@ msgstr "" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "" @@ -1480,7 +1480,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "" @@ -2046,7 +2046,7 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2346,29 +2346,29 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2859,6 +2859,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -2927,99 +2975,99 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "" @@ -3040,17 +3088,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "" @@ -3059,145 +3107,145 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/eu_ES.po b/po/eu_ES.po index c9774ea..a5e7be8 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1086,36 +1086,36 @@ msgstr "" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "" @@ -1480,7 +1480,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "" @@ -2046,7 +2046,7 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2346,29 +2346,29 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2859,6 +2859,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -2927,99 +2975,99 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "" @@ -3040,17 +3088,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "" @@ -3059,145 +3107,145 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 28b43fb..4d2499b 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-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -1115,36 +1115,36 @@ msgstr "en voinut avata %s: %s" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "en voinut avata %s: %s" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "en voinut avata %s: %s" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "en voinut avata %s: %s" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "en voinut avata %s: %s" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, fuzzy, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "en voinut avata %s: %s" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, fuzzy, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "en voinut avata %s: %s" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "" @@ -1534,7 +1534,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "(ei ole luku)" @@ -2163,7 +2163,7 @@ msgstr "generoi PGP-allekirjoitus" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2471,29 +2471,29 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paketti %s ei ole %s:ssä" @@ -2999,6 +2999,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, fuzzy, c-format msgid "missing %s" @@ -3067,101 +3115,101 @@ msgstr "jaettua" msgid "locked db index %s/%s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "puuttuva '{' '%':n jälkeen" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "puuttuva '{' '%{':n jälkeen" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "tyhjä nimiön formaatti" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "tyhjä nimiön nimi" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "tuntematon nimiö" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "']' puuttuu taulukkomäärittelyn lopusta" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "odottamaton ']'" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "odottamaton '}'" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "odotin '?'-merkkiä ilmauksessa" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 #, fuzzy msgid "{ expected after ? in expression" msgstr "odotin '{' '?'-merkin jälkeen ilmauksessa " #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "odotin '}'-merkkiä ilmauksessa" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "odotin ':' '?'-merkin jälkeen ali-ilmauksessa " #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 #, fuzzy msgid "{ expected after : in expression" msgstr "odotin '{' ':'-merkin jälkeen ilmauksessa " #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "odotin '}'-merkkiä ilmauksen lopussa" @@ -3184,17 +3232,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "en voinut avata tiedostoa %s: " -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "virhe: en voi avata %s\n" @@ -3204,145 +3252,145 @@ msgstr "virhe: en voi avata %s\n" msgid "no dbpath has been set\n" msgstr "dbpath ei ole asetettu" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, 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:2342 +#: rpmdb/rpmdb.c:2370 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "virhe etsittäessä pakettia %s\n" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "dbpath ei ole asetettu" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "väliaikainen tietokanta %s on jo olemassa" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "en voi lisätä tietuetta %d:stä" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "en voinut avata %s: %s" diff --git a/po/fr.po b/po/fr.po index f2ef52a..a4df031 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-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1141,36 +1141,36 @@ msgstr "impossible d'ouvrir: %s\n" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, fuzzy, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, fuzzy, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "" @@ -1564,7 +1564,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "" @@ -2207,7 +2207,7 @@ msgstr " --sign - genre une signature PGP" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2515,29 +2515,29 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -3038,6 +3038,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -3106,101 +3154,101 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 #, fuzzy msgid "unexpected ]" msgstr "source de requte inattendue" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 #, fuzzy msgid "unexpected }" msgstr "source de requte inattendue" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "" @@ -3223,17 +3271,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "impossible d'ouvrir: %s\n" @@ -3242,145 +3290,145 @@ msgstr "impossible d'ouvrir: %s\n" msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, 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:2342 +#: rpmdb/rpmdb.c:2370 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" diff --git a/po/gl.po b/po/gl.po index b46a159..0a4ea15 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-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -1081,36 +1081,36 @@ msgstr "" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "" @@ -1475,7 +1475,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "" @@ -2041,7 +2041,7 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2341,29 +2341,29 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2854,6 +2854,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -2922,99 +2970,99 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "" @@ -3035,17 +3083,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "" @@ -3054,145 +3102,145 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index c9774ea..a5e7be8 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1086,36 +1086,36 @@ msgstr "" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "" @@ -1480,7 +1480,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "" @@ -2046,7 +2046,7 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2346,29 +2346,29 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2859,6 +2859,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -2927,99 +2975,99 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "" @@ -3040,17 +3088,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "" @@ -3059,145 +3107,145 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/id.po b/po/id.po index c9774ea..a5e7be8 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1086,36 +1086,36 @@ msgstr "" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "" @@ -1480,7 +1480,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "" @@ -2046,7 +2046,7 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2346,29 +2346,29 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2859,6 +2859,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -2927,99 +2975,99 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "" @@ -3040,17 +3088,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "" @@ -3059,145 +3107,145 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/is.po b/po/is.po index a9a2f37..74b2013 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-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -1088,36 +1088,36 @@ msgstr "l msgid "line %d: Bad %%setup option %s: %s\n" msgstr "" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "" @@ -1484,7 +1484,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "" @@ -2062,7 +2062,7 @@ msgstr "b #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2362,29 +2362,29 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" @@ -2877,6 +2877,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -2945,99 +2993,99 @@ msgstr "deildann" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "" @@ -3058,17 +3106,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, 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:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "get ekki opnað %s index\n" @@ -3077,145 +3125,145 @@ msgstr "get ekki opna msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/it.po b/po/it.po index c9774ea..a5e7be8 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1086,36 +1086,36 @@ msgstr "" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "" @@ -1480,7 +1480,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "" @@ -2046,7 +2046,7 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2346,29 +2346,29 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2859,6 +2859,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -2927,99 +2975,99 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "" @@ -3040,17 +3088,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "" @@ -3059,145 +3107,145 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index f16452e..c9e375d 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-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -1134,37 +1134,37 @@ msgstr "%d msgid "line %d: Bad %%setup option %s: %s\n" msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê %%setup ¥ª¥×¥·¥ç¥ó %s: %s" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "%d ¹ÔÌÜ: %%patch -b ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹: %s" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "%d ¹ÔÌÜ: %%patch -z ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹: %s" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "%d ¹ÔÌÜ: %%patch -p ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹: %s" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, fuzzy, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê %%patch -p ¤Ø¤Î°ú¿ô: %s" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 #, fuzzy msgid "Too many patches!\n" msgstr "¥Ñ¥Ã¥Á¤¬Â¿¤¹¤®¤Þ¤¹" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, fuzzy, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "%d ¹ÔÌÜ: %%patch ¤Ø¤ÎÉÔÀµ¤Ê°ú¿ô: %s" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, fuzzy, c-format msgid "line %d: second %%prep\n" msgstr "%d ¹ÔÌÜ: 2ÈÖÌܤΠ%%prep" @@ -1559,7 +1559,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "(¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)" @@ -2199,7 +2199,7 @@ msgstr "PGP/GPG #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "¥Ç¡¼¥¿¥¿¥¤¥× %d ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" @@ -2509,16 +2509,16 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2527,13 +2527,13 @@ msgstr "" "\"B\" ¤Î°Í¸À­¤Ï epoch ¤òɬÍפȤ·¤Þ¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" @@ -3047,6 +3047,55 @@ msgstr "%s msgid "excluding directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +#, fuzzy +msgid "repackage about-to-be-erased packages\n" +msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ï°ì¤Ä¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸!\n" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, fuzzy, c-format msgid "missing %s" @@ -3115,100 +3164,100 @@ msgstr " msgid "locked db index %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabDate() RPM_STRING_TYPE ¥«¥¦¥ó¥È¤Ï 1 ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "% ¤Î¸å¤Ë { ¤¬¤¢¤ê¤Þ¤»¤ó" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "%{ ¤Î¸å¤Ë } ¤¬¤¢¤ê¤Þ¤»¤ó" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "¶õ¤Î¥¿¥°¥Õ¥©¡¼¥Þ¥Ã¥È" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "¶õ¤Î¥¿¥°Ì¾" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "ÉÔÌÀ¤Ê¥¿¥°" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "ÇÛÎó¤Î¸å¤Ë ] ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "ͽ´ü¤»¤Ì ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "ͽ´ü¤»¤Ì }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "¼°Ãæ¤Ç ? ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "¼°Ãæ¤Ç ? ¤Î¸å¤Ë { ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "¼°Ãæ¤Ë } ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "°Ê²¼¤Î ? ¥µ¥Ö¼°¤Î ¤Ë: ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "¼°Ãæ¤Ç : ¤Î¸å¤Ë { ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "¼°¤Î½ª¤ê¤Ë | ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" @@ -3231,17 +3280,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó %s:%d" -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" @@ -3251,147 +3300,147 @@ msgstr "%s msgid "no dbpath has been set\n" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Þ¤¹" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ­¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤­´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤­´¹¤¨¤Þ¤¹" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n" @@ -4450,9 +4499,6 @@ msgstr "%s: Fread #~ msgid "%s: %-45s YES (added package)\n" #~ msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#~ msgid "package is a version one package!\n" -#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ï°ì¤Ä¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸!\n" - #~ msgid "old style source package -- I'll do my best\n" #~ msgstr "¸Å¤¤¥¹¥¿¥¤¥ë¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸ -- ¥Ù¥¹¥È¤ò¿Ô¤¯¤·¤Þ¤¹\n" diff --git a/po/ko.po b/po/ko.po index d24ea11..f43cb0b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" -"POT-Creation-Date: 2002-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -1095,36 +1095,36 @@ msgstr "%d msgid "line %d: Bad %%setup option %s: %s\n" msgstr "%d ¹ø° Çà: %%setup¿¡ À߸øµÈ %s ¿É¼Ç: %s\n" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "%d ¹ø° Çà: %%patch -b ¿¡ Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù: %s\n" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "%d ¹ø° Çà: %%patch -z ¿¡ Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù: %s\n" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "%d ¹ø° Çà: %%patch -p ¿¡ Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù: %s\n" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "%d ¹ø° Çà: %%patch -p ¿¡ À߸øµÈ Àμö°¡ ÀÖ½À´Ï´Ù: %s\n" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "ÆÐÄ¡°¡ ³Ê¹« ¸¹½À´Ï´Ù!\n" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "%d ¹ø° Çà: %%patch¿¡ À߸øµÈ Àμö°¡ ÀÖ½À´Ï´Ù: %s\n" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "%d ¹ø° Çà: µÎ¹ø° %%prep\n" @@ -1499,7 +1499,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "(¼ýÀÚ°¡ ¾Æ´Õ´Ï´Ù)" @@ -2090,7 +2090,7 @@ msgstr " #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "%d µ¥ÀÌÅÍ À¯ÇüÀº »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù\n" @@ -2399,16 +2399,16 @@ msgstr ")" msgid "OK" msgstr "È®ÀÎ" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "¾Æ´Ï¿À" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "¿¹" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2417,13 +2417,13 @@ msgstr "" "\"B\" ÀÇÁ¸¼ºÀº Áß¿ä½Ã µÇ´Â °Í(epoch)À» ÇÊ¿ä·Î ÇÕ´Ï´Ù (\"A\" ·Î °¡Á¤ÇÕ´Ï´Ù)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä»çÇ×(³»¿ª)ÀÌ ¸¸Á·ÇÏÁö ¾ÊÀ½: %s\n" @@ -2926,6 +2926,54 @@ msgstr "missingok msgid "excluding directory %s\n" msgstr "%s µð·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -2994,99 +3042,99 @@ msgstr " msgid "locked db index %s/%s\n" msgstr "Àá±ÝµÈ db À妽º %s/%s\n" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "ÀÎÁõµÇÁö ¾ÊÀº db ¿É¼Ç: \"%s\"(À»)¸¦ ¹«½ÃÇÕ´Ï´Ù.\n" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s(Àº)´Â ºÎÀûÇÕÇÑ ¼öÄ¡ °ªÀÔ´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s(Àº)´Â ³Ê¹« Å©°Å³ª ³Ê¹« ÀûÀº Á¤¼ö(long) °ªÀÔ´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s(Àº)´Â ³Ê¹« Å©°Å³ª ³Ê¹« ÀûÀº Á¤¼ö(int) °ªÀÔ´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE Ä«¿îÆ®´Â ¹Ýµå½Ã '1' À̾î¾ß ÇÕ´Ï´Ù.\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "'%' µÚ¿¡ '{' °¡ ¾ø½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "'%{' µÚ¿¡ '}' °¡ ¾ø½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "ÅÂ±× Çü½ÄÀÌ ºñ¾îÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "ÅÂ±× À̸§ÀÌ ºñ¾îÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "¾Ë ¼ö ¾ø´Â ÅÂ±× ÀÔ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "¹è¿­ÀÇ ³¡ºÎºÐ¿¡ ']' °¡ ¿Í¾ßÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "ºÒÇÊ¿äÇÑ ']' °¡ ÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "ºÒÇÊ¿äÇÑ '}' °¡ ÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "Ç¥Çö½Ä¿¡ '?' °¡ ¿Í¾ßÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "Ç¥Çö½ÄÀÇ '?' µÚ¿¡ '{' °¡ ¿Í¾ßÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "Ç¥Çö½Ä¿¡ '}' °¡ ¿Í¾ßÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "'?' ÇϺÎÇ¥Çö½Ä(subexpression) µÚ¿¡ ':' ÀÌ ¿Í¾ßÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "Ç¥Çö½ÄÀÇ ':' µÚ¿¡ '{' °¡ ¿Í¾ßÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "Ç¥Çö½ÄÀÇ ³¡ºÎºÐ¿¡ '|' °¡ ¿Í¾ßÇÕ´Ï´Ù" @@ -3109,19 +3157,19 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "(±âÁ¸ÀÇ) rpm[23] ÆÐŰ¡°ú ȣȯÇÏ´Â Çì´õ¸¦ »ý¼ºÇÕ´Ï´Ù" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" "DB ÅÂ±× ÃʱâÈ­[dbiTagsInit]: ÀÎÁõµÇÁö ¾ÊÀº ÅÂ±× À̸§: \"%s\"(Àº)´Â ¹«½ÃµË´Ï" "´Ù\n" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, 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:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "%s À妽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n" @@ -3130,149 +3178,149 @@ msgstr "%s msgid "no dbpath has been set\n" msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" "%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: ¼Õ»óµÈ Çì´õ #%u(ÀÌ)°¡ º¹±¸(retrieved)µÇ¾ú½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%xÀÇ Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" "%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "%2$s À妽º¿¡¼­ \"%1$s\"(À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "%2$s À妽º¿¡¼­ %1$d Ç׸ñµé(entries)À» »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" "%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "%3$s¿¡¼­ %2$s ·¹Äڵ带 »èÁ¦ÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "»õ·Î¿î ÆÐÅ°Áö¸¦ ¹èÄ¡ÇÏ´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%2$s À妽º¿¡ \"%1$s\"(À»)¸¦ Ãß°¡ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "%2$s À妽º¿¡ %1$d Ç׸ñµé(entries)À» Ãß°¡ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "db3¸¦ À籸ÃàÇÑ ÈÄ¿¡ %s(À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%2$s¿¡ %1$s µ¥ÀÌÅͺ£À̽º¸¦ À籸Ãà ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "Àӽà µ¥ÀÌÅͺ£À̽º %s(ÀÌ)°¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÔ: %s\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "dbapi %d·Î ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "dbapi %d·Î »õ·Î¿î µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "µ¥ÀÌÅͺ£À̽ºÀÇ ·¹ÄÚµå ¹øÈ£ %u(ÀÌ)°¡ À߸øµÇ¾ú½À´Ï´Ù -- »ý·«ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "%u¿¡ óÀ½ºÎÅÍ ·¹Äڵ带 Ãß°¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "µ¥ÀÌÅͺ£À̽º¸¦ À籸ÃàÇϴµ¥ ½ÇÆÐÇÔ: ¿øº» µ¥ÀÌÅͺ£À̽º´Â ±×´ë·Î À¯ÁöµË´Ï´Ù\n" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ »õ·Î¿î µ¥ÀÌÅͺ£À̽º·Î ±³Ã¼Çϴµ¥ ½ÇÆÐÇß½À´Ï´Ù!\n" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "º¹±¸Çϱâ À§ÇØ %2$sÀÇ ÆÄÀÏÀ» %1$sÀÇ ÆÄÀÏ·Î ±³Ã¼ÇÕ´Ï´Ù" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆÐÇÔ: %s\n" diff --git a/po/no.po b/po/no.po index f45d207..07f24ad 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-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -1099,36 +1099,36 @@ msgstr "linje %d: Ugyldig argument til %%setup: %s\n" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "linje %d: Ugyldig %%setup flagg %s: %s\n" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "linje %d: Trenger argument til %%patch -b: %s\n" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "linje %d: Trenger argument til %%patch -z: %s\n" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "linje %d: Trenger argument til %%patch -p: %s\n" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "linje %d: Ugyldig argument til %%patch -p: %s\n" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "For mange patcher!\n" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "linje %d: Ugyldig argument til %%patch: %s\n" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "linje %d: %%prep for andre gang\n" @@ -1499,7 +1499,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "" @@ -2086,7 +2086,7 @@ msgstr "generer signatur" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "Datatype %d ikke støttet\n" @@ -2387,29 +2387,29 @@ msgstr "" msgid "OK" msgstr "OK" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "NEI" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "JA" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s er i konflikt: %s\n" @@ -2905,6 +2905,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "ekskluderer katalog %s\n" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -2973,99 +3021,99 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "mangler { etter %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "mangler } etter %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "" @@ -3086,17 +3134,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "generer headere som er kompatible med (gamle) rpm[23] pakker" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, 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:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "kan ikke åpne %s indeks\n" @@ -3105,145 +3153,145 @@ msgstr "kan ikke msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "feil(%d) under lagring av post %s til %s\n" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "feil(%d) under lagring av post %s til %s\n" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "feil(%d) under fjerning av post %s fra %s\n" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "feil(%d) under lagring av post %s til %s\n" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "feil(%d) under fjerning av post %s fra %s\n" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, 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:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index ba9f5a7..ae7e635 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-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -1125,37 +1125,37 @@ msgstr "linia %d: B msgid "line %d: Bad %%setup option %s: %s\n" msgstr "linia %d: B³êdna opcja %%setup %s: %s" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "linia %d: Wymagany argument dla %%patch -b: %s" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "linia %d: Wymagany argument dla %%patch -z: %s" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "linia %d: Wymagany argument dla %%patch -p: %s" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, fuzzy, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "linia %d: B³êdny argument dla %%patch -p: %s" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 #, fuzzy msgid "Too many patches!\n" msgstr "Zbyt wiele ³at!" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, fuzzy, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "linia %d: B³êdny argument dla %%patch: %s" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, fuzzy, c-format msgid "line %d: second %%prep\n" msgstr "linia %d: druga sekcja %%prep" @@ -1541,7 +1541,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "(nie jest liczb±)" @@ -2163,7 +2163,7 @@ msgstr "generuj sygnatur #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "Typ danych %d nie jest obs³ugiwany\n" @@ -2470,30 +2470,30 @@ msgstr ")" msgid "OK" msgstr "OK" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 #, fuzzy msgid "NO " msgstr "NIE DOBRZE" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" @@ -2999,6 +2999,55 @@ msgstr "%s pomini msgid "excluding directory %s\n" msgstr "tworzenie katalogu: %s\n" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +#, fuzzy +msgid "repackage about-to-be-erased packages\n" +msgstr "ten pakiet jest pakietem w wersji jeden!\n" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, fuzzy, c-format msgid "missing %s" @@ -3067,100 +3116,100 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 #, fuzzy 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:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "brak { po %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "brak } po %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "pusty format etykiety" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "pusta nazwa etykiety" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "nieznana etykieta" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "spodziewany ] na koñcu tablicy" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "nie spodziewany ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "nie spodziewany }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "spodziewany ? w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "spodziewany { po ? w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "spodziewany } w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "spodziewany : po podwyra¿eniu ?" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "spodziewany { po : w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "spodziewany | na koñcu wyra¿enia" @@ -3183,17 +3232,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, 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:265 +#: rpmdb/rpmdb.c:263 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "nie mo¿na otworzyæ %s\n" @@ -3203,146 +3252,146 @@ msgstr "nie mo msgid "no dbpath has been set\n" msgstr "¶cie¿ka bazy danych nie zosta³a podana" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "b³±d pobierania rekordu %s z %s" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "b³±d zapisywania rekordu %s do %s" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, 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:2342 +#: rpmdb/rpmdb.c:2370 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "b³±d pobierania rekordu %s z %s" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "usuwanie indeksu grupy\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "usuwanie indeksu nazw\n" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "b³±d pobierania rekordu %s z %s" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "b³±d zapisywania rekordu %s do %s" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "b³±d usuwania rekordu %s z %s" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "b³±d szukania pakietu %s\n" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "b³±d zapisywania rekordu %s do %s" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "¶cie¿ka bazy danych nie zosta³a podana" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "odbudowywujê bazê danych w rootdir %s\n" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "tymczasowa baza danych %s ju¿ istnieje" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otwieranie starej bazy danych\n" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otwieranie nowej bazy danych\n" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, 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:3437 +#: rpmdb/rpmdb.c:3469 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 #, 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:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "zamiana starej bazy na now± nie powiod³a siê!\n" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, 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:3475 +#: rpmdb/rpmdb.c:3507 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n" @@ -4884,9 +4933,6 @@ msgstr "%s: readLead nie powiod #~ msgid "%s: %-45s YES (added package)\n" #~ msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#~ msgid "package is a version one package!\n" -#~ msgstr "ten pakiet jest pakietem w wersji jeden!\n" - #~ msgid "old style source package -- I'll do my best\n" #~ msgstr "stary styl pakietu ¼ród³owego -- Zrobiê co w mojej mocy\n" diff --git a/po/pt.po b/po/pt.po index 05e5be7..03d5018 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2002-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: 2002-02-14 10:51+0000\n" "Last-Translator: José Nuno Coelho Sanarra Pires \n" "Language-Team: pt \n" "Language-Team: Romanian \n" @@ -1081,36 +1081,36 @@ msgstr "" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "" @@ -1475,7 +1475,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "" @@ -2041,7 +2041,7 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2341,29 +2341,29 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2854,6 +2854,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -2922,99 +2970,99 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "" @@ -3035,17 +3083,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "" @@ -3054,145 +3102,145 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 6e9b620..8563f7d 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-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1087,36 +1087,36 @@ msgstr "" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "" @@ -1481,7 +1481,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "" @@ -2047,7 +2047,7 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2347,29 +2347,29 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2860,6 +2860,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -2928,99 +2976,99 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "" @@ -3041,17 +3089,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "" @@ -3060,145 +3108,145 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 1df5787..eccbddf 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-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: 2002-04-09 16:44-0400\n" "Last-Translator: Eugene Kanter, \n" "Language-Team: Black Cat Linux Team \n" @@ -1107,36 +1107,36 @@ msgstr " msgid "line %d: Bad %%setup option %s: %s\n" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÐÁÒÁÍÅÔÒ %%setup %s: %s\n" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "ÓÔÒÏËÁ %d: äÌÑ %%patch -b ÎÕÖÅÎ ÁÒÇÕÍÅÎÔ: %s\n" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "ÓÔÒÏËÁ %d: äÌÑ %%patch -z ÎÕÖÅÎ ÁÒÇÕÍÅÎÔ: %s\n" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "ÓÔÒÏËÁ %d: äÌÑ %%patch -p ÎÕÖÅÎ ÁÒÇÕÍÅÎÔ: %s\n" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %%patch -p: %s\n" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÚÁÐÌÁÔ!\n" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %%patch: %s\n" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "ÓÔÒÏËÁ %d: ×ÔÏÒÏÊ %%prep\n" @@ -1521,7 +1521,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "(ÎÅ ÞÉÓÌÏ)" @@ -2109,7 +2109,7 @@ msgstr " #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "ôÉÐ ÄÁÎÎÙÈ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n" @@ -2412,16 +2412,16 @@ msgstr ")" msgid "OK" msgstr "ïë" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "îåT" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "äá" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2430,13 +2430,13 @@ msgstr "" "ÄÌÑ ÚÁ×ÉÓÉÍÏÓÔÉ \"B\" ÎÕÖÎÏ ÕËÁÚÁÔØ \"epoch\" (ÔÁË ÖÅ ËÁË ÄÌÑ \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "ÐÁËÅÔ %s ÓÏÄÅÒÖÉÔ ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÔÒÅÂÏ×ÁÎÉÑ: %s\n" @@ -2935,6 +2935,54 @@ msgstr "%s msgid "excluding directory %s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -3003,22 +3051,22 @@ msgstr " msgid "locked db index %s/%s\n" msgstr "ÚÁÂÌÏËÉÒÏ×ÁÎ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "ÎÅÏÐÏÚÎÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÂÁÚÙ ÄÁÎÎÙÈ: \"%s\" ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ\n" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "ÎÅ×ÅÒÎÏÅ ÞÉÓÌÏ×ÏÅ ÚÎÁÞÅÎÉÅ %s, ÐÒÏÐÕÝÅÎÏ\n" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s ÉÍÅÅÔ ÓÌÉÛËÏÍ ÍÁÌÕÀ ÉÌÉ ÓÌÉÛËÏÍ ÂÏÌØÛÕÀ ×ÅÌÉÞÉÎÕ long, ÐÒÏÐÕÝÅÎÏ\n" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3026,77 +3074,77 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() ÄÏÐÕÓÔÉÍ ÔÏÌØËÏ ÏÄÉÎ ÜÌÅÍÅÎÔ ÔÉÐÁ RPM_STRING_TYPE\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"{\" ÐÏÓÌÅ \"%\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"}\" ÐÏÓÌÅ \"%{\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "ÐÕÓÔÏÊ ÆÏÒÍÁÔ ÔÜÇÁ" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "ÐÕÓÔÏÅ ÉÍÑ ÔÜÇÁ" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÜÇ" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "× ËÏÎÃÅ ÍÁÓÓÉ×Á ÏÖÉÄÁÌÁÓØ \"]\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"]\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"}\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÏÓØ \"?\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \"?\" ÏÖÉÄÁÌÏÓØ \"{\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÏÓØ \"}\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \"?\" ÏÖÉÄÁÌÏÓØ \":\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \":\" ÏÖÉÄÁÌÏÓØ \"{\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "× ËÏÎÃÅ ×ÙÒÁÖÅÎÉÑ ÏÖÉÄÁÌÓÑ \"|\"" @@ -3119,17 +3167,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "ÓÏÚÄÁÔØ ÚÁÇÏÌÏ×ËÉ, ÓÏ×ÍÅÓÔÉÍÙÅ Ó (ÕÓÔÁÒÅ×ÛÉÍÉ) ÐÁËÅÔÁÍÉ rpm[23]" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: ÉÍÑ ËÌÀÞÁ \"%s\" ÎÅ ÉÚ×ÅÓÔÎÏ, ÉÇÎÏÒÉÒÕÅÔÓÑ\n" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s ÉÓÐÏÌØÚÕÑ db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s\n" @@ -3138,146 +3186,146 @@ msgstr " msgid "no dbpath has been set\n" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: ÐÏÌÕÞÅÎ ÐÏ×ÒÅÖÄÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË #%u, ÐÒÏÐÕÓËÁÅÔÓÑ.\n" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÚÁÇÏÌÏ×ÏË × 0x%x\n" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "ÏÛÉÂËÁ(%d) ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s\n" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "ÏÛÉÂËÁ(%d) ÒÅÚÅÒ×ÉÒÏ×ÁÎÉÑ ÐÁÍÑÔÉ ÄÌÑ ÏÂÒÁÚÁ ÎÏ×ÏÇÏ ÐÁËÅÔÁ\n" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ \"%s\" × ÉÎÄÅËÓ %s.\n" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ × ÉÎÄÅËÓ %s\n" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s ÐÏÓÌÅ ÕÓÐÅÛÎÏÇÏ ÚÁ×ÅÒÛÅÎÉÑ ÐÅÒÅÉÎÄÅËÁÃÉÉ ÂÁÚÙ × db3.\n" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÅÔÓÑ ÂÁÚÁ ÄÁÎÎÙÈ %s × %s\n" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ\n" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s: %s\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÎÏ×ÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %u × ÂÁÚÅ ÄÁÎÎÙÈ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÅÔÓÑ.\n" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %u)\n" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÁÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÎÁ ÎÏ×ÕÀ!\n" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "ÆÁÊÌÙ × %s ÚÁÍÅÎÑÀÔÓÑ ÆÁÊÌÁÍÉ ÉÚ %s ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "ÕÄÁÌÑÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n" diff --git a/po/sk.po b/po/sk.po index 605a9d7..8b0ed2d 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-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -1122,37 +1122,37 @@ msgstr "riadok %d: Chybn msgid "line %d: Bad %%setup option %s: %s\n" msgstr "riadok %d: Chybná voµba pre %%setup %s: %s" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "riadok %d: %%patch -b potrebuje argument: %s" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "riadok %d: %%patch -z potrebuje argument: %s" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "riadok %d: %%patch -p potrebuje argument: %s" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, fuzzy, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "riadok %d: Chybný argument pre %%patch -p: %s" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 #, fuzzy msgid "Too many patches!\n" msgstr "Priveµa záplat!" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, fuzzy, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "riadok %d: Chybný argument pre %%patch: %s" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, fuzzy, c-format msgid "line %d: second %%prep\n" msgstr "riadok %d: druhý %%prep" @@ -1539,7 +1539,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "(nie je èíslo)" @@ -2161,7 +2161,7 @@ msgstr "vytvori #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "Typ údajov %d nie je podorovaný\n" @@ -2468,30 +2468,30 @@ msgstr ")" msgid "OK" msgstr "V PORIADKU" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 #, fuzzy msgid "NO " msgstr "NIE JE V PORIADKU" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" @@ -2995,6 +2995,55 @@ msgstr "%s vynechan msgid "excluding directory %s\n" msgstr "vytvára sa adresár %s\n" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +#, fuzzy +msgid "repackage about-to-be-erased packages\n" +msgstr "balík je verzie jedna!\n" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, fuzzy, c-format msgid "missing %s" @@ -3063,100 +3112,100 @@ msgstr "zdie msgid "locked db index %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 #, fuzzy 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:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "chýbajúce { po %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "chýbajúce } po %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "prázdny tag formát" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "prázdne meno tagu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "neznámy tag" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "] oèakávané na konci poµa" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "neoèakávané ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "neoèakávané }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "? oèakávané vo výraze" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "{ oèakávané po ? vo výraze" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "} oèakávané vo výraze" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr ": oèakávané po ? podvýraze" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "{ oèakávané po : vo výraze" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "| oèakávené na konci výrazu" @@ -3179,17 +3228,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, 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:265 +#: rpmdb/rpmdb.c:263 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "nie je mo¾né otvori» %s\n" @@ -3199,146 +3248,146 @@ msgstr "nie je mo msgid "no dbpath has been set\n" msgstr "nebola nastavená ¾iadna dbpath" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, 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:1423 +#: rpmdb/rpmdb.c:1451 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "chyba pri zápise záznamu %s do %s" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, 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:2342 +#: rpmdb/rpmdb.c:2370 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "chyba pri naèítaní záznamu %s z %s" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuje sa index skupín\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuje sa index názvov\n" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "chyba pri naèítaní záznamu %s z %s" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, 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:2520 +#: rpmdb/rpmdb.c:2548 #, 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:2667 +#: rpmdb/rpmdb.c:2695 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "chyba pri hµadaní balíka %s\n" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, 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:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "nebola nastavená ¾iadna dbpath" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, 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:3347 +#: rpmdb/rpmdb.c:3375 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "doèasná databáza %s u¾ existuje" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otvára sa stará databáza\n" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otvára sa nová databáza\n" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, 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:3437 +#: rpmdb/rpmdb.c:3469 #, 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:3455 +#: rpmdb/rpmdb.c:3487 #, 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:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "nepodarilo sa nahradi» starú databázu novou!\n" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, 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:3475 +#: rpmdb/rpmdb.c:3507 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nepodarilo sa odstráni» adresár %s: %s\n" @@ -4905,9 +4954,6 @@ msgstr "%s: readLead zlyhalo\n" #~ msgid "%s: %-45s YES (added package)\n" #~ msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#~ msgid "package is a version one package!\n" -#~ msgstr "balík je verzie jedna!\n" - #~ msgid "old style source package -- I'll do my best\n" #~ msgstr "zdrojový balík v starom ¹týle - urobím, èo sa dá\n" diff --git a/po/sl.po b/po/sl.po index a934bf6..35958b8 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.281 2002/07/18 21:44:11 jbj Exp $ +# $Id: sl.po,v 1.282 2002/07/20 19:03:40 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -1121,37 +1121,37 @@ msgstr "vrstica %d: Nepravilen argument za %%setup %c: %s" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "vrstica %d: Nepravilna izbira %%setup %s: %s" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "vrstica %d: Manjka argument za %%patch -b: %s" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "vrstica %d: Manjka argument za %%patch -z: %s" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "vrstica %d: Manjka argument za %%patch -p: %s" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, fuzzy, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "vrstica %d: Nepravilen argument za %%patch -p: %s" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 #, fuzzy msgid "Too many patches!\n" msgstr "Preveè popravkov!" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, fuzzy, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "vrstica %d: Nepravilen argument za %%patch: %s" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, fuzzy, c-format msgid "line %d: second %%prep\n" msgstr "vrstica %d: drugi %%prep" @@ -1542,7 +1542,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "(ni ¹tevilo)" @@ -2161,7 +2161,7 @@ msgstr "izdelava podpisa PGP/GPG" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "Tip podatkov %d ni podprt\n" @@ -2468,17 +2468,17 @@ msgstr ")" msgid "OK" msgstr "V REDU" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 #, fuzzy msgid "NO " msgstr "NI DOBRO" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2487,13 +2487,13 @@ msgstr "" "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" @@ -2998,6 +2998,55 @@ msgstr "%s presko msgid "excluding directory %s\n" msgstr "izkljuèevanje imenika %s\n" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +#, fuzzy +msgid "repackage about-to-be-erased packages\n" +msgstr "paket je paket razlièica ena!\n" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, fuzzy, c-format msgid "missing %s" @@ -3066,22 +3115,22 @@ msgstr "skupno" msgid "locked db index %s/%s\n" msgstr "zaklenjeno db kazalo %s/%s\n" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, fuzzy, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "dbiSetConfig: neprepoznana izbira db: \"%s\" prezrto\n" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s ima neveljavno ¹tevilèno vrednost, prezrto\n" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s ima preveliko ali premajhno dolgo (long) vrednost, prezrto\n" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3090,78 +3139,78 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 #, fuzzy 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:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "manjkajoèi { za %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "manjkajoèi } za %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "oblika znaèke manjka" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "ime znaèke manjka" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "neznana znaèka" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "na koncu polja je prièakovan ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "neprièakovan ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "neprièakovan }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "v izrazu je prièakovan ?" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "v izrazu je za { prièakovan ?" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "v izrazu je prièakovan }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "za podizrazom ? je prièakovano :" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "v izrazu je za : prièakovan {" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "na koncu izraza je prièakovan |" @@ -3184,17 +3233,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: neprepoznano ime znaèke: \"%s\" prezrto\n" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, 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:265 +#: rpmdb/rpmdb.c:263 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "ni mo¾no odpreti kazala %s:" @@ -3204,148 +3253,148 @@ msgstr "ni mo msgid "no dbpath has been set\n" msgstr "dbpath ni nastavljena" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, 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:1423 +#: rpmdb/rpmdb.c:1451 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "napaka(%d) pri pisanju zapisa %s v %s" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, 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:2342 +#: rpmdb/rpmdb.c:2370 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstranjevanje \"%s\" iz kazala %s.\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstranjevanje %d vnosov iz kazala %s\n" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "napaka(%d) pri pisanju zapisa %s v %s" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "napaka(%d) pri brisanju zapisa %s iz %s" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "napaka(%d) pri iskanju paketa %s\n" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "dodajanje \"%s\" v kazalo %s.\n" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "dodajanje %d vnosov v kazalo %s.\n" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "napaka(%d) pri pisanju zapisa %s v %s" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "dbpath ni nastavljena" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "zaèasna podatkovna zbirka %s ¾e obstaja" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "odpiranje stare podatkovne zbirke\n" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, 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:3437 +#: rpmdb/rpmdb.c:3469 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "zapisa ni mo¾no dodati na %d" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 #, 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:3463 +#: rpmdb/rpmdb.c:3495 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:3465 +#: rpmdb/rpmdb.c:3497 #, 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:3475 +#: rpmdb/rpmdb.c:3507 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "odstranjevanje imenika: %s\n" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspe¹na odstranitev imenika %s: %s\n" @@ -5021,9 +5070,6 @@ msgstr "%s: branje Fread je bilo neuspe #~ msgid "%s: %-45s YES (added package)\n" #~ msgstr "%s: %s zadovoljen ob dodatnem paketu.\n" -#~ msgid "package is a version one package!\n" -#~ msgstr "paket je paket razlièica ena!\n" - #~ msgid "old style source package -- I'll do my best\n" #~ msgstr "izvorni paket v starem zapisu -- posku¹amo, kar se da\n" diff --git a/po/sr.po b/po/sr.po index 69969d4..65c0e12 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-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -1108,36 +1108,36 @@ msgstr "neuspelo otvaranje %s: %s" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, fuzzy, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, fuzzy, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, fuzzy, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "" @@ -1527,7 +1527,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "(nije broj)" @@ -2154,7 +2154,7 @@ msgstr "napravi PGP potpis" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2462,29 +2462,29 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s nije naveden u %s" @@ -2990,6 +2990,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, fuzzy, c-format msgid "missing %s" @@ -3058,101 +3106,101 @@ msgstr "deljeno" msgid "locked db index %s/%s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "nedostaje { posle %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "nedostaje } posle %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "prazan 'tag' format'" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "prazno ime tag-a" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "nepoznat tag" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "] oèekivano na kraju niza" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "neoèekivano ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "neoèekivano }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "oèekivan znak ? u izrazu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 #, fuzzy msgid "{ expected after ? in expression" msgstr "{ oèekivano posle ? u izrazu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "} oèekivano u izrazu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "oèekivano : praæeno ? podizrazom" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 #, fuzzy msgid "{ expected after : in expression" msgstr "{ oèekivano posle : u izrazu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "| oèekivano na kraju izraza" @@ -3175,17 +3223,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" @@ -3195,145 +3243,145 @@ msgstr "gre msgid "no dbpath has been set\n" msgstr "dbpath nije odreðen" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, 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:1423 +#: rpmdb/rpmdb.c:1451 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, 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:2342 +#: rpmdb/rpmdb.c:2370 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "gre¹ka kod uzimanja sloga %s iz %s" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "gre¹ka kod uzimanja sloga %s iz %s" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "gre¹ka kod potrage za paketom %s\n" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "dbpath nije odreðen" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "privremena baza podataka %s veæ postoji" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, 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:3437 +#: rpmdb/rpmdb.c:3469 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "ne mogu da dodam slog originalno na %d" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspelo otvaranje %s: %s" diff --git a/po/sv.po b/po/sv.po index 1fe229e..6f36c1e 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.1\n" -"POT-Creation-Date: 2002-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: 2002-07-11 22:49+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -1094,36 +1094,36 @@ msgstr "rad %d: Felaktigt argument till %%setup: %s\n" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "rad %d: Felaktig %%setup-flagga %s: %s\n" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "rad %d: Behöver argument till %%patch -b: %s\n" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "rad %d: Behöver argument till %%patch -z: %s\n" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "rad %d: Behöver argument till %%patch -p: %s\n" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "rad %d: Felaktigt argument till %%patch -p: %s\n" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "För många patchar!\n" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "rad %d: Felaktigt argument till %%patch: %s\n" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "rad %d: andra %%prep\n" @@ -1497,7 +1497,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "rpmtsOrder misslyckades, %d element återstår\n" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "(inte ett tal)" @@ -2070,7 +2070,7 @@ msgstr "generera signatur" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "Datatyp %d stöds inte\n" @@ -2371,16 +2371,16 @@ msgstr ")" msgid "OK" msgstr "OK" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "NEJ " -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "JA" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2389,13 +2389,13 @@ msgstr "" "\"B\"-beroendet behöver en epok (antar samma som \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s har ouppfyllda %s: %s\n" @@ -2888,6 +2888,54 @@ msgstr "%s msgid "excluding directory %s\n" msgstr "hoppar över katalogen %s\n" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -2956,99 +3004,99 @@ msgstr "delat" msgid "locked db index %s/%s\n" msgstr "låste db-index %s/%s\n" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "okänd db-flagga: \"%s\" ignorerad\n" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s har ogiltigt ogiltigt numeriskt värde, hoppar över\n" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s har för stort eller för litet \"long\"-värde, hoppar över\n" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s har för stort eller för litet heltalsvärde, hoppar över\n" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 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:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "{ fattas efter %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "} fattas efter %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "tomt taggformat" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "tomt taggnamn" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "okänd tagg" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "] förväntades vid slutet på vektor" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "oväntad ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "oväntad }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "? förväntades i uttryck" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "{ förväntades efter ? i uttryck" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "} förväntades i uttryck" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr ": förväntades efter ? i deluttryck" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "{ förväntades efter : i uttryck" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "| förväntades vid slutet på uttryck" @@ -3069,17 +3117,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "generera huvuden kompatibla med (äldre) rpm[23]-paketering" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: okänt taggnamn: \"%s\" ignorerat\n" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, 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:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "kan inte öppna %s-indexet\n" @@ -3088,145 +3136,145 @@ msgstr "kan inte msgid "no dbpath has been set\n" msgstr "ingen dbpath har satts\n" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, 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:1423 +#: rpmdb/rpmdb.c:1451 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "fel(%d) när post nr. %d sparades i %s\n" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: skadad huvudinstans #%u hämtad, hoppar över.\n" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, 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:2342 +#: rpmdb/rpmdb.c:2370 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "fel(%d) när huvudpost nr. %d för %s skulle tas bort\n" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "tar bort \"%s\" från %s-indexet.\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "tar bort %d poster från %s-indexet.\n" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "fel(%d) när \"%s\"-poster från %s-indexet sattes\n" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, 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:2520 +#: rpmdb/rpmdb.c:2548 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "fel(%d) när post \"%s\" togs bort från %s\n" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "fel(%d) vid allokering av ny paketinstans\n" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "lägger till \"%s\" till %s-indexet.\n" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "lägger till %d poster till %s-indexet.\n" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, 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:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "tar bort %s efter lyckad db3-ombyggnad.\n" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "ingen dbpath har satts" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "bygger om databas %s till %s\n" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "tillfällig databas %s existerar redan\n" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "skapar katalog %s\n" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "skapar katalog %s: %s\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "öppnar gammal databas med dbapi %d\n" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "öppnar ny databas med dbapi %d\n" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, 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:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "kan inte lägga till post ursprungligen vid %u\n" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "kunde inte ersätta gammal databas med ny databas!\n" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, 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:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "tar bort katalog %s\n" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunde inte ta bort katalogen %s: %s\n" diff --git a/po/tr.po b/po/tr.po index e682288..e238cff 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-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -1110,36 +1110,36 @@ msgstr "sat msgid "line %d: Bad %%setup option %s: %s\n" msgstr "satýr %d: %%setup seçeneði %s hatalý: %s\n" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "satýr %d: %%patch -b'ye argüman gerekli: %s\n" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "satýr %d: %%patch -z'ye argüman gerekli: %s\n" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "satýr %d: %%patch -p'ye argüman gerekli: %s\n" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "satýr %d: %%patch -p'nin argümaný hatalý: %s\n" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "Yamalar çok fazla!\n" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "satýr %d: %%patch argüman hatasý: %s\n" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "satýr %d: %%prep saniye\n" @@ -1527,7 +1527,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "(bir sayý deðil)" @@ -2126,7 +2126,7 @@ msgstr "imza #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "%d veri türü desteklenmiyor\n" @@ -2429,16 +2429,16 @@ msgstr ")" msgid "OK" msgstr "Tamam" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "HAYIR " -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "EVET" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, fuzzy, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2447,13 +2447,13 @@ msgstr "" "\"B\" baðýmlýlýðý bir dönemsellik gerektirir (tabii ki \"A\" da)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s-%s-%s gereksinimi tatmin edici deðil: %s\n" @@ -2950,6 +2950,54 @@ msgstr "missingok flamas msgid "excluding directory %s\n" msgstr "%s dizini dýþlanýyor\n" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -3018,99 +3066,99 @@ msgstr "payla msgid "locked db index %s/%s\n" msgstr "kilitli db endeks %s/%s\n" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "tanýnmayan db seçeneði: \"%s\" yoksayýldý\n" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s geçersiz sayýsal deðer içeriyor, atlandý\n" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s ya çok büyük ya da çok küçük 'long' deðer içeriyor, atlandý\n" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s ya çok büyük ya da çok küçük 'integer' deðer içeriyor, atlandý\n" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 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:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "%% den sonraki { yok" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "%%{ den sonraki } yok" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "etiket biçemi boþ" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "etiket ismi boþ" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "bilinmeyen etiket" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "dizinin sonunda ] gerekli" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "beklenmeyen ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "beklenmeyen }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "ifade içerisinde ? gerekli" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "ifade içerisinde ? dan sonra { gerekli" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "ifade içinde } gerekli" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "? alt ifadesinden sonra : gerekli" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "ifade içersinde : den sonra { gerekli" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "ifadenin sonunda | gerekli" @@ -3131,17 +3179,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "(eski) rpm[23] paketleme ile uyumlu baþlýklarý üretir" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: tanýmlanmamýþ etiket adý: \"%s\" yoksayýldý\n" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, 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:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "%s indeksi açýlamadý\n" @@ -3150,147 +3198,147 @@ msgstr "%s indeksi a msgid "no dbpath has been set\n" msgstr "belirtilmiþ bir dbpath deðeri yok\n" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, 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:1423 +#: rpmdb/rpmdb.c:1451 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, 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:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%x de baþlýk okunamadý\n" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "\"%s\" %s indeksinden siliniyor.\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "%d girdi %s indeksinden siliniyor.\n" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "hata(%d) %s kaydýn %s dosyasýndan silinmesi\n" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "yeni paket örneðini tutma hatasý(%d)\n" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "\"%s\" %s indeksine ekleniyor.\n" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "%d girdi %s indeksine ekleniyor.\n" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, 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:3274 +#: rpmdb/rpmdb.c:3302 #, 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:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "belirtilmiþ bir dbpath yok" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%s veritabaný %s içinde yeniden oluþturuluyor\n" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "geçici veritabaný %s zaten mevcut\n" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "%s dizini oluþturuluyor\n" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "%s dizini oluþturuluyor: %s\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "eski veritabaný dbapi %d ile açýlýyor\n" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "yeni veritabaný dbapi %d ile açýlýyor\n" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, 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:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "kayýt özgün olarak %u e eklenemedi\n" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 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:3463 +#: rpmdb/rpmdb.c:3495 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:3465 +#: rpmdb/rpmdb.c:3497 #, 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:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "%s dizini siliniyor\n" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s dizininin silinmesi baþarýsýz: %s\n" diff --git a/po/uk.po b/po/uk.po index c9774ea..a5e7be8 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1086,36 +1086,36 @@ msgstr "" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "" @@ -1480,7 +1480,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "" @@ -2046,7 +2046,7 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2346,29 +2346,29 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2859,6 +2859,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -2927,99 +2975,99 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "" @@ -3040,17 +3088,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "" @@ -3059,145 +3107,145 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/wa.po b/po/wa.po index c9774ea..a5e7be8 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1086,36 +1086,36 @@ msgstr "" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "" @@ -1480,7 +1480,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "" @@ -2046,7 +2046,7 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2346,29 +2346,29 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2859,6 +2859,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -2927,99 +2975,99 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "" @@ -3040,17 +3088,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "" @@ -3059,145 +3107,145 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/zh.po b/po/zh.po index c9774ea..a5e7be8 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1086,36 +1086,36 @@ msgstr "" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "" @@ -1480,7 +1480,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "" @@ -2046,7 +2046,7 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2346,29 +2346,29 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2859,6 +2859,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -2927,99 +2975,99 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "" @@ -3040,17 +3088,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "" @@ -3059,145 +3107,145 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index c9774ea..a5e7be8 100644 --- a/po/zh_CN.GB2312.po +++ b/po/zh_CN.GB2312.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-15 10:05-0400\n" +"POT-Creation-Date: 2002-07-20 15:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1086,36 +1086,36 @@ msgstr "" msgid "line %d: Bad %%setup option %s: %s\n" msgstr "" -#: build/parsePrep.c:481 +#: build/parsePrep.c:479 #, c-format msgid "line %d: Need arg to %%patch -b: %s\n" msgstr "" -#: build/parsePrep.c:490 +#: build/parsePrep.c:488 #, c-format msgid "line %d: Need arg to %%patch -z: %s\n" msgstr "" -#: build/parsePrep.c:502 +#: build/parsePrep.c:500 #, c-format msgid "line %d: Need arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:509 +#: build/parsePrep.c:507 #, c-format msgid "line %d: Bad arg to %%patch -p: %s\n" msgstr "" -#: build/parsePrep.c:516 +#: build/parsePrep.c:514 msgid "Too many patches!\n" msgstr "" -#: build/parsePrep.c:520 +#: build/parsePrep.c:518 #, c-format msgid "line %d: Bad arg to %%patch: %s\n" msgstr "" -#: build/parsePrep.c:556 +#: build/parsePrep.c:554 #, c-format msgid "line %d: second %%prep\n" msgstr "" @@ -1480,7 +1480,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383 -#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169 +#: rpmdb/header.c:3121 rpmdb/header.c:3144 rpmdb/header.c:3168 msgid "(not a number)" msgstr "" @@ -2046,7 +2046,7 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164 +#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2346,29 +2346,29 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "NO " msgstr "" -#: lib/rpmds.c:448 lib/rpmds.c:615 +#: lib/rpmds.c:448 lib/rpmds.c:619 msgid "YES" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:583 +#: lib/rpmds.c:584 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:614 +#: lib/rpmds.c:618 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:638 +#: lib/rpmds.c:642 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2859,6 +2859,54 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" +#. =============================================== +#. * For packages being installed: +#. * - verify package arch/os. +#. * - verify package epoch:version-release is newer. +#. * - count files. +#. * For packages being removed: +#. * - count files. +#. +#: lib/transaction.c:1019 +#, c-format +msgid "sanity checking %d elments\n" +msgstr "" + +#. =============================================== +#. * Initialize transaction element file info for package: +#. +#. +#. * FIXME?: we'd be better off assembling one very large file list and +#. * calling fpLookupList only once. I'm not sure that the speedup is +#. * worth the trouble though. +#. +#: lib/transaction.c:1100 +#, c-format +msgid "computing %d file fingerprints\n" +msgstr "" + +#. =============================================== +#. * Compute file disposition for each package in transaction set. +#. +#: lib/transaction.c:1177 +msgid "computing file dispositions\n" +msgstr "" + +#. =============================================== +#. * Save removed files before erasing. +#. +#: lib/transaction.c:1343 +msgid "repackage about-to-be-erased packages\n" +msgstr "" + +#. =============================================== +#. * Install and remove packages. +#. +#: lib/transaction.c:1369 +#, c-format +msgid "install/erase %d elements\n" +msgstr "" + #: lib/verify.c:288 #, c-format msgid "missing %s" @@ -2927,99 +2975,99 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:401 +#: rpmdb/dbconfig.c:324 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:439 +#: rpmdb/dbconfig.c:364 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:448 +#: rpmdb/dbconfig.c:373 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:457 +#: rpmdb/dbconfig.c:382 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:346 +#: rpmdb/header.c:345 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2298 +#: rpmdb/header.c:2297 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2327 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2341 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2356 +#: rpmdb/header.c:2355 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2373 +#: rpmdb/header.c:2372 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2400 +#: rpmdb/header.c:2399 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2418 +#: rpmdb/header.c:2417 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2422 +#: rpmdb/header.c:2421 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2491 +#: rpmdb/header.c:2490 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2500 +#: rpmdb/header.c:2499 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2513 rpmdb/header.c:2558 +#: rpmdb/header.c:2512 rpmdb/header.c:2557 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2523 +#: rpmdb/header.c:2522 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2543 +#: rpmdb/header.c:2542 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2568 +#: rpmdb/header.c:2567 msgid "| expected at end of expression" msgstr "" @@ -3040,17 +3088,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:168 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:243 +#: rpmdb/rpmdb.c:241 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:265 +#: rpmdb/rpmdb.c:263 #, c-format msgid "cannot open %s index\n" msgstr "" @@ -3059,145 +3107,145 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090 -#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906 +#: rpmdb/rpmdb.c:1036 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:1219 rpmdb/rpmdb.c:2118 +#: rpmdb/rpmdb.c:2224 rpmdb/rpmdb.c:2934 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1423 +#: rpmdb/rpmdb.c:1451 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2010 +#: rpmdb/rpmdb.c:2038 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2279 +#: rpmdb/rpmdb.c:2307 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2342 +#: rpmdb/rpmdb.c:2370 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2457 +#: rpmdb/rpmdb.c:2485 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2489 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2489 +#: rpmdb/rpmdb.c:2517 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2510 +#: rpmdb/rpmdb.c:2538 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2520 +#: rpmdb/rpmdb.c:2548 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2667 +#: rpmdb/rpmdb.c:2695 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2881 +#: rpmdb/rpmdb.c:2909 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2885 +#: rpmdb/rpmdb.c:2913 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2925 +#: rpmdb/rpmdb.c:2953 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3274 +#: rpmdb/rpmdb.c:3302 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3311 +#: rpmdb/rpmdb.c:3339 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3343 +#: rpmdb/rpmdb.c:3371 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3347 +#: rpmdb/rpmdb.c:3375 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3353 +#: rpmdb/rpmdb.c:3381 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3355 +#: rpmdb/rpmdb.c:3383 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3390 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3373 +#: rpmdb/rpmdb.c:3403 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3397 +#: rpmdb/rpmdb.c:3429 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3437 +#: rpmdb/rpmdb.c:3469 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3455 +#: rpmdb/rpmdb.c:3487 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3495 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3497 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3475 +#: rpmdb/rpmdb.c:3507 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3477 +#: rpmdb/rpmdb.c:3509 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/popt/.cvsignore b/popt/.cvsignore index 996c662..de99415 100644 --- a/popt/.cvsignore +++ b/popt/.cvsignore @@ -26,7 +26,9 @@ stamp-h1 stamp-h.in test1 test2 +test3 *.la *.lcd *.lo +*.swp popt-*.tar.gz diff --git a/popt/Makefile.am b/popt/Makefile.am index 98af48e..6bf6c13 100644 --- a/popt/Makefile.am +++ b/popt/Makefile.am @@ -13,13 +13,16 @@ INCLUDES = -I. -I$(top_srcdir) noinst_HEADERS = findme.h poptint.h system.h -noinst_PROGRAMS = test1 test2 +noinst_PROGRAMS = test1 test2 test3 test1_SOURCES = test1.c test1_LDFLAGS = -all-static test1_LDADD = $(lib_LTLIBRARIES) test2_SOURCES = test2.c test2_LDFLAGS = -all-static test2_LDADD = $(lib_LTLIBRARIES) +test3_SOURCES = test3.c +test3_LDFLAGS = -all-static +test3_LDADD = $(lib_LTLIBRARIES) noinst_SCRIPTS = testit.sh diff --git a/popt/po/cs.po b/popt/po/cs.po index 7d7e66d..40bbdf4 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 9b159e2..92c6987 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 9cf7ac3..e973070 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 7209a4e..53a05a5 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 9cf7ac3..e973070 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 9cf7ac3..e973070 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 9cf7ac3..e973070 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 820d8e8..f2a23ad 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 cac9622..4a985cf 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 9cf7ac3..e973070 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 d10ed7c..0686373 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 9cf7ac3..e973070 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 9cf7ac3..e973070 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 192bc6d..7e5b1af 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 d89a819..5501a12 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 9cf7ac3..e973070 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 6a0ccc9..b60a954 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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.po b/popt/po/pt.po index 91fff7e..54f91d1 100644 --- a/popt/po/pt.po +++ b/popt/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt\n" -"POT-Creation-Date: 2002-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-0400\n" "PO-Revision-Date: 2002-02-13 18:32+0000\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" diff --git a/popt/po/pt_BR.po b/popt/po/pt_BR.po index 9cf7ac3..e973070 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 14c4a31..88a5dfc 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 05e236d..c8e0cc5 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 7034950..d521434 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 e5613e0..d32e36c 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 9cf7ac3..e973070 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 e0c91d6..c7b3062 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 c51b46d..d958fd1 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 ac541bf..4c47cb5 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 bd7fdfd..6db9d08 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 9cf7ac3..e973070 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-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 94d5bc0..4f3deeb 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-07-14 10:58-0400\n" +"POT-Creation-Date: 2002-07-20 15:04-0400\n" "PO-Revision-Date: 1999-11-11 05:04+0800\n" "Last-Translator: Dillion Chen \n" "Language-Team: TLDN\n" diff --git a/popt/popt.c b/popt/popt.c index d4b2dc2..d71e2bf 100644 --- a/popt/popt.c +++ b/popt/popt.c @@ -615,27 +615,26 @@ static void poptStripArg(/*@special@*/ poptContext con, int which) /*@=compdef@*/ } -/*@-boundswrite@*/ -static int poptSaveLong(const struct poptOption * opt, long aLong) - /*@modifies opt->arg @*/ +int poptSaveLong(long * arg, int argInfo, long aLong) { - if (opt->arg == NULL) + /* XXX Check alignment, may fail on funky platforms. */ + if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1))) return POPT_ERROR_NULLARG; - if (opt->argInfo & POPT_ARGFLAG_NOT) + if (argInfo & POPT_ARGFLAG_NOT) aLong = ~aLong; - switch (opt->argInfo & POPT_ARGFLAG_LOGICALOPS) { + switch (argInfo & POPT_ARGFLAG_LOGICALOPS) { case 0: - *((long *) opt->arg) = aLong; + *arg = aLong; break; case POPT_ARGFLAG_OR: - *((long *) opt->arg) |= aLong; + *arg |= aLong; break; case POPT_ARGFLAG_AND: - *((long *) opt->arg) &= aLong; + *arg &= aLong; break; case POPT_ARGFLAG_XOR: - *((long *) opt->arg) ^= aLong; + *arg ^= aLong; break; default: return POPT_ERROR_BADOPERATION; @@ -643,29 +642,27 @@ static int poptSaveLong(const struct poptOption * opt, long aLong) } return 0; } -/*@=boundswrite@*/ -/*@-boundswrite@*/ -static int poptSaveInt(const struct poptOption * opt, long aLong) - /*@modifies opt->arg @*/ +int poptSaveInt(/*@null@*/ int * arg, int argInfo, long aLong) { - if (opt->arg == NULL) + /* XXX Check alignment, may fail on funky platforms. */ + if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1))) return POPT_ERROR_NULLARG; - if (opt->argInfo & POPT_ARGFLAG_NOT) + if (argInfo & POPT_ARGFLAG_NOT) aLong = ~aLong; - switch (opt->argInfo & POPT_ARGFLAG_LOGICALOPS) { + switch (argInfo & POPT_ARGFLAG_LOGICALOPS) { case 0: - *((int *) opt->arg) = aLong; + *arg = aLong; break; case POPT_ARGFLAG_OR: - *((int *) opt->arg) |= aLong; + *arg |= aLong; break; case POPT_ARGFLAG_AND: - *((int *) opt->arg) &= aLong; + *arg &= aLong; break; case POPT_ARGFLAG_XOR: - *((int *) opt->arg) ^= aLong; + *arg ^= aLong; break; default: return POPT_ERROR_BADOPERATION; @@ -673,7 +670,6 @@ static int poptSaveInt(const struct poptOption * opt, long aLong) } return 0; } -/*@=boundswrite@*/ /*@-boundswrite@*/ /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */ @@ -821,11 +817,11 @@ int poptGetNextOpt(poptContext con) if (opt == NULL) return POPT_ERROR_BADOPT; /* XXX can't happen */ if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) { - if (poptSaveInt(opt, 1L)) + if (poptSaveInt((int *)opt->arg, opt->argInfo, 1L)) return POPT_ERROR_BADOPERATION; } else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL) { if (opt->arg) { - if (poptSaveInt(opt, (long)opt->val)) + if (poptSaveInt((int *)opt->arg, opt->argInfo, (long)opt->val)) return POPT_ERROR_BADOPERATION; } } else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) { @@ -894,12 +890,12 @@ int poptGetNextOpt(poptContext con) if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_LONG) { if (aLong == LONG_MIN || aLong == LONG_MAX) return POPT_ERROR_OVERFLOW; - if (poptSaveLong(opt, aLong)) + if (poptSaveLong((long *)opt->arg, opt->argInfo, aLong)) return POPT_ERROR_BADOPERATION; } else { if (aLong > INT_MAX || aLong < INT_MIN) return POPT_ERROR_OVERFLOW; - if (poptSaveInt(opt, aLong)) + if (poptSaveInt((int *)opt->arg, opt->argInfo, aLong)) return POPT_ERROR_BADOPERATION; } } /*@switchbreak@*/ break; diff --git a/popt/popt.h b/popt/popt.h index fad30bc..c1a3115 100644 --- a/popt/popt.h +++ b/popt/popt.h @@ -381,6 +381,58 @@ int poptParseArgvString(const char * s, /*@modifies *argcPtr, *argvPtr @*/; /** \ingroup popt + * Parses an input configuration file and returns an string that is a + * command line. For use with popt. You must free the return value when done. + * + * Given the file: +\verbatim +# this line is ignored + # this one too +aaa + bbb + ccc +bla=bla + +this_is = fdsafdas + bad_line= + reall bad line + reall bad line = again +5555= 55555 + test = with lots of spaces +\endverbatim +* +* The result is: +\verbatim +--aaa --bbb --ccc --bla="bla" --this_is="fdsafdas" --5555="55555" --test="with lots of spaces" +\endverbatim +* +* Passing this to poptParseArgvString() yields an argv of: +\verbatim +'--aaa' +'--bbb' +'--ccc' +'--bla=bla' +'--this_is=fdsafdas' +'--5555=55555' +'--test=with lots of spaces' +\endverbatim + * + * @bug NULL is returned if file line is too long. + * @bug Silently ignores invalid lines. + * + * @param fp file handle to read + * @param *argstrp return string of options (malloc'd) + * @param flags unused + * @return 0 on success + * @see poptParseArgvString + */ +/*@-fcnuse@*/ +int poptConfigFileToString(FILE *fp, /*@out@*/ char ** argstrp, int flags) + /*@globals fileSystem @*/ + /*@modifies *fp, *argstrp, fileSystem @*/; +/*@=fcnuse@*/ + +/** \ingroup popt * Return formatted error string for popt failure. * @param error popt error * @return error string @@ -451,6 +503,34 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv) /*@modifies *argv @*/; /*@=fcnuse@*/ +/** + * Save a long, performing logical operation with value. + * @warning Alignment check may be too strict on certain platorms. + * @param arg integer pointer, aligned on int boundary. + * @param argInfo logical operation (see POPT_ARGFLAG_*) + * @param aLong value to use + * @return 0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION + */ +/*@-incondefs@*/ +int poptSaveLong(/*@null@*/ long * arg, int argInfo, long aLong) + /*@modifies *arg @*/ + /*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/; +/*@=incondefs@*/ + +/** + * Save an integer, performing logical operation with value. + * @warning Alignment check may be too strict on certain platorms. + * @param arg integer pointer, aligned on int boundary. + * @param argInfo logical operation (see POPT_ARGFLAG_*) + * @param aLong value to use + * @return 0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION + */ +/*@-incondefs@*/ +int poptSaveInt(/*@null@*/ int * arg, int argInfo, long aLong) + /*@modifies *arg @*/ + /*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/; +/*@=incondefs@*/ + /*@=type@*/ #ifdef __cplusplus } diff --git a/popt/poptparse.c b/popt/poptparse.c index 2071601..0a75f8b 100644 --- a/popt/poptparse.c +++ b/popt/poptparse.c @@ -120,3 +120,108 @@ exit: return rc; } /*@=bounds@*/ + +/* still in the dev stage. + * return values, perhaps 1== file erro + * 2== line to long + * 3== umm.... more? + */ +int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ int flags) +{ + char line[999]; + char * argstr; + char * p; + char * q; + char * x; + int t; + int argvlen = 0; + size_t maxlinelen = sizeof(line); + size_t linelen; + int maxargvlen = 480; + int linenum = 0; + + *argstrp = NULL; + + /* | this_is = our_line + * p q x + */ + + if (fp == NULL) + return POPT_ERROR_NULLARG; + + argstr = calloc(maxargvlen, sizeof(*argstr)); + if (argstr == NULL) return POPT_ERROR_MALLOC; + + while (fgets(line, (int)maxlinelen, fp) != NULL) { + linenum++; + p = line; + + /* loop until first non-space char or EOL */ + while( *p != '\0' && isspace(*p) ) + p++; + + linelen = strlen(p); + if (linelen >= maxlinelen-1) + return POPT_ERROR_OVERFLOW; /* XXX line too long */ + + if (*p == '\0' || *p == '\n') continue; /* line is empty */ + if (*p == '#') continue; /* comment line */ + + q = p; + + while (*q != '\0' && (!isspace(*q)) && *q != '=') + q++; + + if (isspace(*q)) { + /* a space after the name, find next non space */ + *q++='\0'; + while( *q != '\0' && isspace((int)*q) ) q++; + } + if (*q == '\0') { + /* single command line option (ie, no name=val, just name) */ + q[-1] = '\0'; /* kill off newline from fgets() call */ + argvlen += (t = q - p) + (sizeof(" --")-1); + if (argvlen >= maxargvlen) { + maxargvlen = (t > maxargvlen) ? t*2 : maxargvlen*2; + argstr = realloc(argstr, maxargvlen); + if (argstr == NULL) return POPT_ERROR_MALLOC; + } + strcat(argstr, " --"); + strcat(argstr, p); + continue; + } + if (*q != '=') + continue; /* XXX for now, silently ignore bogus line */ + + /* *q is an equal sign. */ + *q++ = '\0'; + + /* find next non-space letter of value */ + while (*q != '\0' && isspace(*q)) + q++; + if (*q == '\0') + continue; /* XXX silently ignore missing value */ + + /* now, loop and strip all ending whitespace */ + x = p + linelen; + while (isspace(*--x)) + *x = 0; /* null out last char if space (including fgets() NL) */ + + /* rest of line accept */ + t = x - p; + argvlen += t + (sizeof("' --='")-1); + if (argvlen >= maxargvlen) { + maxargvlen = (t > maxargvlen) ? t*2 : maxargvlen*2; + argstr = realloc(argstr, maxargvlen); + if (argstr == NULL) return POPT_ERROR_MALLOC; + } + strcat(argstr, " --"); + strcat(argstr, p); + strcat(argstr, "=\""); + strcat(argstr, q); + strcat(argstr, "\""); + } + + *argstrp = argstr; + return 0; +} diff --git a/popt/test3-data/01.answer b/popt/test3-data/01.answer new file mode 100644 index 0000000..bd95a38 --- /dev/null +++ b/popt/test3-data/01.answer @@ -0,0 +1,10 @@ +single string: ' --aaa --bbb --ccc --bla="bla" --this_is="fdsafdas" --5555="55555" --test="with lots of spaces"' +popt array: size=7 +'--aaa' +'--bbb' +'--ccc' +'--bla=bla' +'--this_is=fdsafdas' +'--5555=55555' +'--test=with lots of spaces' + diff --git a/popt/test3-data/01.input b/popt/test3-data/01.input new file mode 100644 index 0000000..157ed05 --- /dev/null +++ b/popt/test3-data/01.input @@ -0,0 +1,13 @@ +# this line is ignored + # this one too +aaa + bbb + ccc +bla=bla + +this_is = fdsafdas + bad_line= + reall bad line + reall bad line = again +5555= 55555 + test = with lots of spaces diff --git a/popt/test3-data/02.answer b/popt/test3-data/02.answer new file mode 100644 index 0000000..309011a --- /dev/null +++ b/popt/test3-data/02.answer @@ -0,0 +1 @@ +cannot parse test3-data/02.input. ret=-18 diff --git a/popt/test3-data/02.input b/popt/test3-data/02.input new file mode 100644 index 0000000..ed57744 --- /dev/null +++ b/popt/test3-data/02.input @@ -0,0 +1,2 @@ +# this next line has 999 letters. this should cause an abort. +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx diff --git a/popt/test3-data/03.answer b/popt/test3-data/03.answer new file mode 100644 index 0000000..085fe6a --- /dev/null +++ b/popt/test3-data/03.answer @@ -0,0 +1,70 @@ +single string: ' --confversion="1.0.0.0" --expires="19:57:56 03/16/01" --sessions="-1" --hostid="72738c36" --hostid="80b0cafb" --hostid="80c104e4" --hostid="80cf520f" --hostid="809fc805" --port="6666" --realservername="goya:554" --realserverip="127.0.0.1:554" --sdmux="0" --runtimeconf="1" --soc="1" --socaddr="127.0.0.1" --socconntimeout="3" --socqport="4110" --socuport="4111" --loadtest="0" --tunnelssmport="5541" --allowtcptransport="0" --realrevpkts="0" --asmrules="4;" --maxasmtime="10" --asmwaittime="4" --asmcalctime="4" --maxletswitchtime="20" --setbw="6;" --setbwblocktime="15" --asmsetbwtime="3" --setbwwaittime="1" --inputmaxsetbw="100" --encratemaxsetbw="100" --livesetbwdelta="2" --encrate="34000" --maxoutproberate="85" --maxoutencrate="140" --minoutencrate="108" --erprgamma="70" --utp="15" --nbalpha="77" --bbalpha="83" --tsfrequency="10" --recoveryrate="140" --maxbuffer="2000" --csmbuffer="12000" --probedelta="120" --numprobes="4" --probebuffpkts="5" --probeinterval="600000" --clientlog="2" --loglevel="2" --monitor="0" --testmode="0" --emulator="0" --emuaddr="127.0.0.1" --emuport="4200" --auxsvr="0" --mngsvrip="127.0.0.1" --mngsvrport="15550" --ssmip="127.0.0.1" --auxsvrport="14445" --auxsvrchkfreq="2" --auxsvrchkperiod="60;" --simulation="0" --netbuffer="5" --siminterval="3"' +popt array: size=67 +'--confversion=1.0.0.0' +'--expires=19:57:56 03/16/01' +'--sessions=-1' +'--hostid=72738c36' +'--hostid=80b0cafb' +'--hostid=80c104e4' +'--hostid=80cf520f' +'--hostid=809fc805' +'--port=6666' +'--realservername=goya:554' +'--realserverip=127.0.0.1:554' +'--sdmux=0' +'--runtimeconf=1' +'--soc=1' +'--socaddr=127.0.0.1' +'--socconntimeout=3' +'--socqport=4110' +'--socuport=4111' +'--loadtest=0' +'--tunnelssmport=5541' +'--allowtcptransport=0' +'--realrevpkts=0' +'--asmrules=4;' +'--maxasmtime=10' +'--asmwaittime=4' +'--asmcalctime=4' +'--maxletswitchtime=20' +'--setbw=6;' +'--setbwblocktime=15' +'--asmsetbwtime=3' +'--setbwwaittime=1' +'--inputmaxsetbw=100' +'--encratemaxsetbw=100' +'--livesetbwdelta=2' +'--encrate=34000' +'--maxoutproberate=85' +'--maxoutencrate=140' +'--minoutencrate=108' +'--erprgamma=70' +'--utp=15' +'--nbalpha=77' +'--bbalpha=83' +'--tsfrequency=10' +'--recoveryrate=140' +'--maxbuffer=2000' +'--csmbuffer=12000' +'--probedelta=120' +'--numprobes=4' +'--probebuffpkts=5' +'--probeinterval=600000' +'--clientlog=2' +'--loglevel=2' +'--monitor=0' +'--testmode=0' +'--emulator=0' +'--emuaddr=127.0.0.1' +'--emuport=4200' +'--auxsvr=0' +'--mngsvrip=127.0.0.1' +'--mngsvrport=15550' +'--ssmip=127.0.0.1' +'--auxsvrport=14445' +'--auxsvrchkfreq=2' +'--auxsvrchkperiod=60;' +'--simulation=0' +'--netbuffer=5' +'--siminterval=3' + diff --git a/popt/test3-data/03.input b/popt/test3-data/03.input new file mode 100644 index 0000000..34a7347 --- /dev/null +++ b/popt/test3-data/03.input @@ -0,0 +1,210 @@ +# +# WARNING: NO LINE IN THIS FILE SHOULD BE LONGER THAN 999 characters! +# +# a vague real world example +# +# the vers no of this file. useful for debug +confversion=1.0.0.0 + +# date and time of expiry of this license +expires=19:57:56 03/16/01 + +# max no of simultaneous sessions +sessions=-1 + +# hostid(s) of licensed host(s): matisse +hostid=72738c36 + +# degas (exodus) +hostid=80b0cafb + +# max +hostid=80c104e4 + +# breton +hostid=80cf520f + +# vaneyck +hostid=809fc805 + +# port at which SSM should listen (unless -p) +port=6666 + +# the name of the realserver that we proxy for +realservername=goya:554 + +# the ip addr of real server we proxy fo +realserverip=127.0.0.1:554 + +# are we using an SDMUX to receive rev STP pkts? +sdmux=0 + +# allow run time config through TCP connection +runtimeconf=1 + +# should we connect to SOC for delivinit/update etc? +soc=1 + +# address of the SOC +socaddr=127.0.0.1 + +# no of secs before we timeout SOC connection +socconntimeout=3 + +# SOC port for sending delivinit query +socqport=4110 + +# SOC port for sending delivery update +socuport=4111 + +# run in load test mode? (ignore player disconnect) +loadtest=0 + +# port of SSM to redirect to on probe bw < desc bw +tunnelssmport=5541 + +# allow TCP (RTSP interleaved) streaming? +allowtcptransport=0 + +# enable RDT rev packets? +realrevpkts=0 + +# allow asm switches? 0=no,1=yes,2=all within maxasmtime,3=1 within maxasmtime +# 4=same as 2 but also whenever told by CSM after maxasmtime+tell CSM +asmrules=4; +# max time to which we will allow asm switches +maxasmtime=10 + +# time to wait after switch before starting below +asmwaittime=4 + +# time over which to calc post asm switch input rate +asmcalctime=4 + +# time after LETSWITCH within which to permit switch +maxletswitchtime=20 + +# change setbw? 0=no,1=block,2=sub w/1st,3=sub w/curr,4=tell CSM,5=allow w/asm +# 6=sub w/cur enc rate & tell CSM & generate setbw on switch +setbw=6; +# minimum time between setbw requests from player +setbwblocktime=15 + +# max time within which we allow post asm setbw +asmsetbwtime=3 + +# post switch wait time (secs) before we send setbw +setbwwaittime=1 + +# max setbw as % of [init/post switch] input rate +inputmaxsetbw=100 + +# max setbw as % of current encoding rate +encratemaxsetbw=100 + +# % increase in encratemaxsetbw for live streams +livesetbwdelta=2 + +# temporarily here. encoding rate bits/sec +encrate=34000 + +# max output rate = maxoutproberate % probe rate +maxoutproberate=85 + +# max output rate = maxoutencrate % curr enc rate +maxoutencrate=140 + +# worst case outrate. should be > encratemaxsetbw +minoutencrate=108 + +# max out rate = er+erprgamma%(maxoutpr%pr-er) +erprgamma=70 + +# the CSM UTP: % loss above which CSM will enter CC +utp=15 + +# CSM alpha for narrowband +nbalpha=77 + +# CSM alpha for broadband +bbalpha=83 + +# periodic sendTS? 0 = sendTS only at SR_COMPUTE +tsfrequency=10 + +# SReoc as a % of the encoding rate +recoveryrate=140 + +# maximum server side buffer (in packets) +maxbuffer=2000 + +# client side buffer (in milliseconds) +csmbuffer=12000 + +# probe bw > probedelta % describe bw for us to work +probedelta=120 + +# the number of probes to do at the beginning +numprobes=4 + +# number of packets to burst during each probe +probebuffpkts=5 + +# time (in microsecs) interval between probes +probeinterval=600000 + +# client logs to none(0),disk(1),soc(2),both(3) +clientlog=2 + +# 0=none,1=brief,2=detailed,3=extensive +loglevel=2 + +# connected to monitor? +monitor=0 + +# 0=none, 1=test +testmode=0 + +# are we using the emulator? +emulator=0 + +# emulator IP address +emuaddr=127.0.0.1 + +# emulator TCP control port to connect to +emuport=4200 + +# +# aux serv config +# +# start aux server? 0=no, 1=yes +auxsvr=0 + +# IP address of mgmt server +mngsvrip=127.0.0.1 + +# port where mgmt server listens +mngsvrport=15550 + +# IP address of SSM that we are monitoring +ssmip=127.0.0.1 + +# port where aux server should listen +auxsvrport=14445 + +# frequency of aux server checks +auxsvrchkfreq=2 + +auxsvrchkperiod=60; +# +# congestion simulation info +# +# congestion simulation? +simulation=0 + +# size of the network buffer +netbuffer=5 + +# time (in secs) between drop rate recalculation +siminterval=3 + diff --git a/popt/test3.c b/popt/test3.c new file mode 100644 index 0000000..5290a9a --- /dev/null +++ b/popt/test3.c @@ -0,0 +1,48 @@ +// vim:ts=8:sts=4 + +#include +#include +#include +#include +#include + +int main (int argc, char **argv) { + char *out; + int newargc, j, f, ret; + char **newargv; + FILE *fp; + + if (argc == 1) { + printf ("usage: test-popt file_1 file_2 ...\n"); + printf ("you may specify many files\n"); + exit (1); + } + + for (f = 1; f < argc; f++) { + fp = fopen (argv[f], "r"); + if (fp == NULL) { + printf ("cannot read file %s. errno=%s\n", argv[f], + strerror(errno)); + continue; + } + + ret = poptConfigFileToString (fp, &out, 0); + if (ret != 0) { + printf ("cannot parse %s. ret=%d\n", argv[f], ret); + continue; + } + + printf ("single string: '%s'\n", out); + + poptParseArgvString (out, &newargc, &newargv); + + printf ("popt array: size=%d\n", newargc); + for (j = 0; j < newargc; j++) + printf ("'%s'\n", newargv[j]); + + printf ("\n"); + free(out); + fclose (fp); + } + return 0; +} diff --git a/popt/testit.sh b/popt/testit.sh index 534a135..ecb4b79 100755 --- a/popt/testit.sh +++ b/popt/testit.sh @@ -14,6 +14,30 @@ run() { fi } +run_diff() { + prog=$1; shift + name=$1; shift + in_file=$1; shift + answer_file=$1; shift + + out=$builddir/tmp.out + diff_file=$builddir/tmp.diff + + echo Running test $name. + + $builddir/$prog $in_file > $out + ret=$? + diff $out $answer_file > $diff_file + diff_ret=$? + + if [ "$diff_ret" != "0" ]; then + echo "Test \"$name\" failed output is in $out, diff is:" + cat $diff_file + exit 2 + fi + rm $out $diff_file +} + builddir=`pwd` srcdir=$builddir cd ${srcdir} @@ -68,5 +92,9 @@ run test1 "test1 - 38" "arg1: 0 arg2: (none) oStr: yadda" --optional yadda run test1 "test1 - 39" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional=ping pong run test1 "test1 - 40" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional ping pong +run_diff test3 "test3 - 41" test3-data/01.input test3-data/01.answer +run_diff test3 "test3 - 42" test3-data/02.input test3-data/02.answer +run_diff test3 "test3 - 43" test3-data/03.input test3-data/03.answer + echo "" echo "Passed." diff --git a/rpm.spec.in b/rpm.spec.in index cc72822..4d3fd60 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -514,6 +514,9 @@ fi %{__prefix}/include/popt.h %changelog +* Sat Jul 20 2002 Jeff Johnson +- popt: parse file into string of options (#56860). + * Mon Jul 15 2002 Jeff Johnson 4.1-0.50 - have rpmdb-redhat autoconfigure rpm to use %%_solve_dbpath. diff --git a/rpmdb/dbconfig.c b/rpmdb/dbconfig.c index 8b5df99..0d8781d 100644 --- a/rpmdb/dbconfig.c +++ b/rpmdb/dbconfig.c @@ -22,22 +22,6 @@ struct _dbiIndex db3dbi; /*@=exportlocal =exportheadervar@*/ -/** \ingroup db3 - * Analogue to struct poptOption - */ -struct dbOption { -/*@observer@*/ /*@null@*/ - const char * longName; /*!< may be NULL */ - const char shortName; /*!< may be '\0' */ - int argInfo; -/*@null@*/ void * arg; /*!< depends on argInfo */ - int val; /*!< 0 means don't return, just update flag */ -/*@observer@*/ /*@null@*/ - const char * descrip; /*!< description for autohelp -- may be NULL */ -/*@observer@*/ /*@null@*/ - const char * argDescrip; /*!< argument description for autohelp */ -}; - /*@unchecked@*/ static int dbi_use_cursors; @@ -45,7 +29,7 @@ static int dbi_use_cursors; /** \ingroup db3 */ /*@unchecked@*/ -struct dbOption rdbOptions[] = { +struct poptOption rdbOptions[] = { /* XXX DB_CXX_NO_EXCEPTIONS */ { "client", 0,POPT_BIT_SET, &db3dbi.dbi_ecflags, DB_CLIENT, NULL, NULL }, @@ -252,62 +236,6 @@ struct dbOption rdbOptions[] = { }; /*@=compmempass =immediatetrans =exportlocal =exportheadervar@*/ -/*@-boundswrite@*/ -static int dbSaveLong(const struct dbOption * opt, int argInfo, long aLong) - /*@modifies opt->arg @*/ -{ - if (argInfo & POPT_ARGFLAG_NOT) - aLong = ~aLong; - if (opt->arg != NULL) - switch (argInfo & POPT_ARGFLAG_LOGICALOPS) { - case 0: - *((long *) opt->arg) = aLong; - break; - case POPT_ARGFLAG_OR: - *((long *) opt->arg) |= aLong; - break; - case POPT_ARGFLAG_AND: - *((long *) opt->arg) &= aLong; - break; - case POPT_ARGFLAG_XOR: - *((long *) opt->arg) ^= aLong; - break; - default: - return POPT_ERROR_BADOPERATION; - /*@notreached@*/ break; - } - return 0; -} -/*@=boundswrite@*/ - -/*@-boundswrite@*/ -static int dbSaveInt(const struct dbOption * opt, int argInfo, long aLong) - /*@modifies opt->arg @*/ -{ - if (argInfo & POPT_ARGFLAG_NOT) - aLong = ~aLong; - if (opt->arg != NULL) - switch (argInfo & POPT_ARGFLAG_LOGICALOPS) { - case 0: - *((int *) opt->arg) = aLong; - break; - case POPT_ARGFLAG_OR: - *((int *) opt->arg) |= aLong; - break; - case POPT_ARGFLAG_AND: - *((int *) opt->arg) &= aLong; - break; - case POPT_ARGFLAG_XOR: - *((int *) opt->arg) ^= aLong; - break; - default: - return POPT_ERROR_BADOPERATION; - /*@notreached@*/ break; - } - return 0; -} -/*@=boundswrite@*/ - dbiIndex db3Free(dbiIndex dbi) { if (dbi) { @@ -338,18 +266,12 @@ dbiIndex db3New(rpmdb rpmdb, rpmTag rpmtag) char * dbOpts; sprintf(dbiTagMacro, "%%{_dbi_config_%s}", tagName(rpmtag)); - /*@-nullpass@*/ dbOpts = rpmExpand(dbiTagMacro, NULL); - /*@=nullpass@*/ if (!(dbOpts && *dbOpts && *dbOpts != '%')) { dbOpts = _free(dbOpts); - /*@-nullpass@*/ dbOpts = rpmExpand("%{_dbi_config}", NULL); - /*@=nullpass@*/ if (!(dbOpts && *dbOpts && *dbOpts != '%')) { - /*@-nullpass@*/ dbOpts = rpmExpand(db3_config_default, NULL); - /*@=nullpass@*/ } } @@ -360,8 +282,9 @@ dbiIndex db3New(rpmdb rpmdb, rpmTag rpmtag) char *p, *pe; memset(&db3dbi, 0, sizeof(db3dbi)); +/*=========*/ for (o = dbOpts; o && *o; o = oe) { - struct dbOption *opt; + struct poptOption *opt; const char * tok; int argInfo; @@ -411,16 +334,18 @@ dbiIndex db3New(rpmdb rpmdb, rpmTag rpmtag) switch (argInfo & POPT_ARG_MASK) { case POPT_ARG_NONE: - (void) dbSaveInt(opt, argInfo, 1L); + (void) poptSaveInt((int *)opt->arg, argInfo, 1L); /*@switchbreak@*/ break; case POPT_ARG_VAL: - (void) dbSaveInt(opt, argInfo, (long)opt->val); + (void) poptSaveInt((int *)opt->arg, argInfo, (long)opt->val); /*@switchbreak@*/ break; case POPT_ARG_STRING: { const char ** t = opt->arg; /*@-mods@*/ if (t) { +/*@-unqualifiedtrans@*/ /* FIX: opt->arg annotation in popt.h */ *t = _free(*t); +/*@=unqualifiedtrans@*/ *t = xstrdup( (p ? p : "") ); } /*@=mods@*/ @@ -449,7 +374,7 @@ dbiIndex db3New(rpmdb rpmdb, rpmTag rpmtag) opt->longName); continue; } - (void) dbSaveLong(opt, argInfo, aLong); + (void) poptSaveLong((long *)opt->arg, argInfo, aLong); /*@switchbreak@*/ break; } else { if (aLong > INT_MAX || aLong < INT_MIN) { @@ -458,13 +383,14 @@ dbiIndex db3New(rpmdb rpmdb, rpmTag rpmtag) opt->longName); continue; } - (void) dbSaveInt(opt, argInfo, aLong); + (void) poptSaveInt((int *)opt->arg, argInfo, aLong); } } /*@switchbreak@*/ break; default: /*@switchbreak@*/ break; } } +/*=========*/ } /*@=branchstate@*/ @@ -521,7 +447,7 @@ dbiIndex db3New(rpmdb rpmdb, rpmTag rpmtag) const char *const prDbiOpenFlags(int dbflags, int print_dbenv_flags) { static char buf[256]; - struct dbOption *opt; + struct poptOption *opt; char * oe; oe = buf; diff --git a/rpmdb/header.c b/rpmdb/header.c index 7ac19cf..ea8aac5 100644 --- a/rpmdb/header.c +++ b/rpmdb/header.c @@ -32,9 +32,6 @@ #define PARSER_IN_ARRAY 1 #define PARSER_IN_EXPR 2 -/*@unchecked@*/ -static int _h_debug = 0; - /** \ingroup header */ /*@observer@*/ /*@unchecked@*/ @@ -103,9 +100,11 @@ Header headerLink(Header h) { if (h != NULL) h->nrefs++; +/*@-nullret@*/ /*@-refcounttrans @*/ return h; /*@=refcounttrans @*/ +/*@=nullret@*/ } /** \ingroup header diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c index 20db5d9..ecb991b 100644 --- a/rpmdb/rpmdb.c +++ b/rpmdb/rpmdb.c @@ -132,9 +132,7 @@ static void dbiTagsInit(void) char * o, * oe; int rpmtag; - /*@-nullpass@*/ dbiTagStr = rpmExpand("%{_dbi_tags}", NULL); - /*@=nullpass@*/ if (!(dbiTagStr && *dbiTagStr && *dbiTagStr != '%')) { dbiTagStr = _free(dbiTagStr); dbiTagStr = xstrdup(_dbiTagStr_default); @@ -718,9 +716,11 @@ rpmdb newRpmdb(/*@kept@*/ /*@null@*/ const char * root, _initialized = 1; } +/*@-boundswrite@*/ /*@-assignexpose@*/ *db = dbTemplate; /* structure assignment */ /*@=assignexpose@*/ +/*@=boundswrite@*/ db->_dbi = NULL; @@ -741,9 +741,7 @@ rpmdb newRpmdb(/*@kept@*/ /*@null@*/ const char * root, db = _free(db); /*@-globstate@*/ return NULL; /*@=globstate@*/ } - /*@-nullpass@*/ db->db_errpfx = rpmExpand( (epfx && *epfx ? epfx : _DB_ERRPFX), NULL); - /*@=nullpass@*/ db->db_remove_env = 0; db->db_filter_dups = _db_filter_dups; db->db_ndbi = dbiTagsMax; @@ -762,6 +760,7 @@ static int openDatabase(/*@null@*/ const char * prefix, /*@globals rpmGlobalMacroContext, fileSystem @*/ /*@modifies *dbp, fileSystem @*/ + /*@requires maxSet(dbp) >= 0 @*/ { rpmdb db; int rc, xx; @@ -906,7 +905,9 @@ int rpmdbOpen (const char * prefix, rpmdb *dbp, int mode, int perms) /*@-mods@*/ int _dbapi = rpmExpandNumeric("%{_dbapi}"); /*@=mods@*/ +/*@-boundswrite@*/ return openDatabase(prefix, NULL, _dbapi, dbp, mode, perms, 0); +/*@=boundswrite@*/ } int rpmdbInit (const char * prefix, int perms) @@ -917,8 +918,10 @@ int rpmdbInit (const char * prefix, int perms) /*@=mods@*/ int rc; +/*@-boundswrite@*/ rc = openDatabase(prefix, NULL, _dbapi, &db, (O_CREAT | O_RDWR), perms, RPMDB_FLAG_JUSTCHECK); +/*@=boundswrite@*/ if (db != NULL) { int xx; xx = rpmdbOpenAll(db); @@ -938,8 +941,9 @@ int rpmdbVerify(const char * prefix) /*@=mods@*/ int rc = 0; +/*@-boundswrite@*/ rc = openDatabase(prefix, NULL, _dbapi, &db, O_RDONLY, 0644, 0); - if (rc) return rc; +/*@=boundswrite@*/ if (db != NULL) { int dbix; @@ -986,7 +990,9 @@ static int rpmdbFindByFile(rpmdb db, /*@null@*/ const char * filespec, int rc; int xx; +/*@-boundswrite@*/ *matches = NULL; +/*@=boundswrite@*/ if (filespec == NULL) return -2; /*@-branchstate@*/ @@ -995,8 +1001,10 @@ static int rpmdbFindByFile(rpmdb db, /*@null@*/ const char * filespec, size_t len; len = baseName - filespec + 1; +/*@-boundswrite@*/ t = strncpy(alloca(len + 1), filespec, len); t[len] = '\0'; +/*@=boundswrite@*/ dirName = t; baseName++; } else { @@ -1044,7 +1052,9 @@ if (rc == 0) return rc; } +/*@-boundswrite@*/ *matches = xcalloc(1, sizeof(**matches)); +/*@=boundswrite@*/ rec = dbiIndexNewItem(0, 0); i = 0; if (allMatches != NULL) @@ -1102,7 +1112,9 @@ if (rc == 0) fpc = fpCacheFree(fpc); if ((*matches)->count == 0) { +/*@-boundswrite@*/ *matches = dbiFreeIndexSet(*matches); +/*@=boundswrite@*/ return 1; } @@ -1237,25 +1249,31 @@ key->size = strlen(name); } h = rpmdbNextIterator(mi); +/*@-boundswrite@*/ if (h) (*matches)->recs[gotMatches++] = (*matches)->recs[i]; else (*matches)->recs[i].hdrNum = 0; +/*@=boundswrite@*/ mi = rpmdbFreeIterator(mi); } /*@=branchstate@*/ if (gotMatches) { +/*@-boundswrite@*/ (*matches)->count = gotMatches; +/*@=boundswrite@*/ rc = RPMRC_OK; } else rc = RPMRC_NOTFOUND; exit: +/*@-boundswrite@*/ /*@-unqualifiedtrans@*/ /* FIX: double indirection */ if (rc && matches && *matches) *matches = dbiFreeIndexSet(*matches); /*@=unqualifiedtrans@*/ +/*@=boundswrite@*/ return rc; } @@ -1290,9 +1308,11 @@ static rpmRC dbiFindByLabel(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data, rc = dbiFindMatches(dbi, dbcursor, key, data, arg, NULL, NULL, matches); if (rc != RPMRC_NOTFOUND) return rc; +/*@-boundswrite@*/ /*@-unqualifiedtrans@*/ /* FIX: double indirection */ *matches = dbiFreeIndexSet(*matches); /*@=unqualifiedtrans@*/ +/*@=boundswrite@*/ /* maybe a name and a release */ localarg = alloca(strlen(arg) + 1); @@ -1317,13 +1337,18 @@ static rpmRC dbiFindByLabel(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data, /*@-nullstate@*/ /* FIX: *matches may be NULL. */ if (s == localarg) return RPMRC_NOTFOUND; +/*@-boundswrite@*/ *s = '\0'; rc = dbiFindMatches(dbi, dbcursor, key, data, localarg, s + 1, NULL, matches); + /*@=nullstate@*/ +/*@=boundswrite@*/ if (rc != RPMRC_NOTFOUND) return rc; +/*@-boundswrite@*/ /*@-unqualifiedtrans@*/ /* FIX: double indirection */ *matches = dbiFreeIndexSet(*matches); /*@=unqualifiedtrans@*/ +/*@=boundswrite@*/ /* how about name-version-release? */ @@ -1347,9 +1372,12 @@ static rpmRC dbiFindByLabel(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data, if (s == localarg) return RPMRC_NOTFOUND; +/*@-boundswrite@*/ *s = '\0'; + /*@-nullstate@*/ /* FIX: *matches may be NULL. */ return dbiFindMatches(dbi, dbcursor, key, data, localarg, s + 1, release, matches); /*@=nullstate@*/ +/*@=boundswrite@*/ } typedef struct miRE_s { @@ -1656,9 +1684,9 @@ int rpmdbSetIteratorRE(rpmdbMatchIterator mi, rpmTag tag, /*@-boundsread@*/ if (defmode == (rpmMireMode)-1) { - /*@-globs -mods -nullpass @*/ + /*@-globs -mods @*/ const char *t = rpmExpand("%{?_query_selector_match}", NULL); - /*@=globs =mods =nullpass @*/ + /*@=globs =mods @*/ if (*t == '\0' || !strcmp(t, "default")) defmode = RPMMIRE_DEFAULT; else if (!strcmp(t, "strcmp")) @@ -3362,21 +3390,25 @@ int rpmdbRebuild(const char * prefix) rpmMessage(RPMMESS_DEBUG, _("opening old database with dbapi %d\n"), _dbapi); _rebuildinprogress = 1; +/*@-boundswrite@*/ if (openDatabase(prefix, dbpath, _dbapi, &olddb, O_RDONLY, 0644, RPMDB_FLAG_MINIMAL)) { rc = 1; goto exit; } +/*@=boundswrite@*/ _dbapi = olddb->db_api; _rebuildinprogress = 0; rpmMessage(RPMMESS_DEBUG, _("opening new database with dbapi %d\n"), _dbapi_rebuild); (void) rpmDefineMacro(NULL, "_rpmdb_rebuild %{nil}", -1); +/*@-boundswrite@*/ if (openDatabase(prefix, newdbpath, _dbapi_rebuild, &newdb, O_RDWR | O_CREAT, 0644, 0)) { rc = 1; goto exit; } +/*@=boundswrite@*/ _dbapi_rebuild = newdb->db_api; { Header h = NULL; -- 2.7.4