From b874299aab3b048055c63036b650e5352f39c574 Mon Sep 17 00:00:00 2001 From: jbj Date: Wed, 20 Dec 2000 21:08:18 +0000 Subject: [PATCH] - whiteout mozilla loop for 7.1. fix the auto %_tmppath creation. CVS patchset: 4363 CVS date: 2000/12/20 21:08:18 --- CHANGES | 1 + lib/depends.c | 18 +++------- lib/misc.c | 7 ++-- po/cs.po | 91 +++++++++++++++++++++++++---------------------- po/da.po | 90 +++++++++++++++++++++++++---------------------- po/de.po | 91 +++++++++++++++++++++++++---------------------- po/es.po | 89 ++++++++++++++++++++++++---------------------- po/fi.po | 90 +++++++++++++++++++++++++---------------------- po/fr.po | 90 +++++++++++++++++++++++++---------------------- po/gl.po | 89 ++++++++++++++++++++++++---------------------- po/hu.po | 89 ++++++++++++++++++++++++---------------------- po/id.po | 89 ++++++++++++++++++++++++---------------------- po/is.po | 91 +++++++++++++++++++++++++---------------------- po/it.po | 89 ++++++++++++++++++++++++---------------------- po/ja.po | 92 +++++++++++++++++++++++++----------------------- po/ko.po | 89 ++++++++++++++++++++++++---------------------- po/no.po | 91 +++++++++++++++++++++++++---------------------- po/pl.po | 90 +++++++++++++++++++++++++---------------------- po/pt.po | 89 ++++++++++++++++++++++++---------------------- po/pt_BR.po | 90 +++++++++++++++++++++++++---------------------- po/ro.po | 89 ++++++++++++++++++++++++---------------------- po/rpm.pot | 14 ++++---- po/ru.po | 91 +++++++++++++++++++++++++---------------------- po/sk.po | 91 +++++++++++++++++++++++++---------------------- po/sl.po | 93 ++++++++++++++++++++++++++----------------------- po/sr.po | 90 +++++++++++++++++++++++++---------------------- po/sv.po | 91 +++++++++++++++++++++++++---------------------- po/tr.po | 91 +++++++++++++++++++++++++---------------------- po/uk.po | 89 ++++++++++++++++++++++++---------------------- po/wa.po | 89 ++++++++++++++++++++++++---------------------- po/zh.po | 89 ++++++++++++++++++++++++---------------------- po/zh_CN.GB2312.po | 89 ++++++++++++++++++++++++---------------------- popt/po/cs.po | 2 +- popt/po/da.po | 2 +- popt/po/de.po | 2 +- popt/po/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/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 +- rpm.spec | 17 ++++++--- rpm.spec.in | 3 ++ 62 files changed, 1403 insertions(+), 1234 deletions(-) diff --git a/CHANGES b/CHANGES index 92d66b9..143f412 100644 --- a/CHANGES +++ b/CHANGES @@ -73,6 +73,7 @@ "just in case". - create _tmppath on the fly if not present. - remove /etc/rpm/macros.db1 configuration file if db3 rebuilt. + - whiteout mozilla loop for 7.1. 3.0.6 -> 4.0 - use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db. diff --git a/lib/depends.c b/lib/depends.c index a321120..85cc2bc 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -1394,7 +1394,7 @@ static int checkDependentConflicts(rpmTransactionSet rpmdep, /* * XXX Hack to remove known Red Hat dependency loops, will be removed - * Real Soon Now. + * as soon as rpm's legacy permits. */ #define DEPENDENCY_WHITEOUT @@ -1407,6 +1407,8 @@ static struct badDeps_s { { "modutils", "vixie-cron" }, { "ypbind", "yp-tools" }, { "ghostscript-fonts", "ghostscript" }, + /* 7.1 only */ + { "mozilla-spm", "mozilla" }, /* 7.0 only */ { "pango-gtkbeta-devel", "pango-gtkbeta" }, { "XFree86", "Mesa" }, @@ -1421,14 +1423,6 @@ static struct badDeps_s { { "pilot-link-devel", "pilot-link" }, /* 5.2 */ { "pam", "pamconfig" }, -#if 0 -/* ================= */ - { "usermode", "util-linux" }, - { "chkfontpath", "SysVinit" }, - { "vixie-cron", "sysklogd" }, - { "XFree86", "XFree86-xfs" }, - { "Xconfigurator", "kudzu" }, -#endif { NULL, NULL } }; @@ -1437,12 +1431,8 @@ static int ignoreDep(struct availablePackage * p, struct availablePackage * q) struct badDeps_s *bdp; for (bdp = badDeps; bdp->pname != NULL; bdp++) { - if (!strcmp(p->name, bdp->pname) && !strcmp(q->name, bdp->qname)) { -#if 0 -fprintf(stderr, "*** avoiding %s Requires: %s\n", p->name, q->name); -#endif + if (!strcmp(p->name, bdp->pname) && !strcmp(q->name, bdp->qname)) return 1; - } } return 0; } diff --git a/lib/misc.c b/lib/misc.c index a5a84ec..4292f4c 100644 --- a/lib/misc.c +++ b/lib/misc.c @@ -234,11 +234,14 @@ static int rpmMkpath(const char * path, mode_t mode, uid_t uid, gid_t gid) if (path == NULL) return -1; - for (de = d = strcpy(alloca(strlen(path)+2), path); de && *de; de++) { + d = alloca(strlen(path)+2); + de = stpcpy(d, path); + de[1] = '\0'; + for (de = d; *de; de++) { struct stat st; char savec; - while (*de != '/') de++; + while (*de && *de != '/') de++; savec = de[1]; de[1] = '\0'; diff --git a/po/cs.po b/po/cs.po index ba3fb6b..5861ff2 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: 2000-08-23 22:24+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -76,11 +76,13 @@ msgid "RPM version %s\n" msgstr "RPM verze %s\n" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +#, fuzzy +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright (c) 1998 - Red Hat Software" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +#, fuzzy +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Tento program lze volnì ¹íøit podle podmínek GNU GPL." #: rpm.c:209 @@ -2414,26 +2416,26 @@ msgstr "bal msgid "package %s conflicts: %s\n" msgstr "balíèek %s koliduje: %s\n" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "odstraòuji \"%s\" z indexu %s.\n" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2801,7 +2803,7 @@ msgstr "varov msgid "running postinstall scripts (if any)\n" msgstr "spou¹tím pøípadný postinstalaèní skript\n" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "chyba pøi vytváøení doèasného souboru %s" @@ -3258,7 +3260,7 @@ msgstr "OK" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: neznámá znaèka: \"%s\" ignorována\n" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3272,17 +3274,17 @@ msgstr "" " a nastavte \"%%_dbapi 3\" (tj. vytvoøte nebo upravte /etc/rpm/macros).\n" "\n" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "nemohu otevøít index %s pøi pou¾ívání db%d - %s (%d)" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, c-format msgid "cannot open %s index" msgstr "nemohu otevøít index %s" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3298,7 +3300,7 @@ msgstr "" " jako root.\n" "\n" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3313,7 +3315,7 @@ msgstr "" " a nastavte \"%%_dbapi %d\" (tj. vytvoøte nebo upravte /etc/rpm/macros).\n" "\n" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3331,26 +3333,26 @@ msgstr "" " \"%%_dbapi_rebuild %d\" (tj. vytvoøte nebo upravte /etc/rpm/macros).\n" "\n" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "chyba(%d) pøi získávání záznamu \"%s\" z indexu %s" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, c-format msgid "error(%d) storing record %s into %s" msgstr "chyba(%d) pøi ukládání záznamu %s do %s" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, c-format msgid "error(%d) removing record %s from %s" msgstr "chyba(%d) pøi odstraòování záznamu %s z %s" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "nebyla nastavena dbpath" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" @@ -3359,111 +3361,116 @@ msgstr "" "formátu databáze" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, c-format msgid "error(%d) counting packages" msgstr "chyba(%d) pøi poèítání balíèkù" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "%s: nemohu èíst hlavièku na 0x%x" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "odstraòuji 0 %s polo¾ek.\n" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuji \"%s\" z indexu %s.\n" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuji %d polo¾ek z indexu %s.\n" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "chyba(%d) pøi alokaci nové instance balíèku" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "pøidávám 0 %s polo¾ek.\n" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "pøidávám \"%s\" do indexu %s\n" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, c-format msgid "adding %d entries to %s index.\n" msgstr "pøidávám %d polo¾ek do indexu %s.\n" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "databázi %s pøevádím do %s\n" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "doèasná databáze %s ji¾ existuje" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, c-format msgid "creating directory %s\n" msgstr "vytváøím adresáø %s\n" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "chyba pøi vytváøení adresáøe %s: %s" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "otevírám starou databázi s dbapi %d\n" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "otevírám novou databázi s dbapi %d\n" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "záznam èíslo %d v databázi je chybný -- vynechávám." -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "nemohu pøidat záznam - pùvodnì u %d" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "databázi nelze zvovu vytvoøit; pùvodní databáze zùstává na svém místì\n" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "starou databázi nelze nahradit novou databází!\n" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "pro obnovení nahraïte soubory v %s soubory z %s" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "ma¾u adresáø %s\n" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nemohu odstranit adresáø %s: %s\n" diff --git a/po/da.po b/po/da.po index 3699725..f65bf53 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: 2000-03-07 05:17+01:00\n" "Last-Translator: K. Christiansen \n" "Language-Team: Danish/Dansk \n" @@ -76,11 +76,12 @@ msgid "RPM version %s\n" msgstr "RPM version %s\n" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +#, fuzzy +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Ophavsret (C) 1998 - Red Hat Software" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" #: rpm.c:209 @@ -2379,26 +2380,26 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2760,7 +2761,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "" @@ -3217,7 +3218,7 @@ msgstr "OK" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3226,17 +3227,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "kan ikke åbne %s ved %s:%d: %s" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, fuzzy, c-format msgid "cannot open %s index" msgstr "kan ikke åbne %s: %s\n" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3246,7 +3247,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3256,7 +3257,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3267,136 +3268,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, c-format msgid "error(%d) storing record %s into %s" msgstr "" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, c-format msgid "error(%d) removing record %s from %s" msgstr "" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, c-format msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, c-format msgid "creating directory %s\n" msgstr "opretter kataloget %s\n" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "fjener kataloget %s\n" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/de.po b/po/de.po index 2c8db53..b7d5775 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -119,11 +119,13 @@ msgid "RPM version %s\n" msgstr "RPM Version %s\n" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +#, fuzzy +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright © 1998 - Red Hat Software" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +#, fuzzy +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Dies darf unter den Bedingungen der »GNU GPL« frei verteilt werden" #: rpm.c:209 @@ -2620,26 +2622,26 @@ msgid "package %s conflicts: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" # FIXME -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -3013,7 +3015,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, fuzzy, c-format msgid "error creating temporary file %s" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" @@ -3513,7 +3515,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3522,17 +3524,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "kann Datei %s nicht öffnen: " -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, fuzzy, c-format msgid "cannot open %s index" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3542,7 +3544,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3552,7 +3554,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3563,142 +3565,147 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "Fehler beim Eintrag %s von %s" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, fuzzy, c-format msgid "error(%d) storing record %s into %s" msgstr "Fehler bei Schreiben des Eintrags %s nach %s" # FIXME -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, fuzzy, c-format msgid "error(%d) removing record %s from %s" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "»dbpath« ist nicht gesetzt" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, fuzzy, c-format msgid "error(%d) counting packages" msgstr "Fehler beim Suchen nach Paket %s\n" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" # FIXME -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" # FIXME -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, fuzzy, c-format msgid "error(%d) allocating new package instance" msgstr "Fehler beim Suchen nach Paket %s\n" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # FIXME -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "die temporäre Datenbank %s existiert schon" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, fuzzy, c-format msgid "record number %d in database is bad -- skipping." msgstr "" "Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" # , c-format -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" diff --git a/po/es.po b/po/es.po index 59c99e9..b1739e4 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -81,11 +81,11 @@ msgid "RPM version %s\n" msgstr "" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" #: rpm.c:209 @@ -2347,26 +2347,26 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2728,7 +2728,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "" @@ -3185,7 +3185,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3194,17 +3194,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, c-format msgid "cannot open %s index" msgstr "" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3214,7 +3214,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3224,7 +3224,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3235,136 +3235,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, c-format msgid "error(%d) storing record %s into %s" msgstr "" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, c-format msgid "error(%d) removing record %s from %s" msgstr "" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, c-format msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, c-format msgid "creating directory %s\n" msgstr "" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 5c9aed1..0df9649 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -77,11 +77,12 @@ msgid "RPM version %s\n" msgstr "RPM versio %s\n" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +#, fuzzy +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Tätä ohjelmaa voi vapaasti levittää GNU GPL:n puittessa" #: rpm.c:209 @@ -2546,26 +2547,26 @@ msgstr "paketti %s ei ole %s:ss msgid "package %s conflicts: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2932,7 +2933,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, fuzzy, c-format msgid "error creating temporary file %s" msgstr "virhe luotaessa hakemistoa %s: %s" @@ -3425,7 +3426,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3434,17 +3435,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "en voinut avata tiedostoa %s: " -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, fuzzy, c-format msgid "cannot open %s index" msgstr "virhe: en voi avata %s\n" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3454,7 +3455,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3464,7 +3465,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3475,136 +3476,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, fuzzy, c-format msgid "error(%d) storing record %s into %s" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, fuzzy, c-format msgid "error(%d) removing record %s from %s" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "dbpath ei ole asetettu" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, fuzzy, c-format msgid "error(%d) counting packages" msgstr "virhe etsittäessä pakettia %s\n" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "en voi lukea headeria %d:stä päivittäessä" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, fuzzy, c-format msgid "error(%d) allocating new package instance" msgstr "virhe etsittäessä pakettia %s\n" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "väliaikainen tietokanta %s on jo olemassa" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, fuzzy, c-format msgid "record number %d in database is bad -- skipping." msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "en voi lisätä tietuetta %d:stä" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, 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 1ab36cc..7659f3a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,5 +1,5 @@ msgid "" -msgstr "POT-Creation-Date: 2000-12-19 09:06-0500\n" +msgstr "POT-Creation-Date: 2000-12-20 13:55-0500\n" #: build.c:26 #, fuzzy, c-format @@ -69,11 +69,12 @@ msgid "RPM version %s\n" msgstr "" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +#, fuzzy +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Peut être redistribué librement selon les termes de la GNU GPL" #: rpm.c:209 @@ -2551,26 +2552,26 @@ msgstr "aucun package n'a msgid "package %s conflicts: %s\n" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2936,7 +2937,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "" @@ -3428,7 +3429,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3437,17 +3438,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, fuzzy, c-format msgid "cannot open %s index" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3457,7 +3458,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3467,7 +3468,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3478,136 +3479,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, fuzzy, c-format msgid "error(%d) storing record %s into %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, fuzzy, c-format msgid "error(%d) removing record %s from %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, fuzzy, c-format msgid "error(%d) counting packages" msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, 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 59c99e9..b1739e4 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -81,11 +81,11 @@ msgid "RPM version %s\n" msgstr "" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" #: rpm.c:209 @@ -2347,26 +2347,26 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2728,7 +2728,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "" @@ -3185,7 +3185,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3194,17 +3194,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, c-format msgid "cannot open %s index" msgstr "" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3214,7 +3214,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3224,7 +3224,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3235,136 +3235,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, c-format msgid "error(%d) storing record %s into %s" msgstr "" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, c-format msgid "error(%d) removing record %s from %s" msgstr "" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, c-format msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, c-format msgid "creating directory %s\n" msgstr "" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index 59c99e9..b1739e4 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -81,11 +81,11 @@ msgid "RPM version %s\n" msgstr "" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" #: rpm.c:209 @@ -2347,26 +2347,26 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2728,7 +2728,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "" @@ -3185,7 +3185,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3194,17 +3194,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, c-format msgid "cannot open %s index" msgstr "" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3214,7 +3214,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3224,7 +3224,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3235,136 +3235,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, c-format msgid "error(%d) storing record %s into %s" msgstr "" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, c-format msgid "error(%d) removing record %s from %s" msgstr "" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, c-format msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, c-format msgid "creating directory %s\n" msgstr "" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/id.po b/po/id.po index 59c99e9..b1739e4 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -81,11 +81,11 @@ msgid "RPM version %s\n" msgstr "" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" #: rpm.c:209 @@ -2347,26 +2347,26 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2728,7 +2728,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "" @@ -3185,7 +3185,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3194,17 +3194,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, c-format msgid "cannot open %s index" msgstr "" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3214,7 +3214,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3224,7 +3224,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3235,136 +3235,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, c-format msgid "error(%d) storing record %s into %s" msgstr "" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, c-format msgid "error(%d) removing record %s from %s" msgstr "" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, c-format msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, c-format msgid "creating directory %s\n" msgstr "" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/is.po b/po/is.po index eac2913..5e28277 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: 2000-08-02 13:00+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -76,11 +76,13 @@ msgid "RPM version %s\n" msgstr "RPM útgáfa %s\n" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +#, fuzzy +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Höfundarréttur (C) 1998 - Red Hat Software" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +#, fuzzy +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Þessu má dreyfa frjálst samkvæmt skilmálum GNU GPL" #: rpm.c:209 @@ -2374,26 +2376,26 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2755,7 +2757,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "" @@ -3212,7 +3214,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3221,17 +3223,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, c-format msgid "cannot open %s index" msgstr "get ekki opnað index í %s" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3241,7 +3243,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3251,7 +3253,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3262,136 +3264,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, c-format msgid "error(%d) storing record %s into %s" msgstr "" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, c-format msgid "error(%d) removing record %s from %s" msgstr "" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, c-format msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, c-format msgid "creating directory %s\n" msgstr "" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/it.po b/po/it.po index 59c99e9..b1739e4 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -81,11 +81,11 @@ msgid "RPM version %s\n" msgstr "" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" #: rpm.c:209 @@ -2347,26 +2347,26 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2728,7 +2728,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "" @@ -3185,7 +3185,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3194,17 +3194,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, c-format msgid "cannot open %s index" msgstr "" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3214,7 +3214,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3224,7 +3224,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3235,136 +3235,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, c-format msgid "error(%d) storing record %s into %s" msgstr "" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, c-format msgid "error(%d) removing record %s from %s" msgstr "" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, c-format msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, c-format msgid "creating directory %s\n" msgstr "" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index b6f6864..3f71361 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -88,7 +88,7 @@ msgstr " # build root [BuildRoot] # net share [¥Í¥Ã¥È¶¦Í­] # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë] -# $Id: ja.po,v 1.127 2000/12/19 17:43:57 jbj Exp $ +# $Id: ja.po,v 1.128 2000/12/20 21:08:20 jbj Exp $ #: rpm.c:185 rpmqv.c:269 #, c-format msgid "rpm: %s\n" @@ -100,7 +100,8 @@ msgid "RPM version %s\n" msgstr "RPM ¥Ð¡¼¥¸¥ç¥ó %s\n" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +#, fuzzy +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" "Ãøºî¸¢ (C) 1998 - Red Hat Software\n" "ËÝÌõ¼Ô ¿ÀÅÄ ½¼ \n" @@ -108,7 +109,7 @@ msgstr "" #: rpm.c:201 rpmqv.c:285 #, fuzzy -msgid "This may be freely redistributed under the terms of the GNU GPL" +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "GNU°ìÈ̸øÍ­»ÈÍѵöÂú½ñ¤Î²¼¤Ç¼«Í³¤ËÇÛÉۤǤ­¤Þ¤¹" #: rpm.c:209 @@ -2493,26 +2494,26 @@ msgstr " msgid "package %s conflicts: %s\n" msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹: %s\n" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2883,7 +2884,7 @@ msgstr " msgid "running postinstall scripts (if any)\n" msgstr "¥Ý¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "°ì»þ¥Õ¥¡¥¤¥ë %s ¤ÎºîÀ®¥¨¥é¡¼" @@ -3384,7 +3385,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3393,17 +3394,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó %s:%d" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, fuzzy, c-format msgid "cannot open %s index" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3413,7 +3414,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3423,7 +3424,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3434,138 +3435,143 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, fuzzy, c-format msgid "error(%d) storing record %s into %s" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, fuzzy, c-format msgid "error(%d) removing record %s from %s" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, fuzzy, c-format msgid "error(%d) counting packages" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, fuzzy, c-format msgid "removing 0 %s entries.\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥¨¥ó¥È¥ê¤òºï½ü¤·¤Þ¤¹\n" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, fuzzy, c-format msgid "error(%d) allocating new package instance" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ÎºîÀ®¥¨¥é¡¼: %s" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, fuzzy, c-format msgid "record number %d in database is bad -- skipping." msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Þ¤¹" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ­¤Þ¤»¤ó" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤­´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤­´¹¤¨¤Þ¤¹" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n" diff --git a/po/ko.po b/po/ko.po index 59c99e9..b1739e4 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -81,11 +81,11 @@ msgid "RPM version %s\n" msgstr "" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" #: rpm.c:209 @@ -2347,26 +2347,26 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2728,7 +2728,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "" @@ -3185,7 +3185,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3194,17 +3194,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, c-format msgid "cannot open %s index" msgstr "" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3214,7 +3214,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3224,7 +3224,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3235,136 +3235,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, c-format msgid "error(%d) storing record %s into %s" msgstr "" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, c-format msgid "error(%d) removing record %s from %s" msgstr "" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, c-format msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, c-format msgid "creating directory %s\n" msgstr "" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/no.po b/po/no.po index dace107..bcc6d2d 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: 2000-08-17 20:22+02:00\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -76,11 +76,13 @@ msgid "RPM version %s\n" msgstr "RPM versjon %s\n" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +#, fuzzy +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright © 1998 - Red Hat Software" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +#, fuzzy +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" "Dette progeammet kan redistribueres fritt under betingelsene gitt i GNU GPL" @@ -2394,26 +2396,26 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2775,7 +2777,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "" @@ -3232,7 +3234,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3241,17 +3243,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, c-format msgid "cannot open %s index" msgstr "kan ikke åpne %s indeks" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3261,7 +3263,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3271,7 +3273,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3282,136 +3284,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, c-format msgid "error(%d) storing record %s into %s" msgstr "" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, c-format msgid "error(%d) removing record %s from %s" msgstr "" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, c-format msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, c-format msgid "creating directory %s\n" msgstr "" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index 3e33086..0f46f93 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -83,12 +83,13 @@ msgid "RPM version %s\n" msgstr "RPM wersja %s\n" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +#, fuzzy +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright (C) 1998 - Red Hat Software" #: rpm.c:201 rpmqv.c:285 #, fuzzy -msgid "This may be freely redistributed under the terms of the GNU GPL" +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Program mo¿e byæ swobodnie rozpowszechniany na warunkach licencji GNU" #: rpm.c:209 @@ -2502,26 +2503,26 @@ msgstr "zale msgid "package %s conflicts: %s\n" msgstr "pakiet %s jest w konflikcie: %s\n" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2886,7 +2887,7 @@ msgstr "ostrze msgid "running postinstall scripts (if any)\n" msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "b³±d w tworzeniu pliku tymczasowego %s" @@ -3365,7 +3366,7 @@ msgstr "OK" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3374,17 +3375,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "nie mo¿na otworzyæ %s przy %s:%d" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, fuzzy, c-format msgid "cannot open %s index" msgstr "nie mo¿na otworzyæ %s\n" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3394,7 +3395,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3404,7 +3405,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3415,26 +3416,26 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "b³±d pobierania rekordu %s z %s" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, fuzzy, c-format msgid "error(%d) storing record %s into %s" msgstr "b³±d zapisywania rekordu %s do %s" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, fuzzy, c-format msgid "error(%d) removing record %s from %s" msgstr "b³±d usuwania rekordu %s z %s" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "¶cie¿ka bazy danych nie zosta³a podana" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" @@ -3443,111 +3444,116 @@ msgstr "" "nowym formacie" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, fuzzy, c-format msgid "error(%d) counting packages" msgstr "b³±d szukania pakietu %s\n" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla poszukiwania" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, fuzzy, c-format msgid "removing 0 %s entries.\n" msgstr "usuwanie wpisu w bazie\n" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "usuwanie indeksu grupy\n" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "usuwanie indeksu nazw\n" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, fuzzy, c-format msgid "error(%d) allocating new package instance" msgstr "b³±d szukania pakietu %s\n" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "odbudowywujê bazê danych w rootdir %s\n" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "tymczasowa baza danych %s ju¿ istnieje" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "b³±d przy tworzeniu katalogu %s: %s" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otwieranie starej bazy danych\n" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otwieranie nowej bazy danych\n" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, fuzzy, c-format msgid "record number %d in database is bad -- skipping." msgstr "rekord numer %d w bazie danych jest b³êdny -- rekord pominiêto" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 #, 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" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "zamiana starej bazy na now± nie powiod³a siê!\n" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, 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" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n" diff --git a/po/pt.po b/po/pt.po index e6368ba..ef0b623 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: 2000-08-01 21:11+01:00\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -78,11 +78,11 @@ msgid "RPM version %s\n" msgstr "" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" #: rpm.c:209 @@ -2344,26 +2344,26 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2725,7 +2725,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "" @@ -3182,7 +3182,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3191,19 +3191,19 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, fuzzy, c-format msgid "cannot open %s index" msgstr "" "não consegui abrir %s/packages.rpm\n" "\n" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3213,7 +3213,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3223,7 +3223,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3234,136 +3234,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, c-format msgid "error(%d) storing record %s into %s" msgstr "" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, c-format msgid "error(%d) removing record %s from %s" msgstr "" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, c-format msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, c-format msgid "creating directory %s\n" msgstr "" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index aeed8f5..f6b9fd0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,7 +2,7 @@ # Revised by Arnaldo Carvalho de Melo , 1998. # msgid "" -msgstr "POT-Creation-Date: 2000-12-19 09:06-0500\n" +msgstr "POT-Creation-Date: 2000-12-20 13:55-0500\n" # , c-format #: build.c:26 @@ -86,11 +86,12 @@ msgid "RPM version %s\n" msgstr "RPM versão %s\n" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +#, fuzzy +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" "Este Software pode ser livremente redistribuido sob os termos da Licensa " "Pública GNU (GPL)" @@ -2623,26 +2624,26 @@ msgstr "n msgid "package %s conflicts: %s\n" msgstr "não foi passado pacote para desinstalação" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -3015,7 +3016,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "" @@ -3506,7 +3507,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3516,18 +3517,18 @@ msgid "" msgstr "" # , c-format -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "Não consegui abrir: %s\n" # , c-format -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, fuzzy, c-format msgid "cannot open %s index" msgstr "Não consegui abrir: %s\n" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3537,7 +3538,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3547,7 +3548,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3559,131 +3560,136 @@ msgid "" msgstr "" # , c-format -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "Não consegui abrir: %s\n" # , c-format -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, fuzzy, c-format msgid "error(%d) storing record %s into %s" msgstr "Não consegui abrir: %s\n" # , c-format -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, fuzzy, c-format msgid "error(%d) removing record %s from %s" msgstr "Não consegui abrir: %s\n" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, fuzzy, c-format msgid "error(%d) counting packages" msgstr "não foi passado pacote para instalação" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "não foi passado pacote para desinstalação" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" # , c-format -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "Não consegui abrir: %s\n" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # , c-format -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "Não consegui abrir: %s\n" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "" # , c-format -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "Não consegui abrir: %s\n" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" @@ -3696,13 +3702,13 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "RPM versão %s\n" # , c-format -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Não consegui abrir: %s\n" diff --git a/po/ro.po b/po/ro.po index e379593..61af4f3 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -76,11 +76,11 @@ msgid "RPM version %s\n" msgstr "" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" #: rpm.c:209 @@ -2342,26 +2342,26 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2723,7 +2723,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "" @@ -3180,7 +3180,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3189,17 +3189,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, c-format msgid "cannot open %s index" msgstr "" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3209,7 +3209,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3219,7 +3219,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3230,136 +3230,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, c-format msgid "error(%d) storing record %s into %s" msgstr "" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, c-format msgid "error(%d) removing record %s from %s" msgstr "" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, c-format msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, c-format msgid "creating directory %s\n" msgstr "" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index c283ca8..588be35 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2347,26 +2347,26 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2728,7 +2728,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "" diff --git a/po/ru.po b/po/ru.po index 7cb172c..43f5811 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: 2000-08-08 01:20+0300\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -77,11 +77,13 @@ msgid "RPM version %s\n" msgstr "RPM ×ÅÒÓÉÑ %s\n" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +#, fuzzy +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright (C) 1998 - Red Hat Software" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +#, fuzzy +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "íÏÖÅÔ Ó×ÏÂÏÄÎÏ ÒÁÓÐÒÏÓÔÒÁÎÑÔØÓÑ ÎÁ ÕÓÌÏ×ÉÑÈ GNU GPL." #: rpm.c:209 @@ -2429,26 +2431,26 @@ msgstr " msgid "package %s conflicts: %s\n" msgstr "ÐÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2817,7 +2819,7 @@ msgstr " msgid "running postinstall scripts (if any)\n" msgstr "×ÙÐÏÌÎÑÅÔÓÑ ÓËÒÉÐÔ postinstall (ÅÓÌÉ ÅÓÔØ)\n" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ %s" @@ -3274,7 +3276,7 @@ msgstr "O msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: ÉÍÑ ËÌÀÞÁ \"%s\" ÎÅ ÉÚ×ÅÓÔÎÏ, ÉÇÎÏÒÉÒÕÅÔÓÑ\n" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3289,17 +3291,17 @@ msgstr "" "/etc/rpm/macros).\n" "\n" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s ÉÓÐÏÌØÚÕÑ db%d - %s (%d)" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, c-format msgid "cannot open %s index" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3314,7 +3316,7 @@ msgstr "" " × ÆÏÒÍÁÔ db%d, ÚÁÐÕÓÔÉ× \"rpm --rebuilddb\" ËÁË root\n" "\n" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3330,7 +3332,7 @@ msgstr "" " ÐÏÐÒÁ×ØÔÅ /etc/rpm/macros).\n" "\n" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3349,26 +3351,26 @@ msgstr "" " × ÆÁÊÌÅ /etc/rpm/macros).\n" "\n" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, c-format msgid "error(%d) storing record %s into %s" msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, c-format msgid "error(%d) removing record %s from %s" msgstr "ÏÛÉÂËÁ(%d) ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" @@ -3377,111 +3379,116 @@ msgstr "" "ÂÁÚÙ ÄÁÎÎÙÈ ÎÏ×ÏÇÏ ÆÏÒÍÁÔÁ" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, c-format msgid "error(%d) counting packages" msgstr "ÏÛÉÂËÁ(%d) ÐÒÉ ÐÏÄÓÞ£ÔÅ ÐÁËÅÔÏ×" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÚÁÇÏÌÏ×ÏË × 0x%x" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "ÕÄÁÌÑÅÔÓÑ 0 ÚÁÐÉÓÅÊ %s.\n" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, c-format msgid "removing %d entries from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "ÏÛÉÂËÁ(%d) ÒÅÚÅÒ×ÉÒÏ×ÁÎÉÑ ÐÁÍÑÔÉ ÄÌÑ ÏÂÒÁÚÁ ÎÏ×ÏÇÏ ÐÁËÅÔÁ" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ 0 ÚÁÐÉÓÅÊ %s.\n" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ \"%s\" × ÉÎÄÅËÓ %s.\n" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, c-format msgid "adding %d entries to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ × ÉÎÄÅËÓ %s\n" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÅÔÓÑ ÂÁÚÁ ÄÁÎÎÙÈ %s × %s\n" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, c-format msgid "creating directory %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ËÁÔÁÌÏÇÁ %s: %s" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÎÏ×ÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %d × ÂÁÚÅ ÄÁÎÎÙÈ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÅÔÓÑ." -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %d)" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÁÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÎÁ ÎÏ×ÕÀ!\n" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "ÆÁÊÌÙ × %s ÚÁÍÅÎÑÀÔÓÑ ÆÁÊÌÁÍÉ ÉÚ %s ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "ÕÄÁÌÑÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, 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 da44651..243bd96 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -77,11 +77,13 @@ msgid "RPM version %s\n" msgstr "RPM verzia %s\n" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +#, fuzzy +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright (C) 1998 - Red Hat Software" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +#, fuzzy +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Program mô¾e by» voµne redistribuovaný v súlade s podmienkami GNU GPL" #: rpm.c:209 @@ -2510,26 +2512,26 @@ msgstr "po msgid "package %s conflicts: %s\n" msgstr "balík %s koliduje: %s\n" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "odstraòuje sa index skupín\n" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2894,7 +2896,7 @@ msgstr "varovanie: %s uchovan msgid "running postinstall scripts (if any)\n" msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "chyba pri vytváraní doèasného súboru %s" @@ -3372,7 +3374,7 @@ msgstr "V PORIADKU" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3381,17 +3383,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "nie je mo¾né otvori» %s na %s:%d" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, fuzzy, c-format msgid "cannot open %s index" msgstr "nie je mo¾né otvori» %s\n" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3401,7 +3403,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3411,7 +3413,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3422,26 +3424,26 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "chyba pri naèítaní záznamu %s z %s" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, fuzzy, c-format msgid "error(%d) storing record %s into %s" msgstr "chyba pri zápise záznamu %s do %s" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, fuzzy, c-format msgid "error(%d) removing record %s from %s" msgstr "chyba pri odstraòovaní záznamu %s z %s" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "nebola nastavená ¾iadna dbpath" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" @@ -3450,111 +3452,116 @@ msgstr "" "databázy v novom formáte" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, fuzzy, c-format msgid "error(%d) counting packages" msgstr "chyba pri hµadaní balíka %s\n" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, fuzzy, c-format msgid "removing 0 %s entries.\n" msgstr "odstraòuje sa záznam z databázy\n" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuje sa index skupín\n" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuje sa index názvov\n" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, fuzzy, c-format msgid "error(%d) allocating new package instance" msgstr "chyba pri hµadaní balíka %s\n" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "znovu sa vytvára databáza v adresári %s\n" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "doèasná databáza %s u¾ existuje" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "vytvára sa adresár %s\n" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "chyba pri vytváraní adresára %s: %s" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otvára sa stará databáza\n" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otvára sa nová databáza\n" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, fuzzy, c-format msgid "record number %d in database is bad -- skipping." msgstr "záznam èíslo %d v databáze je chybný -- bol vynechaný" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "nie je mo¾né prida» záznam pôvodne na %d" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "nepodarilo sa znovu vytvori» databázu; zostáva pôvodná\n" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "nepodarilo sa nahradi» starú databázu novou!\n" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, 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" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "vytvára sa adresár %s\n" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nepodarilo sa odstráni» adresár %s: %s\n" diff --git a/po/sl.po b/po/sl.po index e108232..af7beee 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.112 2000/12/19 17:43:59 jbj Exp $ +# $Id: sl.po,v 1.113 2000/12/20 21:08:23 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -81,11 +81,13 @@ msgid "RPM version %s\n" msgstr "RPM razlièica %s\n" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +#, fuzzy +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright (C) 1998 - Red Hat Software" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +#, fuzzy +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Ta program je dovoljeno razpeèevati pod pogoji navedenimi v GNU GPL." #: rpm.c:209 @@ -2494,26 +2496,26 @@ msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" msgid "package %s conflicts: %s\n" msgstr "paket %s jw v sporu z: %s\n" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2883,7 +2885,7 @@ msgstr "opozorilo: %s shranjen kot %s" msgid "running postinstall scripts (if any)\n" msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "napaka pri ustvarjanju zaèasne datoteke %s" @@ -3358,7 +3360,7 @@ msgstr "V REDU" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: neprepoznano ime znaèke: \"%s\" prezrto\n" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3372,17 +3374,17 @@ msgstr "" " in nastavite \"%%_dbapi 3\" (ustvarite in/ali uredite /etc/rpm/macros).\n" "\n" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "ni mo¾no odpreti kazala %s z uporabo db%d - %s (%d)" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, fuzzy, c-format msgid "cannot open %s index" msgstr "ni mo¾no odpreti kazala %s:" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3397,7 +3399,7 @@ msgstr "" " v obliko db%d tako, da kot root izvedete ukaz \"rpm --rebuilddb\"\n" "\n" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3414,7 +3416,7 @@ msgstr "" "/etc/rpm/macros).\n" "\n" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3433,26 +3435,26 @@ msgstr "" " /etc/rpm/macros).\n" "\n" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, fuzzy, c-format msgid "error(%d) storing record %s into %s" msgstr "napaka(%d) pri pisanju zapisa %s v %s" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, fuzzy, c-format msgid "error(%d) removing record %s from %s" msgstr "napaka(%d) pri brisanju zapisa %s iz %s" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "dbpath ni nastavljena" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" @@ -3460,113 +3462,118 @@ msgstr "" "da bi staro obliko zbirke podatkov pretvorili v novo po¾enite --rebuilddb" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, fuzzy, c-format msgid "error(%d) counting packages" msgstr "napaka(%d) pri ¹tetju paketov" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "%s: ni mo¾no prebrati glave pri 0x%x" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, fuzzy, c-format msgid "removing 0 %s entries.\n" msgstr "odstranjevanje 0 %s vnosov.\n" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstranjevanje \"%s\" iz kazala %s.\n" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstranjevanje %d vnosov iz kazala %s\n" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, fuzzy, c-format msgid "error(%d) allocating new package instance" msgstr "napaka(%d) pri iskanju paketa %s\n" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "dodajanje vnosov 0 %s.\n" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "dodajanje \"%s\" v kazalo %s.\n" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "dodajanje %d vnosov v kazalo %s.\n" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "zaèasna podatkovna zbirka %s ¾e obstaja" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "ustvarjanje imenika: %s\n" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "napaka pri ustvarjanju imenika %s: %s" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "odpiranje stare podatkovne zbirke\n" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "zapis ¹t. %d v zbirki je po¹kodovan -- preskoèeno." -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "zapisa ni mo¾no dodati na %d" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 #, 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" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspe¹na!\n" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, 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" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "odstranjevanje imenika: %s\n" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspe¹na odstranitev imenika %s: %s\n" diff --git a/po/sr.po b/po/sr.po index a15f8b0..60a24ee 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" "From: Erik Troan \n" @@ -75,11 +75,12 @@ msgid "RPM version %s\n" msgstr "RPM verzija %s\n" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +#, fuzzy +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Mo¾ete slobodno distribuirati dalje pod odredbama GNU GPL" #: rpm.c:209 @@ -2503,26 +2504,26 @@ msgstr "paket %s nije naveden u %s" msgid "package %s conflicts: %s\n" msgstr "paket %s nije naveden u %s" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2889,7 +2890,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, fuzzy, c-format msgid "error creating temporary file %s" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" @@ -3380,7 +3381,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3389,17 +3390,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, fuzzy, c-format msgid "cannot open %s index" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3409,7 +3410,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3419,7 +3420,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3430,136 +3431,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "gre¹ka kod uzimanja sloga %s iz %s" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, fuzzy, c-format msgid "error(%d) storing record %s into %s" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, fuzzy, c-format msgid "error(%d) removing record %s from %s" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "dbpath nije odreðen" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, fuzzy, c-format msgid "error(%d) counting packages" msgstr "gre¹ka kod potrage za paketom %s\n" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "ne mogu da proèitam zaglavlje na %d za proveru" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, fuzzy, c-format msgid "error(%d) allocating new package instance" msgstr "gre¹ka kod potrage za paketom %s\n" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "privremena baza podataka %s veæ postoji" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, fuzzy, c-format msgid "record number %d in database is bad -- skipping." msgstr "slog broj %d u bazi podataka je neispravan -- preskaèem ga" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "ne mogu da dodam slog originalno na %d" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, 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 1d3fa49..f416f1f 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: 2000-10-09 22:31+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -76,11 +76,13 @@ msgid "RPM version %s\n" msgstr "RPM version %s\n" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +#, fuzzy +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright (C) 1998 - Red Hat Software" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +#, fuzzy +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Den här programvaran kan distribueras fritt med hänsyn till GNU GPL" #: rpm.c:209 @@ -2403,26 +2405,26 @@ msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" msgid "package %s conflicts: %s\n" msgstr "paket %s står i konflikt: %s\n" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "tar bort \"%s\" från %s-indexet.\n" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2791,7 +2793,7 @@ msgstr "varning: %s sparades som %s" msgid "running postinstall scripts (if any)\n" msgstr "kör (eventuellt) postinstallationsskript\n" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "fel när tämporärfil %s skapades" @@ -3251,7 +3253,7 @@ msgstr "OK" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: okänt taggnamn: \"%s\" ignorerat\n" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3266,17 +3268,17 @@ msgstr "" "/etc/rpm/macros).\n" "\n" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "kan inte öppna %s-indexet med db%d - %s (%d)" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, c-format msgid "cannot open %s index" msgstr "kan inte öppna %s-indexet" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3291,7 +3293,7 @@ msgstr "" " till db%d-format genom att köra \"rpm --rebuilddb\" som root.\n" "\n" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3307,7 +3309,7 @@ msgstr "" "/etc/rpm/macros).\n" "\n" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3325,26 +3327,26 @@ msgstr "" " \"%%_dbapi_rebuild %d\" (d.v.s. skapa och/eller ändra /etc/rpm/macros).\n" "\n" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "fel(%d) när \"%s\"-poster hämtades från %s-indexet" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, c-format msgid "error(%d) storing record %s into %s" msgstr "fel(%d) när post %s sparades i %s" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, c-format msgid "error(%d) removing record %s from %s" msgstr "fel(%d) när post %s togs bort ur %s" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "ingen dbpath har satts" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" @@ -3353,110 +3355,115 @@ msgstr "" "i nytt format" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, c-format msgid "error(%d) counting packages" msgstr "fel(%d) när paket räknades" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "%s: kan inte läsa huvud vid 0x%x" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "tar bort 0 %s-poster.\n" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "tar bort \"%s\" från %s-indexet.\n" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, c-format msgid "removing %d entries from %s index.\n" msgstr "tar bort %d poster från %s-indexet.\n" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "fel(%d) vid allokering av ny paketinstans" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "lägger till 0 %s-poster.\n" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "lägger till \"%s\" till %s-indexet.\n" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, c-format msgid "adding %d entries to %s index.\n" msgstr "lägger till %d poster till %s-indexet.\n" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "bygger om databas %s till %s\n" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "tillfällig databas %s existerar redan" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, c-format msgid "creating directory %s\n" msgstr "skapar katalog %s\n" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "fel när katalog skapades %s: %s" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "öppnar gammal databas med dbapi %d\n" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "öppnar ny databas med dbapi %d\n" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "post nummer %d i databasen är felaktig -- hoppar över den." -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "kan inte lägga till post ursprungligen vid %d" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "kunde inte ersätta gammal databas med ny databas!\n" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, 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" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "tar bort katalog %s\n" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, 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 6edbcf1..f47fe72 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -96,11 +96,13 @@ msgid "RPM version %s\n" msgstr "RPM Sürüm %s\n" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +#, fuzzy +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright (C) 1998 - Red Hat Software" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +#, fuzzy +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Bu ðrogram GNU GPL uyarýnca serbestçe daðýtýlabilir." #: rpm.c:209 @@ -2555,26 +2557,26 @@ msgstr "%s paketi %s alt msgid "package %s conflicts: %s\n" msgstr "%s paketi %s altýnda gözükmüyor" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2941,7 +2943,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, fuzzy, c-format msgid "error creating temporary file %s" msgstr "%s dizinin oluþturulmasýnda hata: %s" @@ -3436,7 +3438,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3445,17 +3447,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "%s dosyasý açýlamýyor: " -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, fuzzy, c-format msgid "cannot open %s index" msgstr "hata: %s eriþilemiyor\n" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3465,7 +3467,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3475,7 +3477,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3486,136 +3488,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "%s kaydýna %s dosyasýnda eriþilemiyor:" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, fuzzy, c-format msgid "error(%d) storing record %s into %s" msgstr "%s kaydý %s dosyasýna yazýlamýyor" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, fuzzy, c-format msgid "error(%d) removing record %s from %s" msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "dbpath deðeri girilmemiþ" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, fuzzy, c-format msgid "error(%d) counting packages" msgstr "%s pakedi aranýrken hata oluþtu\n" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "%d kaydýndan baþlýk bilgisi okunamadý" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, fuzzy, c-format msgid "error(%d) allocating new package instance" msgstr "%s pakedi aranýrken hata oluþtu\n" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "geçici veritabaný %s mevcut" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "%s dizinin oluþturulmasýnda hata: %s" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "%s dizinin oluþturulmasýnda hata: %s" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, fuzzy, c-format msgid "record number %d in database is bad -- skipping." msgstr "veritabanýndaki %d numaralý kayýt hatalý -- atlanýyor" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "%d de yer alan kayýt saklayamýyor" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "%s dizinin oluþturulmasýnda hata: %s" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s açýlamadý: %s" diff --git a/po/uk.po b/po/uk.po index 59c99e9..b1739e4 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -81,11 +81,11 @@ msgid "RPM version %s\n" msgstr "" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" #: rpm.c:209 @@ -2347,26 +2347,26 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2728,7 +2728,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "" @@ -3185,7 +3185,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3194,17 +3194,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, c-format msgid "cannot open %s index" msgstr "" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3214,7 +3214,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3224,7 +3224,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3235,136 +3235,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, c-format msgid "error(%d) storing record %s into %s" msgstr "" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, c-format msgid "error(%d) removing record %s from %s" msgstr "" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, c-format msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, c-format msgid "creating directory %s\n" msgstr "" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/wa.po b/po/wa.po index 59c99e9..b1739e4 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -81,11 +81,11 @@ msgid "RPM version %s\n" msgstr "" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" #: rpm.c:209 @@ -2347,26 +2347,26 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2728,7 +2728,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "" @@ -3185,7 +3185,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3194,17 +3194,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, c-format msgid "cannot open %s index" msgstr "" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3214,7 +3214,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3224,7 +3224,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3235,136 +3235,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, c-format msgid "error(%d) storing record %s into %s" msgstr "" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, c-format msgid "error(%d) removing record %s from %s" msgstr "" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, c-format msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, c-format msgid "creating directory %s\n" msgstr "" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/zh.po b/po/zh.po index 59c99e9..b1739e4 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -81,11 +81,11 @@ msgid "RPM version %s\n" msgstr "" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" #: rpm.c:209 @@ -2347,26 +2347,26 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2728,7 +2728,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "" @@ -3185,7 +3185,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3194,17 +3194,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, c-format msgid "cannot open %s index" msgstr "" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3214,7 +3214,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3224,7 +3224,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3235,136 +3235,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, c-format msgid "error(%d) storing record %s into %s" msgstr "" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, c-format msgid "error(%d) removing record %s from %s" msgstr "" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, c-format msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, c-format msgid "creating directory %s\n" msgstr "" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, 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 59c99e9..b1739e4 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.1\n" -"POT-Creation-Date: 2000-12-19 09:06-0500\n" +"POT-Creation-Date: 2000-12-20 13:55-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -81,11 +81,11 @@ msgid "RPM version %s\n" msgstr "" #: rpm.c:200 rpmqv.c:284 -msgid "Copyright (C) 1998 - Red Hat Software" +msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" #: rpm.c:201 rpmqv.c:285 -msgid "This may be freely redistributed under the terms of the GNU GPL" +msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" #: rpm.c:209 @@ -2347,26 +2347,26 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1532 +#: lib/depends.c:1522 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1636 +#: lib/depends.c:1626 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1686 +#: lib/depends.c:1676 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1789 +#: lib/depends.c:1779 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1820 +#: lib/depends.c:1810 msgid "========== continuing tsort ...\n" msgstr "" @@ -2728,7 +2728,7 @@ msgstr "" msgid "running postinstall scripts (if any)\n" msgstr "" -#: lib/misc.c:336 lib/misc.c:341 lib/misc.c:347 +#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350 #, c-format msgid "error creating temporary file %s" msgstr "" @@ -3185,7 +3185,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:264 +#: lib/rpmdb.c:267 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3194,17 +3194,17 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:279 +#: lib/rpmdb.c:283 #, c-format msgid "cannot open %s index using db%d - %s (%d)" msgstr "" -#: lib/rpmdb.c:299 +#: lib/rpmdb.c:303 #, c-format msgid "cannot open %s index" msgstr "" -#: lib/rpmdb.c:314 +#: lib/rpmdb.c:318 #, c-format msgid "" "\n" @@ -3214,7 +3214,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:327 +#: lib/rpmdb.c:332 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n" @@ -3224,7 +3224,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:342 +#: lib/rpmdb.c:348 msgid "" "\n" "--> The rpm database is in db%d format, not the suggested db%d format.\n" @@ -3235,136 +3235,141 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:410 +#: lib/rpmdb.c:417 #, c-format msgid "error(%d) getting \"%s\" records from %s index" msgstr "" -#: lib/rpmdb.c:528 +#: lib/rpmdb.c:535 #, c-format msgid "error(%d) storing record %s into %s" msgstr "" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:544 #, c-format msgid "error(%d) removing record %s from %s" msgstr "" -#: lib/rpmdb.c:772 lib/rpmdb.c:2351 +#: lib/rpmdb.c:779 lib/rpmdb.c:2368 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:871 +#: lib/rpmdb.c:878 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:1083 +#: lib/rpmdb.c:1090 #, c-format msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1142 lib/rpmdb.c:1686 +#: lib/rpmdb.c:1149 lib/rpmdb.c:1693 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" -#: lib/rpmdb.c:1739 +#: lib/rpmdb.c:1746 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1750 +#: lib/rpmdb.c:1757 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1766 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: lib/rpmdb.c:1901 +#: lib/rpmdb.c:1908 #, c-format msgid "error(%d) allocating new package instance" msgstr "" -#: lib/rpmdb.c:1964 +#: lib/rpmdb.c:1971 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1980 +#: lib/rpmdb.c:1987 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1989 +#: lib/rpmdb.c:1996 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: lib/rpmdb.c:2376 +#: lib/rpmdb.c:2342 +#, c-format +msgid "removing %s after successful db3 rebuild.\n" +msgstr "" + +#: lib/rpmdb.c:2393 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: lib/rpmdb.c:2380 +#: lib/rpmdb.c:2397 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2386 +#: lib/rpmdb.c:2403 #, c-format msgid "creating directory %s\n" msgstr "" -#: lib/rpmdb.c:2388 +#: lib/rpmdb.c:2405 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2412 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2406 +#: lib/rpmdb.c:2423 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2429 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2466 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2492 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2494 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2504 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2506 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/popt/po/cs.po b/popt/po/cs.po index f3cdb8e..31b10cd 100644 --- a/popt/po/cs.po +++ b/popt/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\n" "PO-Revision-Date: 2000-08-23 22:24+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" diff --git a/popt/po/da.po b/popt/po/da.po index f563646..346a403 100644 --- a/popt/po/da.po +++ b/popt/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\n" "PO-Revision-Date: 2000-03-07 05:17+01:00\n" "Last-Translator: K. Christiansen \n" "Language-Team: Danish/Dansk \n" diff --git a/popt/po/de.po b/popt/po/de.po index 6204394..4c4d98f 100644 --- a/popt/po/de.po +++ b/popt/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\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 6204394..4c4d98f 100644 --- a/popt/po/es.po +++ b/popt/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\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 6204394..4c4d98f 100644 --- a/popt/po/fi.po +++ b/popt/po/fi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\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 6204394..4c4d98f 100644 --- a/popt/po/fr.po +++ b/popt/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\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 0e4a0de..9f58484 100644 --- a/popt/po/gl.po +++ b/popt/po/gl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\n" "PO-Revision-Date: 2000-01-06 20:31+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 10d2537..a3abdb3 100644 --- a/popt/po/hu.po +++ b/popt/po/hu.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\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 6204394..4c4d98f 100644 --- a/popt/po/id.po +++ b/popt/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\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 7a9e5ec..2d9759f 100644 --- a/popt/po/is.po +++ b/popt/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\n" "PO-Revision-Date: 2000-06-16 02:12+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" diff --git a/popt/po/it.po b/popt/po/it.po index 6204394..4c4d98f 100644 --- a/popt/po/it.po +++ b/popt/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\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 6204394..4c4d98f 100644 --- a/popt/po/ja.po +++ b/popt/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\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 6204394..4c4d98f 100644 --- a/popt/po/ko.po +++ b/popt/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\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/no.po b/popt/po/no.po index c2cc103..bf8e742 100644 --- a/popt/po/no.po +++ b/popt/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\n" "PO-Revision-Date: 2000-06-21 16:11+02:00\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" diff --git a/popt/po/pl.po b/popt/po/pl.po index 6204394..4c4d98f 100644 --- a/popt/po/pl.po +++ b/popt/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\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 1ec4985..2bd6434 100644 --- a/popt/po/pt.po +++ b/popt/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\n" "PO-Revision-Date: 2000-06-22 01:02+01:00\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 6204394..4c4d98f 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.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\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 52689c8..e374d86 100644 --- a/popt/po/ro.po +++ b/popt/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\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 9d9e5c7..60098ee 100644 --- a/popt/po/ru.po +++ b/popt/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\n" "PO-Revision-Date: 2000-08-13 21:00+0300\n" "Last-Translator: Leon Kanter \n" "Language-Team: Black Cat Linux Team \n" diff --git a/popt/po/sk.po b/popt/po/sk.po index 95e9897..de2d347 100644 --- a/popt/po/sk.po +++ b/popt/po/sk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\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 fd7562a..2939331 100644 --- a/popt/po/sl.po +++ b/popt/po/sl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\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 6204394..4c4d98f 100644 --- a/popt/po/sr.po +++ b/popt/po/sr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\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 e7c2045..bd5f1572 100644 --- a/popt/po/sv.po +++ b/popt/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\n" "PO-Revision-Date: 2000-06-20 00:07+0200\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" diff --git a/popt/po/tr.po b/popt/po/tr.po index 1da4d82..2e56a91 100644 --- a/popt/po/tr.po +++ b/popt/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\n" "PO-Revision-Date: 2000-01-06 13:01+0100\n" "Last-Translator: Görkem Çetin \n" "Language-Team: Gelecek A.Þ \n" diff --git a/popt/po/uk.po b/popt/po/uk.po index 7f0b59e..b4ea032 100644 --- a/popt/po/uk.po +++ b/popt/po/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\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 57fa272..d054d39 100644 --- a/popt/po/wa.po +++ b/popt/po/wa.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\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 6204394..4c4d98f 100644 --- a/popt/po/zh.po +++ b/popt/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\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 9db6ad6..3e7a016 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.1\n" -"POT-Creation-Date: 2000-09-11 12:53-0400\n" +"POT-Creation-Date: 2000-12-19 18:05-0500\n" "PO-Revision-Date: 1999-11-11 05:04+0800\n" "Last-Translator: Dillion Chen \n" "Language-Team: TLDN\n" diff --git a/rpm.spec b/rpm.spec index dc43623..1b79004 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,8 +1,7 @@ %define with_python_subpackage 1 %define with_bzip2 1 %define with_apidocs 1 -%define strip_binaries 0 -%define __spec_install_post : +%define strip_binaries 1 # XXX legacy requires './' payload prefix to be omitted from rpm packages. %define _noPayloadPrefix 1 @@ -14,7 +13,7 @@ Summary: The Red Hat package management system. Name: rpm %define version 4.0.2 Version: %{version} -Release: 0.3 +Release: 0.4 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz Copyright: GPL @@ -141,7 +140,7 @@ E_O_F %endif %if %{with_apidocs} -gzip -9n apidocs/man/* || : +gzip -9n apidocs/man/man*/* || : %endif %clean @@ -310,8 +309,16 @@ fi %{__prefix}/include/popt.h %changelog -* Sat Dec 16 2000 Jeff Johnson +* Wed Dec 20 2000 Jeff Johnson +- whiteout mozilla loop for 7.1. + +* Tue Dec 19 2000 Jeff Johnson - gendiff: generate ChangeLog patches more intelligently (#22356). +- identify install scriptlet failures with the name of the scriptlet. +- handle install chroot's identically throughout the install process. +- add rpmlib(HeaderLoadSortsTags) for tracking header regions "just in case". +- create _tmppath on the fly if not present. +- remove /etc/rpm/macros.db1 configuration file if db3 rebuilt. * Wed Dec 13 2000 Jeff Johnson - bump popt version. diff --git a/rpm.spec.in b/rpm.spec.in index fa30ffd..0e7816a 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -309,6 +309,9 @@ fi %{__prefix}/include/popt.h %changelog +* Wed Dec 20 2000 Jeff Johnson +- whiteout mozilla loop for 7.1. + * Tue Dec 19 2000 Jeff Johnson - gendiff: generate ChangeLog patches more intelligently (#22356). - identify install scriptlet failures with the name of the scriptlet. -- 2.7.4