summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--lib/db3.c39
-rw-r--r--lib/header.c1
-rw-r--r--lib/install.c8
-rw-r--r--lib/rpmdb.c59
-rw-r--r--lib/rpmdb.h10
-rw-r--r--lib/rpmlib.h74
-rw-r--r--lib/uninstall.c45
-rw-r--r--po/cs.po134
-rw-r--r--po/de.po134
-rw-r--r--po/fi.po134
-rw-r--r--po/fr.po134
-rw-r--r--po/ja.po136
-rw-r--r--po/pl.po134
-rw-r--r--po/pt_BR.po135
-rw-r--r--po/rpm.pot134
-rw-r--r--po/ru.po134
-rw-r--r--po/sk.po134
-rw-r--r--po/sl.po136
-rw-r--r--po/sr.po134
-rw-r--r--po/sv.po136
-rw-r--r--po/tr.po134
22 files changed, 1189 insertions, 932 deletions
diff --git a/CHANGES b/CHANGES
index 701c6f865..ec941b91d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,12 +5,12 @@
- cram all of db1, db_185, and db2 interfaces into rpmlib.
- convert db1 -> db2 on-disk format using --rebuilddb.
- add db3 to the pile, isolate all with incremental link and vectors.
- - try for db3 DB_INIT_CDB model.
- prefer db3 as default.
- permit db3 configuration using macros.
- create dbi from template rather than passed args.
- use hashed access for package headers.
- solaris2.6: avoid bsearch with empty dir list (Ric Klaren - klaren@cs.utwente.nl)
+ - db3: save join keys in endian neutral binary format.
3.0.3 -> 3.0.4
- use compressed filenames on install side.
diff --git a/lib/db3.c b/lib/db3.c
index 5b57d2e43..fe33ddadd 100644
--- a/lib/db3.c
+++ b/lib/db3.c
@@ -465,6 +465,17 @@ static int db3GetFirstKey(dbiIndex dbi, const char ** keyp)
return rc;
}
+union _dbswap {
+ unsigned int ui;
+ unsigned char uc[4];
+};
+
+#define _DBSWAP(_a) \
+ { unsigned char _b, *_c = (_a).uc; \
+ _b = _c[3]; _c[3] = _c[0]; _c[0] = _b; \
+ _b = _c[2]; _c[2] = _c[1]; _c[1] = _b; \
+ }
+
static int db3SearchIndex(dbiIndex dbi, const char * str, dbiIndexSet * set)
{
DBT key, data;
@@ -496,6 +507,7 @@ static int db3SearchIndex(dbiIndex dbi, const char * str, dbiIndexSet * set)
#endif
if (rc == 0 && set) {
+ int _dbbyteswapped = db->get_byteswapped(db);
DBIR_t dbir = data.data;
int i;
@@ -505,9 +517,16 @@ static int db3SearchIndex(dbiIndex dbi, const char * str, dbiIndexSet * set)
/* Convert to database internal format */
for (i = 0; i < (*set)->count; i++) {
- /* XXX TODO: swab data */
- (*set)->recs[i].recOffset = dbir[i].recOffset;
- (*set)->recs[i].fileNumber = dbir[i].fileNumber;
+ union _dbswap recOffset, fileNumber;
+
+ recOffset.ui = dbir[i].recOffset;
+ fileNumber.ui = dbir[i].fileNumber;
+ if (_dbbyteswapped) {
+ _DBSWAP(recOffset);
+ _DBSWAP(fileNumber);
+ }
+ (*set)->recs[i].recOffset = recOffset.ui;
+ (*set)->recs[i].fileNumber = fileNumber.ui;
(*set)->recs[i].fpNum = 0;
(*set)->recs[i].dbNum = 0;
}
@@ -532,14 +551,22 @@ static int db3UpdateIndex(dbiIndex dbi, const char * str, dbiIndexSet set)
if (set->count) {
#if defined(__USE_DB2) || defined(__USE_DB3)
+ int _dbbyteswapped = db->get_byteswapped(db);
DBIR_t dbir = alloca(set->count * sizeof(*dbir));
int i;
/* Convert to database internal format */
for (i = 0; i < set->count; i++) {
- /* XXX TODO: swab data */
- dbir[i].recOffset = set->recs[i].recOffset;
- dbir[i].fileNumber = set->recs[i].fileNumber;
+ union _dbswap recOffset, fileNumber;
+
+ recOffset.ui = set->recs[i].recOffset;
+ fileNumber.ui = set->recs[i].fileNumber;
+ if (_dbbyteswapped) {
+ _DBSWAP(recOffset);
+ _DBSWAP(fileNumber);
+ }
+ dbir[i].recOffset = recOffset.ui;
+ dbir[i].fileNumber = fileNumber.ui;
}
#if defined(__USE_DB3)
diff --git a/lib/header.c b/lib/header.c
index f589d987f..769db10f6 100644
--- a/lib/header.c
+++ b/lib/header.c
@@ -14,7 +14,6 @@
#define ntohs(_x) (_x)
#define htonl(_x) (_x)
#define htons(_x) (_x)
-/*@-observertrans@*/ /* XXX FIXME */
#else
#include <netinet/in.h>
#endif /* __LCLINT__ */
diff --git a/lib/install.c b/lib/install.c
index 892b6f90c..0020dce9a 100644
--- a/lib/install.c
+++ b/lib/install.c
@@ -710,6 +710,7 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h,
rpmMessage(RPMMESS_DEBUG, _("package: %s-%s-%s files test = %d\n"),
name, version, release, flags & RPMTRANS_FLAG_TEST);
+#ifdef DYING
rc = rpmdbFindPackage(db, name, &matches);
switch (rc) {
case -1:
@@ -727,6 +728,13 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h,
dbiFreeIndexSet(matches);
matches = NULL;
}
+#else
+ if ((scriptArg = rpmdbCountPackages(db, name)) < 0) {
+ rc = 2;
+ goto exit;
+ }
+ scriptArg += 1;
+#endif
if (!rpmdbFindByHeader(db, h, &matches))
otherOffset = dbiIndexRecordOffset(matches, 0);
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 1e07d4f59..ad06c2178 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -145,8 +145,8 @@ static /*@only@*/ rpmdb newRpmdb(void)
return db;
}
-int openDatabase(const char * prefix, const char * dbpath, rpmdb *rpmdbp, int mode,
- int perms, int flags)
+int openDatabase(const char * prefix, const char * dbpath, rpmdb *dbp,
+ int mode, int perms, int flags)
{
char * filename;
rpmdb db;
@@ -156,6 +156,8 @@ int openDatabase(const char * prefix, const char * dbpath, rpmdb *rpmdbp, int mo
int minimal = flags & RPMDB_FLAG_MINIMAL;
const char * akey;
+ if (dbp)
+ *dbp = NULL;
if (mode & O_WRONLY)
return 1;
@@ -246,9 +248,8 @@ int openDatabase(const char * prefix, const char * dbpath, rpmdb *rpmdbp, int mo
switch (dbix) {
case 1:
if (minimal) {
- *rpmdbp = xmalloc(sizeof(struct rpmdb_s));
- if (rpmdbp)
- *rpmdbp = db; /* structure assignment */
+ if (dbp)
+ *dbp = db;
else
rpmdbClose(db);
return 0;
@@ -276,15 +277,15 @@ int openDatabase(const char * prefix, const char * dbpath, rpmdb *rpmdbp, int mo
}
}
- if (rc || justcheck || rpmdbp == NULL)
+ if (!(rc || justcheck || dbp == NULL))
+ *dbp = db;
+ else
rpmdbClose(db);
- else
- *rpmdbp = db;
- return rc;
+ return rc;
}
-static int doRpmdbOpen (const char * prefix, /*@out@*/ rpmdb * rpmdbp,
+static int doRpmdbOpen (const char * prefix, /*@out@*/ rpmdb * dbp,
int mode, int perms, int flags)
{
const char * dbpath = rpmGetPath("%{_dbpath}", NULL);
@@ -294,21 +295,21 @@ static int doRpmdbOpen (const char * prefix, /*@out@*/ rpmdb * rpmdbp,
rpmMessage(RPMMESS_DEBUG, _("no dbpath has been set"));
rc = 1;
} else
- rc = openDatabase(prefix, dbpath, rpmdbp, mode, perms, flags);
+ rc = openDatabase(prefix, dbpath, dbp, mode, perms, flags);
xfree(dbpath);
return rc;
}
/* XXX called from python/upgrade.c */
-int rpmdbOpenForTraversal(const char * prefix, rpmdb * rpmdbp)
+int rpmdbOpenForTraversal(const char * prefix, rpmdb * dbp)
{
- return doRpmdbOpen(prefix, rpmdbp, O_RDONLY, 0644, RPMDB_FLAG_MINIMAL);
+ return doRpmdbOpen(prefix, dbp, O_RDONLY, 0644, RPMDB_FLAG_MINIMAL);
}
/* XXX called from python/rpmmodule.c */
-int rpmdbOpen (const char * prefix, rpmdb *rpmdbp, int mode, int perms)
+int rpmdbOpen (const char * prefix, rpmdb *dbp, int mode, int perms)
{
- return doRpmdbOpen(prefix, rpmdbp, mode, perms, 0);
+ return doRpmdbOpen(prefix, dbp, mode, perms, 0);
}
int rpmdbInit (const char * prefix, int perms)
@@ -540,6 +541,34 @@ int rpmdbFindPackage(rpmdb db, const char * name, dbiIndexSet * matches) {
return dbiSearchIndex(db->_dbi[RPMDBI_NAME], name, matches);
}
+int rpmdbCountPackages(rpmdb db, const char * name)
+{
+ dbiIndexSet matches = NULL;
+ int rc;
+
+ rc = dbiSearchIndex(db->_dbi[RPMDBI_NAME], name, matches);
+
+ switch (rc) {
+ default:
+ case -1: /* error */
+ rpmError(RPMERR_DBCORRUPT, _("cannot retrieve package \"%s\" from db"),
+ name);
+ rc = -1;
+ break;
+ case 1: /* not found */
+ rc = 0;
+ break;
+ case 0: /* success */
+ rc = dbiIndexSetCount(matches);
+ break;
+ }
+
+ if (matches)
+ dbiFreeIndexSet(matches);
+
+ return rc;
+}
+
static void removeIndexEntry(dbiIndex dbi, const char * key, dbiIndexRecord rec,
int tolerant, const char * idxName)
{
diff --git a/lib/rpmdb.h b/lib/rpmdb.h
index ec275008d..1333bf13d 100644
--- a/lib/rpmdb.h
+++ b/lib/rpmdb.h
@@ -18,19 +18,23 @@ extern "C" {
#endif
/**
+ * @param dbp address of rpm database
*/
-int openDatabase(const char * prefix, const char * dbpath, /*@out@*/rpmdb *rpmdbp, int mode,
- int perms, int flags);
+int openDatabase(const char * prefix, const char * dbpath, /*@out@*/rpmdb *dbp,
+ int mode, int perms, int flags);
/**
+ * @param db rpm database
*/
int rpmdbRemove(rpmdb db, unsigned int offset, int tolerant);
/**
+ * @param db rpm database
*/
int rpmdbAdd(rpmdb db, Header dbentry);
/**
+ * @param db rpm database
*/
int rpmdbUpdateRecord(rpmdb db, int secOffset, Header secHeader);
@@ -43,7 +47,7 @@ void rpmdbRemoveDatabase(const char * rootdir, const char * dbpath);
int rpmdbMoveDatabase(const char * rootdir, const char * olddbpath, const char * newdbpath);
/**
- * matchList must be preallocated!!!
+ * @param db rpm database
*/
int rpmdbFindFpList(rpmdb db, fingerPrint * fpList, /*@out@*/dbiIndexSet * matchList,
int numItems);
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index f70abded2..ba5843e60 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -365,40 +365,92 @@ typedef void * (*rpmCallbackFunction)(const Header h,
void urlSetCallback(rpmCallbackFunction notify, void *notifyData, int notifyCount);
+/**
+ * @param dbp address of rpm database
+ */
int rpmdbOpen (const char * root, /*@out@*/ rpmdb * dbp, int mode, int perms);
/* 0 on error */
int rpmdbInit(const char * root, int perms);
/* nonzero on error */
+/**
+ * @param db rpm database
+ */
void rpmdbClose ( /*@only@*/ rpmdb db);
/* Databases like this should only have rpmdb*RecNum and rpmdbGetRecord
used on them. Anything else could fail! */
-int rpmdbOpenForTraversal(const char * prefix, /*@out@*/ rpmdb * rpmdbp);
+/**
+ * @param dbp address of rpm database
+ */
+int rpmdbOpenForTraversal(const char * prefix, /*@out@*/ rpmdb * dbp);
+/**
+ * @param db rpm database
+ */
int rpmdbFirstRecNum(rpmdb db);
+/**
+ * @param db rpm database
+ * @return 0 at end, -1 on error
+ */
int rpmdbNextRecNum(rpmdb db, unsigned int lastOffset);
- /* 0 at end, -1 on error */
+/**
+ * @param db rpm database
+ */
Header rpmdbGetRecord(rpmdb db, unsigned int offset);
+/**
+ * @param db rpm database
+ */
int rpmdbFindByFile(rpmdb db, const char * filespec,
/*@out@*/ dbiIndexSet * matches);
+/**
+ * @param db rpm database
+ */
int rpmdbFindByGroup(rpmdb db, const char * group,
/*@out@*/ dbiIndexSet * matches);
+/**
+ * @param db rpm database
+ */
int rpmdbFindPackage(rpmdb db, const char * name,
/*@out@*/ dbiIndexSet * matches);
+/**
+ * @param db rpm database
+ */
int rpmdbFindByProvides(rpmdb db, const char * provides,
/*@out@*/ dbiIndexSet * matches);
+/**
+ * @param db rpm database
+ */
int rpmdbFindByRequiredBy(rpmdb db, const char * requires,
/*@out@*/ dbiIndexSet * matches);
+/**
+ * @param db rpm database
+ */
int rpmdbFindByConflicts(rpmdb db, const char * conflicts,
/*@out@*/ dbiIndexSet * matches);
+/**
+ * @param db rpm database
+ */
int rpmdbFindByTriggeredBy(rpmdb db, const char * package,
/*@out@*/ dbiIndexSet * matches);
/* these are just convenience functions */
+/**
+ * @param db rpm database
+ */
int rpmdbFindByLabel(rpmdb db, const char * label,
/*@out@*/ dbiIndexSet * matches);
+/**
+ * @param db rpm database
+ */
int rpmdbFindByHeader(rpmdb db, Header h,
/*@out@*/ dbiIndexSet * matches);
+/**
+ * Return number of instances of package in rpm database.
+ * @param db rpm database
+ * @param name rpm package name
+ * @return number of instances of package in database
+ */
+int rpmdbCountPackages(rpmdb db, const char *name);
/* we pass these around as an array with a sentinel */
typedef struct rpmRelocation_s {
@@ -434,6 +486,9 @@ struct rpmDependencyConflict {
} ;
/* db may be NULL, but don't do things which require the database! */
+/**
+ * @param db rpm database
+ */
/*@only@*/ rpmTransactionSet rpmtransCreateSet( /*@only@*/ rpmdb db,
const char * rootdir);
@@ -737,7 +792,13 @@ struct rpmQVArguments {
};
typedef struct rpmQVArguments QVA_t;
+/**
+ * @param db rpm database
+ */
typedef int (*QVF_t) (QVA_t *qva, rpmdb db, Header h);
+/**
+ * @param db rpm database
+ */
int showMatches(QVA_t *qva, rpmdb db, dbiIndexSet matches, QVF_t showPackage);
#define QUERY_FOR_LIST (1 << 1)
@@ -751,9 +812,15 @@ extern int specedit;
extern struct poptOption rpmQueryPoptTable[];
void rpmDisplayQueryTags(FILE * f);
+/**
+ * @param db rpm database
+ */
int rpmQueryVerify(QVA_t *qva, enum rpmQVSources source, const char * arg,
rpmdb db, QVF_t showPackage);
+/**
+ * @param db rpm database
+ */
int showQueryPackage(QVA_t *qva, rpmdb db, Header h);
int rpmQuery(QVA_t *qva, enum rpmQVSources source, const char * arg);
@@ -764,6 +831,9 @@ int rpmQuery(QVA_t *qva, enum rpmQVSources source, const char * arg);
extern struct poptOption rpmVerifyPoptTable[];
+/**
+ * @param db rpm database
+ */
int showVerifyPackage(QVA_t *qva, /*@only@*/ rpmdb db, Header h);
int rpmVerify(QVA_t *qva, enum rpmQVSources source, const char *arg);
diff --git a/lib/uninstall.c b/lib/uninstall.c
index fbb0db8a8..8f5247507 100644
--- a/lib/uninstall.c
+++ b/lib/uninstall.c
@@ -100,6 +100,7 @@ int removeBinaryPackage(const char * prefix, rpmdb db, unsigned int offset,
* When we run scripts, we pass an argument which is the number of
* versions of this package that will be installed when we are finished.
*/
+#ifdef DYING
{ dbiIndexSet matches;
if (rpmdbFindPackage(db, name, &matches)) {
rpmError(RPMERR_DBCORRUPT, _("cannot read packages named %s for uninstall"),
@@ -111,6 +112,13 @@ int removeBinaryPackage(const char * prefix, rpmdb db, unsigned int offset,
scriptArg = dbiIndexSetCount(matches) - 1;
dbiFreeIndexSet(matches);
}
+#else
+ if ((scriptArg = rpmdbCountPackages(db, name)) < 0) {
+ rc = 1;
+ goto exit;
+ }
+ scriptArg -= 1;
+#endif
if (!(flags & RPMTRANS_FLAG_NOTRIGGERS)) {
/* run triggers from this package which are keyed on installed
@@ -452,7 +460,6 @@ static int handleOneTrigger(const char * root, rpmdb db, int sense, Header sourc
int numTriggers;
int rc = 0;
int i;
- int index;
int skip;
if (!headerGetEntry(triggeredH, RPMTAG_TRIGGERNAME, NULL,
@@ -469,7 +476,6 @@ static int handleOneTrigger(const char * root, rpmdb db, int sense, Header sourc
(void **) &triggerEVR, NULL);
for (i = 0; i < numTriggers; i++) {
- dbiIndexSet matches;
if (!(triggerFlags[i] & sense)) continue;
if (strcmp(triggerNames[i], sourceName)) continue;
@@ -499,7 +505,10 @@ static int handleOneTrigger(const char * root, rpmdb db, int sense, Header sourc
headerGetEntry(triggeredH, RPMTAG_NAME, NULL,
(void **) &triggerPackageName, NULL);
- matches = NULL;
+#ifdef DYING
+ { dbiIndexSet matches = NULL;
+ int index;
+
rpmdbFindPackage(db, triggerPackageName, &matches);
index = triggerIndices[i];
@@ -515,6 +524,25 @@ static int handleOneTrigger(const char * root, rpmdb db, int sense, Header sourc
dbiFreeIndexSet(matches);
matches = NULL;
}
+ }
+#else
+ { int arg1;
+ int index;
+
+ if ((arg1 = rpmdbCountPackages(db, triggerPackageName)) < 0) {
+ rc = 1; /* XXX W2DO? same as "execution of script failed" */
+ } else {
+ arg1 += arg1correction;
+ index = triggerIndices[i];
+ if (!triggersAlreadyRun || !triggersAlreadyRun[index]) {
+ rc = runScript(triggeredH, root, 1, triggerProgs + index,
+ triggerScripts[index],
+ arg1, arg2, scriptFd);
+ if (triggersAlreadyRun) triggersAlreadyRun[index] = 1;
+ }
+ }
+ }
+#endif
free(triggerScripts);
free(triggerProgs);
@@ -550,6 +578,7 @@ int runTriggers(const char * root, rpmdb db, int sense, Header h,
goto exit;
}
+#ifdef DYING
{ dbiIndexSet otherMatches = NULL;
rpmdbFindPackage(db, packageName, &otherMatches);
if (otherMatches) {
@@ -558,6 +587,13 @@ int runTriggers(const char * root, rpmdb db, int sense, Header h,
} else
numPackage = 0;
}
+#else
+ numPackage = rpmdbCountPackages(db, packageName);
+ if (numPackage < 0) {
+ rc = 1;
+ goto exit;
+ }
+#endif
rc = 0;
for (i = 0; i < dbiIndexSetCount(matches); i++) {
@@ -586,7 +622,7 @@ exit:
int runImmedTriggers(const char * root, rpmdb db, int sense, Header h,
int countCorrection, FD_t scriptFd)
{
- dbiIndexSet matches;
+ dbiIndexSet matches = NULL;
int rc = 0;
char ** triggerNames;
int numTriggers;
@@ -603,7 +639,6 @@ int runImmedTriggers(const char * root, rpmdb db, int sense, Header h,
triggersRun = alloca(sizeof(*triggersRun) * i);
memset(triggersRun, 0, sizeof(*triggersRun) * i);
- matches = NULL;
for (i = 0; i < numTriggers; i++) {
if (matches) {
diff --git a/po/cs.po b/po/cs.po
index a3ffba822..2c2caccbf 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-04-06 10:45-0400\n"
+"POT-Creation-Date: 2000-04-07 11:56-0400\n"
"PO-Revision-Date: 1998-10-10 10:10+0200\n"
"Last-Translator: Pavel Makovec <pavelm@terminal.cz>\n"
"Language-Team: Czech <pavelm@terminal.cz>\n"
@@ -2146,69 +2146,69 @@ msgstr ""
msgid "dbrecMatchesDepFlags() failed to read header"
msgstr "dbrecMatchesDepFlags() nemůže přečíst hlavičku"
-#: lib/depends.c:792
+#: lib/depends.c:795
#, c-format
msgid "%s: %s satisfied by added file list.\n"
msgstr ""
-#: lib/depends.c:831
+#: lib/depends.c:834
#, fuzzy, c-format
msgid "%s: %s satisfied by added package.\n"
msgstr "žádný balíček nevlastní soubor %s\n"
-#: lib/depends.c:848
+#: lib/depends.c:851
#, c-format
msgid "%s: %s satisfied by added provide.\n"
msgstr ""
-#: lib/depends.c:879
+#: lib/depends.c:882
#, c-format
msgid "%s: %s satisfied by rpmrc provides.\n"
msgstr ""
-#: lib/depends.c:906
+#: lib/depends.c:909
#, c-format
msgid "%s: %s satisfied by db file lists.\n"
msgstr ""
-#: lib/depends.c:931
+#: lib/depends.c:934
#, c-format
msgid "%s: %s satisfied by db provides.\n"
msgstr ""
-#: lib/depends.c:956
+#: lib/depends.c:959
#, fuzzy, c-format
msgid "%s: %s satisfied by db packages.\n"
msgstr "žádný balíček nevlastní soubor %s\n"
-#: lib/depends.c:973
+#: lib/depends.c:976
#, c-format
msgid "%s: %s satisfied by rpmlib version.\n"
msgstr ""
-#: lib/depends.c:983
+#: lib/depends.c:986
#, c-format
msgid "%s: %s unsatisfied.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1035
+#: lib/depends.c:1038
#, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "položka 'vyžaduje' balíčku %s není splněna: %s\n"
#. conflicts exist.
-#: lib/depends.c:1097
+#: lib/depends.c:1100
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "balíček %s koliduje: %s\n"
-#: lib/depends.c:1152 lib/depends.c:1447
+#: lib/depends.c:1155 lib/depends.c:1450
#, c-format
msgid "cannot read header at %d for dependency check"
msgstr "nelze číst hlavičku u %d pro kontrolu závislostí"
-#: lib/depends.c:1243
+#: lib/depends.c:1246
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr "smyčka v řetězu podmínek: %s"
@@ -2224,7 +2224,7 @@ msgid ""
msgstr ""
#: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2189 lib/header.c:2205 lib/header.c:2224
+#: lib/header.c:2188 lib/header.c:2204 lib/header.c:2223
msgid "(not a number)"
msgstr "(není číslo)"
@@ -2253,82 +2253,82 @@ msgid "file %s is on an unknown device"
msgstr "soubor %s je na neznámém zařízení"
#. This should not be allowed
-#: lib/header.c:220
+#: lib/header.c:219
msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
msgstr "Počet RPM_STRING_TYPE pro grabData() musí být 1.\n"
-#: lib/header.c:251 lib/header.c:814
+#: lib/header.c:250 lib/header.c:813
#, c-format
msgid "Data type %d not supported\n"
msgstr "Datový typ %d není podporován\n"
-#: lib/header.c:1173
+#: lib/header.c:1172
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr "Chybný počet pro headerAddEntry(): %d\n"
-#: lib/header.c:1582
+#: lib/header.c:1581
#, c-format
msgid "missing { after %"
msgstr "po % chybí {"
-#: lib/header.c:1610
+#: lib/header.c:1609
msgid "missing } after %{"
msgstr "po %{ chybí }"
-#: lib/header.c:1622
+#: lib/header.c:1621
msgid "empty tag format"
msgstr "prázdný formát příznaku"
-#: lib/header.c:1632
+#: lib/header.c:1631
msgid "empty tag name"
msgstr "prázdný název příznaku"
-#: lib/header.c:1647
+#: lib/header.c:1646
msgid "unknown tag"
msgstr "neznámý příznak"
-#: lib/header.c:1673
+#: lib/header.c:1672
msgid "] expected at end of array"
msgstr "na konci řady se očekávala ]"
-#: lib/header.c:1689
+#: lib/header.c:1688
msgid "unexpected ]"
msgstr "neočekávaná ]"
-#: lib/header.c:1691
+#: lib/header.c:1690
msgid "unexpected }"
msgstr "neočekávaná }"
-#: lib/header.c:1745
+#: lib/header.c:1744
msgid "? expected in expression"
msgstr "ve výrazu se očekával ?"
-#: lib/header.c:1752
+#: lib/header.c:1751
msgid "{ expected after ? in expression"
msgstr "ve výrazu se po ? očekávala {"
-#: lib/header.c:1762 lib/header.c:1797
+#: lib/header.c:1761 lib/header.c:1796
msgid "} expected in expression"
msgstr "ve výrazu se očekávala }"
-#: lib/header.c:1770
+#: lib/header.c:1769
msgid ": expected following ? subexpression"
msgstr "v podvýrazu se po ? očekávala :"
-#: lib/header.c:1784
+#: lib/header.c:1783
msgid "{ expected after : in expression"
msgstr "ve výrazu se po : očekávala {"
-#: lib/header.c:1805
+#: lib/header.c:1804
msgid "| expected at end of expression"
msgstr "na konci výrazu se očekávala |"
-#: lib/header.c:1973
+#: lib/header.c:1972
msgid "(unknown type)"
msgstr "(neznámý typ)"
-#: lib/install.c:146 lib/uninstall.c:192
+#: lib/install.c:146 lib/uninstall.c:200
#, fuzzy, c-format
msgid " file: %s action: %s\n"
msgstr "soubor %s: %s\n"
@@ -2398,7 +2398,7 @@ msgstr "balíček %s neobsahuje soubory"
msgid "renaming %s to %s\n"
msgstr "Probíhá získávání %s jako %s\n"
-#: lib/install.c:562 lib/install.c:846 lib/uninstall.c:31
+#: lib/install.c:562 lib/install.c:854 lib/uninstall.c:31
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "%s nelze přejmenovat na %s: %s"
@@ -2412,27 +2412,27 @@ msgstr ""
msgid "package: %s-%s-%s files test = %d\n"
msgstr "balíček %s-%s-%s obsahuje sdílení soubory\n"
-#: lib/install.c:776
+#: lib/install.c:784
#, fuzzy
msgid "stopping install as we're running --test\n"
msgstr "probíhá zastavení zdrojové instalace, neboť jde jen o testování\n"
-#: lib/install.c:781
+#: lib/install.c:789
#, fuzzy
msgid "running preinstall script (if any)\n"
msgstr "spouští se případný poinstalační skript\n"
-#: lib/install.c:806
+#: lib/install.c:814
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:842
+#: lib/install.c:850
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:916
+#: lib/install.c:924
#, fuzzy
msgid "running postinstall scripts (if any)\n"
msgstr "spouští se případný poinstalační skript\n"
@@ -2844,7 +2844,7 @@ msgstr ""
msgid "display a verbose file listing"
msgstr "zobrazit seznam souborů balíčků"
-#: lib/rebuilddb.c:34 lib/rpmdb.c:294
+#: lib/rebuilddb.c:34 lib/rpmdb.c:295
msgid "no dbpath has been set"
msgstr "nebyla nastavena dbpath"
@@ -3001,95 +3001,101 @@ msgstr ""
msgid "OK"
msgstr "OK"
-#: lib/rpmdb.c:190
+#: lib/rpmdb.c:192
#, fuzzy, c-format
msgid "opening database mode 0x%x in %s\n"
msgstr "probíhá otevírání databázového režimu: 0%o\n"
-#: lib/rpmdb.c:202 lib/url.c:445
+#: lib/rpmdb.c:204 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "nelze otevřít %s: %s"
-#: lib/rpmdb.c:216 lib/rpmdb.c:224
+#: lib/rpmdb.c:218 lib/rpmdb.c:226
#, c-format
msgid "cannot get %s lock on database"
msgstr "nelze získat %s zámek k databázi"
-#: lib/rpmdb.c:217
+#: lib/rpmdb.c:219
msgid "exclusive"
msgstr "výhradní"
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:227
msgid "shared"
msgstr "sdílený"
-#: lib/rpmdb.c:267
+#: lib/rpmdb.c:268
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
+#. error
#: lib/rpmdb.c:554
#, fuzzy, c-format
+msgid "cannot retrieve package \"%s\" from db"
+msgstr "chyba: nelze otevřít %s%s/packages.rpm\n"
+
+#: lib/rpmdb.c:583
+#, fuzzy, c-format
msgid "package not found with key \"%s\" in %s"
msgstr "balíček %s nenalezen v %s"
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:592
#, fuzzy, c-format
msgid "key \"%s\" not found in %s"
msgstr "balíček %s nenalezen v %s"
-#: lib/rpmdb.c:581
+#: lib/rpmdb.c:610
#, fuzzy, c-format
msgid "rpmdbRemove: cannot read header at 0x%x"
msgstr "nelze číst hlavičku u %d pro vyhledání"
-#: lib/rpmdb.c:609
+#: lib/rpmdb.c:638
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "odstraňuje se položka databáze\n"
-#: lib/rpmdb.c:615
+#: lib/rpmdb.c:644
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstraňuje se rejstřík skupin\n"
-#: lib/rpmdb.c:623
+#: lib/rpmdb.c:652
#, fuzzy, c-format
msgid "removing %d entries in %s index:\n"
msgstr "odstraňuje se rejstřík názvů\n"
-#: lib/rpmdb.c:627 lib/rpmdb.c:812
+#: lib/rpmdb.c:656 lib/rpmdb.c:841
#, c-format
msgid "\t%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:745
+#: lib/rpmdb.c:774
msgid "cannot allocate space for database"
msgstr "nelze alokovat prostor pro databázi"
-#: lib/rpmdb.c:789
+#: lib/rpmdb.c:818
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:801
+#: lib/rpmdb.c:830
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "Probíhá získávání %s jako %s\n"
-#: lib/rpmdb.c:808
+#: lib/rpmdb.c:837
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:866
+#: lib/rpmdb.c:895
#, c-format
msgid "cannot read header at %d for update"
msgstr "nelze číst hlavičku u %d pro inovaci"
-#: lib/rpmdb.c:879
+#: lib/rpmdb.c:908
msgid "header changed size!"
msgstr "hlavička změnila velikost!"
@@ -3545,25 +3551,25 @@ msgstr "%s nelze odstranit: %s"
msgid "cannot read header at %d for uninstall"
msgstr "nelze číst hlavičku u %d pro deinstalaci"
-#: lib/uninstall.c:105
+#: lib/uninstall.c:106
#, c-format
msgid "cannot read packages named %s for uninstall"
msgstr "nelze číst balíčky nazvané %d pro deinstalaci"
-#: lib/uninstall.c:138
+#: lib/uninstall.c:146
#, c-format
msgid "will remove files test = %d\n"
msgstr "odstraní se soubory test = %d\n"
-#: lib/uninstall.c:206
+#: lib/uninstall.c:214
msgid "running postuninstall script (if any)\n"
msgstr "spouští se případný poinstalační skript\n"
-#: lib/uninstall.c:220
+#: lib/uninstall.c:228
msgid "removing database entry\n"
msgstr "odstraňuje se položka databáze\n"
-#: lib/uninstall.c:404
+#: lib/uninstall.c:412
msgid "execution of script failed"
msgstr "skript nelze spustit"
diff --git a/po/de.po b/po/de.po
index 2edabc889..0955a0a37 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 2.5.2\n"
-"POT-Creation-Date: 2000-04-06 10:45-0400\n"
+"POT-Creation-Date: 2000-04-07 11:56-0400\n"
"PO-Revision-Date: 1998-08-03 18:02+02:00\n"
"Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
"Language-Team: German <de@li.org>\n"
@@ -2249,69 +2249,69 @@ msgstr ""
msgid "dbrecMatchesDepFlags() failed to read header"
msgstr ""
-#: lib/depends.c:792
+#: lib/depends.c:795
#, c-format
msgid "%s: %s satisfied by added file list.\n"
msgstr ""
-#: lib/depends.c:831
+#: lib/depends.c:834
#, fuzzy, c-format
msgid "%s: %s satisfied by added package.\n"
msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
-#: lib/depends.c:848
+#: lib/depends.c:851
#, c-format
msgid "%s: %s satisfied by added provide.\n"
msgstr ""
-#: lib/depends.c:879
+#: lib/depends.c:882
#, c-format
msgid "%s: %s satisfied by rpmrc provides.\n"
msgstr ""
-#: lib/depends.c:906
+#: lib/depends.c:909
#, c-format
msgid "%s: %s satisfied by db file lists.\n"
msgstr ""
-#: lib/depends.c:931
+#: lib/depends.c:934
#, c-format
msgid "%s: %s satisfied by db provides.\n"
msgstr ""
-#: lib/depends.c:956
+#: lib/depends.c:959
#, fuzzy, c-format
msgid "%s: %s satisfied by db packages.\n"
msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
-#: lib/depends.c:973
+#: lib/depends.c:976
#, c-format
msgid "%s: %s satisfied by rpmlib version.\n"
msgstr ""
-#: lib/depends.c:983
+#: lib/depends.c:986
#, c-format
msgid "%s: %s unsatisfied.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1035
+#: lib/depends.c:1038
#, fuzzy, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "Paket %s wird nicht in %s aufgeführt"
#. conflicts exist.
-#: lib/depends.c:1097
+#: lib/depends.c:1100
#, fuzzy, c-format
msgid "package %s conflicts: %s\n"
msgstr "Paket %s wird nicht in %s aufgeführt"
-#: lib/depends.c:1152 lib/depends.c:1447
+#: lib/depends.c:1155 lib/depends.c:1450
#, c-format
msgid "cannot read header at %d for dependency check"
msgstr "kann Kopfzeilen bei %d nicht lesen, um Abhängigkeiten zu prüfen"
-#: lib/depends.c:1243
+#: lib/depends.c:1246
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr ""
@@ -2327,7 +2327,7 @@ msgid ""
msgstr ""
#: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2189 lib/header.c:2205 lib/header.c:2224
+#: lib/header.c:2188 lib/header.c:2204 lib/header.c:2223
msgid "(not a number)"
msgstr "(keine Zahl)"
@@ -2358,86 +2358,86 @@ msgid "file %s is on an unknown device"
msgstr ""
#. This should not be allowed
-#: lib/header.c:220
+#: lib/header.c:219
msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:251 lib/header.c:814
+#: lib/header.c:250 lib/header.c:813
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1173
+#: lib/header.c:1172
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
-#: lib/header.c:1582
+#: lib/header.c:1581
#, c-format
msgid "missing { after %"
msgstr "fehlende { nach %{"
-#: lib/header.c:1610
+#: lib/header.c:1609
msgid "missing } after %{"
msgstr "fehlende } nach %{"
# ťTagŤ übersetzen??? -ke-
-#: lib/header.c:1622
+#: lib/header.c:1621
msgid "empty tag format"
msgstr "leeres ťTagŤ-Format"
-#: lib/header.c:1632
+#: lib/header.c:1631
msgid "empty tag name"
msgstr "leerer ťTagŤ-Name"
-#: lib/header.c:1647
+#: lib/header.c:1646
msgid "unknown tag"
msgstr "unbekannter ťTagŤ"
-#: lib/header.c:1673
+#: lib/header.c:1672
msgid "] expected at end of array"
msgstr "] am Ende des Arrays erwartet"
-#: lib/header.c:1689
+#: lib/header.c:1688
msgid "unexpected ]"
msgstr "unerwartete ]"
-#: lib/header.c:1691
+#: lib/header.c:1690
msgid "unexpected }"
msgstr "unerwartete }"
-#: lib/header.c:1745
+#: lib/header.c:1744
msgid "? expected in expression"
msgstr "? im Ausdruck erwartet"
-#: lib/header.c:1752
+#: lib/header.c:1751
#, fuzzy
msgid "{ expected after ? in expression"
msgstr "{ nach ? im Ausdruck erwartet"
-#: lib/header.c:1762 lib/header.c:1797
+#: lib/header.c:1761 lib/header.c:1796
msgid "} expected in expression"
msgstr "} im Ausdruck erwartet"
-#: lib/header.c:1770
+#: lib/header.c:1769
msgid ": expected following ? subexpression"
msgstr ": nach ? Unterausdruck erwartet"
-#: lib/header.c:1784
+#: lib/header.c:1783
#, fuzzy
msgid "{ expected after : in expression"
msgstr "{ nach : im Ausdruck erwartet"
-#: lib/header.c:1805
+#: lib/header.c:1804
msgid "| expected at end of expression"
msgstr "| am Ende des Ausdrucks erwartet"
-#: lib/header.c:1973
+#: lib/header.c:1972
msgid "(unknown type)"
msgstr "(unbekannter Typ)"
# , c-format
-#: lib/install.c:146 lib/uninstall.c:192
+#: lib/install.c:146 lib/uninstall.c:200
#, fuzzy, c-format
msgid " file: %s action: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
@@ -2508,7 +2508,7 @@ msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:562 lib/install.c:846 lib/uninstall.c:31
+#: lib/install.c:562 lib/install.c:854 lib/uninstall.c:31
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "umbennen von %s nach %s fehlgeschlagen: %s"
@@ -2523,25 +2523,25 @@ msgstr ""
msgid "package: %s-%s-%s files test = %d\n"
msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
-#: lib/install.c:776
+#: lib/install.c:784
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:781
+#: lib/install.c:789
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:806
+#: lib/install.c:814
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:842
+#: lib/install.c:850
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:916
+#: lib/install.c:924
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2960,7 +2960,7 @@ msgstr ""
msgid "display a verbose file listing"
msgstr "Dateiliste des Pakets anzeigen"
-#: lib/rebuilddb.c:34 lib/rpmdb.c:294
+#: lib/rebuilddb.c:34 lib/rpmdb.c:295
msgid "no dbpath has been set"
msgstr "ťdbpathŤ ist nicht gesetzt"
@@ -3120,99 +3120,105 @@ msgstr ""
msgid "OK"
msgstr ""
-#: lib/rpmdb.c:190
+#: lib/rpmdb.c:192
#, fuzzy, c-format
msgid "opening database mode 0x%x in %s\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
# , c-format
-#: lib/rpmdb.c:202 lib/url.c:445
+#: lib/rpmdb.c:204 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: lib/rpmdb.c:216 lib/rpmdb.c:224
+#: lib/rpmdb.c:218 lib/rpmdb.c:226
#, c-format
msgid "cannot get %s lock on database"
msgstr "kann %s lock für die Datenbank nicht bekommen"
-#: lib/rpmdb.c:217
+#: lib/rpmdb.c:219
msgid "exclusive"
msgstr "exklusiv"
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:227
msgid "shared"
msgstr "geteilt"
-#: lib/rpmdb.c:267
+#: lib/rpmdb.c:268
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
+#. error
#: lib/rpmdb.c:554
#, fuzzy, c-format
+msgid "cannot retrieve package \"%s\" from db"
+msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
+
+#: lib/rpmdb.c:583
+#, fuzzy, c-format
msgid "package not found with key \"%s\" in %s"
msgstr "Paket %s in %s nicht gefunden"
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:592
#, fuzzy, c-format
msgid "key \"%s\" not found in %s"
msgstr "Paket %s in %s nicht gefunden"
-#: lib/rpmdb.c:581
+#: lib/rpmdb.c:610
#, fuzzy, c-format
msgid "rpmdbRemove: cannot read header at 0x%x"
msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen"
-#: lib/rpmdb.c:609
+#: lib/rpmdb.c:638
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
# FIXME
-#: lib/rpmdb.c:615
+#: lib/rpmdb.c:644
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
# FIXME
-#: lib/rpmdb.c:623
+#: lib/rpmdb.c:652
#, fuzzy, c-format
msgid "removing %d entries in %s index:\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
-#: lib/rpmdb.c:627 lib/rpmdb.c:812
+#: lib/rpmdb.c:656 lib/rpmdb.c:841
#, c-format
msgid "\t%6d %s\n"
msgstr ""
# reservieren???
-#: lib/rpmdb.c:745
+#: lib/rpmdb.c:774
msgid "cannot allocate space for database"
msgstr "kann keinen Platz für die Datenbank bekommen"
-#: lib/rpmdb.c:789
+#: lib/rpmdb.c:818
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:801
+#: lib/rpmdb.c:830
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:808
+#: lib/rpmdb.c:837
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:866
+#: lib/rpmdb.c:895
#, c-format
msgid "cannot read header at %d for update"
msgstr "kann Kopfzeilen bei %d nicht lesen, um Update durchzuführen"
-#: lib/rpmdb.c:879
+#: lib/rpmdb.c:908
msgid "header changed size!"
msgstr ""
@@ -3681,25 +3687,25 @@ msgstr "öffnen von %s fehlgeschlagen: %s"
msgid "cannot read header at %d for uninstall"
msgstr "kann Kopfzeilen bei %d nicht lesen, um Deinstallation durchzuführen"
-#: lib/uninstall.c:105
+#: lib/uninstall.c:106
#, fuzzy, c-format
msgid "cannot read packages named %s for uninstall"
msgstr "kann Kopfzeilen bei %d nicht lesen, um Deinstallation durchzuführen"
-#: lib/uninstall.c:138
+#: lib/uninstall.c:146
#, c-format
msgid "will remove files test = %d\n"
msgstr ""
-#: lib/uninstall.c:206
+#: lib/uninstall.c:214
msgid "running postuninstall script (if any)\n"
msgstr ""
-#: lib/uninstall.c:220
+#: lib/uninstall.c:228
msgid "removing database entry\n"
msgstr ""
-#: lib/uninstall.c:404
+#: lib/uninstall.c:412
msgid "execution of script failed"
msgstr "Ausführung des Skripts fehlgeschlagen"
diff --git a/po/fi.po b/po/fi.po
index 2cd9bd84b..aab1b4a52 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-04-06 10:45-0400\n"
+"POT-Creation-Date: 2000-04-07 11:56-0400\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"
"Content-Type: text/plain; charset=\n"
@@ -2184,69 +2184,69 @@ msgstr ""
msgid "dbrecMatchesDepFlags() failed to read header"
msgstr ""
-#: lib/depends.c:792
+#: lib/depends.c:795
#, c-format
msgid "%s: %s satisfied by added file list.\n"
msgstr ""
-#: lib/depends.c:831
+#: lib/depends.c:834
#, fuzzy, c-format
msgid "%s: %s satisfied by added package.\n"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/depends.c:848
+#: lib/depends.c:851
#, c-format
msgid "%s: %s satisfied by added provide.\n"
msgstr ""
-#: lib/depends.c:879
+#: lib/depends.c:882
#, c-format
msgid "%s: %s satisfied by rpmrc provides.\n"
msgstr ""
-#: lib/depends.c:906
+#: lib/depends.c:909
#, c-format
msgid "%s: %s satisfied by db file lists.\n"
msgstr ""
-#: lib/depends.c:931
+#: lib/depends.c:934
#, c-format
msgid "%s: %s satisfied by db provides.\n"
msgstr ""
-#: lib/depends.c:956
+#: lib/depends.c:959
#, fuzzy, c-format
msgid "%s: %s satisfied by db packages.\n"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/depends.c:973
+#: lib/depends.c:976
#, c-format
msgid "%s: %s satisfied by rpmlib version.\n"
msgstr ""
-#: lib/depends.c:983
+#: lib/depends.c:986
#, c-format
msgid "%s: %s unsatisfied.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1035
+#: lib/depends.c:1038
#, fuzzy, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "paketti %s ei ole %s:ssä"
#. conflicts exist.
-#: lib/depends.c:1097
+#: lib/depends.c:1100
#, fuzzy, c-format
msgid "package %s conflicts: %s\n"
msgstr "paketti %s ei ole %s:ssä"
-#: lib/depends.c:1152 lib/depends.c:1447
+#: lib/depends.c:1155 lib/depends.c:1450
#, c-format
msgid "cannot read header at %d for dependency check"
msgstr "en voi lukea headeria %d:ssä riippuvuutta tarkistaessa"
-#: lib/depends.c:1243
+#: lib/depends.c:1246
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr "silmukka edellytysten ketjussa: %s"
@@ -2262,7 +2262,7 @@ msgid ""
msgstr ""
#: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2189 lib/header.c:2205 lib/header.c:2224
+#: lib/header.c:2188 lib/header.c:2204 lib/header.c:2223
msgid "(not a number)"
msgstr "(ei ole luku)"
@@ -2291,84 +2291,84 @@ msgid "file %s is on an unknown device"
msgstr ""
#. This should not be allowed
-#: lib/header.c:220
+#: lib/header.c:219
msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:251 lib/header.c:814
+#: lib/header.c:250 lib/header.c:813
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1173
+#: lib/header.c:1172
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
-#: lib/header.c:1582
+#: lib/header.c:1581
#, c-format
msgid "missing { after %"
msgstr "puuttuva '{' '%':n jälkeen"
-#: lib/header.c:1610
+#: lib/header.c:1609
msgid "missing } after %{"
msgstr "puuttuva '{' '%{':n jälkeen"
-#: lib/header.c:1622
+#: lib/header.c:1621
msgid "empty tag format"
msgstr "tyhjä nimiön formaatti"
-#: lib/header.c:1632
+#: lib/header.c:1631
msgid "empty tag name"
msgstr "tyhjä nimiön nimi"
-#: lib/header.c:1647
+#: lib/header.c:1646
msgid "unknown tag"
msgstr "tuntematon nimiö"
-#: lib/header.c:1673
+#: lib/header.c:1672
msgid "] expected at end of array"
msgstr "']' puuttuu taulukkomäärittelyn lopusta"
-#: lib/header.c:1689
+#: lib/header.c:1688
msgid "unexpected ]"
msgstr "odottamaton ']'"
-#: lib/header.c:1691
+#: lib/header.c:1690
msgid "unexpected }"
msgstr "odottamaton '}'"
-#: lib/header.c:1745
+#: lib/header.c:1744
msgid "? expected in expression"
msgstr "odotin '?'-merkkiä ilmauksessa"
-#: lib/header.c:1752
+#: lib/header.c:1751
#, fuzzy
msgid "{ expected after ? in expression"
msgstr "odotin '{' '?'-merkin jälkeen ilmauksessa "
-#: lib/header.c:1762 lib/header.c:1797
+#: lib/header.c:1761 lib/header.c:1796
msgid "} expected in expression"
msgstr "odotin '}'-merkkiä ilmauksessa"
-#: lib/header.c:1770
+#: lib/header.c:1769
msgid ": expected following ? subexpression"
msgstr "odotin ':' '?'-merkin jälkeen ali-ilmauksessa "
-#: lib/header.c:1784
+#: lib/header.c:1783
#, fuzzy
msgid "{ expected after : in expression"
msgstr "odotin '{' ':'-merkin jälkeen ilmauksessa "
-#: lib/header.c:1805
+#: lib/header.c:1804
msgid "| expected at end of expression"
msgstr "odotin '}'-merkkiä ilmauksen lopussa"
-#: lib/header.c:1973
+#: lib/header.c:1972
msgid "(unknown type)"
msgstr "(tuntematon tyyppi)"
-#: lib/install.c:146 lib/uninstall.c:192
+#: lib/install.c:146 lib/uninstall.c:200
#, fuzzy, c-format
msgid " file: %s action: %s\n"
msgstr "en voinut avata %s: %s"
@@ -2438,7 +2438,7 @@ msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:562 lib/install.c:846 lib/uninstall.c:31
+#: lib/install.c:562 lib/install.c:854 lib/uninstall.c:31
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "%s:n nimeäminen %s:ksi epäonnistui: %s"
@@ -2452,25 +2452,25 @@ msgstr ""
msgid "package: %s-%s-%s files test = %d\n"
msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n"
-#: lib/install.c:776
+#: lib/install.c:784
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:781
+#: lib/install.c:789
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:806
+#: lib/install.c:814
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:842
+#: lib/install.c:850
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:916
+#: lib/install.c:924
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2882,7 +2882,7 @@ msgstr ""
msgid "display a verbose file listing"
msgstr "näytä paketin tiedostolistaus"
-#: lib/rebuilddb.c:34 lib/rpmdb.c:294
+#: lib/rebuilddb.c:34 lib/rpmdb.c:295
msgid "no dbpath has been set"
msgstr "dbpath ei ole asetettu"
@@ -3039,95 +3039,101 @@ msgstr ""
msgid "OK"
msgstr ""
-#: lib/rpmdb.c:190
+#: lib/rpmdb.c:192
#, fuzzy, c-format
msgid "opening database mode 0x%x in %s\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: lib/rpmdb.c:202 lib/url.c:445
+#: lib/rpmdb.c:204 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "en voinut avata %s: %s"
-#: lib/rpmdb.c:216 lib/rpmdb.c:224
+#: lib/rpmdb.c:218 lib/rpmdb.c:226
#, c-format
msgid "cannot get %s lock on database"
msgstr "en voi saada %s lukitusta tietokantaan"
-#: lib/rpmdb.c:217
+#: lib/rpmdb.c:219
msgid "exclusive"
msgstr "poissulkevaa"
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:227
msgid "shared"
msgstr "jaettua"
-#: lib/rpmdb.c:267
+#: lib/rpmdb.c:268
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
+#. error
#: lib/rpmdb.c:554
#, fuzzy, c-format
+msgid "cannot retrieve package \"%s\" from db"
+msgstr "virhe: en voi avata %s%s/packages.rpm\n"
+
+#: lib/rpmdb.c:583
+#, fuzzy, c-format
msgid "package not found with key \"%s\" in %s"
msgstr "paketti %s ei ole %s:ssä"
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:592
#, fuzzy, c-format
msgid "key \"%s\" not found in %s"
msgstr "paketti %s ei ole %s:ssä"
-#: lib/rpmdb.c:581
+#: lib/rpmdb.c:610
#, fuzzy, c-format
msgid "rpmdbRemove: cannot read header at 0x%x"
msgstr "en voi lukea headeria %d:stä päivittäessä"
-#: lib/rpmdb.c:609
+#: lib/rpmdb.c:638
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:615
+#: lib/rpmdb.c:644
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: lib/rpmdb.c:623
+#: lib/rpmdb.c:652
#, fuzzy, c-format
msgid "removing %d entries in %s index:\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: lib/rpmdb.c:627 lib/rpmdb.c:812
+#: lib/rpmdb.c:656 lib/rpmdb.c:841
#, c-format
msgid "\t%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:745
+#: lib/rpmdb.c:774
msgid "cannot allocate space for database"
msgstr "en voi varata tilaa tietokannalle"
-#: lib/rpmdb.c:789
+#: lib/rpmdb.c:818
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:801
+#: lib/rpmdb.c:830
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:808
+#: lib/rpmdb.c:837
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:866
+#: lib/rpmdb.c:895
#, c-format
msgid "cannot read header at %d for update"
msgstr "en voi lukea headeria %d:stä päivittäessä"
-#: lib/rpmdb.c:879
+#: lib/rpmdb.c:908
msgid "header changed size!"
msgstr ""
@@ -3590,25 +3596,25 @@ msgstr "%s:n poisto epäonnistui: %s"
msgid "cannot read header at %d for uninstall"
msgstr "en voi lukea headeria %d:stä poistamiseen"
-#: lib/uninstall.c:105
+#: lib/uninstall.c:106
#, fuzzy, c-format
msgid "cannot read packages named %s for uninstall"
msgstr "en voi lukea headeria %d:stä poistamiseen"
-#: lib/uninstall.c:138
+#: lib/uninstall.c:146
#, c-format
msgid "will remove files test = %d\n"
msgstr ""
-#: lib/uninstall.c:206
+#: lib/uninstall.c:214
msgid "running postuninstall script (if any)\n"
msgstr ""
-#: lib/uninstall.c:220
+#: lib/uninstall.c:228
msgid "removing database entry\n"
msgstr ""
-#: lib/uninstall.c:404
+#: lib/uninstall.c:412
msgid "execution of script failed"
msgstr "skriptin ajo epäonnistui"
diff --git a/po/fr.po b/po/fr.po
index c77f65e61..fdd3f885b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
msgid ""
-msgstr "POT-Creation-Date: 2000-04-06 10:45-0400\n"
+msgstr "POT-Creation-Date: 2000-04-07 11:56-0400\n"
#: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:425
#, c-format
@@ -2185,69 +2185,69 @@ msgstr ""
msgid "dbrecMatchesDepFlags() failed to read header"
msgstr ""
-#: lib/depends.c:792
+#: lib/depends.c:795
#, c-format
msgid "%s: %s satisfied by added file list.\n"
msgstr ""
-#: lib/depends.c:831
+#: lib/depends.c:834
#, c-format
msgid "%s: %s satisfied by added package.\n"
msgstr ""
-#: lib/depends.c:848
+#: lib/depends.c:851
#, c-format
msgid "%s: %s satisfied by added provide.\n"
msgstr ""
-#: lib/depends.c:879
+#: lib/depends.c:882
#, c-format
msgid "%s: %s satisfied by rpmrc provides.\n"
msgstr ""
-#: lib/depends.c:906
+#: lib/depends.c:909
#, c-format
msgid "%s: %s satisfied by db file lists.\n"
msgstr ""
-#: lib/depends.c:931
+#: lib/depends.c:934
#, c-format
msgid "%s: %s satisfied by db provides.\n"
msgstr ""
-#: lib/depends.c:956
+#: lib/depends.c:959
#, c-format
msgid "%s: %s satisfied by db packages.\n"
msgstr ""
-#: lib/depends.c:973
+#: lib/depends.c:976
#, c-format
msgid "%s: %s satisfied by rpmlib version.\n"
msgstr ""
-#: lib/depends.c:983
+#: lib/depends.c:986
#, c-format
msgid "%s: %s unsatisfied.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1035
+#: lib/depends.c:1038
#, fuzzy, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "aucun package n'a été spécifié pour l'installation"
#. conflicts exist.
-#: lib/depends.c:1097
+#: lib/depends.c:1100
#, fuzzy, c-format
msgid "package %s conflicts: %s\n"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: lib/depends.c:1152 lib/depends.c:1447
+#: lib/depends.c:1155 lib/depends.c:1450
#, c-format
msgid "cannot read header at %d for dependency check"
msgstr ""
-#: lib/depends.c:1243
+#: lib/depends.c:1246
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr ""
@@ -2263,7 +2263,7 @@ msgid ""
msgstr ""
#: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2189 lib/header.c:2205 lib/header.c:2224
+#: lib/header.c:2188 lib/header.c:2204 lib/header.c:2223
msgid "(not a number)"
msgstr ""
@@ -2292,84 +2292,84 @@ msgid "file %s is on an unknown device"
msgstr ""
#. This should not be allowed
-#: lib/header.c:220
+#: lib/header.c:219
msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:251 lib/header.c:814
+#: lib/header.c:250 lib/header.c:813
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1173
+#: lib/header.c:1172
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
-#: lib/header.c:1582
+#: lib/header.c:1581
#, c-format
msgid "missing { after %"
msgstr ""
-#: lib/header.c:1610
+#: lib/header.c:1609
msgid "missing } after %{"
msgstr ""
-#: lib/header.c:1622
+#: lib/header.c:1621
msgid "empty tag format"
msgstr ""
-#: lib/header.c:1632
+#: lib/header.c:1631
msgid "empty tag name"
msgstr ""
-#: lib/header.c:1647
+#: lib/header.c:1646
msgid "unknown tag"
msgstr ""
-#: lib/header.c:1673
+#: lib/header.c:1672
msgid "] expected at end of array"
msgstr ""
-#: lib/header.c:1689
+#: lib/header.c:1688
#, fuzzy
msgid "unexpected ]"
msgstr "source de requęte inattendue"
-#: lib/header.c:1691
+#: lib/header.c:1690
#, fuzzy
msgid "unexpected }"
msgstr "source de requęte inattendue"
-#: lib/header.c:1745
+#: lib/header.c:1744
msgid "? expected in expression"
msgstr ""
-#: lib/header.c:1752
+#: lib/header.c:1751
msgid "{ expected after ? in expression"
msgstr ""
-#: lib/header.c:1762 lib/header.c:1797
+#: lib/header.c:1761 lib/header.c:1796
msgid "} expected in expression"
msgstr ""
-#: lib/header.c:1770
+#: lib/header.c:1769
msgid ": expected following ? subexpression"
msgstr ""
-#: lib/header.c:1784
+#: lib/header.c:1783
msgid "{ expected after : in expression"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1804
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:1973
+#: lib/header.c:1972
msgid "(unknown type)"
msgstr ""
-#: lib/install.c:146 lib/uninstall.c:192
+#: lib/install.c:146 lib/uninstall.c:200
#, c-format
msgid " file: %s action: %s\n"
msgstr ""
@@ -2439,7 +2439,7 @@ msgstr ""
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:562 lib/install.c:846 lib/uninstall.c:31
+#: lib/install.c:562 lib/install.c:854 lib/uninstall.c:31
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
@@ -2453,25 +2453,25 @@ msgstr ""
msgid "package: %s-%s-%s files test = %d\n"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/install.c:776
+#: lib/install.c:784
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:781
+#: lib/install.c:789
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:806
+#: lib/install.c:814
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:842
+#: lib/install.c:850
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:916
+#: lib/install.c:924
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2886,7 +2886,7 @@ msgstr ""
msgid "display a verbose file listing"
msgstr " -l - affiche la liste des packages"
-#: lib/rebuilddb.c:34 lib/rpmdb.c:294
+#: lib/rebuilddb.c:34 lib/rpmdb.c:295
msgid "no dbpath has been set"
msgstr ""
@@ -3042,95 +3042,101 @@ msgstr ""
msgid "OK"
msgstr ""
-#: lib/rpmdb.c:190
+#: lib/rpmdb.c:192
#, c-format
msgid "opening database mode 0x%x in %s\n"
msgstr ""
-#: lib/rpmdb.c:202 lib/url.c:445
+#: lib/rpmdb.c:204 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmdb.c:216 lib/rpmdb.c:224
+#: lib/rpmdb.c:218 lib/rpmdb.c:226
#, c-format
msgid "cannot get %s lock on database"
msgstr ""
-#: lib/rpmdb.c:217
+#: lib/rpmdb.c:219
msgid "exclusive"
msgstr ""
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:227
msgid "shared"
msgstr ""
-#: lib/rpmdb.c:267
+#: lib/rpmdb.c:268
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
+#. error
#: lib/rpmdb.c:554
#, fuzzy, c-format
+msgid "cannot retrieve package \"%s\" from db"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: lib/rpmdb.c:583
+#, fuzzy, c-format
msgid "package not found with key \"%s\" in %s"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:592
#, fuzzy, c-format
msgid "key \"%s\" not found in %s"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: lib/rpmdb.c:581
+#: lib/rpmdb.c:610
#, c-format
msgid "rpmdbRemove: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:609
+#: lib/rpmdb.c:638
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:615
+#: lib/rpmdb.c:644
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:623
+#: lib/rpmdb.c:652
#, c-format
msgid "removing %d entries in %s index:\n"
msgstr ""
-#: lib/rpmdb.c:627 lib/rpmdb.c:812
+#: lib/rpmdb.c:656 lib/rpmdb.c:841
#, c-format
msgid "\t%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:745
+#: lib/rpmdb.c:774
msgid "cannot allocate space for database"
msgstr ""
-#: lib/rpmdb.c:789
+#: lib/rpmdb.c:818
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:801
+#: lib/rpmdb.c:830
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:808
+#: lib/rpmdb.c:837
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:866
+#: lib/rpmdb.c:895
#, c-format
msgid "cannot read header at %d for update"
msgstr ""
-#: lib/rpmdb.c:879
+#: lib/rpmdb.c:908
msgid "header changed size!"
msgstr ""
@@ -3577,25 +3583,25 @@ msgstr ""
msgid "cannot read header at %d for uninstall"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: lib/uninstall.c:105
+#: lib/uninstall.c:106
#, fuzzy, c-format
msgid "cannot read packages named %s for uninstall"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: lib/uninstall.c:138
+#: lib/uninstall.c:146
#, c-format
msgid "will remove files test = %d\n"
msgstr ""
-#: lib/uninstall.c:206
+#: lib/uninstall.c:214
msgid "running postuninstall script (if any)\n"
msgstr ""
-#: lib/uninstall.c:220
+#: lib/uninstall.c:228
msgid "removing database entry\n"
msgstr ""
-#: lib/uninstall.c:404
+#: lib/uninstall.c:412
msgid "execution of script failed"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 3f71f55bf..04ca73456 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm-3.0.4\n"
-"POT-Creation-Date: 2000-04-06 10:45-0400\n"
+"POT-Creation-Date: 2000-04-07 11:56-0400\n"
"PO-Revision-Date: 1999-12-01 22:49 +JST\n"
"Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
"Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -193,7 +193,7 @@ msgstr "copyright ¤Ź¤˘¤ę¤Ţ¤ť¤ó!\n"
# build root [BuildRoot]
# net share [ĽÍĽĂĽČśŚÍ­]
# reloate [şĆÇŰĂÖ/°ÜĆ°¤š¤ë]
-# $Id: ja.po,v 1.37 2000/04/06 15:20:30 jbj Exp $
+# $Id: ja.po,v 1.38 2000/04/07 16:09:26 jbj Exp $
#: rpm.c:200
#, c-format
msgid "rpm: %s\n"
@@ -2154,69 +2154,69 @@ msgstr ""
msgid "dbrecMatchesDepFlags() failed to read header"
msgstr "dbrecMatchesDepFlags() ¤ŹĽŘĽĂĽŔ¤ňĆɤŕ¤Î¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż"
-#: lib/depends.c:792
+#: lib/depends.c:795
#, c-format
msgid "%s: %s satisfied by added file list.\n"
msgstr "%s: %s ¤ĎĽŐĽĄĽ¤ĽëĽęĽšĽČ¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
-#: lib/depends.c:831
+#: lib/depends.c:834
#, fuzzy, c-format
msgid "%s: %s satisfied by added package.\n"
msgstr "%s: %s ¤ĎĽŃĽĂĽąĄźĽ¸¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
-#: lib/depends.c:848
+#: lib/depends.c:851
#, c-format
msgid "%s: %s satisfied by added provide.\n"
msgstr "%s: %s ¤Ď provide ¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
-#: lib/depends.c:879
+#: lib/depends.c:882
#, c-format
msgid "%s: %s satisfied by rpmrc provides.\n"
msgstr "%s: %s ¤Ď rpmrc ¤ŹÄ󜥤š¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
-#: lib/depends.c:906
+#: lib/depends.c:909
#, c-format
msgid "%s: %s satisfied by db file lists.\n"
msgstr "%s: %s ¤Ď db ĽŐĽĄĽ¤Ľë¤ŹĽęĽšĽČ¤ňşî¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
-#: lib/depends.c:931
+#: lib/depends.c:934
#, c-format
msgid "%s: %s satisfied by db provides.\n"
msgstr "%s: %s ¤Ď db ¤ŹÄ󜥤š¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
-#: lib/depends.c:956
+#: lib/depends.c:959
#, fuzzy, c-format
msgid "%s: %s satisfied by db packages.\n"
msgstr "%s: %s ¤Ď db ĽŃĽĂĽąĄźĽ¸¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ć¤¤¤Ţ¤šĄŁ\n"
-#: lib/depends.c:973
+#: lib/depends.c:976
#, c-format
msgid "%s: %s satisfied by rpmlib version.\n"
msgstr "%s: %s ¤Ď rpmlib ¤ÎĽĐĄźĽ¸ĽçĽó¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ć¤¤¤Ţ¤šĄŁ\n"
-#: lib/depends.c:983
+#: lib/depends.c:986
#, c-format
msgid "%s: %s unsatisfied.\n"
msgstr "%s: %s ¤ĎËţ¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤óĄŁ\n"
#. requirements are not satisfied.
-#: lib/depends.c:1035
+#: lib/depends.c:1038
#, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Ď require ¤ŹËţ¤ż¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s\n"
#. conflicts exist.
-#: lib/depends.c:1097
+#: lib/depends.c:1100
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "%s ¤ČśĽšç¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤š: %s\n"
-#: lib/depends.c:1152 lib/depends.c:1447
+#: lib/depends.c:1155 lib/depends.c:1450
#, c-format
msgid "cannot read header at %d for dependency check"
msgstr "°Í¸Ŕ­ĽÁĽ§ĽĂĽŻ¤Î¤ż¤á¤Ë %d ¤ÇĽŘĽĂĽŔ¤ňĆɤá¤Ţ¤ť¤ó"
-#: lib/depends.c:1243
+#: lib/depends.c:1246
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr "prerequisite ĽÁĽ§ĄźĽó¤ÎĽëĄźĽ×: %s"
@@ -2237,7 +2237,7 @@ msgstr ""
"žÜşŮ¤ĘžđĘ󤏟čĆŔ¤Ç¤­¤Ţ¤šĄŁ\n"
#: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2189 lib/header.c:2205 lib/header.c:2224
+#: lib/header.c:2188 lib/header.c:2204 lib/header.c:2223
msgid "(not a number)"
msgstr "(żôťú¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó)"
@@ -2266,82 +2266,82 @@ msgid "file %s is on an unknown device"
msgstr "ĽŐĽĄĽ¤Ľë %s ¤ĎÉÔĚŔ¤ĘĽÇĽĐĽ¤Ľš¤Ç¤š"
#. This should not be allowed
-#: lib/header.c:220
+#: lib/header.c:219
msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
msgstr "grabDate() RPM_STRING_TYPE ĽŤĽŚĽóĽČ¤Ď 1 ¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤óĄŁ\n"
-#: lib/header.c:251 lib/header.c:814
+#: lib/header.c:250 lib/header.c:813
#, c-format
msgid "Data type %d not supported\n"
msgstr "ĽÇĄźĽżĽżĽ¤Ľ× %d ¤ĎĽľĽÝĄźĽČ¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n"
-#: lib/header.c:1173
+#: lib/header.c:1172
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr "headerAddEntry() ¤ÎÉÔŔľ¤ĘĽŤĽŚĽóĽČ: %d\n"
-#: lib/header.c:1582
+#: lib/header.c:1581
#, c-format
msgid "missing { after %"
msgstr "% ¤Î¸ĺ¤Ë { ¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: lib/header.c:1610
+#: lib/header.c:1609
msgid "missing } after %{"
msgstr "%{ ¤Î¸ĺ¤Ë } ¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: lib/header.c:1622
+#: lib/header.c:1621
msgid "empty tag format"
msgstr "śő¤ÎĽżĽ°ĽŐĽŠĄźĽŢĽĂĽČ"
-#: lib/header.c:1632
+#: lib/header.c:1631
msgid "empty tag name"
msgstr "śő¤ÎĽżĽ°Ěž"
-#: lib/header.c:1647
+#: lib/header.c:1646
msgid "unknown tag"
msgstr "ÉÔĚŔ¤ĘĽżĽ°"
-#: lib/header.c:1673
+#: lib/header.c:1672
msgid "] expected at end of array"
msgstr "ÇŰÎó¤Î¸ĺ¤Ë ] ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
-#: lib/header.c:1689
+#: lib/header.c:1688
msgid "unexpected ]"
msgstr "Í˝´ü¤ť¤Ě ]"
-#: lib/header.c:1691
+#: lib/header.c:1690
msgid "unexpected }"
msgstr "Í˝´ü¤ť¤Ě }"
-#: lib/header.c:1745
+#: lib/header.c:1744
msgid "? expected in expression"
msgstr "ź°Ăć¤Ç ? ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
-#: lib/header.c:1752
+#: lib/header.c:1751
msgid "{ expected after ? in expression"
msgstr "ź°Ăć¤Ç ? ¤Î¸ĺ¤Ë { ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
-#: lib/header.c:1762 lib/header.c:1797
+#: lib/header.c:1761 lib/header.c:1796
msgid "} expected in expression"
msgstr "ź°Ăć¤Ë } ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
-#: lib/header.c:1770
+#: lib/header.c:1769
msgid ": expected following ? subexpression"
msgstr "°Ę˛ź¤Î ? ĽľĽÖź°¤Î ¤Ë: ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
-#: lib/header.c:1784
+#: lib/header.c:1783
msgid "{ expected after : in expression"
msgstr "ź°Ăć¤Ç : ¤Î¸ĺ¤Ë { ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
-#: lib/header.c:1805
+#: lib/header.c:1804
msgid "| expected at end of expression"
msgstr "ź°¤Î˝Ş¤ę¤Ë | ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
-#: lib/header.c:1973
+#: lib/header.c:1972
msgid "(unknown type)"
msgstr "(ÉÔĚŔ¤ĘĽżĽ¤Ľ×)"
-#: lib/install.c:146 lib/uninstall.c:192
+#: lib/install.c:146 lib/uninstall.c:200
#, fuzzy, c-format
msgid " file: %s action: %s\n"
msgstr "ĽŐĽĄĽ¤Ľë %s: Ľ˘ĽŻĽˇĽçĽó: %s\n"
@@ -2413,7 +2413,7 @@ msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ď .spec ĽŐĽĄĽ¤Ľë¤ň´Ţ¤ó¤Ç¤¤¤Ţ¤ť¤ó"
msgid "renaming %s to %s\n"
msgstr "%s ¤ň %s ¤ŘĚžÁ°¤ňĘŃšš¤ˇ¤Ţ¤š\n"
-#: lib/install.c:562 lib/install.c:846 lib/uninstall.c:31
+#: lib/install.c:562 lib/install.c:854 lib/uninstall.c:31
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "%s ¤ň %s ¤Ë¤š¤ëĚžÁ°¤ÎĘŃšš¤ËźşÇÔ: %s"
@@ -2427,25 +2427,25 @@ msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ź´üÂÔ¤ľ¤ě¤Ţ¤šĄ˘ĽĐĽ¤ĽĘĽę¤Ď¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż"
msgid "package: %s-%s-%s files test = %d\n"
msgstr "ĽŃĽĂĽąĄźĽ¸: %s-%s-%s ĽŐĽĄĽ¤ĽëĽĆĽšĽČ = %d\n"
-#: lib/install.c:776
+#: lib/install.c:784
msgid "stopping install as we're running --test\n"
msgstr "--test ¤ňźÂšÔ¤š¤ë¤č¤Ś¤ËĽ¤ĽóĽšĽČĄźĽë¤ňĂćťß¤ˇ¤Ć¤¤¤Ţ¤š\n"
-#: lib/install.c:781
+#: lib/install.c:789
msgid "running preinstall script (if any)\n"
msgstr "Ľ×ĽęĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ­¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n"
-#: lib/install.c:806
+#: lib/install.c:814
#, c-format
msgid "warning: %s created as %s"
msgstr "ˇŮšđ: %s ¤Ď %s ¤Č¤ˇ¤ĆşîŔŽ¤ľ¤ě¤Ţ¤š"
-#: lib/install.c:842
+#: lib/install.c:850
#, c-format
msgid "warning: %s saved as %s"
msgstr "ˇŮšđ: %s ¤Ď %s ¤Č¤ˇ¤ĆĘݸ¤ľ¤ě¤Ţ¤š"
-#: lib/install.c:916
+#: lib/install.c:924
#, fuzzy
msgid "running postinstall scripts (if any)\n"
msgstr "ĽÝĽšĽČĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ­¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n"
@@ -2866,7 +2866,7 @@ msgstr "Îóľó¤ˇ¤żĽŐĽĄĽ¤Ľë¤ÎžőÂÖ¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
msgid "display a verbose file listing"
msgstr "ĽŐĽĄĽ¤ĽëĽęĽšĽČ¤ňžéÄš¤ËÉ˝ź¨¤ˇ¤Ţ¤š"
-#: lib/rebuilddb.c:34 lib/rpmdb.c:294
+#: lib/rebuilddb.c:34 lib/rpmdb.c:295
msgid "no dbpath has been set"
msgstr "dbpath ¤ŹŔßÄꤾ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
@@ -3024,95 +3024,101 @@ msgstr ""
msgid "OK"
msgstr ""
-#: lib/rpmdb.c:190
+#: lib/rpmdb.c:192
#, fuzzy, c-format
msgid "opening database mode 0x%x in %s\n"
msgstr "ĽÇĄźĽżĽŮĄźĽšĽâĄźĽÉ 0x%x ¤ÎĽŞĄźĽ×Ľó (%s)\n"
-#: lib/rpmdb.c:202 lib/url.c:445
+#: lib/rpmdb.c:204 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s"
-#: lib/rpmdb.c:216 lib/rpmdb.c:224
+#: lib/rpmdb.c:218 lib/rpmdb.c:226
#, c-format
msgid "cannot get %s lock on database"
msgstr "ĽÇĄźĽżĽŮĄźĽš¤Î %s ¤ňĽíĽĂĽŻ¤Ç¤­¤Ţ¤ť¤ó"
-#: lib/rpmdb.c:217
+#: lib/rpmdb.c:219
msgid "exclusive"
msgstr "˝üł°"
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:227
msgid "shared"
msgstr "śŚÍ­"
-#: lib/rpmdb.c:267
+#: lib/rpmdb.c:268
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
+#. error
#: lib/rpmdb.c:554
#, fuzzy, c-format
+msgid "cannot retrieve package \"%s\" from db"
+msgstr "%s/packages.rpm ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
+
+#: lib/rpmdb.c:583
+#, fuzzy, c-format
msgid "package not found with key \"%s\" in %s"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Ď %s Ăć¤Ë¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó"
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:592
#, fuzzy, c-format
msgid "key \"%s\" not found in %s"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Ď %s Ăć¤Ë¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó"
-#: lib/rpmdb.c:581
+#: lib/rpmdb.c:610
#, fuzzy, c-format
msgid "rpmdbRemove: cannot read header at 0x%x"
msgstr "¸Ąş÷¤Î¤ż¤á¤Î %d ¤Ç ĽŘĽĂĽŔ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó"
-#: lib/rpmdb.c:609
+#: lib/rpmdb.c:638
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "ĽÇĄźĽżĽŮĄźĽšĽ¨ĽóĽČĽę¤ňşď˝ü¤ˇ¤Ţ¤š\n"
-#: lib/rpmdb.c:615
+#: lib/rpmdb.c:644
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "group Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
-#: lib/rpmdb.c:623
+#: lib/rpmdb.c:652
#, fuzzy, c-format
msgid "removing %d entries in %s index:\n"
msgstr "name Ľ¤ĽóĽÇĽĂĽŻĽšşď˝ü¤ˇ¤Ţ¤š\n"
-#: lib/rpmdb.c:627 lib/rpmdb.c:812
+#: lib/rpmdb.c:656 lib/rpmdb.c:841
#, c-format
msgid "\t%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:745
+#: lib/rpmdb.c:774
msgid "cannot allocate space for database"
msgstr "ĽÇĄźĽżĽŮĄźĽšÍѤΜő¤­ÍĆÎ̤ŹÂ­¤ę¤Ţ¤ť¤ó"
-#: lib/rpmdb.c:789
+#: lib/rpmdb.c:818
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:801
+#: lib/rpmdb.c:830
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "%s ¤ň %s ¤ŘĚžÁ°¤ňĘŃšš¤ˇ¤Ţ¤š\n"
-#: lib/rpmdb.c:808
+#: lib/rpmdb.c:837
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:866
+#: lib/rpmdb.c:895
#, c-format
msgid "cannot read header at %d for update"
msgstr "Ľ˘ĽĂĽ×ĽÇĄźĽČÍѤΠ%d ¤ÇĽŘĽĂĽŔ¤ňĆɤá¤Ţ¤ť¤ó"
-#: lib/rpmdb.c:879
+#: lib/rpmdb.c:908
msgid "header changed size!"
msgstr "ĽŘĽĂĽŔ¤ÎĽľĽ¤Ľş¤ŹĘŃšš¤ľ¤ě¤Ţ¤ˇ¤ż"
@@ -3573,26 +3579,26 @@ msgstr "%s ¤Îşď˝ü¤ËźşÇÔ: %s"
msgid "cannot read header at %d for uninstall"
msgstr "Ľ˘ĽóĽ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤Ë %d ¤ÇĽŘĽĂĽŔ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó"
-#: lib/uninstall.c:105
+#: lib/uninstall.c:106
#, c-format
msgid "cannot read packages named %s for uninstall"
msgstr ""
"Ľ˘ĽóĽ¤ĽóĽšĽČĄźĽë¤š¤ë¤ż¤á¤Ë %s ¤ČĚžÉŐ¤ą¤é¤ě¤żĽŃĽĂĽąĄźĽ¸¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó"
-#: lib/uninstall.c:138
+#: lib/uninstall.c:146
#, c-format
msgid "will remove files test = %d\n"
msgstr "ĽŐĽĄĽ¤Ľë test = %d ¤ňşď˝ü¤ˇ¤Ţ¤š\n"
-#: lib/uninstall.c:206
+#: lib/uninstall.c:214
msgid "running postuninstall script (if any)\n"
msgstr "ĽÝĽšĽČĽ˘ĽóĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ­¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n"
-#: lib/uninstall.c:220
+#: lib/uninstall.c:228
msgid "removing database entry\n"
msgstr "ĽÇĄźĽżĽŮĄźĽšĽ¨ĽóĽČĽę¤ňşď˝ü¤ˇ¤Ţ¤š\n"
-#: lib/uninstall.c:404
+#: lib/uninstall.c:412
msgid "execution of script failed"
msgstr "ĽšĽŻĽęĽ×ĽČ¤ÎźÂšÔ¤ËźşÇÔ"
diff --git a/po/pl.po b/po/pl.po
index 7888e5eb7..abab38980 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm-3.0.2\n"
-"POT-Creation-Date: 2000-04-06 10:45-0400\n"
+"POT-Creation-Date: 2000-04-07 11:56-0400\n"
"PO-Revision-Date: 1999-05-25 17:00+0100\n"
"Last-Translator: Paweł Dziekoński <pdziekonski@mml.ch.pwr.wroc.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -2105,69 +2105,69 @@ msgstr ""
msgid "dbrecMatchesDepFlags() failed to read header"
msgstr "dbrecMatchesDepFlags() odczyt nagłówka nie powiódł się"
-#: lib/depends.c:792
+#: lib/depends.c:795
#, c-format
msgid "%s: %s satisfied by added file list.\n"
msgstr ""
-#: lib/depends.c:831
+#: lib/depends.c:834
#, fuzzy, c-format
msgid "%s: %s satisfied by added package.\n"
msgstr "plik %s nie należy do żadnego pakietu\n"
-#: lib/depends.c:848
+#: lib/depends.c:851
#, c-format
msgid "%s: %s satisfied by added provide.\n"
msgstr ""
-#: lib/depends.c:879
+#: lib/depends.c:882
#, c-format
msgid "%s: %s satisfied by rpmrc provides.\n"
msgstr ""
-#: lib/depends.c:906
+#: lib/depends.c:909
#, c-format
msgid "%s: %s satisfied by db file lists.\n"
msgstr ""
-#: lib/depends.c:931
+#: lib/depends.c:934
#, c-format
msgid "%s: %s satisfied by db provides.\n"
msgstr ""
-#: lib/depends.c:956
+#: lib/depends.c:959
#, fuzzy, c-format
msgid "%s: %s satisfied by db packages.\n"
msgstr "plik %s nie należy do żadnego pakietu\n"
-#: lib/depends.c:973
+#: lib/depends.c:976
#, c-format
msgid "%s: %s satisfied by rpmlib version.\n"
msgstr ""
-#: lib/depends.c:983
+#: lib/depends.c:986
#, c-format
msgid "%s: %s unsatisfied.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1035
+#: lib/depends.c:1038
#, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "zależności pakietu %s nie zostały spełnione: %s\n"
#. conflicts exist.
-#: lib/depends.c:1097
+#: lib/depends.c:1100
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "pakiet %s jest w konflikcie: %s\n"
-#: lib/depends.c:1152 lib/depends.c:1447
+#: lib/depends.c:1155 lib/depends.c:1450
#, c-format
msgid "cannot read header at %d for dependency check"
msgstr "nie można odczytać nagłówka %d dla sprawdzenia zależności"
-#: lib/depends.c:1243
+#: lib/depends.c:1246
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr ""
@@ -2183,7 +2183,7 @@ msgid ""
msgstr ""
#: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2189 lib/header.c:2205 lib/header.c:2224
+#: lib/header.c:2188 lib/header.c:2204 lib/header.c:2223
msgid "(not a number)"
msgstr "(nie jest liczbą)"
@@ -2212,82 +2212,82 @@ msgid "file %s is on an unknown device"
msgstr "plik %s jest na nieznanym urządzeniu"
#. This should not be allowed
-#: lib/header.c:220
+#: lib/header.c:219
msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
msgstr "grabData() RPM_STRING_TYPE licznik musi być 1.\n"
-#: lib/header.c:251 lib/header.c:814
+#: lib/header.c:250 lib/header.c:813
#, c-format
msgid "Data type %d not supported\n"
msgstr "Typ danych %d nie jest obsługiwany\n"
-#: lib/header.c:1173
+#: lib/header.c:1172
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr "Błedny licznik dla headerAddEntry(): %d\n"
-#: lib/header.c:1582
+#: lib/header.c:1581
#, c-format
msgid "missing { after %"
msgstr "brak { po %"
-#: lib/header.c:1610
+#: lib/header.c:1609
msgid "missing } after %{"
msgstr "brak } po %{"
-#: lib/header.c:1622
+#: lib/header.c:1621
msgid "empty tag format"
msgstr "pusty format etykiety"
-#: lib/header.c:1632
+#: lib/header.c:1631
msgid "empty tag name"
msgstr "pusta nazwa etykiety"
-#: lib/header.c:1647
+#: lib/header.c:1646
msgid "unknown tag"
msgstr "nieznana etykieta"
-#: lib/header.c:1673
+#: lib/header.c:1672
msgid "] expected at end of array"
msgstr "spodziewany ] na końcu tablicy"
-#: lib/header.c:1689
+#: lib/header.c:1688
msgid "unexpected ]"
msgstr "nie spodziewany ]"
-#: lib/header.c:1691
+#: lib/header.c:1690
msgid "unexpected }"
msgstr "nie spodziewany }"
-#: lib/header.c:1745
+#: lib/header.c:1744
msgid "? expected in expression"
msgstr "spodziewany ? w wyrażeniu"
-#: lib/header.c:1752
+#: lib/header.c:1751
msgid "{ expected after ? in expression"
msgstr "spodziewany { po ? w wyrażeniu"
-#: lib/header.c:1762 lib/header.c:1797
+#: lib/header.c:1761 lib/header.c:1796
msgid "} expected in expression"
msgstr "spodziewany } w wyrażeniu"
-#: lib/header.c:1770
+#: lib/header.c:1769
msgid ": expected following ? subexpression"
msgstr "spodziewany : po podwyrażeniu ?"
-#: lib/header.c:1784
+#: lib/header.c:1783
msgid "{ expected after : in expression"
msgstr "spodziewany { po : w wyrażeniu"
-#: lib/header.c:1805
+#: lib/header.c:1804
msgid "| expected at end of expression"
msgstr "spodziewany | na końcu wyrażenia"
-#: lib/header.c:1973
+#: lib/header.c:1972
msgid "(unknown type)"
msgstr "(nieznany typ)"
-#: lib/install.c:146 lib/uninstall.c:192
+#: lib/install.c:146 lib/uninstall.c:200
#, c-format
msgid " file: %s action: %s\n"
msgstr " plik: %s akcja: %s\n"
@@ -2355,7 +2355,7 @@ msgstr "pakiet źródłowy nie zawiera pliku .spec"
msgid "renaming %s to %s\n"
msgstr "zmiana nazwy %s na %s\n"
-#: lib/install.c:562 lib/install.c:846 lib/uninstall.c:31
+#: lib/install.c:562 lib/install.c:854 lib/uninstall.c:31
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "zmiana nazwy z %s na %s nie powiodła sie: %s"
@@ -2369,25 +2369,25 @@ msgstr "spodziewany pakiet źródłowy a nie binarny"
msgid "package: %s-%s-%s files test = %d\n"
msgstr "pakiet: %s-%s-%s test plików = %d\n"
-#: lib/install.c:776
+#: lib/install.c:784
msgid "stopping install as we're running --test\n"
msgstr "przebieg testowy - instalacja zatrzymana\n"
-#: lib/install.c:781
+#: lib/install.c:789
msgid "running preinstall script (if any)\n"
msgstr "uruchamianie skryptu preinstall (jeśli istnieje)\n"
-#: lib/install.c:806
+#: lib/install.c:814
#, c-format
msgid "warning: %s created as %s"
msgstr "ostrzeżenie: %s utworzony jako %s"
-#: lib/install.c:842
+#: lib/install.c:850
#, c-format
msgid "warning: %s saved as %s"
msgstr "ostrzeżenie: %s zapisany jako %s"
-#: lib/install.c:916
+#: lib/install.c:924
#, fuzzy
msgid "running postinstall scripts (if any)\n"
msgstr "uruchamianie skryptu postinstall (jeśli istnieje)\n"
@@ -2787,7 +2787,7 @@ msgstr "wyświetl status pokazywanych plików"
msgid "display a verbose file listing"
msgstr "wyświetl więcej informacji o plikach z listy"
-#: lib/rebuilddb.c:34 lib/rpmdb.c:294
+#: lib/rebuilddb.c:34 lib/rpmdb.c:295
msgid "no dbpath has been set"
msgstr "ścieżka bazy danych nie została podana"
@@ -2943,30 +2943,30 @@ msgstr ")"
msgid "OK"
msgstr "OK"
-#: lib/rpmdb.c:190
+#: lib/rpmdb.c:192
#, c-format
msgid "opening database mode 0x%x in %s\n"
msgstr "otwiernie bazę danych w trybie 0x%x w %s\n"
-#: lib/rpmdb.c:202 lib/url.c:445
+#: lib/rpmdb.c:204 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "nie można otworzyć %s: %s"
-#: lib/rpmdb.c:216 lib/rpmdb.c:224
+#: lib/rpmdb.c:218 lib/rpmdb.c:226
#, c-format
msgid "cannot get %s lock on database"
msgstr "utworzenie blokady %s na bazie danych nie jest możliwe"
-#: lib/rpmdb.c:217
+#: lib/rpmdb.c:219
msgid "exclusive"
msgstr ""
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:227
msgid "shared"
msgstr ""
-#: lib/rpmdb.c:267
+#: lib/rpmdb.c:268
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
@@ -2974,66 +2974,72 @@ msgstr ""
"baza danych jest w starym formacie; użyj --rebuilddb aby wygenerować bazę w "
"nowym formacie"
+#. error
#: lib/rpmdb.c:554
#, fuzzy, c-format
+msgid "cannot retrieve package \"%s\" from db"
+msgstr "nie można otworzyć %s/packages.rpm\n"
+
+#: lib/rpmdb.c:583
+#, fuzzy, c-format
msgid "package not found with key \"%s\" in %s"
msgstr "pakiet %s nie znaleziony w %s"
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:592
#, fuzzy, c-format
msgid "key \"%s\" not found in %s"
msgstr "pakiet %s nie znaleziony w %s"
-#: lib/rpmdb.c:581
+#: lib/rpmdb.c:610
#, fuzzy, c-format
msgid "rpmdbRemove: cannot read header at 0x%x"
msgstr "nie można odczytać nagłówka przy %d dla poszukiwania"
-#: lib/rpmdb.c:609
+#: lib/rpmdb.c:638
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "usuwanie wpisu w bazie\n"
-#: lib/rpmdb.c:615
+#: lib/rpmdb.c:644
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "usuwanie indeksu grupy\n"
-#: lib/rpmdb.c:623
+#: lib/rpmdb.c:652
#, fuzzy, c-format
msgid "removing %d entries in %s index:\n"
msgstr "usuwanie indeksu nazw\n"
-#: lib/rpmdb.c:627 lib/rpmdb.c:812
+#: lib/rpmdb.c:656 lib/rpmdb.c:841
#, c-format
msgid "\t%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:745
+#: lib/rpmdb.c:774
msgid "cannot allocate space for database"
msgstr "nie można alokować przestrzeni dla bazy danych"
-#: lib/rpmdb.c:789
+#: lib/rpmdb.c:818
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:801
+#: lib/rpmdb.c:830
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "zmiana nazwy %s na %s\n"
-#: lib/rpmdb.c:808
+#: lib/rpmdb.c:837
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:866
+#: lib/rpmdb.c:895
#, c-format
msgid "cannot read header at %d for update"
msgstr "nie można odczytać nagłówka przy %d dla uaktualnienia"
-#: lib/rpmdb.c:879
+#: lib/rpmdb.c:908
msgid "header changed size!"
msgstr "nagłówek zmienił swój rozmiar!"
@@ -3475,25 +3481,25 @@ msgstr "skasowanie %s nie powiodło się: %s"
msgid "cannot read header at %d for uninstall"
msgstr "nie można odczytać nagłówka przy %d dla deinstalacji"
-#: lib/uninstall.c:105
+#: lib/uninstall.c:106
#, c-format
msgid "cannot read packages named %s for uninstall"
msgstr "nie można odczytać pakietów nazwanych %s dla zdeinstalowania"
-#: lib/uninstall.c:138
+#: lib/uninstall.c:146
#, c-format
msgid "will remove files test = %d\n"
msgstr "usunie pliki test = %d\n"
-#: lib/uninstall.c:206
+#: lib/uninstall.c:214
msgid "running postuninstall script (if any)\n"
msgstr "uruchamianie skryptu postinstalacyjnego (jeŚli istnieje)\n"
-#: lib/uninstall.c:220
+#: lib/uninstall.c:228
msgid "removing database entry\n"
msgstr "usuwanie wpisu w bazie\n"
-#: lib/uninstall.c:404
+#: lib/uninstall.c:412
msgid "execution of script failed"
msgstr "wykonanie skryptu nie powiodło się"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c6fdef2fb..a192d067c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
# Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
#
msgid ""
-msgstr "POT-Creation-Date: 2000-04-06 10:45-0400\n"
+msgstr "POT-Creation-Date: 2000-04-07 11:56-0400\n"
#: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:425
#, c-format
@@ -2248,69 +2248,69 @@ msgstr ""
msgid "dbrecMatchesDepFlags() failed to read header"
msgstr ""
-#: lib/depends.c:792
+#: lib/depends.c:795
#, c-format
msgid "%s: %s satisfied by added file list.\n"
msgstr ""
-#: lib/depends.c:831
+#: lib/depends.c:834
#, c-format
msgid "%s: %s satisfied by added package.\n"
msgstr ""
-#: lib/depends.c:848
+#: lib/depends.c:851
#, c-format
msgid "%s: %s satisfied by added provide.\n"
msgstr ""
-#: lib/depends.c:879
+#: lib/depends.c:882
#, c-format
msgid "%s: %s satisfied by rpmrc provides.\n"
msgstr ""
-#: lib/depends.c:906
+#: lib/depends.c:909
#, c-format
msgid "%s: %s satisfied by db file lists.\n"
msgstr ""
-#: lib/depends.c:931
+#: lib/depends.c:934
#, c-format
msgid "%s: %s satisfied by db provides.\n"
msgstr ""
-#: lib/depends.c:956
+#: lib/depends.c:959
#, c-format
msgid "%s: %s satisfied by db packages.\n"
msgstr ""
-#: lib/depends.c:973
+#: lib/depends.c:976
#, c-format
msgid "%s: %s satisfied by rpmlib version.\n"
msgstr ""
-#: lib/depends.c:983
+#: lib/depends.c:986
#, c-format
msgid "%s: %s unsatisfied.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1035
+#: lib/depends.c:1038
#, fuzzy, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "năo foi passado pacote para instalaçăo"
#. conflicts exist.
-#: lib/depends.c:1097
+#: lib/depends.c:1100
#, fuzzy, c-format
msgid "package %s conflicts: %s\n"
msgstr "năo foi passado pacote para desinstalaçăo"
-#: lib/depends.c:1152 lib/depends.c:1447
+#: lib/depends.c:1155 lib/depends.c:1450
#, c-format
msgid "cannot read header at %d for dependency check"
msgstr ""
-#: lib/depends.c:1243
+#: lib/depends.c:1246
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr ""
@@ -2326,7 +2326,7 @@ msgid ""
msgstr ""
#: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2189 lib/header.c:2205 lib/header.c:2224
+#: lib/header.c:2188 lib/header.c:2204 lib/header.c:2223
msgid "(not a number)"
msgstr ""
@@ -2357,84 +2357,84 @@ msgid "file %s is on an unknown device"
msgstr ""
#. This should not be allowed
-#: lib/header.c:220
+#: lib/header.c:219
msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:251 lib/header.c:814
+#: lib/header.c:250 lib/header.c:813
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1173
+#: lib/header.c:1172
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
-#: lib/header.c:1582
+#: lib/header.c:1581
#, c-format
msgid "missing { after %"
msgstr ""
-#: lib/header.c:1610
+#: lib/header.c:1609
msgid "missing } after %{"
msgstr ""
-#: lib/header.c:1622
+#: lib/header.c:1621
msgid "empty tag format"
msgstr ""
-#: lib/header.c:1632
+#: lib/header.c:1631
msgid "empty tag name"
msgstr ""
-#: lib/header.c:1647
+#: lib/header.c:1646
msgid "unknown tag"
msgstr ""
-#: lib/header.c:1673
+#: lib/header.c:1672
msgid "] expected at end of array"
msgstr ""
-#: lib/header.c:1689
+#: lib/header.c:1688
#, fuzzy
msgid "unexpected ]"
msgstr "fonte de pesquisa năo esperado"
-#: lib/header.c:1691
+#: lib/header.c:1690
#, fuzzy
msgid "unexpected }"
msgstr "fonte de pesquisa năo esperado"
-#: lib/header.c:1745
+#: lib/header.c:1744
msgid "? expected in expression"
msgstr ""
-#: lib/header.c:1752
+#: lib/header.c:1751
msgid "{ expected after ? in expression"
msgstr ""
-#: lib/header.c:1762 lib/header.c:1797
+#: lib/header.c:1761 lib/header.c:1796
msgid "} expected in expression"
msgstr ""
-#: lib/header.c:1770
+#: lib/header.c:1769
msgid ": expected following ? subexpression"
msgstr ""
-#: lib/header.c:1784
+#: lib/header.c:1783
msgid "{ expected after : in expression"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1804
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:1973
+#: lib/header.c:1972
msgid "(unknown type)"
msgstr ""
-#: lib/install.c:146 lib/uninstall.c:192
+#: lib/install.c:146 lib/uninstall.c:200
#, c-format
msgid " file: %s action: %s\n"
msgstr ""
@@ -2507,7 +2507,7 @@ msgstr "pesquise o pacote ao qual <arquivo> pertence"
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:562 lib/install.c:846 lib/uninstall.c:31
+#: lib/install.c:562 lib/install.c:854 lib/uninstall.c:31
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
@@ -2521,25 +2521,25 @@ msgstr ""
msgid "package: %s-%s-%s files test = %d\n"
msgstr "năo foi passado pacote para instalaçăo"
-#: lib/install.c:776
+#: lib/install.c:784
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:781
+#: lib/install.c:789
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:806
+#: lib/install.c:814
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:842
+#: lib/install.c:850
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:916
+#: lib/install.c:924
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2952,7 +2952,7 @@ msgstr ""
msgid "display a verbose file listing"
msgstr "mostre a lista de arquivos do pacote"
-#: lib/rebuilddb.c:34 lib/rpmdb.c:294
+#: lib/rebuilddb.c:34 lib/rpmdb.c:295
msgid "no dbpath has been set"
msgstr ""
@@ -3113,96 +3113,103 @@ msgstr ""
msgid "OK"
msgstr ""
-#: lib/rpmdb.c:190
+#: lib/rpmdb.c:192
#, fuzzy, c-format
msgid "opening database mode 0x%x in %s\n"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
# , c-format
-#: lib/rpmdb.c:202 lib/url.c:445
+#: lib/rpmdb.c:204 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "Năo consegui abrir: %s\n"
-#: lib/rpmdb.c:216 lib/rpmdb.c:224
+#: lib/rpmdb.c:218 lib/rpmdb.c:226
#, c-format
msgid "cannot get %s lock on database"
msgstr ""
-#: lib/rpmdb.c:217
+#: lib/rpmdb.c:219
msgid "exclusive"
msgstr ""
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:227
msgid "shared"
msgstr ""
-#: lib/rpmdb.c:267
+#: lib/rpmdb.c:268
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
+# , c-format
+#. error
#: lib/rpmdb.c:554
#, fuzzy, c-format
+msgid "cannot retrieve package \"%s\" from db"
+msgstr "Năo consegui abrir: %s\n"
+
+#: lib/rpmdb.c:583
+#, fuzzy, c-format
msgid "package not found with key \"%s\" in %s"
msgstr "năo foi passado pacote para desinstalaçăo"
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:592
#, fuzzy, c-format
msgid "key \"%s\" not found in %s"
msgstr "năo foi passado pacote para desinstalaçăo"
-#: lib/rpmdb.c:581
+#: lib/rpmdb.c:610
#, c-format
msgid "rpmdbRemove: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:609
+#: lib/rpmdb.c:638
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:615
+#: lib/rpmdb.c:644
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:623
+#: lib/rpmdb.c:652
#, c-format
msgid "removing %d entries in %s index:\n"
msgstr ""
-#: lib/rpmdb.c:627 lib/rpmdb.c:812
+#: lib/rpmdb.c:656 lib/rpmdb.c:841
#, c-format
msgid "\t%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:745
+#: lib/rpmdb.c:774
msgid "cannot allocate space for database"
msgstr ""
-#: lib/rpmdb.c:789
+#: lib/rpmdb.c:818
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:801
+#: lib/rpmdb.c:830
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:808
+#: lib/rpmdb.c:837
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:866
+#: lib/rpmdb.c:895
#, c-format
msgid "cannot read header at %d for update"
msgstr ""
-#: lib/rpmdb.c:879
+#: lib/rpmdb.c:908
msgid "header changed size!"
msgstr ""
@@ -3684,25 +3691,25 @@ msgstr ""
msgid "cannot read header at %d for uninstall"
msgstr "năo foi passado pacote para desinstalaçăo"
-#: lib/uninstall.c:105
+#: lib/uninstall.c:106
#, fuzzy, c-format
msgid "cannot read packages named %s for uninstall"
msgstr "năo foi passado pacote para desinstalaçăo"
-#: lib/uninstall.c:138
+#: lib/uninstall.c:146
#, c-format
msgid "will remove files test = %d\n"
msgstr ""
-#: lib/uninstall.c:206
+#: lib/uninstall.c:214
msgid "running postuninstall script (if any)\n"
msgstr ""
-#: lib/uninstall.c:220
+#: lib/uninstall.c:228
msgid "removing database entry\n"
msgstr ""
-#: lib/uninstall.c:404
+#: lib/uninstall.c:412
msgid "execution of script failed"
msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index ea68ba601..3007e3e0f 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-04-06 10:45-0400\n"
+"POT-Creation-Date: 2000-04-07 11:56-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2036,69 +2036,69 @@ msgstr ""
msgid "dbrecMatchesDepFlags() failed to read header"
msgstr ""
-#: lib/depends.c:792
+#: lib/depends.c:795
#, c-format
msgid "%s: %s satisfied by added file list.\n"
msgstr ""
-#: lib/depends.c:831
+#: lib/depends.c:834
#, c-format
msgid "%s: %s satisfied by added package.\n"
msgstr ""
-#: lib/depends.c:848
+#: lib/depends.c:851
#, c-format
msgid "%s: %s satisfied by added provide.\n"
msgstr ""
-#: lib/depends.c:879
+#: lib/depends.c:882
#, c-format
msgid "%s: %s satisfied by rpmrc provides.\n"
msgstr ""
-#: lib/depends.c:906
+#: lib/depends.c:909
#, c-format
msgid "%s: %s satisfied by db file lists.\n"
msgstr ""
-#: lib/depends.c:931
+#: lib/depends.c:934
#, c-format
msgid "%s: %s satisfied by db provides.\n"
msgstr ""
-#: lib/depends.c:956
+#: lib/depends.c:959
#, c-format
msgid "%s: %s satisfied by db packages.\n"
msgstr ""
-#: lib/depends.c:973
+#: lib/depends.c:976
#, c-format
msgid "%s: %s satisfied by rpmlib version.\n"
msgstr ""
-#: lib/depends.c:983
+#: lib/depends.c:986
#, c-format
msgid "%s: %s unsatisfied.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1035
+#: lib/depends.c:1038
#, c-format
msgid "package %s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1097
+#: lib/depends.c:1100
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
-#: lib/depends.c:1152 lib/depends.c:1447
+#: lib/depends.c:1155 lib/depends.c:1450
#, c-format
msgid "cannot read header at %d for dependency check"
msgstr ""
-#: lib/depends.c:1243
+#: lib/depends.c:1246
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr ""
@@ -2114,7 +2114,7 @@ msgid ""
msgstr ""
#: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2189 lib/header.c:2205 lib/header.c:2224
+#: lib/header.c:2188 lib/header.c:2204 lib/header.c:2223
msgid "(not a number)"
msgstr ""
@@ -2143,82 +2143,82 @@ msgid "file %s is on an unknown device"
msgstr ""
#. This should not be allowed
-#: lib/header.c:220
+#: lib/header.c:219
msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:251 lib/header.c:814
+#: lib/header.c:250 lib/header.c:813
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1173
+#: lib/header.c:1172
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
-#: lib/header.c:1582
+#: lib/header.c:1581
#, c-format
msgid "missing { after %"
msgstr ""
-#: lib/header.c:1610
+#: lib/header.c:1609
msgid "missing } after %{"
msgstr ""
-#: lib/header.c:1622
+#: lib/header.c:1621
msgid "empty tag format"
msgstr ""
-#: lib/header.c:1632
+#: lib/header.c:1631
msgid "empty tag name"
msgstr ""
-#: lib/header.c:1647
+#: lib/header.c:1646
msgid "unknown tag"
msgstr ""
-#: lib/header.c:1673
+#: lib/header.c:1672
msgid "] expected at end of array"
msgstr ""
-#: lib/header.c:1689
+#: lib/header.c:1688
msgid "unexpected ]"
msgstr ""
-#: lib/header.c:1691
+#: lib/header.c:1690
msgid "unexpected }"
msgstr ""
-#: lib/header.c:1745
+#: lib/header.c:1744
msgid "? expected in expression"
msgstr ""
-#: lib/header.c:1752
+#: lib/header.c:1751
msgid "{ expected after ? in expression"
msgstr ""
-#: lib/header.c:1762 lib/header.c:1797
+#: lib/header.c:1761 lib/header.c:1796
msgid "} expected in expression"
msgstr ""
-#: lib/header.c:1770
+#: lib/header.c:1769
msgid ": expected following ? subexpression"
msgstr ""
-#: lib/header.c:1784
+#: lib/header.c:1783
msgid "{ expected after : in expression"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1804
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:1973
+#: lib/header.c:1972
msgid "(unknown type)"
msgstr ""
-#: lib/install.c:146 lib/uninstall.c:192
+#: lib/install.c:146 lib/uninstall.c:200
#, c-format
msgid " file: %s action: %s\n"
msgstr ""
@@ -2286,7 +2286,7 @@ msgstr ""
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:562 lib/install.c:846 lib/uninstall.c:31
+#: lib/install.c:562 lib/install.c:854 lib/uninstall.c:31
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
@@ -2300,25 +2300,25 @@ msgstr ""
msgid "package: %s-%s-%s files test = %d\n"
msgstr ""
-#: lib/install.c:776
+#: lib/install.c:784
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:781
+#: lib/install.c:789
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:806
+#: lib/install.c:814
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:842
+#: lib/install.c:850
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:916
+#: lib/install.c:924
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2713,7 +2713,7 @@ msgstr ""
msgid "display a verbose file listing"
msgstr ""
-#: lib/rebuilddb.c:34 lib/rpmdb.c:294
+#: lib/rebuilddb.c:34 lib/rpmdb.c:295
msgid "no dbpath has been set"
msgstr ""
@@ -2868,95 +2868,101 @@ msgstr ""
msgid "OK"
msgstr ""
-#: lib/rpmdb.c:190
+#: lib/rpmdb.c:192
#, c-format
msgid "opening database mode 0x%x in %s\n"
msgstr ""
-#: lib/rpmdb.c:202 lib/url.c:445
+#: lib/rpmdb.c:204 lib/url.c:445
#, c-format
msgid "failed to open %s: %s\n"
msgstr ""
-#: lib/rpmdb.c:216 lib/rpmdb.c:224
+#: lib/rpmdb.c:218 lib/rpmdb.c:226
#, c-format
msgid "cannot get %s lock on database"
msgstr ""
-#: lib/rpmdb.c:217
+#: lib/rpmdb.c:219
msgid "exclusive"
msgstr ""
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:227
msgid "shared"
msgstr ""
-#: lib/rpmdb.c:267
+#: lib/rpmdb.c:268
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
+#. error
#: lib/rpmdb.c:554
#, c-format
+msgid "cannot retrieve package \"%s\" from db"
+msgstr ""
+
+#: lib/rpmdb.c:583
+#, c-format
msgid "package not found with key \"%s\" in %s"
msgstr ""
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:592
#, c-format
msgid "key \"%s\" not found in %s"
msgstr ""
-#: lib/rpmdb.c:581
+#: lib/rpmdb.c:610
#, c-format
msgid "rpmdbRemove: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:609
+#: lib/rpmdb.c:638
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:615
+#: lib/rpmdb.c:644
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:623
+#: lib/rpmdb.c:652
#, c-format
msgid "removing %d entries in %s index:\n"
msgstr ""
-#: lib/rpmdb.c:627 lib/rpmdb.c:812
+#: lib/rpmdb.c:656 lib/rpmdb.c:841
#, c-format
msgid "\t%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:745
+#: lib/rpmdb.c:774
msgid "cannot allocate space for database"
msgstr ""
-#: lib/rpmdb.c:789
+#: lib/rpmdb.c:818
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:801
+#: lib/rpmdb.c:830
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:808
+#: lib/rpmdb.c:837
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:866
+#: lib/rpmdb.c:895
#, c-format
msgid "cannot read header at %d for update"
msgstr ""
-#: lib/rpmdb.c:879
+#: lib/rpmdb.c:908
msgid "header changed size!"
msgstr ""
@@ -3396,25 +3402,25 @@ msgstr ""
msgid "cannot read header at %d for uninstall"
msgstr ""
-#: lib/uninstall.c:105
+#: lib/uninstall.c:106
#, c-format
msgid "cannot read packages named %s for uninstall"
msgstr ""
-#: lib/uninstall.c:138
+#: lib/uninstall.c:146
#, c-format
msgid "will remove files test = %d\n"
msgstr ""
-#: lib/uninstall.c:206
+#: lib/uninstall.c:214
msgid "running postuninstall script (if any)\n"
msgstr ""
-#: lib/uninstall.c:220
+#: lib/uninstall.c:228
msgid "removing database entry\n"
msgstr ""
-#: lib/uninstall.c:404
+#: lib/uninstall.c:412
msgid "execution of script failed"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 76212693a..df397bdf8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-04-06 10:45-0400\n"
+"POT-Creation-Date: 2000-04-07 11:56-0400\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=koi8-r\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -2112,69 +2112,69 @@ msgstr ""
msgid "dbrecMatchesDepFlags() failed to read header"
msgstr "ĎŰÉÂËÁ dbrecMatchesDepFlags() ĐŇÉ ŢÔĹÎÉÉ ČĹÄĹŇÁ"
-#: lib/depends.c:792
+#: lib/depends.c:795
#, c-format
msgid "%s: %s satisfied by added file list.\n"
msgstr ""
-#: lib/depends.c:831
+#: lib/depends.c:834
#, fuzzy, c-format
msgid "%s: %s satisfied by added package.\n"
msgstr "ĆÁĘĚ %s ÎĹ ĐŇÉÎÁÄĚĹÖÉÔ ÎÉ ĎÄÎĎÍŐ ÉÚ ĐÁËĹÔĎ×\n"
-#: lib/depends.c:848
+#: lib/depends.c:851
#, c-format
msgid "%s: %s satisfied by added provide.\n"
msgstr ""
-#: lib/depends.c:879
+#: lib/depends.c:882
#, c-format
msgid "%s: %s satisfied by rpmrc provides.\n"
msgstr ""
-#: lib/depends.c:906
+#: lib/depends.c:909
#, c-format
msgid "%s: %s satisfied by db file lists.\n"
msgstr ""
-#: lib/depends.c:931
+#: lib/depends.c:934
#, c-format
msgid "%s: %s satisfied by db provides.\n"
msgstr ""
-#: lib/depends.c:956
+#: lib/depends.c:959
#, fuzzy, c-format
msgid "%s: %s satisfied by db packages.\n"
msgstr "ĆÁĘĚ %s ÎĹ ĐŇÉÎÁÄĚĹÖÉÔ ÎÉ ĎÄÎĎÍŐ ÉÚ ĐÁËĹÔĎ×\n"
-#: lib/depends.c:973
+#: lib/depends.c:976
#, c-format
msgid "%s: %s satisfied by rpmlib version.\n"
msgstr ""
-#: lib/depends.c:983
+#: lib/depends.c:986
#, c-format
msgid "%s: %s unsatisfied.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1035
+#: lib/depends.c:1038
#, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "ÔŇĹÂĎ×ÁÎÉŃ ĐÁËĹÔÁ %s ÎĹ ŐÄĎ×ĚĹÔ×ĎŇĹÎŮ: %s\n"
#. conflicts exist.
-#: lib/depends.c:1097
+#: lib/depends.c:1100
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "ĐÁËĹÔ %s ËĎÎĆĚÉËÔŐĹÔ Ó: %s\n"
-#: lib/depends.c:1152 lib/depends.c:1447
+#: lib/depends.c:1155 lib/depends.c:1450
#, c-format
msgid "cannot read header at %d for dependency check"
msgstr "ÎĹ ÍĎÇŐ ĐŇĎŢĹÓÔŘ ČĹÄĹŇ × %d ÄĚŃ ĐŇĎ×ĹŇËÉ ÚÁ×ÉÓÉÍĎÓÔĹĘ"
-#: lib/depends.c:1243
+#: lib/depends.c:1246
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr "ÚÁÍËÎŐÔŮĘ ĂÉËĚ × ĂĹĐĎŢËĹ ÔŇĹÂĎ×ÁÎÉĘ ÄĚŃ ŐÓÔÁÎĎ×ËÉ: %s"
@@ -2190,7 +2190,7 @@ msgid ""
msgstr ""
#: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2189 lib/header.c:2205 lib/header.c:2224
+#: lib/header.c:2188 lib/header.c:2204 lib/header.c:2223
msgid "(not a number)"
msgstr "(ÎĹ ŢÉÓĚĎ)"
@@ -2219,82 +2219,82 @@ msgid "file %s is on an unknown device"
msgstr "ĆÁĘĚ %s - ÎÁ ÎĹÉÚ×ĹÓÔÎĎÍ ŐÓÔŇĎĘÓÔ×Ĺ"
#. This should not be allowed
-#: lib/header.c:220
+#: lib/header.c:219
msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
msgstr "grabData() RPM_STRING_TYPE count must be 1.\n"
-#: lib/header.c:251 lib/header.c:814
+#: lib/header.c:250 lib/header.c:813
#, c-format
msgid "Data type %d not supported\n"
msgstr "ôÉĐ ÄÁÎÎŮČ %d ÎĹ ĐĎÄÄĹŇÖÉ×ÁĹÔÓŃ\n"
-#: lib/header.c:1173
+#: lib/header.c:1172
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr "îĹ×ĹŇÎĎĹ ŢÉÓĚĎ ÄĚŃ headerAddEntry(): %d\n"
-#: lib/header.c:1582
+#: lib/header.c:1581
#, c-format
msgid "missing { after %"
msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ \"{\" ĐĎÓĚĹ \"%\""
-#: lib/header.c:1610
+#: lib/header.c:1609
msgid "missing } after %{"
msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ \"}\" ĐĎÓĚĹ \"%{\""
-#: lib/header.c:1622
+#: lib/header.c:1621
msgid "empty tag format"
msgstr "ĐŐÓÔĎĘ ĆĎŇÍÁÔ ÔÜÇÁ"
-#: lib/header.c:1632
+#: lib/header.c:1631
msgid "empty tag name"
msgstr "ĐŐÓÔĎĹ ÉÍŃ ÔÜÇÁ"
-#: lib/header.c:1647
+#: lib/header.c:1646
msgid "unknown tag"
msgstr "ÎĹÉÚ×ĹÓÔÎŮĘ ÔÜÇ"
-#: lib/header.c:1673
+#: lib/header.c:1672
msgid "] expected at end of array"
msgstr "× ËĎÎĂĹ ÍÁÓÓÉ×Á ĎÖÉÄÁĚÁÓŘ \"]\""
-#: lib/header.c:1689
+#: lib/header.c:1688
msgid "unexpected ]"
msgstr "ÎĹĎÖÉÄÁÎÎÁŃ \"]\""
-#: lib/header.c:1691
+#: lib/header.c:1690
msgid "unexpected }"
msgstr "ÎĹĎÖÉÄÁÎÎÁŃ \"}\""
-#: lib/header.c:1745
+#: lib/header.c:1744
msgid "? expected in expression"
msgstr "× ×ŮŇÁÖĹÎÉÉ ĎÖÉÄÁĚÓŃ \"?\""
-#: lib/header.c:1752
+#: lib/header.c:1751
msgid "{ expected after ? in expression"
msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \"?\" ĎÖÉÄÁĚÁÓŘ \"{\""
-#: lib/header.c:1762 lib/header.c:1797
+#: lib/header.c:1761 lib/header.c:1796
msgid "} expected in expression"
msgstr "× ×ŮŇÁÖĹÎÉÉ ĎÖÉÄÁĚÁÓŘ \"}\""
-#: lib/header.c:1770
+#: lib/header.c:1769
msgid ": expected following ? subexpression"
msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \"?\" ĎÖÉÄÁĚĎÓŘ \":\""
-#: lib/header.c:1784
+#: lib/header.c:1783
msgid "{ expected after : in expression"
msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \":\" ĎÖÉÄÁĚÁÓŘ \"{\""
-#: lib/header.c:1805
+#: lib/header.c:1804
msgid "| expected at end of expression"
msgstr "× ËĎÎĂĹ ×ŮŇÁÖĹÎÉŃ ĎÖÉÄÁĚÓŃ \"|\""
-#: lib/header.c:1973
+#: lib/header.c:1972
msgid "(unknown type)"
msgstr "(ÎĹÉÚ×ĹÓÔÎŮĘ ÔÉĐ)"
-#: lib/install.c:146 lib/uninstall.c:192
+#: lib/install.c:146 lib/uninstall.c:200
#, c-format
msgid " file: %s action: %s\n"
msgstr "ĆÁĘĚ : %s ÄĹĘÓÔ×ÉĹ: %s\n"
@@ -2362,7 +2362,7 @@ msgstr "ÉÓČĎÄÎŮĘ ĐÁËĹÔ ÎĹ ÓĎÄĹŇÖÉÔ ĆÁĘĚÁ .spec"
msgid "renaming %s to %s\n"
msgstr "ĐĹŇĹÉÍĹÎĎ×Ů×ÁŔ %s × %s\n"
-#: lib/install.c:562 lib/install.c:846 lib/uninstall.c:31
+#: lib/install.c:562 lib/install.c:854 lib/uninstall.c:31
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "ĎŰÉÂËÁ ĐĹŇĹÉÍĹÎĎ×ÁÎÉŃ %s × %s: %s"
@@ -2376,25 +2376,25 @@ msgstr "ĎÖÉÄÁĚÓŃ ÉÓČĎÄÎŮĘ ĐÁËĹÔ, ÎÁĘÄĹÎ ÂÉÎÁŇÎŮĘ"
msgid "package: %s-%s-%s files test = %d\n"
msgstr "ĐÁËĹÔ: %s-%s-%s ĆÁĘĚĎ×; test = %d\n"
-#: lib/install.c:776
+#: lib/install.c:784
msgid "stopping install as we're running --test\n"
msgstr "ĎÓÔÁÎÁ×ĚÉ×ÁŔ ŐÓÔÁÎĎ×ËŐ, Ô.Ë. ÍŮ ÉÓĐĎĚÎŃĹÍ --test\n"
-#: lib/install.c:781
+#: lib/install.c:789
msgid "running preinstall script (if any)\n"
msgstr "ÉÓĐĎĚÎŃŔ ÓËŇÉĐÔ preinstall (ĹÓĚÉ ĹÓÔŘ)\n"
-#: lib/install.c:806
+#: lib/install.c:814
#, c-format
msgid "warning: %s created as %s"
msgstr "ĐŇĹÄŐĐŇĹÖÄĹÎÉĹ: %s ÓĎÚÄÁÎ ËÁË %s"
-#: lib/install.c:842
+#: lib/install.c:850
#, c-format
msgid "warning: %s saved as %s"
msgstr "ĐŇĹÄŐĐŇĹÖÄĹÎÉĹ: %s ÓĎČŇÁÎĹÎ ËÁË %s"
-#: lib/install.c:916
+#: lib/install.c:924
#, fuzzy
msgid "running postinstall scripts (if any)\n"
msgstr "ÉÓĐĎĚÎŃŔ ÓËŇÉĐÔ postinstall (ĹÓĚÉ ĹÓÔŘ)\n"
@@ -2791,7 +2791,7 @@ msgstr "ĐĎËÁÚÁÔŘ ÓĎÓÔĎŃÎÉĹ ĐĎËÁÚÁÎÎŮČ ĆÁĘĚĎ×"
msgid "display a verbose file listing"
msgstr "×Ů×ĹÓÔÉ ÄĹÔÁĚŘÎŮĘ ÓĐÉÓĎË ĆÁĘĚĎ× ĐÁËĹÔÁ"
-#: lib/rebuilddb.c:34 lib/rpmdb.c:294
+#: lib/rebuilddb.c:34 lib/rpmdb.c:295
msgid "no dbpath has been set"
msgstr "ÎĹ ŐÓÔÁÎĎ×ĚĹÎÁ dbpath"
@@ -2947,30 +2947,30 @@ msgstr ")"
msgid "OK"
msgstr "Ok"
-#: lib/rpmdb.c:190
+#: lib/rpmdb.c:192
#, c-format
msgid "opening database mode 0x%x in %s\n"
msgstr "ĎÔËŇŮ×ÁŔ ÂÁÚŐ × ŇĹÖÉÍĹ 0x%x × %s\n"
-#: lib/rpmdb.c:202 lib/url.c:445
+#: lib/rpmdb.c:204 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "ÎĹ ÍĎÇŐ ĎÔËŇŮÔŘ %s: %s"
-#: lib/rpmdb.c:216 lib/rpmdb.c:224
+#: lib/rpmdb.c:218 lib/rpmdb.c:226
#, c-format
msgid "cannot get %s lock on database"
msgstr "ÎĹ ÍĎÇŐ ĐĎĚŐŢÉÔŘ %s ÄĎÓÔŐĐ Ë ÂÁÚĹ ÄÁÎÎŮČ"
-#: lib/rpmdb.c:217
+#: lib/rpmdb.c:219
msgid "exclusive"
msgstr "ÉÓËĚŔŢÉÔĹĚŘÎŮĘ"
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:227
msgid "shared"
msgstr "ŇÁÚÄĹĚŃĹÍŮĘ"
-#: lib/rpmdb.c:267
+#: lib/rpmdb.c:268
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
@@ -2978,66 +2978,72 @@ msgstr ""
"ÎÁĘÄĹÎÁ ÂÁÚÁ ÄÁÎÎŮČ ÓÔÁŇĎÇĎ ĆĎŇÍÁÔÁ; ÉÓĐĎĚŘÚŐĘÔĹ --rebuilddb ÄĚŃ ÇĹÎĹŇÁĂÉÉ "
"ÂÁÚŮ ÎĎ×ĎÇĎ ĆĎŇÍÁÔÁ"
+#. error
#: lib/rpmdb.c:554
#, fuzzy, c-format
+msgid "cannot retrieve package \"%s\" from db"
+msgstr "ÎĹ ÍĎÇŐ ĎÔËŇŮÔŘ %s/packages.rpm\n"
+
+#: lib/rpmdb.c:583
+#, fuzzy, c-format
msgid "package not found with key \"%s\" in %s"
msgstr "ĐÁËĹÔ %s ÎĹ ÎÁĘÄĹÎ × %s"
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:592
#, fuzzy, c-format
msgid "key \"%s\" not found in %s"
msgstr "ĐÁËĹÔ %s ÎĹ ÎÁĘÄĹÎ × %s"
-#: lib/rpmdb.c:581
+#: lib/rpmdb.c:610
#, fuzzy, c-format
msgid "rpmdbRemove: cannot read header at 0x%x"
msgstr "ÎĹ ÍĎÇŐ ĐŇĎŢĹÓÔŘ ČĹÄĹŇ × %d ÄĚŃ ĐĎÉÓËÁ"
-#: lib/rpmdb.c:609
+#: lib/rpmdb.c:638
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "ŐÄÁĚŃŔ ÚÁĐÉÓŘ ÂÁÚŮ ÄÁÎÎŮČ\n"
-#: lib/rpmdb.c:615
+#: lib/rpmdb.c:644
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "ŐÄÁĚŃŔ ÉÎÄĹËÓ ÇŇŐĐĐ\n"
-#: lib/rpmdb.c:623
+#: lib/rpmdb.c:652
#, fuzzy, c-format
msgid "removing %d entries in %s index:\n"
msgstr "ŐÄÁĚŃŔ ÉÎÄĹËÓ ÉÍĹÎ\n"
-#: lib/rpmdb.c:627 lib/rpmdb.c:812
+#: lib/rpmdb.c:656 lib/rpmdb.c:841
#, c-format
msgid "\t%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:745
+#: lib/rpmdb.c:774
msgid "cannot allocate space for database"
msgstr "ÎĹ ÍĎÇŐ ×ŮÄĹĚÉÔŘ ÍĹÓÔĎ ÄĚŃ ÂÁÚŮ ÄÁÎÎŮČ"
-#: lib/rpmdb.c:789
+#: lib/rpmdb.c:818
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:801
+#: lib/rpmdb.c:830
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "ĐĹŇĹÉÍĹÎĎ×Ů×ÁŔ %s × %s\n"
-#: lib/rpmdb.c:808
+#: lib/rpmdb.c:837
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:866
+#: lib/rpmdb.c:895
#, c-format
msgid "cannot read header at %d for update"
msgstr "ÎĹ ÍĎÇŐ ĐŇĎŢÉÔÁÔŘ ČĹÄĹŇ × %d ÄĚŃ ÁĐÇŇĹĘÄÁ"
-#: lib/rpmdb.c:879
+#: lib/rpmdb.c:908
msgid "header changed size!"
msgstr "ČĹÄĹŇ ÉÚÍĹÎÉĚ ŇÁÚÍĹŇ!"
@@ -3482,25 +3488,25 @@ msgstr "ĎŰÉÂËÁ ŐÄÁĚĹÎÉŃ %s: %s"
msgid "cannot read header at %d for uninstall"
msgstr "ÎĹ ÍĎÇŐ ĐŇĎŢÉÔÁÔŘ ČĹÄĹŇ × %d ÄĚŃ ŐÄÁĚĹÎÉŃ"
-#: lib/uninstall.c:105
+#: lib/uninstall.c:106
#, c-format
msgid "cannot read packages named %s for uninstall"
msgstr "ÎĹ ÍĎÇŐ ĐŇĎŢÉÔÁÔŘ ĐÁËĹÔŮ %s ÄĚŃ ŐÄ×ĚĹÎÉŃ"
-#: lib/uninstall.c:138
+#: lib/uninstall.c:146
#, c-format
msgid "will remove files test = %d\n"
msgstr "ŐÄÁĚÉÔ ĆÁĘĚŮ; test = %d\n"
-#: lib/uninstall.c:206
+#: lib/uninstall.c:214
msgid "running postuninstall script (if any)\n"
msgstr "ÉÓĐĎĚÎŃŔ ÓËŇÉĐÔ postuninstall (ĹÓĚÉ ĹÓÔŘ)\n"
-#: lib/uninstall.c:220
+#: lib/uninstall.c:228
msgid "removing database entry\n"
msgstr "ŐÄÁĚŃŔ ÚÁĐÉÓŘ ÂÁÚŮ ÄÁÎÎŮČ\n"
-#: lib/uninstall.c:404
+#: lib/uninstall.c:412
msgid "execution of script failed"
msgstr "ĎŰÉÂËÁ ÉÓĐĎĚÎĹÎÉŃ ÓËŇÉĐÔÁ"
diff --git a/po/sk.po b/po/sk.po
index 8092103cc..3b8f7d0a6 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 2.93\n"
-"POT-Creation-Date: 2000-04-06 10:45-0400\n"
+"POT-Creation-Date: 2000-04-07 11:56-0400\n"
"PO-Revision-Date: 1999-04-08 21:37+02:00\n"
"Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -2115,69 +2115,69 @@ msgstr ""
msgid "dbrecMatchesDepFlags() failed to read header"
msgstr "dbrecMatchesDepFlags() sa nepodarilo prečítať hlavičku"
-#: lib/depends.c:792
+#: lib/depends.c:795
#, c-format
msgid "%s: %s satisfied by added file list.\n"
msgstr ""
-#: lib/depends.c:831
+#: lib/depends.c:834
#, fuzzy, c-format
msgid "%s: %s satisfied by added package.\n"
msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
-#: lib/depends.c:848
+#: lib/depends.c:851
#, c-format
msgid "%s: %s satisfied by added provide.\n"
msgstr ""
-#: lib/depends.c:879
+#: lib/depends.c:882
#, c-format
msgid "%s: %s satisfied by rpmrc provides.\n"
msgstr ""
-#: lib/depends.c:906
+#: lib/depends.c:909
#, c-format
msgid "%s: %s satisfied by db file lists.\n"
msgstr ""
-#: lib/depends.c:931
+#: lib/depends.c:934
#, c-format
msgid "%s: %s satisfied by db provides.\n"
msgstr ""
-#: lib/depends.c:956
+#: lib/depends.c:959
#, fuzzy, c-format
msgid "%s: %s satisfied by db packages.\n"
msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
-#: lib/depends.c:973
+#: lib/depends.c:976
#, c-format
msgid "%s: %s satisfied by rpmlib version.\n"
msgstr ""
-#: lib/depends.c:983
+#: lib/depends.c:986
#, c-format
msgid "%s: %s unsatisfied.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1035
+#: lib/depends.c:1038
#, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "požiadavka balíka %s nie je uspokojená: %s\n"
#. conflicts exist.
-#: lib/depends.c:1097
+#: lib/depends.c:1100
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "balík %s koliduje: %s\n"
-#: lib/depends.c:1152 lib/depends.c:1447
+#: lib/depends.c:1155 lib/depends.c:1450
#, c-format
msgid "cannot read header at %d for dependency check"
msgstr "nie je možné prečítať hlavičku na %d pre kontrolu závislostí"
-#: lib/depends.c:1243
+#: lib/depends.c:1246
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr "slučka v reťazi požiadaviek: %s"
@@ -2193,7 +2193,7 @@ msgid ""
msgstr ""
#: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2189 lib/header.c:2205 lib/header.c:2224
+#: lib/header.c:2188 lib/header.c:2204 lib/header.c:2223
msgid "(not a number)"
msgstr "(nie je číslo)"
@@ -2222,82 +2222,82 @@ msgid "file %s is on an unknown device"
msgstr "súbor %s sa nachádza na neznámom zariadení"
#. This should not be allowed
-#: lib/header.c:220
+#: lib/header.c:219
msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
msgstr "grabData() RPM_STRING_TYPE počet musí byť 1.\n"
-#: lib/header.c:251 lib/header.c:814
+#: lib/header.c:250 lib/header.c:813
#, c-format
msgid "Data type %d not supported\n"
msgstr "Typ údajov %d nie je podorovaný\n"
-#: lib/header.c:1173
+#: lib/header.c:1172
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr "Chybný počet pre headerAddEntry(): %d\n"
-#: lib/header.c:1582
+#: lib/header.c:1581
#, c-format
msgid "missing { after %"
msgstr "chýbajúce { po %"
-#: lib/header.c:1610
+#: lib/header.c:1609
msgid "missing } after %{"
msgstr "chýbajúce } po %{"
-#: lib/header.c:1622
+#: lib/header.c:1621
msgid "empty tag format"
msgstr "prázdny tag formát"
-#: lib/header.c:1632
+#: lib/header.c:1631
msgid "empty tag name"
msgstr "prázdne meno tagu"
-#: lib/header.c:1647
+#: lib/header.c:1646
msgid "unknown tag"
msgstr "neznámy tag"
-#: lib/header.c:1673
+#: lib/header.c:1672
msgid "] expected at end of array"
msgstr "] očakávané na konci poľa"
-#: lib/header.c:1689
+#: lib/header.c:1688
msgid "unexpected ]"
msgstr "neočakávané ]"
-#: lib/header.c:1691
+#: lib/header.c:1690
msgid "unexpected }"
msgstr "neočakávané }"
-#: lib/header.c:1745
+#: lib/header.c:1744
msgid "? expected in expression"
msgstr "? očakávané vo výraze"
-#: lib/header.c:1752
+#: lib/header.c:1751
msgid "{ expected after ? in expression"
msgstr "{ očakávané po ? vo výraze"
-#: lib/header.c:1762 lib/header.c:1797
+#: lib/header.c:1761 lib/header.c:1796
msgid "} expected in expression"
msgstr "} očakávané vo výraze"
-#: lib/header.c:1770
+#: lib/header.c:1769
msgid ": expected following ? subexpression"
msgstr ": očakávané po ? podvýraze"
-#: lib/header.c:1784
+#: lib/header.c:1783
msgid "{ expected after : in expression"
msgstr "{ očakávané po : vo výraze"
-#: lib/header.c:1805
+#: lib/header.c:1804
msgid "| expected at end of expression"
msgstr "| očakávené na konci výrazu"
-#: lib/header.c:1973
+#: lib/header.c:1972
msgid "(unknown type)"
msgstr "(neznámy typ)"
-#: lib/install.c:146 lib/uninstall.c:192
+#: lib/install.c:146 lib/uninstall.c:200
#, c-format
msgid " file: %s action: %s\n"
msgstr " súbor: akcia %s: %s\n"
@@ -2365,7 +2365,7 @@ msgstr "zdrojový balík neobsahuje žiadny .spec súbor"
msgid "renaming %s to %s\n"
msgstr "premenováva sa %s na %s\n"
-#: lib/install.c:562 lib/install.c:846 lib/uninstall.c:31
+#: lib/install.c:562 lib/install.c:854 lib/uninstall.c:31
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "premenovanie %s na %s zlyhalo: %s"
@@ -2379,25 +2379,25 @@ msgstr "očakávaný zdrojový balík, nájdený binárny"
msgid "package: %s-%s-%s files test = %d\n"
msgstr "balík: %s-%s-%s test súborov = %d\n"
-#: lib/install.c:776
+#: lib/install.c:784
msgid "stopping install as we're running --test\n"
msgstr "inštalácia zastavená kvôli režimu --test\n"
-#: lib/install.c:781
+#: lib/install.c:789
msgid "running preinstall script (if any)\n"
msgstr "vykonávajú sa predinštalačné skripty (ak existujú)\n"
-#: lib/install.c:806
+#: lib/install.c:814
#, c-format
msgid "warning: %s created as %s"
msgstr "varovanie: %s vytvorené ako %s"
-#: lib/install.c:842
+#: lib/install.c:850
#, c-format
msgid "warning: %s saved as %s"
msgstr "varovanie: %s uchovaný ako %s"
-#: lib/install.c:916
+#: lib/install.c:924
#, fuzzy
msgid "running postinstall scripts (if any)\n"
msgstr "vykonávajú sa poinštalačné skripty (ak existujú)\n"
@@ -2795,7 +2795,7 @@ msgstr "zobraziiť stav daných súborov"
msgid "display a verbose file listing"
msgstr "zobraziť podrobný zoznam súborov balíka"
-#: lib/rebuilddb.c:34 lib/rpmdb.c:294
+#: lib/rebuilddb.c:34 lib/rpmdb.c:295
msgid "no dbpath has been set"
msgstr "nebola nastavená žiadna dbpath"
@@ -2951,30 +2951,30 @@ msgstr ")"
msgid "OK"
msgstr "V PORIADKU"
-#: lib/rpmdb.c:190
+#: lib/rpmdb.c:192
#, c-format
msgid "opening database mode 0x%x in %s\n"
msgstr "otvára sa databáza s právami 0x%x v %s\n"
-#: lib/rpmdb.c:202 lib/url.c:445
+#: lib/rpmdb.c:204 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "nepodarilo sa otvoriť %s: %s"
-#: lib/rpmdb.c:216 lib/rpmdb.c:224
+#: lib/rpmdb.c:218 lib/rpmdb.c:226
#, c-format
msgid "cannot get %s lock on database"
msgstr "nie je možné získať %s zámok pre databázu"
-#: lib/rpmdb.c:217
+#: lib/rpmdb.c:219
msgid "exclusive"
msgstr "výhradný"
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:227
msgid "shared"
msgstr "zdieľaný"
-#: lib/rpmdb.c:267
+#: lib/rpmdb.c:268
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
@@ -2982,66 +2982,72 @@ msgstr ""
"existuje databáza v starom formáte; použite --rebuilddb pre vytvorenie "
"databázy v novom formáte"
+#. error
#: lib/rpmdb.c:554
#, fuzzy, c-format
+msgid "cannot retrieve package \"%s\" from db"
+msgstr "nie je možné otvoriť %s/packages.rpm\n"
+
+#: lib/rpmdb.c:583
+#, fuzzy, c-format
msgid "package not found with key \"%s\" in %s"
msgstr "balík %s nebol nájdený v %s"
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:592
#, fuzzy, c-format
msgid "key \"%s\" not found in %s"
msgstr "balík %s nebol nájdený v %s"
-#: lib/rpmdb.c:581
+#: lib/rpmdb.c:610
#, fuzzy, c-format
msgid "rpmdbRemove: cannot read header at 0x%x"
msgstr "nie je možné prečítať hlavičku na %d pre vyhľadanie"
-#: lib/rpmdb.c:609
+#: lib/rpmdb.c:638
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "odstraňuje sa záznam z databázy\n"
-#: lib/rpmdb.c:615
+#: lib/rpmdb.c:644
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstraňuje sa index skupín\n"
-#: lib/rpmdb.c:623
+#: lib/rpmdb.c:652
#, fuzzy, c-format
msgid "removing %d entries in %s index:\n"
msgstr "odstraňuje sa index názvov\n"
-#: lib/rpmdb.c:627 lib/rpmdb.c:812
+#: lib/rpmdb.c:656 lib/rpmdb.c:841
#, c-format
msgid "\t%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:745
+#: lib/rpmdb.c:774
msgid "cannot allocate space for database"
msgstr "nie je možné prideliť miesto pre databázu"
-#: lib/rpmdb.c:789
+#: lib/rpmdb.c:818
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:801
+#: lib/rpmdb.c:830
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "premenováva sa %s na %s\n"
-#: lib/rpmdb.c:808
+#: lib/rpmdb.c:837
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:866
+#: lib/rpmdb.c:895
#, c-format
msgid "cannot read header at %d for update"
msgstr "nie je možné prečítať hlavičku na %d pre úpravu"
-#: lib/rpmdb.c:879
+#: lib/rpmdb.c:908
msgid "header changed size!"
msgstr "zmenila sa veľkosť hlavičky!"
@@ -3483,25 +3489,25 @@ msgstr "odstránenie %s zlyhalo: %s"
msgid "cannot read header at %d for uninstall"
msgstr "nie je možné prečítať hlavičku na %d pre odinštalovanie"
-#: lib/uninstall.c:105
+#: lib/uninstall.c:106
#, c-format
msgid "cannot read packages named %s for uninstall"
msgstr "nie je možné prečítať balíky %s pre odinštalovanie"
-#: lib/uninstall.c:138
+#: lib/uninstall.c:146
#, c-format
msgid "will remove files test = %d\n"
msgstr "budú sa odstraňovať súbory test = %d\n"
-#: lib/uninstall.c:206
+#: lib/uninstall.c:214
msgid "running postuninstall script (if any)\n"
msgstr "vykonávajú sa postdeinštalačné skripty (ak existujú)\n"
-#: lib/uninstall.c:220
+#: lib/uninstall.c:228
msgid "removing database entry\n"
msgstr "odstraňuje sa záznam z databázy\n"
-#: lib/uninstall.c:404
+#: lib/uninstall.c:412
msgid "execution of script failed"
msgstr "vykonanie skriptu zlyhalo"
diff --git a/po/sl.po b/po/sl.po
index b1e47a914..3756b9265 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 <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.22 2000/04/06 15:20:31 jbj Exp $
+# $Id: sl.po,v 1.23 2000/04/07 16:09:27 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-04-06 10:45-0400\n"
+"POT-Creation-Date: 2000-04-07 11:56-0400\n"
"PO-Revision-Date: 2000-02-17 22:25+01:00\n"
"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -2098,69 +2098,69 @@ msgstr " %s A %s\tB %s\n"
msgid "dbrecMatchesDepFlags() failed to read header"
msgstr "dbrecMatchesDepFlags() ni uspel prebrati glave"
-#: lib/depends.c:792
+#: lib/depends.c:795
#, c-format
msgid "%s: %s satisfied by added file list.\n"
msgstr "%s: %s zadovoljen ob dodatnem seznamu datotek.\n"
-#: lib/depends.c:831
+#: lib/depends.c:834
#, c-format
msgid "%s: %s satisfied by added package.\n"
msgstr "%s: %s zadovoljen ob dodatnem paketu.\n"
-#: lib/depends.c:848
+#: lib/depends.c:851
#, c-format
msgid "%s: %s satisfied by added provide.\n"
msgstr "%s: %s zadovoljen ob dodatni ponudbi.\n"
-#: lib/depends.c:879
+#: lib/depends.c:882
#, c-format
msgid "%s: %s satisfied by rpmrc provides.\n"
msgstr "%s: %s zadovoljen ob dodatnem ponudbi rpmrc.\n"
-#: lib/depends.c:906
+#: lib/depends.c:909
#, c-format
msgid "%s: %s satisfied by db file lists.\n"
msgstr "%s: %s zadovoljen ob seznamu datotek db.\n"
-#: lib/depends.c:931
+#: lib/depends.c:934
#, c-format
msgid "%s: %s satisfied by db provides.\n"
msgstr "%s: %s zadovoljen ob ponudbi db.\n"
-#: lib/depends.c:956
+#: lib/depends.c:959
#, c-format
msgid "%s: %s satisfied by db packages.\n"
msgstr "%s: %s zadovoljen ob paketih db.\n"
-#: lib/depends.c:973
+#: lib/depends.c:976
#, c-format
msgid "%s: %s satisfied by rpmlib version.\n"
msgstr "%s: %s zadovoljen ob različici rpmlib.\n"
-#: lib/depends.c:983
+#: lib/depends.c:986
#, c-format
msgid "%s: %s unsatisfied.\n"
msgstr "%s: %s nezadovoljen.\n"
#. requirements are not satisfied.
-#: lib/depends.c:1035
+#: lib/depends.c:1038
#, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "paket %s zahteva, a ni zadovoljeno: %s\n"
#. conflicts exist.
-#: lib/depends.c:1097
+#: lib/depends.c:1100
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "paket %s v sporu: %s\n"
-#: lib/depends.c:1152 lib/depends.c:1447
+#: lib/depends.c:1155 lib/depends.c:1450
#, c-format
msgid "cannot read header at %d for dependency check"
msgstr "ni možno prebrati glave pri %d za preizkus soodvisnosti"
-#: lib/depends.c:1243
+#: lib/depends.c:1246
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr "zanka v predpogojevani verigi: %s"
@@ -2180,7 +2180,7 @@ msgstr ""
"na strani http://www.rpm.org ali po dopisni listi rpm-list@redhat.com.\n"
#: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2189 lib/header.c:2205 lib/header.c:2224
+#: lib/header.c:2188 lib/header.c:2204 lib/header.c:2223
msgid "(not a number)"
msgstr "(ni število)"
@@ -2209,82 +2209,82 @@ msgid "file %s is on an unknown device"
msgstr "datoteka %s se nahaja na neznani napravi"
#. This should not be allowed
-#: lib/header.c:220
+#: lib/header.c:219
msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
msgstr "števec grabData() RPM_STRING_TYPE mora biti 1.\n"
-#: lib/header.c:251 lib/header.c:814
+#: lib/header.c:250 lib/header.c:813
#, c-format
msgid "Data type %d not supported\n"
msgstr "Tip podatkov %d ni podprt\n"
-#: lib/header.c:1173
+#: lib/header.c:1172
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr "Okvarjen števec za headerAddEntry(): %d\n"
-#: lib/header.c:1582
+#: lib/header.c:1581
#, c-format
msgid "missing { after %"
msgstr "manjkajoči { za %"
-#: lib/header.c:1610
+#: lib/header.c:1609
msgid "missing } after %{"
msgstr "manjkajoči } za %{"
-#: lib/header.c:1622
+#: lib/header.c:1621
msgid "empty tag format"
msgstr "oblika značke manjka"
-#: lib/header.c:1632
+#: lib/header.c:1631
msgid "empty tag name"
msgstr "ime značke manjka"
-#: lib/header.c:1647
+#: lib/header.c:1646
msgid "unknown tag"
msgstr "neznana značka"
-#: lib/header.c:1673
+#: lib/header.c:1672
msgid "] expected at end of array"
msgstr "] ni pričakovan na koncu polja"
-#: lib/header.c:1689
+#: lib/header.c:1688
msgid "unexpected ]"
msgstr "nepričakovan ]"
-#: lib/header.c:1691
+#: lib/header.c:1690
msgid "unexpected }"
msgstr "nepričakovan }"
-#: lib/header.c:1745
+#: lib/header.c:1744
msgid "? expected in expression"
msgstr "? pričakovan v izrazu"
-#: lib/header.c:1752
+#: lib/header.c:1751
msgid "{ expected after ? in expression"
msgstr "{ pričakovan za ? v izrazu"
-#: lib/header.c:1762 lib/header.c:1797
+#: lib/header.c:1761 lib/header.c:1796
msgid "} expected in expression"
msgstr "} pričakovan v izrazu"
-#: lib/header.c:1770
+#: lib/header.c:1769
msgid ": expected following ? subexpression"
msgstr ": pričakovan za podizrazom ?"
-#: lib/header.c:1784
+#: lib/header.c:1783
msgid "{ expected after : in expression"
msgstr "{ pričakovan za : v izrazu"
-#: lib/header.c:1805
+#: lib/header.c:1804
msgid "| expected at end of expression"
msgstr "| pričakovan na koncu izraza"
-#: lib/header.c:1973
+#: lib/header.c:1972
msgid "(unknown type)"
msgstr "(neznan tip)"
-#: lib/install.c:146 lib/uninstall.c:192
+#: lib/install.c:146 lib/uninstall.c:200
#, c-format
msgid " file: %s action: %s\n"
msgstr " datoteka: %s akcija: %s\n"
@@ -2352,7 +2352,7 @@ msgstr "izvorni paket ne vsebuje datoteke .spec"
msgid "renaming %s to %s\n"
msgstr "preimenujemo %s v %s\n"
-#: lib/install.c:562 lib/install.c:846 lib/uninstall.c:31
+#: lib/install.c:562 lib/install.c:854 lib/uninstall.c:31
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "preimenovanje %s v %s neuspešno: %s"
@@ -2366,25 +2366,25 @@ msgstr "pričakovan izvorni paket, najden binarni"
msgid "package: %s-%s-%s files test = %d\n"
msgstr "paket: %s-%s-%s datoteke test = %d\n"
-#: lib/install.c:776
+#: lib/install.c:784
msgid "stopping install as we're running --test\n"
msgstr "ustavljamo namestitev ker tečemo kot --test\n"
-#: lib/install.c:781
+#: lib/install.c:789
msgid "running preinstall script (if any)\n"
msgstr "poganjamo prednamestitvene skripte (če obstajajo)\n"
-#: lib/install.c:806
+#: lib/install.c:814
#, c-format
msgid "warning: %s created as %s"
msgstr "opozorilo: %s ustvarjen kot %s"
-#: lib/install.c:842
+#: lib/install.c:850
#, c-format
msgid "warning: %s saved as %s"
msgstr "opozorilo: %s shranjen kot %s"
-#: lib/install.c:916
+#: lib/install.c:924
msgid "running postinstall scripts (if any)\n"
msgstr "poganjamo ponamestitvene skripte (če obstajajo)\n"
@@ -2781,7 +2781,7 @@ msgstr "izpis stanja seznama datotek"
msgid "display a verbose file listing"
msgstr "izpis obširnega seznama datotek"
-#: lib/rebuilddb.c:34 lib/rpmdb.c:294
+#: lib/rebuilddb.c:34 lib/rpmdb.c:295
msgid "no dbpath has been set"
msgstr "dbpath ni nastavljena"
@@ -2937,95 +2937,101 @@ msgstr ")"
msgid "OK"
msgstr "V REDU"
-#: lib/rpmdb.c:190
+#: lib/rpmdb.c:192
#, c-format
msgid "opening database mode 0x%x in %s\n"
msgstr "odpiramo datoteko z načinom 0x%x v %s\n"
-#: lib/rpmdb.c:202 lib/url.c:445
+#: lib/rpmdb.c:204 lib/url.c:445
#, c-format
msgid "failed to open %s: %s\n"
msgstr "neuspešno odpiranje %s: %s\n"
-#: lib/rpmdb.c:216 lib/rpmdb.c:224
+#: lib/rpmdb.c:218 lib/rpmdb.c:226
#, c-format
msgid "cannot get %s lock on database"
msgstr "datoteke ni možno %s zakleniti"
-#: lib/rpmdb.c:217
+#: lib/rpmdb.c:219
msgid "exclusive"
msgstr "izključujoče"
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:227
msgid "shared"
msgstr "deljeno"
-#: lib/rpmdb.c:267
+#: lib/rpmdb.c:268
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr "staro obliko podatkove zbirke pretvorite v novo z --rebuilddb"
+#. error
#: lib/rpmdb.c:554
#, fuzzy, c-format
+msgid "cannot retrieve package \"%s\" from db"
+msgstr "paketa ni možno odpreti: %s\n"
+
+#: lib/rpmdb.c:583
+#, fuzzy, c-format
msgid "package not found with key \"%s\" in %s"
msgstr "paketa %s ni najti v %s"
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:592
#, fuzzy, c-format
msgid "key \"%s\" not found in %s"
msgstr "paketa %s ni najti v %s"
-#: lib/rpmdb.c:581
+#: lib/rpmdb.c:610
#, fuzzy, c-format
msgid "rpmdbRemove: cannot read header at 0x%x"
msgstr "ni možno prebrati glave pri %d za vpogled"
-#: lib/rpmdb.c:609
+#: lib/rpmdb.c:638
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "odstranjujemo vnose v podatkovni zbirki\n"
-#: lib/rpmdb.c:615
+#: lib/rpmdb.c:644
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstranjujemo seznam skupin\n"
-#: lib/rpmdb.c:623
+#: lib/rpmdb.c:652
#, fuzzy, c-format
msgid "removing %d entries in %s index:\n"
msgstr "odstranjujemo seznam imen\n"
-#: lib/rpmdb.c:627 lib/rpmdb.c:812
+#: lib/rpmdb.c:656 lib/rpmdb.c:841
#, c-format
msgid "\t%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:745
+#: lib/rpmdb.c:774
msgid "cannot allocate space for database"
msgstr "ni možno zagotoviti prostora za podatkovno zbirko"
-#: lib/rpmdb.c:789
+#: lib/rpmdb.c:818
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:801
+#: lib/rpmdb.c:830
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "preimenujemo %s v %s\n"
-#: lib/rpmdb.c:808
+#: lib/rpmdb.c:837
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:866
+#: lib/rpmdb.c:895
#, c-format
msgid "cannot read header at %d for update"
msgstr "glave pri %d ni možno prebrati za obnovo"
-#: lib/rpmdb.c:879
+#: lib/rpmdb.c:908
msgid "header changed size!"
msgstr "velikost glave se je spremenila!"
@@ -3465,25 +3471,25 @@ msgstr "odstranitev %s neuspešna: %s"
msgid "cannot read header at %d for uninstall"
msgstr "ni možno prebrati glave pri %d za odstranitev"
-#: lib/uninstall.c:105
+#: lib/uninstall.c:106
#, c-format
msgid "cannot read packages named %s for uninstall"
msgstr "paketa %s ni možno prebrati za odnamestitev"
-#: lib/uninstall.c:138
+#: lib/uninstall.c:146
#, c-format
msgid "will remove files test = %d\n"
msgstr "datoteke bomo odstranili, test = %d\n"
-#: lib/uninstall.c:206
+#: lib/uninstall.c:214
msgid "running postuninstall script (if any)\n"
msgstr "poganjamo poodnamestitvene skripte (če obstajajo)\n"
-#: lib/uninstall.c:220
+#: lib/uninstall.c:228
msgid "removing database entry\n"
msgstr "odstranjujemo vnose v podatkovni zbirki\n"
-#: lib/uninstall.c:404
+#: lib/uninstall.c:412
msgid "execution of script failed"
msgstr "skript se ni uspešno izvedel"
diff --git a/po/sr.po b/po/sr.po
index 184b26e72..cd4910d8f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-04-06 10:45-0400\n"
+"POT-Creation-Date: 2000-04-07 11:56-0400\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-05-02 21:41:47-0400\n"
"From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -2145,69 +2145,69 @@ msgstr ""
msgid "dbrecMatchesDepFlags() failed to read header"
msgstr ""
-#: lib/depends.c:792
+#: lib/depends.c:795
#, c-format
msgid "%s: %s satisfied by added file list.\n"
msgstr ""
-#: lib/depends.c:831
+#: lib/depends.c:834
#, fuzzy, c-format
msgid "%s: %s satisfied by added package.\n"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/depends.c:848
+#: lib/depends.c:851
#, c-format
msgid "%s: %s satisfied by added provide.\n"
msgstr ""
-#: lib/depends.c:879
+#: lib/depends.c:882
#, c-format
msgid "%s: %s satisfied by rpmrc provides.\n"
msgstr ""
-#: lib/depends.c:906
+#: lib/depends.c:909
#, c-format
msgid "%s: %s satisfied by db file lists.\n"
msgstr ""
-#: lib/depends.c:931
+#: lib/depends.c:934
#, c-format
msgid "%s: %s satisfied by db provides.\n"
msgstr ""
-#: lib/depends.c:956
+#: lib/depends.c:959
#, fuzzy, c-format
msgid "%s: %s satisfied by db packages.\n"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/depends.c:973
+#: lib/depends.c:976
#, c-format
msgid "%s: %s satisfied by rpmlib version.\n"
msgstr ""
-#: lib/depends.c:983
+#: lib/depends.c:986
#, c-format
msgid "%s: %s unsatisfied.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1035
+#: lib/depends.c:1038
#, fuzzy, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "paket %s nije naveden u %s"
#. conflicts exist.
-#: lib/depends.c:1097
+#: lib/depends.c:1100
#, fuzzy, c-format
msgid "package %s conflicts: %s\n"
msgstr "paket %s nije naveden u %s"
-#: lib/depends.c:1152 lib/depends.c:1447
+#: lib/depends.c:1155 lib/depends.c:1450
#, c-format
msgid "cannot read header at %d for dependency check"
msgstr "ne mogu da pročitam zaglavlje na %s za proveru zavisnosti"
-#: lib/depends.c:1243
+#: lib/depends.c:1246
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr "petlja u lancu: %s"
@@ -2223,7 +2223,7 @@ msgid ""
msgstr ""
#: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2189 lib/header.c:2205 lib/header.c:2224
+#: lib/header.c:2188 lib/header.c:2204 lib/header.c:2223
msgid "(not a number)"
msgstr "(nije broj)"
@@ -2252,84 +2252,84 @@ msgid "file %s is on an unknown device"
msgstr ""
#. This should not be allowed
-#: lib/header.c:220
+#: lib/header.c:219
msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:251 lib/header.c:814
+#: lib/header.c:250 lib/header.c:813
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1173
+#: lib/header.c:1172
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
-#: lib/header.c:1582
+#: lib/header.c:1581
#, c-format
msgid "missing { after %"
msgstr "nedostaje { posle %"
-#: lib/header.c:1610
+#: lib/header.c:1609
msgid "missing } after %{"
msgstr "nedostaje } posle %"
-#: lib/header.c:1622
+#: lib/header.c:1621
msgid "empty tag format"
msgstr "prazan 'tag' format'"
-#: lib/header.c:1632
+#: lib/header.c:1631
msgid "empty tag name"
msgstr "prazno ime tag-a"
-#: lib/header.c:1647
+#: lib/header.c:1646
msgid "unknown tag"
msgstr "nepoznat tag"
-#: lib/header.c:1673
+#: lib/header.c:1672
msgid "] expected at end of array"
msgstr "] očekivano na kraju niza"
-#: lib/header.c:1689
+#: lib/header.c:1688
msgid "unexpected ]"
msgstr "neočekivano ]"
-#: lib/header.c:1691
+#: lib/header.c:1690
msgid "unexpected }"
msgstr "neočekivano }"
-#: lib/header.c:1745
+#: lib/header.c:1744
msgid "? expected in expression"
msgstr "očekivan znak ? u izrazu"
-#: lib/header.c:1752
+#: lib/header.c:1751
#, fuzzy
msgid "{ expected after ? in expression"
msgstr "{ očekivano posle ? u izrazu"
-#: lib/header.c:1762 lib/header.c:1797
+#: lib/header.c:1761 lib/header.c:1796
msgid "} expected in expression"
msgstr "} očekivano u izrazu"
-#: lib/header.c:1770
+#: lib/header.c:1769
msgid ": expected following ? subexpression"
msgstr "očekivano : praćeno ? podizrazom"
-#: lib/header.c:1784
+#: lib/header.c:1783
#, fuzzy
msgid "{ expected after : in expression"
msgstr "{ očekivano posle : u izrazu"
-#: lib/header.c:1805
+#: lib/header.c:1804
msgid "| expected at end of expression"
msgstr "| očekivano na kraju izraza"
-#: lib/header.c:1973
+#: lib/header.c:1972
msgid "(unknown type)"
msgstr "(nepoznat tip)"
-#: lib/install.c:146 lib/uninstall.c:192
+#: lib/install.c:146 lib/uninstall.c:200
#, fuzzy, c-format
msgid " file: %s action: %s\n"
msgstr "neuspelo otvaranje %s: %s"
@@ -2399,7 +2399,7 @@ msgstr "upit nad paketom koji ima <datoteku>"
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:562 lib/install.c:846 lib/uninstall.c:31
+#: lib/install.c:562 lib/install.c:854 lib/uninstall.c:31
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "preimenovanje %s u %s nije uspelo: %s"
@@ -2413,25 +2413,25 @@ msgstr ""
msgid "package: %s-%s-%s files test = %d\n"
msgstr "paket %s-%s-%s sadrži deljene datoteke\n"
-#: lib/install.c:776
+#: lib/install.c:784
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:781
+#: lib/install.c:789
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:806
+#: lib/install.c:814
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:842
+#: lib/install.c:850
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:916
+#: lib/install.c:924
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2842,7 +2842,7 @@ msgstr ""
msgid "display a verbose file listing"
msgstr "prikaži listu datoteka u paketu"
-#: lib/rebuilddb.c:34 lib/rpmdb.c:294
+#: lib/rebuilddb.c:34 lib/rpmdb.c:295
msgid "no dbpath has been set"
msgstr "dbpath nije određen"
@@ -2999,95 +2999,101 @@ msgstr ""
msgid "OK"
msgstr ""
-#: lib/rpmdb.c:190
+#: lib/rpmdb.c:192
#, fuzzy, c-format
msgid "opening database mode 0x%x in %s\n"
msgstr "rekreiraj bazu podataka iz postojeće baze"
-#: lib/rpmdb.c:202 lib/url.c:445
+#: lib/rpmdb.c:204 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/rpmdb.c:216 lib/rpmdb.c:224
+#: lib/rpmdb.c:218 lib/rpmdb.c:226
#, c-format
msgid "cannot get %s lock on database"
msgstr "ne mogu da dobijem %s zaključavanje baze podataka"
-#: lib/rpmdb.c:217
+#: lib/rpmdb.c:219
msgid "exclusive"
msgstr "ekskluzivno"
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:227
msgid "shared"
msgstr "deljeno"
-#: lib/rpmdb.c:267
+#: lib/rpmdb.c:268
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
+#. error
#: lib/rpmdb.c:554
#, fuzzy, c-format
+msgid "cannot retrieve package \"%s\" from db"
+msgstr "greška: ne mogu da otvorim %s%s/packages.rpm\n"
+
+#: lib/rpmdb.c:583
+#, fuzzy, c-format
msgid "package not found with key \"%s\" in %s"
msgstr "paket %s nije nađen u %s"
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:592
#, fuzzy, c-format
msgid "key \"%s\" not found in %s"
msgstr "paket %s nije nađen u %s"
-#: lib/rpmdb.c:581
+#: lib/rpmdb.c:610
#, fuzzy, c-format
msgid "rpmdbRemove: cannot read header at 0x%x"
msgstr "ne mogu da pročitam zaglavlje na %d za proveru"
-#: lib/rpmdb.c:609
+#: lib/rpmdb.c:638
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:615
+#: lib/rpmdb.c:644
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "greška uklanjanja sloga %s u %s"
-#: lib/rpmdb.c:623
+#: lib/rpmdb.c:652
#, fuzzy, c-format
msgid "removing %d entries in %s index:\n"
msgstr "greška uklanjanja sloga %s u %s"
-#: lib/rpmdb.c:627 lib/rpmdb.c:812
+#: lib/rpmdb.c:656 lib/rpmdb.c:841
#, c-format
msgid "\t%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:745
+#: lib/rpmdb.c:774
msgid "cannot allocate space for database"
msgstr "ne mogu da zauzmem prostor za bazu podataka"
-#: lib/rpmdb.c:789
+#: lib/rpmdb.c:818
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:801
+#: lib/rpmdb.c:830
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:808
+#: lib/rpmdb.c:837
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:866
+#: lib/rpmdb.c:895
#, c-format
msgid "cannot read header at %d for update"
msgstr "ne mogu da pročitam zaglavlje na %d za ažuriranje"
-#: lib/rpmdb.c:879
+#: lib/rpmdb.c:908
msgid "header changed size!"
msgstr ""
@@ -3550,25 +3556,25 @@ msgstr "uklanjanje %s nije uspelo: %s"
msgid "cannot read header at %d for uninstall"
msgstr "ne mogu da pročitam zaglavlje na %d za deinstalaciju"
-#: lib/uninstall.c:105
+#: lib/uninstall.c:106
#, fuzzy, c-format
msgid "cannot read packages named %s for uninstall"
msgstr "ne mogu da pročitam zaglavlje na %d za deinstalaciju"
-#: lib/uninstall.c:138
+#: lib/uninstall.c:146
#, c-format
msgid "will remove files test = %d\n"
msgstr ""
-#: lib/uninstall.c:206
+#: lib/uninstall.c:214
msgid "running postuninstall script (if any)\n"
msgstr ""
-#: lib/uninstall.c:220
+#: lib/uninstall.c:228
msgid "removing database entry\n"
msgstr ""
-#: lib/uninstall.c:404
+#: lib/uninstall.c:412
msgid "execution of script failed"
msgstr "neuspelo izvršavanje skripta"
diff --git a/po/sv.po b/po/sv.po
index 5231acee1..84f38374b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,12 +1,12 @@
# Swedish messages for RPM
# Copyright Š 1999 Free Software Foundation, Inc.
# Göran Uddeborg <göran@uddeborg.pp.se>, 1999, 2000.
-# $Revision: 1.82 $
+# $Revision: 1.83 $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-04-06 10:45-0400\n"
+"POT-Creation-Date: 2000-04-07 11:56-0400\n"
"PO-Revision-Date: 2000-02-21 12:20+0100\n"
"Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -2087,69 +2087,69 @@ msgstr " %s A %s\tB %s\n"
msgid "dbrecMatchesDepFlags() failed to read header"
msgstr "dbrecMatchesDepFlags() kunde inte läsa huvud"
-#: lib/depends.c:792
+#: lib/depends.c:795
#, c-format
msgid "%s: %s satisfied by added file list.\n"
msgstr "%s: %s uppfyllt av tillagd fillista.\n"
-#: lib/depends.c:831
+#: lib/depends.c:834
#, c-format
msgid "%s: %s satisfied by added package.\n"
msgstr "%s: %s uppfyllt av tillagt paket.\n"
-#: lib/depends.c:848
+#: lib/depends.c:851
#, c-format
msgid "%s: %s satisfied by added provide.\n"
msgstr "%s: %s uppfyllt av tillagt tillhandahĺllande (provide).\n"
-#: lib/depends.c:879
+#: lib/depends.c:882
#, c-format
msgid "%s: %s satisfied by rpmrc provides.\n"
msgstr "%s: %s uppfyllt av tillhandahĺllanden (provides) frĺn rpmrc.\n"
-#: lib/depends.c:906
+#: lib/depends.c:909
#, c-format
msgid "%s: %s satisfied by db file lists.\n"
msgstr "%s: %s uppfyllt av fillistor frĺn db.\n"
-#: lib/depends.c:931
+#: lib/depends.c:934
#, c-format
msgid "%s: %s satisfied by db provides.\n"
msgstr "%s: %s uppfyllt av tillhandahĺllanden (provides) frĺn db.\n"
-#: lib/depends.c:956
+#: lib/depends.c:959
#, c-format
msgid "%s: %s satisfied by db packages.\n"
msgstr "%s: %s uppfyllt av db-paket.\n"
-#: lib/depends.c:973
+#: lib/depends.c:976
#, c-format
msgid "%s: %s satisfied by rpmlib version.\n"
msgstr "%s: %s uppfyllt av rpmlib-version.\n"
-#: lib/depends.c:983
+#: lib/depends.c:986
#, c-format
msgid "%s: %s unsatisfied.\n"
msgstr "%s: %s ej uppfyllt.\n"
#. requirements are not satisfied.
-#: lib/depends.c:1035
+#: lib/depends.c:1038
#, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "paket %s behov inte uppfyllda: %s\n"
#. conflicts exist.
-#: lib/depends.c:1097
+#: lib/depends.c:1100
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "paket %s stĺr i konflikt: %s\n"
-#: lib/depends.c:1152 lib/depends.c:1447
+#: lib/depends.c:1155 lib/depends.c:1450
#, c-format
msgid "cannot read header at %d for dependency check"
msgstr "kan inte läsa huvud vid %d för beroendekontroll"
-#: lib/depends.c:1243
+#: lib/depends.c:1246
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr "cirkularitet i kedja av förutsättningar: %s"
@@ -2170,7 +2170,7 @@ msgstr ""
"problemet.\n"
#: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2189 lib/header.c:2205 lib/header.c:2224
+#: lib/header.c:2188 lib/header.c:2204 lib/header.c:2223
msgid "(not a number)"
msgstr "(inte ett tal)"
@@ -2199,82 +2199,82 @@ msgid "file %s is on an unknown device"
msgstr "filen %s är pĺ en okänd enhet"
#. This should not be allowed
-#: lib/header.c:220
+#: lib/header.c:219
msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
msgstr "grabData() RPM_STRING_TYPE mĺste vara 1.\n"
-#: lib/header.c:251 lib/header.c:814
+#: lib/header.c:250 lib/header.c:813
#, c-format
msgid "Data type %d not supported\n"
msgstr "Datatyp %d stöds inte\n"
-#: lib/header.c:1173
+#: lib/header.c:1172
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr "Felaktigt antal till headerAddEntry(): %d\n"
-#: lib/header.c:1582
+#: lib/header.c:1581
#, c-format
msgid "missing { after %"
msgstr "{ fattas efter %"
-#: lib/header.c:1610
+#: lib/header.c:1609
msgid "missing } after %{"
msgstr "} fattas efter %{"
-#: lib/header.c:1622
+#: lib/header.c:1621
msgid "empty tag format"
msgstr "tomt taggformat"
-#: lib/header.c:1632
+#: lib/header.c:1631
msgid "empty tag name"
msgstr "tomt taggnamn"
-#: lib/header.c:1647
+#: lib/header.c:1646
msgid "unknown tag"
msgstr "okänd tagg"
-#: lib/header.c:1673
+#: lib/header.c:1672
msgid "] expected at end of array"
msgstr "] förväntades vid slutet pĺ vektor"
-#: lib/header.c:1689
+#: lib/header.c:1688
msgid "unexpected ]"
msgstr "oväntad ]"
-#: lib/header.c:1691
+#: lib/header.c:1690
msgid "unexpected }"
msgstr "oväntad }"
-#: lib/header.c:1745
+#: lib/header.c:1744
msgid "? expected in expression"
msgstr "? förväntades i uttryck"
-#: lib/header.c:1752
+#: lib/header.c:1751
msgid "{ expected after ? in expression"
msgstr "{ förväntades efter ? i uttryck"
-#: lib/header.c:1762 lib/header.c:1797
+#: lib/header.c:1761 lib/header.c:1796
msgid "} expected in expression"
msgstr "} förväntades i uttryck"
-#: lib/header.c:1770
+#: lib/header.c:1769
msgid ": expected following ? subexpression"
msgstr ": förväntades efter ? i deluttryck"
-#: lib/header.c:1784
+#: lib/header.c:1783
msgid "{ expected after : in expression"
msgstr "{ förväntades efter : i uttryck"
-#: lib/header.c:1805
+#: lib/header.c:1804
msgid "| expected at end of expression"
msgstr "| förväntades vid slutet pĺ uttryck"
-#: lib/header.c:1973
+#: lib/header.c:1972
msgid "(unknown type)"
msgstr "(okänd typ)"
-#: lib/install.c:146 lib/uninstall.c:192
+#: lib/install.c:146 lib/uninstall.c:200
#, c-format
msgid " file: %s action: %s\n"
msgstr " fil: %s ĺtgärd: %s\n"
@@ -2342,7 +2342,7 @@ msgstr "källpaket innehĺller ingen spec-fil"
msgid "renaming %s to %s\n"
msgstr "byter namn pĺ %s till %s\n"
-#: lib/install.c:562 lib/install.c:846 lib/uninstall.c:31
+#: lib/install.c:562 lib/install.c:854 lib/uninstall.c:31
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "namnbyte frĺn %s till %s misslyckades: %s"
@@ -2356,25 +2356,25 @@ msgstr "källpaket förväntades, fann binärpaket"
msgid "package: %s-%s-%s files test = %d\n"
msgstr "paket: %s-%s-%s filtest = %d\n"
-#: lib/install.c:776
+#: lib/install.c:784
msgid "stopping install as we're running --test\n"
msgstr "avbryter installation eftersom vi kör --test\n"
-#: lib/install.c:781
+#: lib/install.c:789
msgid "running preinstall script (if any)\n"
msgstr "kör (eventuellt) preinstalltionsskript\n"
-#: lib/install.c:806
+#: lib/install.c:814
#, c-format
msgid "warning: %s created as %s"
msgstr "varning: %s skapades som %s"
-#: lib/install.c:842
+#: lib/install.c:850
#, c-format
msgid "warning: %s saved as %s"
msgstr "varning: %s sparades som %s"
-#: lib/install.c:916
+#: lib/install.c:924
msgid "running postinstall scripts (if any)\n"
msgstr "kör (eventuellt) postinstallationsskript\n"
@@ -2773,7 +2773,7 @@ msgstr "visa tillstĺnd för de listade filerna"
msgid "display a verbose file listing"
msgstr "visa en utförlig fillistning"
-#: lib/rebuilddb.c:34 lib/rpmdb.c:294
+#: lib/rebuilddb.c:34 lib/rpmdb.c:295
msgid "no dbpath has been set"
msgstr "ingen dbpath har satts"
@@ -2928,30 +2928,30 @@ msgstr ")"
msgid "OK"
msgstr "OK"
-#: lib/rpmdb.c:190
+#: lib/rpmdb.c:192
#, c-format
msgid "opening database mode 0x%x in %s\n"
msgstr "öppnar databas med rättighet 0x%x i %s\n"
-#: lib/rpmdb.c:202 lib/url.c:445
+#: lib/rpmdb.c:204 lib/url.c:445
#, c-format
msgid "failed to open %s: %s\n"
msgstr "kunde inte öppna %s: %s\n"
-#: lib/rpmdb.c:216 lib/rpmdb.c:224
+#: lib/rpmdb.c:218 lib/rpmdb.c:226
#, c-format
msgid "cannot get %s lock on database"
msgstr "kan inte fĺ %s lĺs pĺ databas"
-#: lib/rpmdb.c:217
+#: lib/rpmdb.c:219
msgid "exclusive"
msgstr "uteslutande"
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:227
msgid "shared"
msgstr "delat"
-#: lib/rpmdb.c:267
+#: lib/rpmdb.c:268
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
@@ -2959,66 +2959,72 @@ msgstr ""
"databas i gammalt format finns; använd --rebuilddb för att skapa en databas "
"i nytt format"
+#. error
#: lib/rpmdb.c:554
#, fuzzy, c-format
+msgid "cannot retrieve package \"%s\" from db"
+msgstr "kan inte öppna paket: %s\n"
+
+#: lib/rpmdb.c:583
+#, fuzzy, c-format
msgid "package not found with key \"%s\" in %s"
msgstr "fann ej paket %s i %s"
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:592
#, fuzzy, c-format
msgid "key \"%s\" not found in %s"
msgstr "fann ej paket %s i %s"
-#: lib/rpmdb.c:581
+#: lib/rpmdb.c:610
#, fuzzy, c-format
msgid "rpmdbRemove: cannot read header at 0x%x"
msgstr "kan inte läsa huvud vid %d för uppslagning"
-#: lib/rpmdb.c:609
+#: lib/rpmdb.c:638
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "tar bort databasposter\n"
-#: lib/rpmdb.c:615
+#: lib/rpmdb.c:644
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "tar bort gruppindex\n"
-#: lib/rpmdb.c:623
+#: lib/rpmdb.c:652
#, fuzzy, c-format
msgid "removing %d entries in %s index:\n"
msgstr "tar bort namnindex\n"
-#: lib/rpmdb.c:627 lib/rpmdb.c:812
+#: lib/rpmdb.c:656 lib/rpmdb.c:841
#, c-format
msgid "\t%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:745
+#: lib/rpmdb.c:774
msgid "cannot allocate space for database"
msgstr "kan inte allokera plats för databas"
-#: lib/rpmdb.c:789
+#: lib/rpmdb.c:818
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:801
+#: lib/rpmdb.c:830
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "byter namn pĺ %s till %s\n"
-#: lib/rpmdb.c:808
+#: lib/rpmdb.c:837
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:866
+#: lib/rpmdb.c:895
#, c-format
msgid "cannot read header at %d for update"
msgstr "kan inte läsa huvud vid %d för uppdatering"
-#: lib/rpmdb.c:879
+#: lib/rpmdb.c:908
msgid "header changed size!"
msgstr "huvud ändrade storlek!"
@@ -3458,25 +3464,25 @@ msgstr "borttagning av %s misslyckades: %s"
msgid "cannot read header at %d for uninstall"
msgstr "kan inte läsa huvud vid %d för avinstallation"
-#: lib/uninstall.c:105
+#: lib/uninstall.c:106
#, c-format
msgid "cannot read packages named %s for uninstall"
msgstr "kan inte läsa paket med namn %s för avinstallation"
-#: lib/uninstall.c:138
+#: lib/uninstall.c:146
#, c-format
msgid "will remove files test = %d\n"
msgstr "tar bort filer test = %d\n"
-#: lib/uninstall.c:206
+#: lib/uninstall.c:214
msgid "running postuninstall script (if any)\n"
msgstr "kör (eventuellt) postavinstallationsskript\n"
-#: lib/uninstall.c:220
+#: lib/uninstall.c:228
msgid "removing database entry\n"
msgstr "tar bort databasposter\n"
-#: lib/uninstall.c:404
+#: lib/uninstall.c:412
msgid "execution of script failed"
msgstr "skriptkörning misslyckades"
diff --git a/po/tr.po b/po/tr.po
index a83c9ed7c..86d9ac5f3 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-04-06 10:45-0400\n"
+"POT-Creation-Date: 2000-04-07 11:56-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2183,69 +2183,69 @@ msgstr ""
msgid "dbrecMatchesDepFlags() failed to read header"
msgstr ""
-#: lib/depends.c:792
+#: lib/depends.c:795
#, c-format
msgid "%s: %s satisfied by added file list.\n"
msgstr ""
-#: lib/depends.c:831
+#: lib/depends.c:834
#, fuzzy, c-format
msgid "%s: %s satisfied by added package.\n"
msgstr "%s dosyasý, hiç bir pakete ait deđil\n"
-#: lib/depends.c:848
+#: lib/depends.c:851
#, c-format
msgid "%s: %s satisfied by added provide.\n"
msgstr ""
-#: lib/depends.c:879
+#: lib/depends.c:882
#, c-format
msgid "%s: %s satisfied by rpmrc provides.\n"
msgstr ""
-#: lib/depends.c:906
+#: lib/depends.c:909
#, c-format
msgid "%s: %s satisfied by db file lists.\n"
msgstr ""
-#: lib/depends.c:931
+#: lib/depends.c:934
#, c-format
msgid "%s: %s satisfied by db provides.\n"
msgstr ""
-#: lib/depends.c:956
+#: lib/depends.c:959
#, fuzzy, c-format
msgid "%s: %s satisfied by db packages.\n"
msgstr "%s dosyasý, hiç bir pakete ait deđil\n"
-#: lib/depends.c:973
+#: lib/depends.c:976
#, c-format
msgid "%s: %s satisfied by rpmlib version.\n"
msgstr ""
-#: lib/depends.c:983
+#: lib/depends.c:986
#, c-format
msgid "%s: %s unsatisfied.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1035
+#: lib/depends.c:1038
#, fuzzy, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "%s paketi %s altýnda gözükmüyor"
#. conflicts exist.
-#: lib/depends.c:1097
+#: lib/depends.c:1100
#, fuzzy, c-format
msgid "package %s conflicts: %s\n"
msgstr "%s paketi %s altýnda gözükmüyor"
-#: lib/depends.c:1152 lib/depends.c:1447
+#: lib/depends.c:1155 lib/depends.c:1450
#, c-format
msgid "cannot read header at %d for dependency check"
msgstr "bađýmlýlýk sorgulamasý için %d numaralý baţlýk okunamýyor"
-#: lib/depends.c:1243
+#: lib/depends.c:1246
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr "gerekenler zincirinde döngü: %s"
@@ -2261,7 +2261,7 @@ msgid ""
msgstr ""
#: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2189 lib/header.c:2205 lib/header.c:2224
+#: lib/header.c:2188 lib/header.c:2204 lib/header.c:2223
msgid "(not a number)"
msgstr "(üye deđil)"
@@ -2290,84 +2290,84 @@ msgid "file %s is on an unknown device"
msgstr ""
#. This should not be allowed
-#: lib/header.c:220
+#: lib/header.c:219
msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:251 lib/header.c:814
+#: lib/header.c:250 lib/header.c:813
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1173
+#: lib/header.c:1172
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
-#: lib/header.c:1582
+#: lib/header.c:1581
#, c-format
msgid "missing { after %"
msgstr "% den sonra eksik {"
-#: lib/header.c:1610
+#: lib/header.c:1609
msgid "missing } after %{"
msgstr "%{ den sonra eksik }"
-#: lib/header.c:1622
+#: lib/header.c:1621
msgid "empty tag format"
msgstr "boţ tag tanýmlamasý"
-#: lib/header.c:1632
+#: lib/header.c:1631
msgid "empty tag name"
msgstr "boţ tag ismi"
-#: lib/header.c:1647
+#: lib/header.c:1646
msgid "unknown tag"
msgstr "bilinmeyen tag"
-#: lib/header.c:1673
+#: lib/header.c:1672
msgid "] expected at end of array"
msgstr "dizinin sonunda ] bekleniyordu"
-#: lib/header.c:1689
+#: lib/header.c:1688
msgid "unexpected ]"
msgstr "beklenmeyen ]"
-#: lib/header.c:1691
+#: lib/header.c:1690
msgid "unexpected }"
msgstr "beklenmeyen }"
-#: lib/header.c:1745
+#: lib/header.c:1744
msgid "? expected in expression"
msgstr "dizi içerisinde ? bekleniyordu"
-#: lib/header.c:1752
+#: lib/header.c:1751
#, fuzzy
msgid "{ expected after ? in expression"
msgstr "dizi içerisinde ? den sonra { bekleniyordu"
-#: lib/header.c:1762 lib/header.c:1797
+#: lib/header.c:1761 lib/header.c:1796
msgid "} expected in expression"
msgstr "dizi içerisinde } bekleniyordu"
-#: lib/header.c:1770
+#: lib/header.c:1769
msgid ": expected following ? subexpression"
msgstr "? altdizisinden sonra : bekleniyordu"
-#: lib/header.c:1784
+#: lib/header.c:1783
#, fuzzy
msgid "{ expected after : in expression"
msgstr "dizide : den sonra { bekleniyordu"
-#: lib/header.c:1805
+#: lib/header.c:1804
msgid "| expected at end of expression"
msgstr "dizinin sonunda | bekleniyordu"
-#: lib/header.c:1973
+#: lib/header.c:1972
msgid "(unknown type)"
msgstr "(bilinmeyen tip)"
-#: lib/install.c:146 lib/uninstall.c:192
+#: lib/install.c:146 lib/uninstall.c:200
#, fuzzy, c-format
msgid " file: %s action: %s\n"
msgstr "%s açýlamadý: %s"
@@ -2437,7 +2437,7 @@ msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:562 lib/install.c:846 lib/uninstall.c:31
+#: lib/install.c:562 lib/install.c:854 lib/uninstall.c:31
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "%s 'nin isminin %s 'ye çevrilmesinde belirtilen hata oluţtu: %s"
@@ -2451,25 +2451,25 @@ msgstr ""
msgid "package: %s-%s-%s files test = %d\n"
msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n"
-#: lib/install.c:776
+#: lib/install.c:784
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:781
+#: lib/install.c:789
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:806
+#: lib/install.c:814
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:842
+#: lib/install.c:850
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:916
+#: lib/install.c:924
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2882,7 +2882,7 @@ msgstr ""
msgid "display a verbose file listing"
msgstr "Paketin içerdiđi dosyalarý gösterme"
-#: lib/rebuilddb.c:34 lib/rpmdb.c:294
+#: lib/rebuilddb.c:34 lib/rpmdb.c:295
msgid "no dbpath has been set"
msgstr "dbpath deđeri girilmemiţ"
@@ -3039,96 +3039,102 @@ msgstr ""
msgid "OK"
msgstr ""
-#: lib/rpmdb.c:190
+#: lib/rpmdb.c:192
#, fuzzy, c-format
msgid "opening database mode 0x%x in %s\n"
msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluţturur"
-#: lib/rpmdb.c:202 lib/url.c:445
+#: lib/rpmdb.c:204 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "%s açýlamadý: %s"
-#: lib/rpmdb.c:216 lib/rpmdb.c:224
+#: lib/rpmdb.c:218 lib/rpmdb.c:226
#, c-format
msgid "cannot get %s lock on database"
msgstr "Veritabaný için %s kilit (lock) alýnamadý"
-#: lib/rpmdb.c:217
+#: lib/rpmdb.c:219
msgid "exclusive"
msgstr "özel"
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:227
msgid "shared"
msgstr "paylaţýlan (shared)"
-#: lib/rpmdb.c:267
+#: lib/rpmdb.c:268
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
+#. error
#: lib/rpmdb.c:554
#, fuzzy, c-format
+msgid "cannot retrieve package \"%s\" from db"
+msgstr "hata: %s%s/packages.rpm açýlamýyor\n"
+
+#: lib/rpmdb.c:583
+#, fuzzy, c-format
msgid "package not found with key \"%s\" in %s"
msgstr "%s pakedi %s içerisinde bulunamadý"
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:592
#, fuzzy, c-format
msgid "key \"%s\" not found in %s"
msgstr "%s pakedi %s içerisinde bulunamadý"
-#: lib/rpmdb.c:581
+#: lib/rpmdb.c:610
#, fuzzy, c-format
msgid "rpmdbRemove: cannot read header at 0x%x"
msgstr "%d kaydýndan baţlýk bilgisi okunamadý"
-#: lib/rpmdb.c:609
+#: lib/rpmdb.c:638
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:615
+#: lib/rpmdb.c:644
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
-#: lib/rpmdb.c:623
+#: lib/rpmdb.c:652
#, fuzzy, c-format
msgid "removing %d entries in %s index:\n"
msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
-#: lib/rpmdb.c:627 lib/rpmdb.c:812
+#: lib/rpmdb.c:656 lib/rpmdb.c:841
#, c-format
msgid "\t%6d %s\n"
msgstr ""
# reservieren???
-#: lib/rpmdb.c:745
+#: lib/rpmdb.c:774
msgid "cannot allocate space for database"
msgstr "Veritabaný için yer bulunamadý"
-#: lib/rpmdb.c:789
+#: lib/rpmdb.c:818
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:801
+#: lib/rpmdb.c:830
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:808
+#: lib/rpmdb.c:837
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:866
+#: lib/rpmdb.c:895
#, c-format
msgid "cannot read header at %d for update"
msgstr "%d numaralý paketin güncelleme için gereken 'header' kýsmý okunamadý"
-#: lib/rpmdb.c:879
+#: lib/rpmdb.c:908
msgid "header changed size!"
msgstr ""
@@ -3591,25 +3597,25 @@ msgstr "%s 'in silinmesinde belirtilen hata oluţtu: %s"
msgid "cannot read header at %d for uninstall"
msgstr "%d numaralý paketin silmek için gereken 'header' kýsmý okunamadý"
-#: lib/uninstall.c:105
+#: lib/uninstall.c:106
#, fuzzy, c-format
msgid "cannot read packages named %s for uninstall"
msgstr "%d numaralý paketin silmek için gereken 'header' kýsmý okunamadý"
-#: lib/uninstall.c:138
+#: lib/uninstall.c:146
#, c-format
msgid "will remove files test = %d\n"
msgstr ""
-#: lib/uninstall.c:206
+#: lib/uninstall.c:214
msgid "running postuninstall script (if any)\n"
msgstr ""
-#: lib/uninstall.c:220
+#: lib/uninstall.c:228
msgid "removing database entry\n"
msgstr ""
-#: lib/uninstall.c:404
+#: lib/uninstall.c:412
msgid "execution of script failed"
msgstr "betik (script) çalýţtýrýlamadý "