Initialize dbN vector from dbNopen.
Use db3 return convention for dbNopen.
Always save tag index in join key.
Rename rpmdbAppendIteratorMatches -> rpmdbAppendIterator.
Remove tolerant from rpmdbRemove API.
Use hdrNum rather than offset, tagNum rather than fileNumber most everywhere.
rpmdb.c: Create rpmdbPruneIterator to exclude items from set.
rpmdb.c: Remove legacy code from rpmdbAdd/rpmdbRemove.
rpmdb.c: Rename (shorten) many routines.
tagName.c: prepare for ADDED/REMOVED/AVAILABLE temorary databases.
depends.c: use rpmdbPruneIterator.
depends.c: don't check ranges unless provides names match.
depends.c: Depends now works (watch out for data values of 0).
rpmpopt.in: Add --dbapi and --rebuilddbapi options.
CVS patchset: 3720
CVS date: 2000/05/07 00:53:11
const char * urlfn = NULL;
const char * fn = NULL;
dbiIndex dbi = NULL;
+ extern struct _dbiVec db1vec;
int rc = 0;
if (dbip)
*dbip = NULL;
if ((dbi = db3New(rpmdb, rpmtag)) == NULL)
- return 1;
+ return -1;
dbi->dbi_api = DB_VERSION_MAJOR;
base = db1basename(rpmtag);
(void) urlPath(urlfn, &fn);
if (!(fn && *fn != '\0')) {
rpmError(RPMERR_DBOPEN, _("bad db file %s"), urlfn);
- rc = 1;
+ rc = -1;
goto exit;
}
pkgs = fadOpen(fn, dbi->dbi_mode, dbi->dbi_perms);
if (Ferror(pkgs)) {
+ rc = errno;
rpmError(RPMERR_DBOPEN, _("failed to open %s: %s\n"), urlfn,
Fstrerror(pkgs));
- rc = 1;
goto exit;
}
l.l_type = (dbi->dbi_mode & O_RDWR) ? F_WRLCK : F_RDLCK;
if (Fcntl(pkgs, F_SETLK, (void *) &l)) {
+ rc = errno;
rpmError(RPMERR_FLOCK, _("cannot get %s lock on database"),
((dbi->dbi_mode & O_RDWR) ? _("exclusive") : _("shared")));
- rc = 1;
goto exit;
}
}
dbi->dbi_db = dbopen(fn, dbimode, dbi->dbi_perms,
db3_to_dbtype(dbi->dbi_type), dbopeninfo);
- if (dbi->dbi_db == NULL) rc = 1;
- if (dbi->dbi_debug)
- fprintf(stderr, "db1open: rc %d db %p dbip %p\n", rc, dbi->dbi_db, dbip);
+ if (dbi->dbi_db == NULL) rc = errno;
}
exit:
- if (rc == 0 && dbi->dbi_db != NULL && dbip)
+ if (rc == 0 && dbi->dbi_db != NULL && dbip) {
+ dbi->dbi_vec = &db1vec;
*dbip = dbi;
- else
+ } else
db1close(dbi, 0);
if (base) {
dbi->dbi_rpmdb = rpmdb;
dbi->dbi_rpmtag = rpmtag;
- dbi->dbi_jlen = (rpmtag == RPMTAG_BASENAMES ? 2 : 1) * sizeof(int_32);
+ switch (rpmtag) {
+ case RPMDBI_PACKAGES:
+ case RPMDBI_DEPENDS:
+ dbi->dbi_jlen = 1 * sizeof(int_32);
+ break;
+ default:
+ dbi->dbi_jlen = 2 * sizeof(int_32);
+ break;
+ }
return dbi;
}
rc = cvtdberr(dbi, "dbenv->close", rc, _debug);
if (dbfile)
- rpmMessage(RPMMESS_DEBUG, _("closed db environment %s/%s(%s)\n"),
- dbhome, dbfile, dbsubfile);
+ rpmMessage(RPMMESS_DEBUG, _("closed db environment %s/%s\n"),
+ dbhome, dbfile);
if (rpmdb->db_remove_env || dbi->dbi_tear_down) {
int xx;
xx = cvtdberr(dbi, "dbenv->remove", rc, _debug);
if (dbfile)
- rpmMessage(RPMMESS_DEBUG, _("removed db environment %s/%s(%s)\n"),
- dbhome, dbfile, dbsubfile);
+ rpmMessage(RPMMESS_DEBUG, _("removed db environment %s/%s\n"),
+ dbhome, dbfile);
}
if ( dbi->dbi_mode & O_CREAT) eflags |= DB_CREATE;
if (dbfile)
- rpmMessage(RPMMESS_DEBUG, _("opening db environment %s/%s(%s) %s\n"),
- dbhome, dbfile, dbsubfile, prDbiOpenFlags(eflags, 1));
+ rpmMessage(RPMMESS_DEBUG, _("opening db environment %s/%s %s\n"),
+ dbhome, dbfile, prDbiOpenFlags(eflags, 1));
rc = db_env_create(&dbenv, dbi->dbi_cflags);
rc = cvtdberr(dbi, "db_env_create", rc, _debug);
#if defined(__USE_DB2) || defined(__USE_DB3)
int _printit;
+
rc = db->sync(db, flags);
/* XXX DB_INCOMPLETE is returned occaisionally with multiple access. */
_printit = (rc == DB_INCOMPLETE ? 0 : _debug);
rc = dbcursor->c_get(dbcursor, key, data, rmw | flags);
+ /* XXX DB_NOTFOUND can be returned */
_printit = (rc == DB_NOTFOUND ? 0 : _debug);
rc = cvtdberr(dbi, "dbcursor->c_get", rc, _printit);
return rc;
if (dbcursor == dbi->dbi_rmw)
dbi->dbi_rmw = NULL;
}
- if (dbi->dbi_debug) fprintf(stderr, "db3cclose: rc %d rmw %p\n", rc, dbi->dbi_rmw);
return rc;
}
if (dbcp)
*dbcp = dbi->dbi_rmw;
- if (dbi->dbi_debug) fprintf(stderr, "db3copen: rc %d dbc %p 0x%x rmw %p\n", rc, dbcursor, (dbcursor ? dbcursor->flags : 0), dbi->dbi_rmw);
return rc;
}
if (!dbi->dbi_use_cursors) {
int _printit;
rc = db->get(db, txnid, &key, &data, 0);
+ /* XXX DB_NOTFOUND can be returned */
_printit = (rc == DB_NOTFOUND ? 0 : _debug);
rc = cvtdberr(dbi, "db->get", rc, _printit);
} else {
rc = cvtdberr(dbi, "db->close", rc, _debug);
db = dbi->dbi_db = NULL;
- if (dbfile)
- rpmMessage(RPMMESS_DEBUG, _("closed db index %s/%s(%s)\n"),
- dbhome, dbfile, dbsubfile);
+ rpmMessage(RPMMESS_DEBUG, _("closed db index %s/%s\n"),
+ dbhome, (dbfile ? dbfile : tagName(dbi->dbi_rpmtag)));
}
static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
{
const char * urlfn = NULL;
- const char * dbpath;
const char * dbhome;
const char * dbfile;
const char * dbsubfile;
+ const char * dbpath;
+ extern struct _dbiVec db3vec;
dbiIndex dbi = NULL;
int rc = 0;
+ int xx;
#if defined(__USE_DB2) || defined(__USE_DB3)
DB * db = NULL;
DB_ENV * dbenv = NULL;
DB_TXN * txnid = NULL;
u_int32_t oflags;
+ int _printit;
if (dbip)
*dbip = NULL;
if (dbi->dbi_use_dbenv)
rc = db_init(dbi, dbhome, dbfile, dbsubfile, &dbenv);
- if (dbfile)
- rpmMessage(RPMMESS_DEBUG, _("opening db index %s/%s(%s) %s mode=0x%x\n"),
- dbhome, dbfile, dbsubfile, prDbiOpenFlags(oflags, 0), dbi->dbi_mode);
+ rpmMessage(RPMMESS_DEBUG, _("opening db index %s/%s %s mode=0x%x\n"),
+ dbhome, (dbfile ? dbfile : tagName(dbi->dbi_rpmtag)),
+ prDbiOpenFlags(oflags, 0), dbi->dbi_mode);
if (rc == 0) {
#if defined(__USE_DB3)
}
dbi->dbi_dbinfo = NULL;
- if (!dbi->dbi_use_dbenv && !dbi->dbi_temporary) {
- char * t = alloca(strlen(dbhome) + 1 + strlen(dbfile) + 1);
- stpcpy( stpcpy( stpcpy(t, dbhome), "/"), dbfile);
- dbpath = t;
- } else
- dbpath = dbfile;
+ { const char * dbfullpath;
+ char * t;
+ int nb;
+
+ nb = strlen(dbhome);
+ if (dbfile) nb += 1 + strlen(dbfile);
+ dbfullpath = t = alloca(nb);
+
+ t = stpcpy(t, dbhome);
+ if (dbfile)
+ t = stpcpy( stpcpy( t, "/"), dbfile);
+ dbpath = (!dbi->dbi_use_dbenv && !dbi->dbi_temporary)
+ ? dbfullpath : dbfile;
+ }
rc = db->open(db, dbpath, dbsubfile,
dbi->dbi_type, oflags, dbi->dbi_perms);
- rc = cvtdberr(dbi, "db->open", rc, _debug);
+ /* XXX return rc == errno without printing */
+ _printit = (rc > 0 ? 0 : _debug);
+ xx = cvtdberr(dbi, "db->open", rc, _printit);
if (rc == 0 && dbi->dbi_get_rmw_cursor) {
DBC * dbcursor = NULL;
if (fcntl(fdno, F_SETLK, (void *) &l)) {
rpmError(RPMERR_FLOCK,
- _("cannot get %s lock on %s/%s(%s)\n"),
+ _("cannot get %s lock on %s/%s\n"),
((dbi->dbi_mode & O_RDWR)
? _("exclusive") : _("shared")),
- dbhome, dbfile, dbsubfile);
+ dbhome, dbfile);
rc = 1;
} else if (dbfile) {
rpmMessage(RPMMESS_DEBUG,
- _("locked db index %s/%s(%s)\n"),
- dbhome, dbfile, dbsubfile);
+ _("locked db index %s/%s\n"),
+ dbhome, dbfile);
}
}
}
}
-#else
+#else /* __USE_DB3 */
{ DB_INFO * dbinfo = xcalloc(1, sizeof(*dbinfo));
dbinfo->db_cachesize = dbi->dbi_cachesize;
dbinfo->db_lorder = dbi->dbi_lorder;
dbi->dbi_dbinfo = dbinfo;
rc = db_open(dbfile, dbi->dbi_type, oflags,
dbi->dbi_perms, dbenv, dbinfo, &db);
- rc = cvtdberr(dbi, "db_open", rc, _debug);
+ /* XXX return rc == errno without printing */
+ _printit = (rc > 0 ? 0 : _debug);
+ xx = cvtdberr(dbi, "db->open", rc, _printit);
}
#endif /* __USE_DB3 */
}
dbi->dbi_db = dbopen(dbfile, dbi->dbi_mode, dbi->dbi_perms,
dbi->dbi_type, dbopeninfo);
- if (dbi->dbi_db == NULL) rc = 1;
+ /* XXX return rc == errno without printing */
+ if (dbi->dbi_db == NULL) rc = errno;
#endif /* __USE_DB2 || __USE_DB3 */
- if (rc == 0 && dbi->dbi_db != NULL && dbip != NULL)
+ if (rc == 0 && dbi->dbi_db != NULL && dbip != NULL) {
+ dbi->dbi_vec = &db3vec;
*dbip = dbi;
- else
+ } else
db3close(dbi, 0);
if (urlfn)
{
const int * aptr = a;
const int * bptr = b;
-
- if (*aptr < *bptr)
- return -1;
- else if (*aptr == *bptr)
- return 0;
-
- return 1;
+ int rc = (*aptr - *bptr);
+ return rc;
}
static void parseEVR(char *evr,
result = 0;
for (i = 0; i < providesCount; i++) {
+ /* Filter out provides that came along for the ride. */
+ if (strcmp(provides[i], reqName))
+ continue;
+
result = rangesOverlap(provides[i], providesEVR[i], provideFlags[i],
- reqName, reqEVR, reqFlags);
+ reqName, reqEVR, reqFlags);
/* If this provide matches the require, we're done. */
if (result)
return result;
}
-int headerMatchesDepFlags(Header h, const char *reqName, const char * reqEVR, int reqFlags)
+/* XXX FIXME: eliminate when obsoletes is correctly implemented */
+int headerMatchesDepFlags(Header h,
+ const char * reqName, const char * reqEVR, int reqFlags)
{
const char *name, *version, *release;
int_32 * epoch;
Header h2;
mi = rpmdbInitIterator(rpmdep->db, RPMTAG_NAME, obsoletes[j], 0);
- while((h2 = rpmdbNextIterator(mi)) != NULL) {
- unsigned int recOffset = rpmdbGetIteratorOffset(mi);
- if (bsearch(&recOffset,
- rpmdep->removedPackages, rpmdep->numRemovedPackages,
- sizeof(int), intcmp))
- continue;
+ rpmdbPruneIterator(mi,
+ rpmdep->removedPackages, rpmdep->numRemovedPackages, 1);
+
+ while((h2 = rpmdbNextIterator(mi)) != NULL) {
/*
* Rpm prior to 3.0.3 does not have versioned obsoletes.
* If no obsoletes version info is available, match all names.
*/
if (obsoletesEVR == NULL ||
headerMatchesDepFlags(h2,
- obsoletes[j], obsoletesEVR[j], obsoletesFlags[j])) {
- removePackage(rpmdep, recOffset, alNum);
+ obsoletes[j], obsoletesEVR[j], obsoletesFlags[j]))
+ {
+ removePackage(rpmdep, rpmdbGetIteratorOffset(mi), alNum);
}
}
rpmdbFreeIterator(mi);
for (i = 0; i < dirMatch->numFiles; i++) {
if (!strcmp(dirMatch->files[i].baseName, baseName)) {
if (keyType)
- rpmMessage(RPMMESS_DEBUG, _("%s: %s satisfied by added file "
- "list.\n"), keyType, fileName);
+ rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (added files)\n"),
+ keyType, fileName);
return al->list + dirMatch->files[i].pkgNum;
}
}
(void) stpcpy( stpcpy( stpcpy(t, p->version) , "-") , p->release);
rc = rangesOverlap(p->name, pEVR, pFlags, keyName, keyEVR, keyFlags);
if (keyType && keyDepend && rc)
- rpmMessage(RPMMESS_DEBUG, _("%s: %s satisfied by added package.\n"), keyType, keyDepend);
+ rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (added package)\n"),
+ keyType, keyDepend+2);
} break;
#else
- rpmError(RPMERR_INTERNAL, _("%s: %s satisfied by added package (shouldn't happen).\n"), keyType, keyDepend);
+ rpmError(RPMERR_INTERNAL, _("%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"), keyType, keyDepend+2);
break;
#endif
case IET_PROVIDES:
int proFlags;
/* Filter out provides that came along for the ride. */
- if (strcmp(p->provides[i], keyName)) continue;
+ if (strcmp(p->provides[i], keyName))
+ continue;
proEVR = (p->providesEVR ? p->providesEVR[i] : NULL);
proFlags = (p->provideFlags ? p->provideFlags[i] : 0);
if (rc) break;
}
if (keyType && keyDepend && rc)
- rpmMessage(RPMMESS_DEBUG, _("%s: %s satisfied by added "
- "provide.\n"), keyType, keyDepend+2);
+ rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (added provide)\n"),
+ keyType, keyDepend+2);
break;
}
* Check if dbiOpen/dbiPut failed (e.g. permissions), we can't cache.
*/
if (_cacheDependsRC) {
- mi = rpmdbInitIterator(rpmdep->db, RPMDBI_DEPENDS, keyDepend, 0);
- if (mi) {
- rc = rpmdbGetIteratorOffset(mi);
- rpmdbFreeIterator(mi);
- rpmMessage(RPMMESS_DEBUG, _("%s: %s satisfied by Depends cache.\n"), keyType, keyDepend+2);
- return rc;
+ dbiIndex dbi;
+ dbi = dbiOpen(rpmdep->db, RPMDBI_DEPENDS, 0);
+ if (dbi == NULL)
+ _cacheDependsRC = 0;
+ else {
+ size_t keylen = strlen(keyDepend);
+ void * datap = NULL;
+ size_t datalen = 0;
+ int xx;
+ xx = dbiCopen(dbi, NULL, 0);
+ xx = dbiGet(dbi, (void **)&keyDepend, &keylen, &datap, &datalen, 0);
+ if (xx == 0 && datap && datalen == 4) {
+ memcpy(&rc, datap, datalen);
+ rpmMessage(RPMMESS_DEBUG, _("%s: %-45s %-3s (cached)\n"),
+ keyType, keyDepend, (rc ? "NO" : "YES"));
+ xx = dbiCclose(dbi, NULL, 0);
+ return rc;
+ }
+ xx = dbiCclose(dbi, NULL, 0);
}
- rpmdbFreeIterator(mi);
}
{ const char * rcProvidesString;
i = strlen(keyName);
while ((start = strstr(rcProvidesString, keyName))) {
if (isspace(start[i]) || start[i] == '\0' || start[i] == ',') {
- rpmMessage(RPMMESS_DEBUG, _("%s: %s satisfied by rpmrc provides.\n"), keyType, keyDepend+2);
+ rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (rpmrc provides)\n"),
+ keyType, keyDepend+2);
goto exit;
}
rcProvidesString = start + 1;
/* keyFlags better be 0! */
mi = rpmdbInitIterator(rpmdep->db, RPMTAG_BASENAMES, keyName, 0);
+
+ rpmdbPruneIterator(mi,
+ rpmdep->removedPackages, rpmdep->numRemovedPackages, 1);
+
while ((h = rpmdbNextIterator(mi)) != NULL) {
- unsigned int recOffset = rpmdbGetIteratorOffset(mi);
- if (bsearch(&recOffset,
- rpmdep->removedPackages,
- rpmdep->numRemovedPackages,
- sizeof(int), intcmp))
- continue;
- break;
- }
- rpmdbFreeIterator(mi);
- if (h) {
- rpmMessage(RPMMESS_DEBUG, _("%s: %s satisfied by db file lists.\n"), keyType, keyDepend+2);
+ rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (db files)\n"),
+ keyType, keyDepend+2);
+ rpmdbFreeIterator(mi);
goto exit;
}
+ rpmdbFreeIterator(mi);
}
mi = rpmdbInitIterator(rpmdep->db, RPMTAG_PROVIDENAME, keyName, 0);
+ rpmdbPruneIterator(mi,
+ rpmdep->removedPackages, rpmdep->numRemovedPackages, 1);
while ((h = rpmdbNextIterator(mi)) != NULL) {
- unsigned int recOffset = rpmdbGetIteratorOffset(mi);
- if (bsearch(&recOffset,
- rpmdep->removedPackages,
- rpmdep->numRemovedPackages,
- sizeof(int), intcmp))
- continue;
- if (rangeMatchesDepFlags(h, keyName, keyEVR, keyFlags))
- break;
+ if (rangeMatchesDepFlags(h, keyName, keyEVR, keyFlags)) {
+ rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (db provides)\n"),
+ keyType, keyDepend+2);
+ rpmdbFreeIterator(mi);
+ goto exit;
+ }
}
rpmdbFreeIterator(mi);
- if (h) {
- rpmMessage(RPMMESS_DEBUG, _("%s: %s satisfied by db provides.\n"), keyType, keyDepend+2);
- goto exit;
- }
#ifdef DYING
mi = rpmdbInitIterator(rpmdep->db, RPMTAG_NAME, keyName, 0);
+ rpmdbPruneIterator(mi,
+ rpmdep->removedPackages, rpmdep->numRemovedPackages, 1);
while ((h = rpmdbNextIterator(mi)) != NULL) {
- unsigned int recOffset = rpmdbGetIteratorOffset(mi);
- if (bsearch(&recOffset,
- rpmdep->removedPackages,
- rpmdep->numRemovedPackages,
- sizeof(int), intcmp))
- continue;
- if (headerMatchesDepFlags(h, keyName, keyEVR, keyFlags))
- break;
+ if (headerMatchesDepFlags(h, keyName, keyEVR, keyFlags)) {
+ rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (db packages)\n"),
+ keyType, keyDepend+2);
+ rpmdbFreeIterator(mi);
+ goto exit;
+ }
}
rpmdbFreeIterator(mi);
- if (h) {
- rpmMessage(RPMMESS_DEBUG, _("%s: %s satisfied by db packages.\n"), keyType, keyDepend+2);
- goto exit;
- }
#endif
/*
if (!strcmp(keyName, rpmNAME)) {
i = rangesOverlap(keyName, keyEVR, keyFlags, rpmNAME, rpmEVR, rpmFLAGS);
if (i) {
- rpmMessage(RPMMESS_DEBUG, _("%s: %s satisfied by rpmlib version.\n"), keyType, keyDepend+2);
+ rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (rpmlib version)\n"),
+ keyType, keyDepend+2);
goto exit;
}
}
*suggestion = alSatisfiesDepend(&rpmdep->availablePackages, NULL, NULL,
keyName, keyEVR, keyFlags);
- rpmMessage(RPMMESS_DEBUG, _("%s: %s unsatisfied.\n"), keyType, keyDepend+2);
+ rpmMessage(RPMMESS_DEBUG, _("%s: %-45s NO\n"), keyType, keyDepend+2);
rc = 1; /* dependency is unsatisfied */
exit:
int xx;
xx = dbiCopen(dbi, NULL, 0);
xx = dbiPut(dbi, keyDepend, strlen(keyDepend), &rc, sizeof(rc), 0);
- if (xx) {
+ if (xx)
_cacheDependsRC = 0;
- } else {
- rpmMessage(RPMMESS_DEBUG, _("%s: (%s, %d) added to Depends cache.\n"), keyType, keyDepend, rc);
- }
+#if 0 /* XXX NOISY */
+ else
+ rpmMessage(RPMMESS_DEBUG, _("%s: (%s, %s) added to Depends cache.\n"), keyType, keyDepend, (rc ? "NO" : "YES"));
+#endif
xx = dbiCclose(dbi, NULL, 0);
}
}
keyDepend = printDepend("R", requires[i], requiresEVR[i], requireFlags[i]);
- rc = unsatisfiedDepend(rpmdep, " requires", keyDepend,
+ rc = unsatisfiedDepend(rpmdep, " Requires", keyDepend,
requires[i], requiresEVR[i], requireFlags[i], &suggestion);
switch (rc) {
break;
case 1: /* requirements are not satisfied. */
rpmMessage(RPMMESS_DEBUG, _("package %s require not satisfied: %s\n"),
- name, keyDepend);
+ name, keyDepend+2);
if (psp->num == psp->alloced) {
psp->alloced += 5;
keyDepend = printDepend("C", conflicts[i], conflictsEVR[i], conflictFlags[i]);
- rc = unsatisfiedDepend(rpmdep, "conflicts", keyDepend,
+ rc = unsatisfiedDepend(rpmdep, "Conflicts", keyDepend,
conflicts[i], conflictsEVR[i], conflictFlags[i], NULL);
/* 1 == unsatisfied, 0 == satsisfied */
switch (rc) {
case 0: /* conflicts exist. */
rpmMessage(RPMMESS_DEBUG, _("package %s conflicts: %s\n"),
- name, keyDepend);
+ name, keyDepend+2);
if (psp->num == psp->alloced) {
psp->alloced += 5;
Header h;
int rc = 0;
+ rpmdbPruneIterator(mi,
+ rpmdep->removedPackages, rpmdep->numRemovedPackages, 1);
while ((h = rpmdbNextIterator(mi)) != NULL) {
- unsigned int recOffset = rpmdbGetIteratorOffset(mi);
- if (bsearch(&recOffset, rpmdep->removedPackages,
- rpmdep->numRemovedPackages, sizeof(int), intcmp))
- continue;
-
if (checkPackageDeps(rpmdep, psp, h, key)) {
rc = 1;
break;
/* now look at the removed packages and make sure they aren't critical */
mi = rpmdbInitIterator(rpmdep->db, RPMDBI_PACKAGES, NULL, 0);
- rpmdbAppendIteratorMatches(mi, rpmdep->removedPackages,
+ rpmdbAppendIterator(mi, rpmdep->removedPackages,
rpmdep->numRemovedPackages);
while ((h = rpmdbNextIterator(mi)) != NULL) {
offsets[num++] = fileInfo->otherPkg;
mi = rpmdbInitIterator(db, RPMDBI_PACKAGES, NULL, 0);
- rpmdbAppendIteratorMatches(mi, offsets, num);
+ rpmdbAppendIterator(mi, offsets, num);
fileInfo = replList;
while ((h = rpmdbNextIterator(mi)) != NULL) {
fileInfo++;
}
+ /* XXX for dbN with falloc, headers *must* be the same size */
rpmdbSetIteratorModified(mi, modified);
}
rpmdbFreeIterator(mi);
/* if this package has already been installed, remove it from the database
before adding the new one */
- if (otherOffset) {
- rpmdbRemove(db, otherOffset, 1);
- }
+ if (otherOffset)
+ rpmdbRemove(db, otherOffset);
if (rpmdbAdd(db, h)) {
rc = 2;
return 0;
}
-int showQueryPackage(QVA_t *qva, /*@unused@*/rpmdb db, Header h)
+int showQueryPackage(QVA_t *qva, /*@unused@*/rpmdb rpmdb, Header h)
{
FILE *fp = stdout; /* XXX FIXME: pass as arg */
int queryFlags = qva->qva_flags;
void (*freeSpecVec) (Spec spec) = NULL;
int rpmQueryVerify(QVA_t *qva, enum rpmQVSources source, const char * arg,
- rpmdb db, QVF_t showPackage)
+ rpmdb rpmdb, QVF_t showPackage)
{
rpmdbMatchIterator mi = NULL;
Header h;
retcode = 1;
break;
}
- retcode = showPackage(qva, db, h);
+ retcode = showPackage(qva, rpmdb, h);
headerFree(h);
break;
case 1:
case RPMQV_ALL:
/* RPMDBI_PACKAGES */
- mi = rpmdbInitIterator(db, RPMDBI_PACKAGES, NULL, 0);
+ mi = rpmdbInitIterator(rpmdb, RPMDBI_PACKAGES, NULL, 0);
if (mi == NULL) {
fprintf(stderr, _("no packages\n"));
retcode = 1;
break;
case RPMQV_GROUP:
- mi = rpmdbInitIterator(db, RPMTAG_GROUP, arg, 0);
+ mi = rpmdbInitIterator(rpmdb, RPMTAG_GROUP, arg, 0);
if (mi == NULL) {
fprintf(stderr, _("group %s does not contain any packages\n"), arg);
retcode = 1;
break;
case RPMQV_TRIGGEREDBY:
- mi = rpmdbInitIterator(db, RPMTAG_TRIGGERNAME, arg, 0);
+ mi = rpmdbInitIterator(rpmdb, RPMTAG_TRIGGERNAME, arg, 0);
if (mi == NULL) {
fprintf(stderr, _("no package triggers %s\n"), arg);
retcode = 1;
break;
case RPMQV_WHATREQUIRES:
- mi = rpmdbInitIterator(db, RPMTAG_REQUIRENAME, arg, 0);
+ mi = rpmdbInitIterator(rpmdb, RPMTAG_REQUIRENAME, arg, 0);
if (mi == NULL) {
fprintf(stderr, _("no package requires %s\n"), arg);
retcode = 1;
case RPMQV_WHATPROVIDES:
if (arg[0] != '/') {
- mi = rpmdbInitIterator(db, RPMTAG_PROVIDENAME, arg, 0);
+ mi = rpmdbInitIterator(rpmdb, RPMTAG_PROVIDENAME, arg, 0);
if (mi == NULL) {
fprintf(stderr, _("no package provides %s\n"), arg);
retcode = 1;
}
/*@fallthrough@*/
case RPMQV_PATH:
- mi = rpmdbInitIterator(db, RPMTAG_BASENAMES, arg, 0);
+ mi = rpmdbInitIterator(rpmdb, RPMTAG_BASENAMES, arg, 0);
if (mi == NULL) {
int myerrno = 0;
if (access(arg, F_OK) != 0)
}
rpmMessage(RPMMESS_DEBUG, _("package record number: %u\n"), recOffset);
/* RPMDBI_PACKAGES */
- mi = rpmdbInitIterator(db, RPMDBI_PACKAGES, &recOffset, sizeof(recOffset));
+ mi = rpmdbInitIterator(rpmdb, RPMDBI_PACKAGES, &recOffset, sizeof(recOffset));
if (mi == NULL) {
fprintf(stderr, _("record %d could not be read\n"), recOffset);
retcode = 1;
case RPMQV_PACKAGE:
/* XXX HACK to get rpmdbFindByLabel out of the API */
- mi = rpmdbInitIterator(db, RPMDBI_LABEL, arg, 0);
+ mi = rpmdbInitIterator(rpmdb, RPMDBI_LABEL, arg, 0);
if (mi == NULL) {
fprintf(stderr, _("package %s is not installed\n"), arg);
retcode = 1;
int rpmQuery(QVA_t *qva, enum rpmQVSources source, const char * arg)
{
- rpmdb db = NULL;
+ rpmdb rpmdb = NULL;
int rc;
switch (source) {
case RPMQV_SPECFILE:
break;
default:
- if (rpmdbOpen(qva->qva_prefix, &db, O_RDONLY, 0644)) {
- fprintf(stderr, _("rpmQuery: rpmdbOpen() failed\n"));
+ if (rpmdbOpen(qva->qva_prefix, &rpmdb, O_RDONLY, 0644))
return 1;
- }
break;
}
- rc = rpmQueryVerify(qva, source, arg, db, showQueryPackage);
+ rc = rpmQueryVerify(qva, source, arg, rpmdb, showQueryPackage);
- if (db)
- rpmdbClose(db);
+ if (rpmdb)
+ rpmdbClose(rpmdb);
return rc;
}
#include "rpmdb.h"
/*@access dbiIndexSet@*/
-/*@access dbiIndexRecord@*/
+/*@access dbiIndexItem@*/
/*@access rpmdbMatchIterator@*/
#include "fprint.h"
};
inline int dbiSync(dbiIndex dbi, unsigned int flags) {
+if (_debug < 0 || dbi->dbi_debug)
+fprintf(stderr, " Sync %s\n", tagName(dbi->dbi_rpmtag));
return (*dbi->dbi_vec->sync) (dbi, flags);
}
inline int XdbiCopen(dbiIndex dbi, DBC ** dbcp, unsigned int flags,
const char * f, unsigned int l)
{
-if (_debug < 0)
+if (_debug < 0 || dbi->dbi_debug)
fprintf(stderr, "+++ RMW %s (%s:%u)\n", tagName(dbi->dbi_rpmtag), f, l);
return (*dbi->dbi_vec->copen) (dbi, dbcp, flags);
}
inline int XdbiCclose(dbiIndex dbi, DBC * dbcursor, unsigned int flags,
const char * f, unsigned int l)
{
-if (_debug < 0)
+if (_debug < 0 || dbi->dbi_debug)
fprintf(stderr, "--- RMW %s (%s:%u)\n", tagName(dbi->dbi_rpmtag), f, l);
return (*dbi->dbi_vec->cclose) (dbi, dbcursor, flags);
}
inline int dbiDel(dbiIndex dbi, const void * keyp, size_t keylen, unsigned int flags) {
+if (_debug < 0 || dbi->dbi_debug)
+fprintf(stderr, " %s Del key (%p,%d) %s\n", tagName(dbi->dbi_rpmtag), keyp, keylen, (dbi->dbi_rpmtag != RPMDBI_PACKAGES ? keyp : ""));
return (*dbi->dbi_vec->cdel) (dbi, keyp, keylen, flags);
}
inline int dbiGet(dbiIndex dbi, void ** keypp, size_t * keylenp,
void ** datapp, size_t * datalenp, unsigned int flags) {
- return (*dbi->dbi_vec->cget) (dbi, keypp, keylenp, datapp, datalenp, flags);
+ int rc;
+ rc = (*dbi->dbi_vec->cget) (dbi, keypp, keylenp, datapp, datalenp, flags);
+if (_debug < 0 || dbi->dbi_debug) {
+int dataval = 0xdeadbeef;
+if (rc == 0 && datapp && *datapp) memcpy(&dataval, *datapp, sizeof(dataval));
+fprintf(stderr, " %s Get key (%p,%d) data (%p,%d) %s %x\n", tagName(dbi->dbi_rpmtag), *keypp, *keylenp, *datapp, *datalenp,
+(dbi->dbi_rpmtag != RPMDBI_PACKAGES ? *keypp : ""), dataval);
+}
+ return rc;
}
inline int dbiPut(dbiIndex dbi, const void * keyp, size_t keylen,
const void * datap, size_t datalen, unsigned int flags) {
+if (_debug < 0 || dbi->dbi_debug) {
+int dataval = 0xdeadbeef;
+if (datap) memcpy(&dataval, datap, sizeof(dataval));
+fprintf(stderr, " %s Put key (%p,%d) data (%p,%d) %s %x\n", tagName(dbi->dbi_rpmtag), keyp, keylen, datap, datalen, (dbi->dbi_rpmtag != RPMDBI_PACKAGES ? keyp : ""), dataval);
+}
return (*dbi->dbi_vec->cput) (dbi, keyp, keylen, datap, datalen, flags);
}
inline int dbiClose(dbiIndex dbi, unsigned int flags) {
+if (_debug < 0 || dbi->dbi_debug)
+fprintf(stderr, " %s Close\n", tagName(dbi->dbi_rpmtag));
return (*dbi->dbi_vec->close) (dbi, flags);
}
{
int dbix;
dbiIndex dbi = NULL;
- int _dbapi;
+ int _dbapi, _dbapi_rebuild, _dbapi_wanted;
int rc = 0;
dbix = dbiTagToDbix(rpmtag);
if ((dbi = rpmdb->_dbi[dbix]) != NULL)
return dbi;
- _dbapi = rpmdb->db_api;
+ _dbapi_wanted = rpmdb->db_api;
+ _dbapi_rebuild = rpmExpandNumeric("%{_dbapi_rebuild}");
+ if (_dbapi_rebuild < 1 || _dbapi_rebuild > 3)
+ _dbapi_rebuild = 3;
- switch (_dbapi) {
- case 3:
- case 2:
- case 1:
- case 0:
- if (mydbvecs[_dbapi] == NULL) {
+ switch (_dbapi_wanted) {
+ default:
+ _dbapi = _dbapi_wanted;
+ if (_dbapi < 0 || _dbapi >= 4 || mydbvecs[_dbapi] == NULL) {
+ static int _printed = 0;
+ if (!_printed++)
fprintf(stderr, _("\n\
---> This version of rpm was not compiled with support for db%d. Please\
- verify the setting of the macro %%_dbapi using \"rpm --showrc\" and\
- correct your configuration.\
+--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n\
+ Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n\
+ and configure \"%%_dbapi -1\" (e.g. create and/or edit /etc/rpm/macros).\n\
\n\
-"));
- rc = 1;
- break;
+"), _dbapi_wanted);
+ return NULL;
}
errno = 0;
+ dbi = NULL;
rc = (*mydbvecs[_dbapi]->open) (rpmdb, rpmtag, &dbi);
- if (rc == 0 && dbi) {
- dbi->dbi_vec = mydbvecs[_dbapi];
- }
- break;
+ if (rc == 0 && dbi)
+ break;
+ /*@fallthrough@*/
case -1:
_dbapi = 4;
while (_dbapi-- > 1) {
if (mydbvecs[_dbapi] == NULL)
continue;
errno = 0;
+ dbi = NULL;
rc = (*mydbvecs[_dbapi]->open) (rpmdb, rpmtag, &dbi);
- if (rc == 0 && dbi) {
- dbi->dbi_vec = mydbvecs[_dbapi];
+ if (rc == 0 && dbi)
break;
- }
- if (rc == 1 && _dbapi == 3) {
- fprintf(stderr, _("\n\
---> Please run \"rpm --rebuilddb\" as root to convert your database from\n\
- db1 to db3 on-disk format.\n\
-\n\
-"));
- }
}
- if (rpmdb->db_api == -1)
+ if (rpmdb->db_api == -1 && _dbapi > 0)
rpmdb->db_api = _dbapi;
break;
}
- if (rc == 0) {
+ if (_dbapi <= 0) { /* failed to open with any dbapi */
+ rpmError(RPMERR_DBOPEN, _("dbiOpen: cannot open %s index"),
+ tagName(rpmtag));
+ rc = 1;
+ } else /* suggest possible conversion */
+ if (_dbapi_wanted < 0 && _dbapi != _dbapi_rebuild) {
+ static int _printed = 0;
+ rc = (dbi->dbi_rpmtag != RPMDBI_PACKAGES);
+ if (rc && !_printed++)
+ fprintf(stderr, _("\n\
+--> The database is in db%d format, not the suggested db%d format.\n\
+ Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n\
+ using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n\
+ to convert your database from db%d to db%d format, or configure\n\
+ \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n\
+\n\
+"), _dbapi, (_dbapi_rebuild > 0 ? _dbapi_rebuild : 3),
+ _dbapi, (_dbapi_rebuild > 0 ? _dbapi_rebuild : 3), _dbapi);
+ } else /* suggest possible configuration */
+ if (_dbapi_wanted >= 0 && _dbapi != _dbapi_wanted) {
+ static int _printed = 0;
+ if (!_printed++)
+ fprintf(stderr, _("\n\
+--> The configured %%_dbapi was db%d, but the database is db%d format.\n\
+ Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n\
+ and configure \"%%_dbapi %d\" (e.g. create and/or edit /etc/rpm/macros).\n\
+\n\
+"), _dbapi_wanted, _dbapi, _dbapi);
+ rc = 1;
+ }
+
+ if (rc == 0 && dbi) {
rpmdb->_dbi[dbix] = dbi;
} else if (dbi) {
/* XXX FIXME: dbNopen handles failures already. */
- rpmError(RPMERR_DBOPEN, _("dbiOpen: cannot open %s index"),
- tagName(rpmtag));
db3Free(dbi);
dbi = NULL;
- }
+ }
return dbi;
}
/**
- * Create and initialize element of index database set.
- * @param recOffset byte offset of header in db
- * @param fileNumber file array index
- * @return new element
+ * Create and initialize item for index database set.
+ * @param hdrNum header instance in db
+ * @param tagNum tag index in header
+ * @return new item
*/
-static inline dbiIndexRecord dbiReturnIndexRecordInstance(unsigned int recOffset, unsigned int fileNumber) {
- dbiIndexRecord rec = xcalloc(1, sizeof(*rec));
- rec->recOffset = recOffset;
- rec->fileNumber = fileNumber;
+static inline dbiIndexItem dbiIndexNewItem(unsigned int hdrNum, unsigned int tagNum) {
+ dbiIndexItem rec = xcalloc(1, sizeof(*rec));
+ rec->hdrNum = hdrNum;
+ rec->tagNum = tagNum;
return rec;
}
/* Convert to database internal format */
switch (dbi->dbi_jlen) {
+ default:
case 2*sizeof(int_32):
set->count = datalen / (2*sizeof(int_32));
set->recs = xmalloc(set->count * sizeof(*(set->recs)));
for (i = 0; i < set->count; i++) {
- union _dbswap recOffset, fileNumber;
+ union _dbswap hdrNum, tagNum;
- memcpy(&recOffset.ui, sdbir, sizeof(recOffset.ui));
- sdbir += sizeof(recOffset.ui);
- memcpy(&fileNumber.ui, sdbir, sizeof(fileNumber.ui));
- sdbir += sizeof(fileNumber.ui);
+ memcpy(&hdrNum.ui, sdbir, sizeof(hdrNum.ui));
+ sdbir += sizeof(hdrNum.ui);
+ memcpy(&tagNum.ui, sdbir, sizeof(tagNum.ui));
+ sdbir += sizeof(tagNum.ui);
if (_dbbyteswapped) {
- _DBSWAP(recOffset);
- _DBSWAP(fileNumber);
+ _DBSWAP(hdrNum);
+ _DBSWAP(tagNum);
}
- set->recs[i].recOffset = recOffset.ui;
- set->recs[i].fileNumber = fileNumber.ui;
+ set->recs[i].hdrNum = hdrNum.ui;
+ set->recs[i].tagNum = tagNum.ui;
set->recs[i].fpNum = 0;
set->recs[i].dbNum = 0;
}
break;
- default:
case 1*sizeof(int_32):
set->count = datalen / (1*sizeof(int_32));
set->recs = xmalloc(set->count * sizeof(*(set->recs)));
for (i = 0; i < set->count; i++) {
- union _dbswap recOffset;
+ union _dbswap hdrNum;
- memcpy(&recOffset.ui, sdbir, sizeof(recOffset.ui));
- sdbir += sizeof(recOffset.ui);
+ memcpy(&hdrNum.ui, sdbir, sizeof(hdrNum.ui));
+ sdbir += sizeof(hdrNum.ui);
if (_dbbyteswapped) {
- _DBSWAP(recOffset);
+ _DBSWAP(hdrNum);
}
- set->recs[i].recOffset = recOffset.ui;
- set->recs[i].fileNumber = 0;
+ set->recs[i].hdrNum = hdrNum.ui;
+ set->recs[i].tagNum = 0;
set->recs[i].fpNum = 0;
set->recs[i].dbNum = 0;
}
/* Convert to database internal format */
switch (dbi->dbi_jlen) {
+ default:
case 2*sizeof(int_32):
datalen = set->count * (2 * sizeof(int_32));
datap = tdbir = alloca(datalen);
for (i = 0; i < set->count; i++) {
- union _dbswap recOffset, fileNumber;
+ union _dbswap hdrNum, tagNum;
- recOffset.ui = set->recs[i].recOffset;
- fileNumber.ui = set->recs[i].fileNumber;
+ hdrNum.ui = set->recs[i].hdrNum;
+ tagNum.ui = set->recs[i].tagNum;
if (_dbbyteswapped) {
- _DBSWAP(recOffset);
- _DBSWAP(fileNumber);
+ _DBSWAP(hdrNum);
+ _DBSWAP(tagNum);
}
- memcpy(tdbir, &recOffset.ui, sizeof(recOffset.ui));
- tdbir += sizeof(recOffset.ui);
- memcpy(tdbir, &fileNumber.ui, sizeof(fileNumber.ui));
- tdbir += sizeof(fileNumber.ui);
+ memcpy(tdbir, &hdrNum.ui, sizeof(hdrNum.ui));
+ tdbir += sizeof(hdrNum.ui);
+ memcpy(tdbir, &tagNum.ui, sizeof(tagNum.ui));
+ tdbir += sizeof(tagNum.ui);
}
break;
- default:
case 1*sizeof(int_32):
datalen = set->count * (1 * sizeof(int_32));
datap = tdbir = alloca(datalen);
for (i = 0; i < set->count; i++) {
- union _dbswap recOffset;
+ union _dbswap hdrNum;
- recOffset.ui = set->recs[i].recOffset;
+ hdrNum.ui = set->recs[i].hdrNum;
if (_dbbyteswapped) {
- _DBSWAP(recOffset);
+ _DBSWAP(hdrNum);
}
- memcpy(tdbir, &recOffset.ui, sizeof(recOffset.ui));
- tdbir += sizeof(recOffset.ui);
+ memcpy(tdbir, &hdrNum.ui, sizeof(hdrNum.ui));
+ tdbir += sizeof(hdrNum.ui);
}
break;
}
}
/*@=compmempass@*/
+/* XXX assumes hdrNum is first int in dbiIndexItem */
+static int hdrNumCmp(const void * one, const void * two) {
+ const int * a = one, * b = two;
+ return (*a - *b);
+}
+
/**
* Append element(s) to set of index database items.
* @param set set of index database items
* @param recs array of items to append to set
* @param nrecs number of items
- * @return 0 success (always)
+ * @param recsize size of an array item
+ * @param sortset should resulting set be sorted?
+ * @return 0 success, 1 failure (bad args)
*/
-static inline int dbiAppendSet(dbiIndexSet set, dbiIndexRecord recs, int nrecs)
+static inline int dbiAppendSet(dbiIndexSet set, const void * recs,
+ int nrecs, size_t recsize, int sortset)
{
+ const char * rptr = recs;
+ size_t rlen = (recsize < sizeof(*(set->recs)))
+ ? recsize : sizeof(*(set->recs));
+
+ if (set == NULL || recs == NULL || nrecs <= 0 || recsize <= 0)
+ return 1;
+
set->recs = (set->count == 0)
? xmalloc(nrecs * sizeof(*(set->recs)))
: xrealloc(set->recs, (set->count + nrecs) * sizeof(*(set->recs)));
- memcpy(set->recs + set->count, recs, nrecs * sizeof(*recs));
- set->count += nrecs;
+
+ memset(set->recs + set->count, 0, nrecs * sizeof(*recs));
+
+ while (nrecs-- > 0) {
+ memcpy(set->recs + set->count, rptr, rlen);
+ rptr += recsize;
+ set->count++;
+ }
+
+ if (set->count > 1 && sortset)
+ qsort(set->recs, set->count, sizeof(*(set->recs)), hdrNumCmp);
+
return 0;
}
-/* returns 1 on failure */
/**
- * Remove element from set of index database items.
- * @param set set of index database items
- * @param rec item to remove from set
- * @return 0 success, 1 failure
+ * Remove element(s) from set of index database items.
+ * @param set set of index database items
+ * @param recs array of items to remove from set
+ * @param nrecs number of items
+ * @param recsize size of an array item
+ * @param sorted array is already sorted?
+ * @return 0 success, 1 failure (no items found)
*/
-static inline int dbiRemoveIndexRecord(dbiIndexSet set, dbiIndexRecord rec) {
+static inline int dbiPruneSet(dbiIndexSet set, void * recs, int nrecs,
+ size_t recsize, int sorted)
+{
int from;
int to = 0;
int num = set->count;
int numCopied = 0;
+ if (nrecs > 1 && !sorted)
+ qsort(recs, nrecs, recsize, hdrNumCmp);
+
for (from = 0; from < num; from++) {
- if (rec->recOffset != set->recs[from].recOffset ||
- rec->fileNumber != set->recs[from].fileNumber) {
- /* structure assignment */
- if (from != to) set->recs[to] = set->recs[from];
- to++;
- numCopied++;
- } else {
+ if (bsearch(&set->recs[from], recs, nrecs, recsize, hdrNumCmp)) {
set->count--;
+ continue;
}
+ if (from != to)
+ set->recs[to] = set->recs[from]; /* structure assignment */
+ to++;
+ numCopied++;
}
return (numCopied == num);
/* XXX transaction.c */
unsigned int dbiIndexRecordOffset(dbiIndexSet set, int recno) {
- return set->recs[recno].recOffset;
+ return set->recs[recno].hdrNum;
}
/* XXX transaction.c */
unsigned int dbiIndexRecordFileNumber(dbiIndexSet set, int recno) {
- return set->recs[recno].fileNumber;
-}
-
-/**
- * Change record offset of header within element in index database set.
- * @param set set of index database items
- * @param recno index of item in set
- * @param recoff new record offset
- */
-static inline void dbiIndexRecordOffsetSave(dbiIndexSet set, int recno, unsigned int recoff) {
- set->recs[recno].recOffset = recoff;
+ return set->recs[recno].tagNum;
}
/* XXX transaction.c */
_initialized++;
}
+ /* Insure that _dbapi has one of -1, 1, 2, or 3 */
+ if (_dbapi < -1 || _dbapi > 3)
+ _dbapi = -1;
+ if (_dbapi == 0)
+ _dbapi = 1;
+
if (dbp)
*dbp = NULL;
if (mode & O_WRONLY)
dbiIndex dbi;
int rpmtag;
- rpmtag = dbiTags[dbix];
-
- switch (rpmtag) {
+ /* Filter out temporary databases */
+ switch ((rpmtag = dbiTags[dbix])) {
+ case RPMDBI_AVAILABLE:
+ case RPMDBI_ADDED:
+ case RPMDBI_REMOVED:
case RPMDBI_DEPENDS:
continue;
/*@notreached@*/ break;
fingerPrint fp1;
dbiIndex dbi = NULL;
dbiIndexSet allMatches = NULL;
- dbiIndexRecord rec = NULL;
+ dbiIndexItem rec = NULL;
int i;
int rc;
int xx;
}
*matches = xcalloc(1, sizeof(**matches));
- rec = dbiReturnIndexRecordInstance(0, 0);
+ rec = dbiIndexNewItem(0, 0);
i = 0;
while (i < allMatches->count) {
const char ** baseNames, ** dirNames;
fp2 = fpLookup(fpc, dirNames[dirIndexes[num]], baseNames[num], 1);
if (FP_EQUAL(fp1, fp2)) {
- rec->recOffset = dbiIndexRecordOffset(allMatches, i);
- rec->fileNumber = dbiIndexRecordFileNumber(allMatches, i);
- dbiAppendSet(*matches, rec, 1);
+ rec->hdrNum = dbiIndexRecordOffset(allMatches, i);
+ rec->tagNum = dbiIndexRecordFileNumber(allMatches, i);
+ dbiAppendSet(*matches, rec, 1, sizeof(*rec), 0);
}
prevoff = offset;
default:
case -1: /* error */
rpmError(RPMERR_DBCORRUPT, _("cannot retrieve package \"%s\" from db"),
- name);
+ name);
rc = -1;
break;
case 1: /* not found */
if (goodRelease && goodVersion)
gotMatches = 1;
else
- dbiIndexRecordOffsetSave(*matches, i, 0);
+ (*matches)->recs[i].hdrNum = 0;
headerFree(h);
}
dbiIndexSet mi_set;
int mi_setx;
Header mi_h;
+ int mi_sorted;
int mi_modified;
unsigned int mi_prevoffset;
unsigned int mi_offset;
return mi->mi_h;
}
-static int intMatchCmp(const void * one, const void * two) {
- const struct _dbiIndexRecord * a = one, * b = two;
- return (a->recOffset - b->recOffset);
-}
-
static void rpmdbSortIterator(rpmdbMatchIterator mi) {
- if (mi && mi->mi_set && mi->mi_set->recs && mi->mi_set->count > 0)
+ if (mi && mi->mi_set && mi->mi_set->recs && mi->mi_set->count > 0) {
qsort(mi->mi_set->recs, mi->mi_set->count, sizeof(*mi->mi_set->recs),
- intMatchCmp);
+ hdrNumCmp);
+ mi->mi_sorted = 1;
+ }
}
static int rpmdbGrowIterator(rpmdbMatchIterator mi,
return rc;
}
-void rpmdbAppendIteratorMatches(rpmdbMatchIterator mi, int * offsets,
- int numOffsets)
+int rpmdbPruneIterator(rpmdbMatchIterator mi, int * hdrNums,
+ int nHdrNums, int sorted)
{
- dbiIndexRecord recs;
- int i;
+ if (mi == NULL || hdrNums == NULL || nHdrNums <= 0)
+ return 1;
+
+ if (mi->mi_set)
+ dbiPruneSet(mi->mi_set, hdrNums, nHdrNums, sizeof(*hdrNums), sorted);
+ return 0;
+}
+
+int rpmdbAppendIterator(rpmdbMatchIterator mi, int * hdrNums, int nHdrNums)
+{
+ if (mi == NULL || hdrNums == NULL || nHdrNums <= 0)
+ return 1;
- if (mi == NULL)
- return;
- recs = alloca(numOffsets * sizeof(*recs));
- for (i = 0; i < numOffsets; i++) {
- memset(recs + i, 0, sizeof(*recs));
- recs[i].recOffset = offsets[i];
- }
if (mi->mi_set == NULL)
mi->mi_set = xcalloc(1, sizeof(*mi->mi_set));
- dbiAppendSet(mi->mi_set, recs, numOffsets);
+ dbiAppendSet(mi->mi_set, hdrNums, nHdrNums, sizeof(*hdrNums), 0);
+ return 0;
}
rpmdbMatchIterator rpmdbInitIterator(rpmdb rpmdb, int rpmtag,
mi->mi_set = set;
mi->mi_setx = 0;
mi->mi_h = NULL;
+ mi->mi_sorted = 0;
mi->mi_modified = 0;
mi->mi_prevoffset = 0;
mi->mi_offset = 0;
return mi;
}
-static inline int removeIndexEntry(dbiIndex dbi, const char * keyp, dbiIndexRecord rec,
- int tolerant)
+static inline int removeIndexEntry(dbiIndex dbi, const char * keyp,
+ dbiIndexItem rec)
{
dbiIndexSet set = NULL;
int rc;
break; /* error message already generated from dbindex.c */
case 1: /* not found */
rc = 0;
- if (!tolerant) {
- rpmError(RPMERR_DBCORRUPT, _("key \"%s\" not found in %s"),
- keyp, tagName(dbi->dbi_rpmtag));
- rc = 1;
- }
break;
case 0: /* success */
- if (dbiRemoveIndexRecord(set, rec)) {
- if (!tolerant) {
- rpmError(RPMERR_DBCORRUPT, _("key \"%s\" not removed from %s"),
- keyp, tagName(dbi->dbi_rpmtag));
- rc = 1;
- }
+ if (dbiPruneSet(set, rec, 1, sizeof(*rec), 1))
break;
- }
if (dbiUpdateIndex(dbi, keyp, set))
rc = 1;
break;
}
/* XXX install.c uninstall.c */
-int rpmdbRemove(rpmdb rpmdb, unsigned int offset, int tolerant)
+int rpmdbRemove(rpmdb rpmdb, unsigned int hdrNum)
{
Header h;
sigset_t signalMask;
#ifndef DYING_NOTYET
- h = rpmdbGetRecord(rpmdb, offset);
+ h = rpmdbGetRecord(rpmdb, hdrNum);
#else
{ rpmdbMatchIterator mi;
- mi = rpmdbInitIterator(rpmdb, RPMDBI_PACKAGES, &offset, sizeof(offset));
+ mi = rpmdbInitIterator(rpmdb, RPMDBI_PACKAGES, &hdrNum, sizeof(hdrNum));
h = rpmdbNextIterator(mi);
if (h)
h = headerLink(h);
#endif
if (h == NULL) {
rpmError(RPMERR_DBCORRUPT, _("%s: cannot read header at 0x%x"),
- "rpmdbRemove", offset);
+ "rpmdbRemove", hdrNum);
return 1;
}
{ const char *n, *v, *r;
headerNVR(h, &n, &v, &r);
- rpmMessage(RPMMESS_VERBOSE, " --- %10d %s-%s-%s\n", offset, n, v, r);
+ rpmMessage(RPMMESS_VERBOSE, " --- %10d %s-%s-%s\n", hdrNum, n, v, r);
}
blockSignals(rpmdb, &signalMask);
{ int dbix;
- dbiIndexRecord rec = dbiReturnIndexRecordInstance(offset, 0);
+ dbiIndexItem rec = dbiIndexNewItem(hdrNum, 0);
for (dbix = 0; dbix < dbiTagsMax; dbix++) {
dbiIndex dbi;
- const char **rpmvals = NULL;
+ const char *av[1];
+ const char ** rpmvals = NULL;
int rpmtype = 0;
int rpmcnt = 0;
int rpmtag;
int xx;
+ int i;
dbi = NULL;
rpmtag = dbiTags[dbix];
switch (rpmtag) {
+ /* Filter out temporary databases */
+ case RPMDBI_AVAILABLE:
+ case RPMDBI_ADDED:
+ case RPMDBI_REMOVED:
case RPMDBI_DEPENDS:
continue;
/*@notreached@*/ break;
case RPMDBI_PACKAGES:
dbi = dbiOpen(rpmdb, rpmtag, 0);
xx = dbiCopen(dbi, NULL, 0);
- xx = dbiDel(dbi, &offset, sizeof(offset), 0);
+ xx = dbiDel(dbi, &hdrNum, sizeof(hdrNum), 0);
xx = dbiCclose(dbi, NULL, 0);
/* XXX HACK sync is on the bt with multiple db access */
if (!dbi->dbi_no_dbsync)
dbi = dbiOpen(rpmdb, rpmtag, 0);
xx = dbiCopen(dbi, NULL, 0);
+
if (rpmtype == RPM_STRING_TYPE) {
+
rpmMessage(RPMMESS_DEBUG, _("removing \"%s\" from %s index.\n"),
(const char *)rpmvals, tagName(dbi->dbi_rpmtag));
- (void) removeIndexEntry(dbi, (const char *)rpmvals,
- rec, tolerant);
+ /* XXX force uniform headerGetEntry return */
+ av[0] = (const char *) rpmvals;
+ rpmvals = av;
+ rpmcnt = 1;
} else {
- int i, mytolerant;
- rpmMessage(RPMMESS_DEBUG, _("removing %d entries in %s index:\n"),
+ rpmMessage(RPMMESS_DEBUG, _("removing %d entries from %s index:\n"),
rpmcnt, tagName(dbi->dbi_rpmtag));
- for (i = 0; i < rpmcnt; i++) {
- rpmMessage(RPMMESS_DEBUG, _("\t%6d %s\n"),
- i, rpmvals[i]);
-
- mytolerant = tolerant;
- rec->fileNumber = 0;
-
- switch (dbi->dbi_rpmtag) {
- case RPMTAG_BASENAMES:
- rec->fileNumber = i;
- break;
- /*
- * There could be dups in the sorted list. Rather then
- * sort the list, be tolerant of missing entries as they
- * should just indicate duplicated entries.
- */
- case RPMTAG_REQUIRENAME:
- case RPMTAG_TRIGGERNAME:
- mytolerant = 1;
- break;
- }
+ }
- (void) removeIndexEntry(dbi, rpmvals[i],
- rec, mytolerant);
- }
+ for (i = 0; i < rpmcnt; i++) {
+#if 0
+ rpmMessage(RPMMESS_DEBUG, _("%6d %s\n"), i, rpmvals[i]);
+#endif
+ /*
+ * This is almost right, but, if there are duplicate tag
+ * values, there will be duplicate attempts to remove
+ * the header instance. It's easier to just ignore errors
+ * than to do things correctly.
+ */
+ xx = removeIndexEntry(dbi, rpmvals[i], rec);
}
+
xx = dbiCclose(dbi, NULL, 0);
/* XXX HACK sync is on the bt with multiple db access */
return 0;
}
-static inline int addIndexEntry(dbiIndex dbi, const char *index, dbiIndexRecord rec)
+static inline int addIndexEntry(dbiIndex dbi, const char *index, dbiIndexItem rec)
{
dbiIndexSet set = NULL;
int rc;
set = xcalloc(1, sizeof(*set));
/*@fallthrough@*/
case 0: /* success */
- dbiAppendSet(set, rec, 1);
+ dbiAppendSet(set, rec, 1, sizeof(*rec), 0);
if (dbiUpdateIndex(dbi, index, set))
rc = 1;
break;
int type;
dbiIndex dbi;
int dbix;
- unsigned int offset;
+ unsigned int hdrNum;
int rc = 0;
int xx;
rc = dbiGet(dbi, &keyp, &keylen, &datap, &datalen, 0);
- offset = 0;
+ hdrNum = 0;
if (rc == 0 && datap)
- memcpy(&offset, datap, sizeof(offset));
- ++offset;
+ memcpy(&hdrNum, datap, sizeof(hdrNum));
+ ++hdrNum;
if (rc == 0 && datap) {
- memcpy(datap, &offset, sizeof(offset));
+ memcpy(datap, &hdrNum, sizeof(hdrNum));
} else {
- datap = &offset;
- datalen = sizeof(offset);
+ datap = &hdrNum;
+ datalen = sizeof(hdrNum);
}
rc = dbiPut(dbi, keyp, keylen, datap, datalen, 0);
/* Now update the indexes */
- { dbiIndexRecord rec = dbiReturnIndexRecordInstance(offset, 0);
+ { dbiIndexItem rec = dbiIndexNewItem(hdrNum, 0);
for (dbix = 0; dbix < dbiTagsMax; dbix++) {
+ const char *av[1];
const char **rpmvals = NULL;
int rpmtype = 0;
int rpmcnt = 0;
int rpmtag;
+ int i, j;
dbi = NULL;
rpmtag = dbiTags[dbix];
switch (rpmtag) {
+ /* Filter out temporary databases */
+ case RPMDBI_AVAILABLE:
+ case RPMDBI_ADDED:
+ case RPMDBI_REMOVED:
case RPMDBI_DEPENDS:
continue;
/*@notreached@*/ break;
case RPMDBI_PACKAGES:
dbi = dbiOpen(rpmdb, rpmtag, 0);
xx = dbiCopen(dbi, NULL, 0);
- xx = dbiUpdateRecord(dbi, offset, h);
+ xx = dbiUpdateRecord(dbi, hdrNum, h);
xx = dbiCclose(dbi, NULL, 0);
if (!dbi->dbi_no_dbsync)
xx = dbiSync(dbi, 0);
{ const char *n, *v, *r;
headerNVR(h, &n, &v, &r);
- rpmMessage(RPMMESS_VERBOSE, " +++ %10d %s-%s-%s\n", offset, n, v, r);
+ rpmMessage(RPMMESS_VERBOSE, " +++ %10d %s-%s-%s\n", hdrNum, n, v, r);
}
continue;
/*@notreached@*/ break;
rpmMessage(RPMMESS_DEBUG, _("adding \"%s\" to %s index.\n"),
(const char *)rpmvals, tagName(dbi->dbi_rpmtag));
- rc += addIndexEntry(dbi, (const char *)rpmvals, rec);
+ /* XXX force uniform headerGetEntry return */
+ av[0] = (const char *) rpmvals;
+ rpmvals = av;
+ rpmcnt = 1;
} else {
- int i, j;
rpmMessage(RPMMESS_DEBUG, _("adding %d entries to %s index:\n"),
rpmcnt, tagName(dbi->dbi_rpmtag));
- for (i = 0; i < rpmcnt; i++) {
- rpmMessage(RPMMESS_DEBUG, _("%6d %s\n"),
- i, rpmvals[i]);
+ }
- rec->fileNumber = 0;
+ for (i = 0; i < rpmcnt; i++) {
+#if 0
+ rpmMessage(RPMMESS_DEBUG, _("%6d %s\n"), i, rpmvals[i]);
+#endif
- switch (dbi->dbi_rpmtag) {
- case RPMTAG_BASENAMES:
- rec->fileNumber = i;
- break;
- case RPMTAG_TRIGGERNAME: /* don't add duplicates */
- if (i == 0)
- break;
+ /*
+ * Include the tagNum in all indices. rpm-3.0.4 and earlier
+ * included the tagNum only for files.
+ */
+ switch (dbi->dbi_rpmtag) {
+ case RPMTAG_TRIGGERNAME:
+ if (i) { /* don't add duplicates */
for (j = 0; j < i; j++) {
if (!strcmp(rpmvals[i], rpmvals[j]))
break;
}
if (j < i)
continue;
- break;
}
-
- rc += addIndexEntry(dbi, rpmvals[i], rec);
+ /*@fallthrough@*/
+ default:
+ rec->tagNum = i;
+ break;
}
+
+ rc += addIndexEntry(dbi, rpmvals[i], rec);
}
xx = dbiCclose(dbi, NULL, 0);
int_32 * dirIndexes;
int_32 * fullDirIndexes;
fingerPrint * fps;
- dbiIndexRecord im;
+ dbiIndexItem im;
int start;
int num;
int end;
/* Find the end of the set of matched files in this package. */
for (end = start + 1; end < mi->mi_set->count; end++) {
- if (im->recOffset != mi->mi_set->recs[end].recOffset)
+ if (im->hdrNum != mi->mi_set->recs[end].hdrNum)
break;
}
num = end - start;
baseNames = xcalloc(num, sizeof(*baseNames));
dirIndexes = xcalloc(num, sizeof(*dirIndexes));
for (i = 0; i < num; i++) {
- baseNames[i] = fullBaseNames[im[i].fileNumber];
- dirIndexes[i] = fullDirIndexes[im[i].fileNumber];
+ baseNames[i] = fullBaseNames[im[i].tagNum];
+ dirIndexes[i] = fullDirIndexes[im[i].tagNum];
}
fps = xcalloc(num, sizeof(*fps));
/* Add db (recnum,filenum) to list for fingerprint matches. */
for (i = 0; i < num; i++, im++) {
if (FP_EQUAL_DIFFERENT_CACHE(fps[i], fpList[im->fpNum]))
- dbiAppendSet(matchList[im->fpNum], im, 1);
+ dbiAppendSet(matchList[im->fpNum], im, 1, sizeof(*im), 0);
}
free(fps);
(void)rpmCleanPath(filename);
xx = unlink(filename);
}
- for (i = 0; i < 16; i++) {
+ for (i = 0; i < 16; i++) {
sprintf(filename, "%s/%s/__db.%03d", rootdir, dbpath, i);
+ (void)rpmCleanPath(filename);
xx = unlink(filename);
}
break;
for (i = 0; i < dbiTagsMax; i++) {
const char * base = db1basename(dbiTags[i]);
sprintf(filename, "%s/%s/%s", rootdir, dbpath, base);
+ (void)rpmCleanPath(filename);
xx = unlink(filename);
xfree(base);
}
}
sprintf(filename, "%s/%s", rootdir, dbpath);
+ (void)rpmCleanPath(filename);
xx = rmdir(filename);
return 0;
switch (_olddbapi) {
case 3:
for (i = 0; i < dbiTagsMax; i++) {
- const char * base = tagName(dbiTags[i]);
+ const char * base;
+ int rpmtag;
+
+ /* Filter out temporary databases */
+ switch ((rpmtag = dbiTags[i])) {
+ case RPMDBI_AVAILABLE:
+ case RPMDBI_ADDED:
+ case RPMDBI_REMOVED:
+ case RPMDBI_DEPENDS:
+ continue;
+ /*@notreached@*/ break;
+ default:
+ break;
+ }
+
+ base = tagName(rpmtag);
sprintf(ofilename, "%s/%s/%s", rootdir, olddbpath, base);
(void)rpmCleanPath(ofilename);
if (!rpmfileexists(ofilename))
if ((xx = Rename(ofilename, nfilename)) != 0)
rc = 1;
}
- for (i = 0; i < 16; i++) {
+ for (i = 0; i < 16; i++) {
sprintf(ofilename, "%s/%s/__db.%03d", rootdir, olddbpath, i);
(void)rpmCleanPath(ofilename);
if (!rpmfileexists(ofilename))
case 1:
case 0:
for (i = 0; i < dbiTagsMax; i++) {
- const char * base = db1basename(dbiTags[i]);
+ const char * base;
+ int rpmtag;
+
+ /* Filter out temporary databases */
+ switch ((rpmtag = dbiTags[i])) {
+ case RPMDBI_AVAILABLE:
+ case RPMDBI_ADDED:
+ case RPMDBI_REMOVED:
+ case RPMDBI_DEPENDS:
+ continue;
+ /*@notreached@*/ break;
+ default:
+ break;
+ }
+
+ base = db1basename(rpmtag);
sprintf(ofilename, "%s/%s/%s", rootdir, olddbpath, base);
(void)rpmCleanPath(ofilename);
if (!rpmfileexists(ofilename))
const char * tfn;
int nocleanup = 1;
int failed = 0;
+ int removedir = 0;
int rc = 0;
int _dbapi;
int _dbapi_rebuild;
goto exit;
}
- rpmMessage(RPMMESS_DEBUG, _("creating directory: %s\n"), newrootdbpath);
+ rpmMessage(RPMMESS_DEBUG, _("creating directory %s\n"), newrootdbpath);
if (Mkdir(newrootdbpath, 0755)) {
rpmError(RPMERR_MKDIR, _("error creating directory %s: %s"),
newrootdbpath, strerror(errno));
rc = 1;
goto exit;
}
+ removedir = 1;
rpmMessage(RPMMESS_DEBUG, _("opening old database with dbapi %d\n"),
_dbapi);
rc = 1;
goto exit;
}
- if ((_dbapi = olddb->db_api) == 0)
- _dbapi = 1;
+ _dbapi = olddb->db_api;
rpmMessage(RPMMESS_DEBUG, _("opening new database with dbapi %d\n"),
_dbapi_rebuild);
rc = 1;
goto exit;
}
- if ((_dbapi_rebuild = newdb->db_api) == 0)
- _dbapi_rebuild = 1;
+ _dbapi_rebuild = newdb->db_api;
{ Header h = NULL;
rpmdbMatchIterator mi;
rpmdbClose(newdb);
if (failed) {
- rpmMessage(RPMMESS_NORMAL, _("failed to rebuild database; original database "
+ rpmMessage(RPMMESS_NORMAL, _("failed to rebuild database: original database "
"remains in place\n"));
rpmdbRemoveDatabase(rootdir, newdbpath, _dbapi_rebuild);
rc = 1;
goto exit;
}
- if (Rmdir(newrootdbpath))
- rpmMessage(RPMMESS_ERROR, _("failed to remove directory %s: %s\n"),
- newrootdbpath, strerror(errno));
}
rc = 0;
exit:
- if (rootdbpath) xfree(rootdbpath);
+ if (removedir) {
+ rpmMessage(RPMMESS_DEBUG, _("removing directory %s\n"), newrootdbpath);
+ if (Rmdir(newrootdbpath))
+ rpmMessage(RPMMESS_ERROR, _("failed to remove directory %s: %s\n"),
+ newrootdbpath, strerror(errno));
+ }
if (newrootdbpath) xfree(newrootdbpath);
+ if (rootdbpath) xfree(rootdbpath);
return rc;
}
#include "fprint.h"
-typedef /*@abstract@*/ struct _dbiIndexRecord * dbiIndexRecord;
+typedef /*@abstract@*/ struct _dbiIndexItem * dbiIndexItem;
typedef /*@abstract@*/ struct _dbiIndex * dbiIndex;
/* this will break if sizeof(int) != 4 */
* Note: In rpm-3.0.4 and earlier, this structure was passed by value,
* and was identical to the "data saved" structure below.
*/
-struct _dbiIndexRecord {
- unsigned int recOffset; /*!< byte offset of header in db */
- unsigned int fileNumber; /*!< file array index */
+struct _dbiIndexItem {
+ unsigned int hdrNum; /*!< header instance in db */
+ unsigned int tagNum; /*!< tag index in header */
unsigned int fpNum; /*!< finger print index */
unsigned int dbNum; /*!< database index */
};
* Items retrieved from the index database.
*/
struct _dbiIndexSet {
-/*@owned@*/ struct _dbiIndexRecord * recs; /*!< array of records */
+/*@owned@*/ struct _dbiIndexItem * recs; /*!< array of records */
int count; /*!< number of records */
};
#define RPMDBI_PACKAGES 0
#define RPMDBI_DEPENDS 1
#define RPMDBI_LABEL 2 /* XXX remove rpmdbFindByLabel from API */
+#define RPMDBI_ADDED 3
+#define RPMDBI_REMOVED 4
+#define RPMDBI_AVAILABLE 5
+
/* these tags are found in package headers */
/* none of these can be 0 !! */
int rpmdbGetIteratorCount(rpmdbMatchIterator mi);
/**
- * Modify iterator to append given set of package instances.
- * TODO: replace with a more general mechanism.
+ * Append items to set of package instances to iterate.
* @param mi rpm database iterator
- * @param offsets array of package instances to match.
- * @param numOffsets number of elements in array
+ * @param hdrNums array of package instances
+ * @param nHdrNums number of elements in array
+ * @return 0 on success, 1 on failure (bad args)
*/
-void rpmdbAppendIteratorMatches(rpmdbMatchIterator mi, int * offsets,
- int numOffsets);
+int rpmdbAppendIterator(rpmdbMatchIterator mi, int * hdrNums, int nHdrNums);
+
+/**
+ * Remove items from set of package instances to iterate.
+ * @param mi rpm database iterator
+ * @param hdrNums array of package instances
+ * @param nHdrNums number of elements in array
+ * @param sorted is the array sorted? (array will be sorted on return)
+ * @return 0 on success, 1 on failure (bad args)
+ */
+int rpmdbPruneIterator(rpmdbMatchIterator mi, int * hdrNums,
+ int nHdrNums, int sorted);
/**
* Modify iterator to filter out headers that do not match version.
* Remove package header from rpm database and indices.
* @param rpmdb rpm database
* @param offset location in Packages dbi
- * @param tolerant (legacy) print error messages?
* @return 0 on success
*/
-int rpmdbRemove(rpmdb db, unsigned int offset, int tolerant);
+int rpmdbRemove(rpmdb db, unsigned int offset);
/**
* Add package header to rpm database and indices.
* @param rpmdb rpm database
* @param rpmtag rpm tag
+ * @return 0 on success
*/
int rpmdbAdd(rpmdb rpmdb, Header dbentry);
strcpy(nameBuf, "Depends");
return nameBuf;
/*@notreached@*/ break;
+ case RPMDBI_ADDED:
+ strcpy(nameBuf, "Added");
+ return nameBuf;
+ /*@notreached@*/ break;
+ case RPMDBI_REMOVED:
+ strcpy(nameBuf, "Removed");
+ return nameBuf;
+ /*@notreached@*/ break;
+ case RPMDBI_AVAILABLE:
+ strcpy(nameBuf, "Available");
+ return nameBuf;
+ /*@notreached@*/ break;
}
strcpy(nameBuf, "(unknown)");
return RPMDBI_PACKAGES;
if (!strcmp(tagstr, "Depends"))
return RPMDBI_DEPENDS;
+ if (!strcmp(tagstr, "Added"))
+ return RPMDBI_ADDED;
+ if (!strcmp(tagstr, "Removed"))
+ return RPMDBI_REMOVED;
+ if (!strcmp(tagstr, "Available"))
+ return RPMDBI_AVAILABLE;
for (t = rpmTagTable; t->name != NULL; t++) {
if (!strcasecmp(t->name + 7, tagstr))
Header h;
mi = rpmdbInitIterator(ts->db, RPMDBI_PACKAGES, NULL, 0);
- rpmdbAppendIteratorMatches(mi,
- ts->removedPackages, ts->numRemovedPackages);
+ rpmdbAppendIterator(mi, ts->removedPackages, ts->numRemovedPackages);
while ((h = rpmdbNextIterator(mi)) != NULL) {
if (headerGetEntry(h, RPMTAG_BASENAMES, NULL, NULL, &fileCount))
totalFileCount += fileCount;
}
}
- if (!(flags & RPMTRANS_FLAG_TEST)) {
- rpmMessage(RPMMESS_DEBUG, _("removing database entry\n"));
- /*
- * XXX rpmdbRemove used to have 2nd arg, tolerant = 0. This generates
- * XXX an error message because of a db-1.85 hash access bug that
- * XXX cannot be easily fixed. So, we turn off the error message.
- */
- rpmdbRemove(db, offset, 0);
- }
+ if (!(flags & RPMTRANS_FLAG_TEST))
+ rpmdbRemove(db, offset);
rc = 0;
return ec;
}
-static int verifyDependencies(/*@only@*/rpmdb db, Header h) {
+static int verifyDependencies(/*@only@*/ rpmdb rpmdb, Header h) {
rpmTransactionSet rpmdep;
struct rpmDependencyConflict * conflicts;
int numConflicts;
const char * name, * version, * release;
int i;
- rpmdep = rpmtransCreateSet(db, NULL);
+ rpmdep = rpmtransCreateSet(rpmdb, NULL);
rpmtransAddPackage(rpmdep, h, NULL, NULL, 0, NULL);
rpmdepCheck(rpmdep, &conflicts, &numConflicts);
}
/** */
-int showVerifyPackage(QVA_t *qva, rpmdb db, Header h)
+int showVerifyPackage(QVA_t *qva, rpmdb rpmdb, Header h)
{
int ec, rc;
FD_t fdo;
ec = 0;
if ((qva->qva_flags & VERIFY_DEPS) &&
- (rc = verifyDependencies(db, h)) != 0)
+ (rc = verifyDependencies(rpmdb, h)) != 0)
ec = rc;
if ((qva->qva_flags & VERIFY_FILES) &&
(rc = verifyHeader(qva, h)) != 0)
/** */
int rpmVerify(QVA_t *qva, enum rpmQVSources source, const char *arg)
{
- rpmdb db = NULL;
+ rpmdb rpmdb = NULL;
int rc;
switch (source) {
break;
/*@fallthrough@*/
default:
- if (rpmdbOpen(qva->qva_prefix, &db, O_RDONLY, 0644)) {
- fprintf(stderr, _("rpmVerify: rpmdbOpen() failed\n"));
+ if (rpmdbOpen(qva->qva_prefix, &rpmdb, O_RDONLY, 0644))
return 1;
- }
break;
}
- rc = rpmQueryVerify(qva, source, arg, db, showVerifyPackage);
+ rc = rpmQueryVerify(qva, source, arg, rpmdb, showVerifyPackage);
- if (db)
- rpmdbClose(db);
+ if (rpmdb)
+ rpmdbClose(rpmdb);
return rc;
}
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-02 04:48-0400\n"
+"POT-Creation-Date: 2000-05-06 19:31-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"
msgstr "chyba pgp"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:439
+#: lib/depends.c:434
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:468
+#: lib/depends.c:463
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#: lib/depends.c:786
#, c-format
-msgid "%s: %s satisfied by added file list.\n"
+msgid "%s: %-45s YES (added files)\n"
msgstr ""
#: lib/depends.c:835
#, fuzzy, c-format
-msgid "%s: %s satisfied by added package.\n"
+msgid "%s: %-45s YES (added package)\n"
msgstr "¾ádný balíèek nevlastní soubor %s\n"
-#: lib/depends.c:838
-#, fuzzy, c-format
-msgid "%s: %s satisfied by added package (shouldn't happen).\n"
-msgstr "¾ádný balíèek nevlastní soubor %s\n"
+#: lib/depends.c:839
+#, c-format
+msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
+msgstr ""
-#: lib/depends.c:856
+#: lib/depends.c:858
#, c-format
-msgid "%s: %s satisfied by added provide.\n"
+msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:890
-#, fuzzy, c-format
-msgid "%s: %s satisfied by Depends cache.\n"
-msgstr "¾ádný balíèek nevlastní soubor %s\n"
+#: lib/depends.c:901
+#, c-format
+msgid "%s: %-45s %-3s (cached)\n"
+msgstr ""
-#: lib/depends.c:904
+#: lib/depends.c:918
#, c-format
-msgid "%s: %s satisfied by rpmrc provides.\n"
+msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:932
+#: lib/depends.c:941
#, c-format
-msgid "%s: %s satisfied by db file lists.\n"
+msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:950
+#: lib/depends.c:954
#, c-format
-msgid "%s: %s satisfied by db provides.\n"
+msgid "%s: %-45s YES (db provides)\n"
msgstr ""
#: lib/depends.c:968
#, fuzzy, c-format
-msgid "%s: %s satisfied by db packages.\n"
+msgid "%s: %-45s YES (db packages)\n"
msgstr "¾ádný balíèek nevlastní soubor %s\n"
-#: lib/depends.c:981
+#: lib/depends.c:985
#, c-format
-msgid "%s: %s satisfied by rpmlib version.\n"
+msgid "%s: %-45s YES (rpmlib version)\n"
msgstr ""
-#: lib/depends.c:991
+#: lib/depends.c:996
#, c-format
-msgid "%s: %s unsatisfied.\n"
+msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1010
+#: lib/depends.c:1016
#, fuzzy, c-format
-msgid "%s: (%s, %d) added to Depends cache.\n"
+msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "¾ádný balíèek nevlastní soubor %s\n"
#. requirements are not satisfied.
-#: lib/depends.c:1059
+#: lib/depends.c:1065
#, 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:1121
+#: lib/depends.c:1127
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "balíèek %s koliduje: %s\n"
-#: lib/depends.c:1251
+#: lib/depends.c:1254
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr "smyèka v øetìzu podmínek: %s"
msgid "removed db file %s\n"
msgstr "odstraòuje se rejstøík souborù pro %s\n"
-#: lib/db1.c:419
+#: lib/db1.c:420
#, fuzzy, c-format
msgid "bad db file %s"
msgstr "nelze provést statistiku %s: %s"
-#: lib/db1.c:424
+#: lib/db1.c:425
#, fuzzy, c-format
msgid "opening db file %s mode 0x%x\n"
msgstr "probíhá otevírání databázového re¾imu: 0%o\n"
-#: lib/db1.c:432 lib/url.c:445
+#: lib/db1.c:434 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "nelze otevøít %s: %s"
-#: lib/db1.c:448
+#: lib/db1.c:450
#, c-format
msgid "cannot get %s lock on database"
msgstr "nelze získat %s zámek k databázi"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "exclusive"
msgstr "výhradní"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "shared"
msgstr "sdílený"
-#: lib/db2.c:133 lib/db3.c:456
+#: lib/db2.c:133
#, c-format
msgid "closed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:145 lib/db3.c:468
+#: lib/db2.c:145
#, c-format
msgid "removed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:182 lib/db3.c:505
+#: lib/db2.c:182
#, c-format
msgid "opening db environment %s/%s(%s) %s\n"
msgstr ""
-#: lib/db2.c:557 lib/db3.c:876
+#: lib/db2.c:557
#, c-format
msgid "closed db index %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:635 lib/db3.c:965
+#: lib/db2.c:635
#, c-format
msgid "opening db index %s/%s(%s) %s mode=0x%x\n"
msgstr ""
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
-#: lib/db3.c:1057
+#: lib/db3.c:464
+#, fuzzy, c-format
+msgid "closed db environment %s/%s\n"
+msgstr "odstraòuje se rejstøík souborù pro %s\n"
+
+#: lib/db3.c:476
+#, fuzzy, c-format
+msgid "removed db environment %s/%s\n"
+msgstr "odstraòuje se rejstøík souborù pro %s\n"
+
+#: lib/db3.c:513
+#, fuzzy, c-format
+msgid "opening db environment %s/%s %s\n"
+msgstr "otevírá se databáze v %s\n"
+
+#: lib/db3.c:884
#, fuzzy, c-format
-msgid "cannot get %s lock on %s/%s(%s)\n"
+msgid "closed db index %s/%s\n"
+msgstr "odstraòuje se rejstøík souborù pro %s\n"
+
+#: lib/db3.c:975
+#, fuzzy, c-format
+msgid "opening db index %s/%s %s mode=0x%x\n"
+msgstr "probíhá otevírání databázového re¾imu: 0%o\n"
+
+#: lib/db3.c:1078
+#, fuzzy, c-format
+msgid "cannot get %s lock on %s/%s\n"
msgstr "nelze získat %s zámek k databázi"
-#: lib/db3.c:1064
+#: lib/db3.c:1085
#, fuzzy, c-format
-msgid "locked db index %s/%s(%s)\n"
+msgid "locked db index %s/%s\n"
msgstr "odstraòuje se rejstøík souborù pro %s\n"
#: lib/falloc.c:135
#. this would probably be a good place to check if disk space
#. was used up - if so, we should return a different error
-#: lib/install.c:364
+#: lib/install.c:365
#, c-format
msgid "unpacking of archive failed%s%s: %s"
msgstr ""
-#: lib/install.c:365
+#: lib/install.c:366
msgid " on file "
msgstr ""
-#: lib/install.c:409
+#: lib/install.c:410
#, fuzzy
msgid "installing a source package\n"
msgstr "probíhá instalace binárních balíèkù\n"
-#: lib/install.c:429
+#: lib/install.c:430
#, fuzzy, c-format
msgid "cannot create sourcedir %s"
msgstr "nelze otevøít soubor %s: "
-#: lib/install.c:435 lib/install.c:465
+#: lib/install.c:436 lib/install.c:466
#, fuzzy, c-format
msgid "cannot write to %s"
msgstr "nelze otevøít soubor %s: "
-#: lib/install.c:439
+#: lib/install.c:440
#, c-format
msgid "sources in: %s\n"
msgstr ""
-#: lib/install.c:459
+#: lib/install.c:460
#, fuzzy, c-format
msgid "cannot create specdir %s"
msgstr "nelze otevøít soubor %s: "
-#: lib/install.c:469
+#: lib/install.c:470
#, fuzzy, c-format
msgid "spec file in: %s\n"
msgstr "soubor %s: %s\n"
-#: lib/install.c:503 lib/install.c:531
+#: lib/install.c:504 lib/install.c:532
#, fuzzy
msgid "source package contains no .spec file"
msgstr "balíèek %s neobsahuje soubory"
-#: lib/install.c:553
+#: lib/install.c:554
#, fuzzy, c-format
msgid "renaming %s to %s\n"
msgstr "Probíhá získávání %s jako %s\n"
-#: lib/install.c:555 lib/install.c:829 lib/uninstall.c:28
+#: lib/install.c:556 lib/install.c:830 lib/uninstall.c:28
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "%s nelze pøejmenovat na %s: %s"
-#: lib/install.c:646
+#: lib/install.c:647
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:701
+#: lib/install.c:702
#, fuzzy, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "balíèek %s-%s-%s obsahuje sdílení soubory\n"
-#: lib/install.c:759
+#: lib/install.c:760
#, 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:764
+#: lib/install.c:765
#, fuzzy
msgid "running preinstall script (if any)\n"
msgstr "spou¹tí se pøípadný poinstalaèní skript\n"
-#: lib/install.c:789
+#: lib/install.c:790
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:825
+#: lib/install.c:826
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
msgid "package %s is not installed\n"
msgstr "balíèek %s není nainstalován\n"
-#: lib/query.c:683
-#, fuzzy
-msgid "rpmQuery: rpmdbOpen() failed\n"
-msgstr "%s: Chybné otevøení\n"
-
-#: lib/query.c:742
+#: lib/query.c:740
#, fuzzy
msgid "query package owning file"
msgstr "dotazy na balíèek vlastnící <soubor>"
-#: lib/query.c:744
+#: lib/query.c:742
#, fuzzy
msgid "query packages in group"
msgstr "balíèek nemá skupinu\n"
-#: lib/query.c:746
+#: lib/query.c:744
#, fuzzy
msgid "query a package file"
msgstr "dotazovat v¹echny balíèky"
-#: lib/query.c:750
+#: lib/query.c:748
#, fuzzy
msgid "query a spec file"
msgstr "dotaz na %s se nezdaøil\n"
-#: lib/query.c:752
+#: lib/query.c:750
#, fuzzy
msgid "query the pacakges triggered by the package"
msgstr "dotazy na balíèky aktivované <balíkem>"
-#: lib/query.c:754
+#: lib/query.c:752
#, fuzzy
msgid "query the packages which require a capability"
msgstr "dotazovat balíèky vy¾adující schopnost <sch>"
-#: lib/query.c:756
+#: lib/query.c:754
#, fuzzy
msgid "query the packages which provide a capability"
msgstr "dotazovat balíèky poskytující schopnost <sch>"
-#: lib/query.c:795
+#: lib/query.c:793
#, fuzzy
msgid "list all configuration files"
msgstr "uvést pouze konfiguraèní soubory (implikuje -l)"
-#: lib/query.c:797
+#: lib/query.c:795
#, fuzzy
msgid "list all documentation files"
msgstr "nainstalovat dokumentaci"
-#: lib/query.c:799
+#: lib/query.c:797
#, fuzzy
msgid "dump basic file information"
msgstr "zobrazit informace o balíèku"
-#: lib/query.c:801
+#: lib/query.c:799
#, fuzzy
msgid "list files in package"
msgstr "binární balíèek starého typu\n"
-#: lib/query.c:805
+#: lib/query.c:803
msgid "use the following query format"
msgstr ""
-#: lib/query.c:807
+#: lib/query.c:805
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "balíèek %s neobsahuje soubory"
-#: lib/query.c:809
+#: lib/query.c:807
msgid "display the states of the listed files"
msgstr ""
-#: lib/query.c:811
+#: lib/query.c:809
#, fuzzy
msgid "display a verbose file listing"
msgstr "zobrazit seznam souborù balíèkù"
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: lib/rpmdb.c:196
+#: lib/rpmdb.c:218
msgid ""
"\n"
-"--> This version of rpm was not compiled with support for db%d. Please "
-"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and "
-"correct your configuration.\n"
+"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
msgstr ""
-#: lib/rpmdb.c:223
+#. failed to open with any dbapi
+#: lib/rpmdb.c:249
+#, fuzzy, c-format
+msgid "dbiOpen: cannot open %s index"
+msgstr "chyba: nelze otevøít %s\n"
+
+#: lib/rpmdb.c:257
msgid ""
"\n"
-"--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
-" db1 to db3 on-disk format.\n"
+"--> The database is in db%d format, not the suggested db%d format.\n"
+" Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
+" using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
+" to convert your database from db%d to db%d format, or configure\n"
+" \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#. XXX FIXME: dbNopen handles failures already.
-#: lib/rpmdb.c:239
-#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
-msgstr "chyba: nelze otevøít %s\n"
+#: lib/rpmdb.c:270
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
-#: lib/rpmdb.c:293
+#: lib/rpmdb.c:335
#, fuzzy, c-format
msgid "error getting \"%s\" records from %s index"
msgstr "chyba pøi získávání záznamu %s z %s"
-#: lib/rpmdb.c:410
+#: lib/rpmdb.c:452
#, c-format
msgid "error storing record %s into %s"
msgstr "chyba pøi ukládání záznamu %s do %s"
-#: lib/rpmdb.c:419
+#: lib/rpmdb.c:461
#, fuzzy, c-format
msgid "error removing record %s from %s"
msgstr "chyba pøi odstraòování záznamu %s do %s"
-#: lib/rpmdb.c:619 lib/rpmdb.c:2078
+#: lib/rpmdb.c:683 lib/rpmdb.c:2186
msgid "no dbpath has been set"
msgstr "nebyla nastavena dbpath"
-#: lib/rpmdb.c:708
+#: lib/rpmdb.c:780
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:912
+#: lib/rpmdb.c:984
#, fuzzy, c-format
msgid "cannot retrieve package \"%s\" from db"
msgstr "chyba: nelze otevøít %s%s/packages.rpm\n"
-#: lib/rpmdb.c:978 lib/rpmdb.c:1496 lib/uninstall.c:90
+#: lib/rpmdb.c:1050 lib/rpmdb.c:1560 lib/uninstall.c:90
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x"
msgstr "nelze èíst hlavièku u %d pro vyhledání"
-#: lib/rpmdb.c:1451
-#, fuzzy, c-format
-msgid "key \"%s\" not found in %s"
-msgstr "balíèek %s nenalezen v %s"
-
-#: lib/rpmdb.c:1459
-#, fuzzy, c-format
-msgid "key \"%s\" not removed from %s"
-msgstr "balíèek %s nenalezen v %s"
-
-#: lib/rpmdb.c:1541
+#: lib/rpmdb.c:1611
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "odstraòuje se polo¾ka databáze\n"
-#: lib/rpmdb.c:1550
+#: lib/rpmdb.c:1622
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstraòuje se rejstøík skupin\n"
-#: lib/rpmdb.c:1558
+#: lib/rpmdb.c:1631
#, fuzzy, c-format
-msgid "removing %d entries in %s index:\n"
+msgid "removing %d entries from %s index:\n"
msgstr "odstraòuje se rejstøík názvù\n"
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1638 lib/rpmdb.c:1861
#, c-format
-msgid "\t%6d %s\n"
+msgid "%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1774
#, fuzzy
msgid "cannot allocate new instance in database"
msgstr "nelze alokovat prostor pro databázi"
-#: lib/rpmdb.c:1761
+#: lib/rpmdb.c:1829
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1777
+#: lib/rpmdb.c:1845
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "Probíhá získávání %s jako %s\n"
-#: lib/rpmdb.c:1784
+#: lib/rpmdb.c:1854
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:1788
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
-#: lib/rpmdb.c:2103
+#: lib/rpmdb.c:2211
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "databáze se pøestavuje v koøenovém adresáøi %s\n"
-#: lib/rpmdb.c:2107
+#: lib/rpmdb.c:2215
#, c-format
msgid "temporary database %s already exists"
msgstr "doèasná databáze %s ji¾ existuje"
-#: lib/rpmdb.c:2113
-#, c-format
-msgid "creating directory: %s\n"
+#: lib/rpmdb.c:2221
+#, fuzzy, c-format
+msgid "creating directory %s\n"
msgstr "vytváøí se adresáø: %s\n"
-#: lib/rpmdb.c:2115
+#: lib/rpmdb.c:2223
#, c-format
msgid "error creating directory %s: %s"
msgstr "chyba pøi vytváøení adresáøe %s: %s"
-#: lib/rpmdb.c:2121
+#: lib/rpmdb.c:2230
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "otevírá se stará databáze\n"
-#: lib/rpmdb.c:2131
+#: lib/rpmdb.c:2239
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "otevírá se nová databáze\n"
-#: lib/rpmdb.c:2155
+#: lib/rpmdb.c:2262
#, fuzzy, c-format
msgid "record number %d in database is bad -- skipping."
msgstr "záznam èíslo %d v databázi je chybný -- vynechává se"
-#: lib/rpmdb.c:2187
+#: lib/rpmdb.c:2294
#, c-format
msgid "cannot add record originally at %d"
msgstr "nelze pøidat záznam - pùvodnì u %d"
-#: lib/rpmdb.c:2205
-msgid "failed to rebuild database; original database remains in place\n"
+#: lib/rpmdb.c:2312
+#, fuzzy
+msgid "failed to rebuild database: original database remains in place\n"
msgstr "databázi nelze pøestavit; pùvodní databáze zùstává na svém místì\n"
-#: lib/rpmdb.c:2213
+#: lib/rpmdb.c:2320
msgid "failed to replace old database with new database!\n"
msgstr "starou databázi nelze nahradit novou databází!\n"
-#: lib/rpmdb.c:2215
+#: lib/rpmdb.c:2322
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "aby se obnovily, nahrazuje soubory v %s soubory z %s"
-#: lib/rpmdb.c:2221
+#: lib/rpmdb.c:2332
+#, fuzzy, c-format
+msgid "removing directory %s\n"
+msgstr "vytváøí se adresáø: %s\n"
+
+#: lib/rpmdb.c:2334
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "nelze odstranit %s: %s\n"
msgid "running postuninstall script (if any)\n"
msgstr "spou¹tí se pøípadný poinstalaèní skript\n"
-#: lib/uninstall.c:213
-msgid "removing database entry\n"
-msgstr "odstraòuje se polo¾ka databáze\n"
-
-#: lib/uninstall.c:397
+#: lib/uninstall.c:390
msgid "execution of script failed"
msgstr "skript nelze spustit"
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: "
-#: lib/verify.c:381
#, fuzzy
-msgid "rpmVerify: rpmdbOpen() failed\n"
-msgstr "%s: Chybné otevøení\n"
+#~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
+#~ msgstr "¾ádný balíèek nevlastní soubor %s\n"
+
+#, fuzzy
+#~ msgid "%s: %s satisfied by Depends cache.\n"
+#~ msgstr "¾ádný balíèek nevlastní soubor %s\n"
+
+#, fuzzy
+#~ msgid "rpmQuery: rpmdbOpen() failed\n"
+#~ msgstr "%s: Chybné otevøení\n"
+
+#, fuzzy
+#~ msgid "key \"%s\" not found in %s"
+#~ msgstr "balíèek %s nenalezen v %s"
+
+#, fuzzy
+#~ msgid "key \"%s\" not removed from %s"
+#~ msgstr "balíèek %s nenalezen v %s"
+
+#~ msgid "removing database entry\n"
+#~ msgstr "odstraòuje se polo¾ka databáze\n"
+
+#, fuzzy
+#~ msgid "rpmVerify: rpmdbOpen() failed\n"
+#~ msgstr "%s: Chybné otevøení\n"
#~ msgid "cannot read header at %d for dependency check"
#~ msgstr "nelze èíst hlavièku u %d pro kontrolu závislostí"
#~ msgid "maximum path length exceeded\n"
#~ msgstr "pøekroèena maximální délka cesty\n"
-#~ msgid "opening database in %s\n"
-#~ msgstr "otevírá se databáze v %s\n"
-
#, fuzzy
#~ msgid "no macroname for setenv %s:%d"
#~ msgstr "chybí argument pro %s u %s:%d"
msgid ""
msgstr ""
"Project-Id-Version: rpm 2.5.2\n"
-"POT-Creation-Date: 2000-05-02 04:48-0400\n"
+"POT-Creation-Date: 2000-05-06 19:31-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"
msgstr "pgp fehlgeschlagen"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:439
+#: lib/depends.c:434
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:468
+#: lib/depends.c:463
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#: lib/depends.c:786
#, c-format
-msgid "%s: %s satisfied by added file list.\n"
+msgid "%s: %-45s YES (added files)\n"
msgstr ""
#: lib/depends.c:835
#, fuzzy, c-format
-msgid "%s: %s satisfied by added package.\n"
+msgid "%s: %-45s YES (added package)\n"
msgstr "die Datei »%s« gehört zu keinem Paket\n"
-#: lib/depends.c:838
-#, fuzzy, c-format
-msgid "%s: %s satisfied by added package (shouldn't happen).\n"
-msgstr "die Datei »%s« gehört zu keinem Paket\n"
+#: lib/depends.c:839
+#, c-format
+msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
+msgstr ""
-#: lib/depends.c:856
+#: lib/depends.c:858
#, c-format
-msgid "%s: %s satisfied by added provide.\n"
+msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:890
-#, fuzzy, c-format
-msgid "%s: %s satisfied by Depends cache.\n"
-msgstr "die Datei »%s« gehört zu keinem Paket\n"
+#: lib/depends.c:901
+#, c-format
+msgid "%s: %-45s %-3s (cached)\n"
+msgstr ""
-#: lib/depends.c:904
+#: lib/depends.c:918
#, c-format
-msgid "%s: %s satisfied by rpmrc provides.\n"
+msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:932
+#: lib/depends.c:941
#, c-format
-msgid "%s: %s satisfied by db file lists.\n"
+msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:950
+#: lib/depends.c:954
#, c-format
-msgid "%s: %s satisfied by db provides.\n"
+msgid "%s: %-45s YES (db provides)\n"
msgstr ""
#: lib/depends.c:968
#, fuzzy, c-format
-msgid "%s: %s satisfied by db packages.\n"
+msgid "%s: %-45s YES (db packages)\n"
msgstr "die Datei »%s« gehört zu keinem Paket\n"
-#: lib/depends.c:981
+#: lib/depends.c:985
#, c-format
-msgid "%s: %s satisfied by rpmlib version.\n"
+msgid "%s: %-45s YES (rpmlib version)\n"
msgstr ""
-#: lib/depends.c:991
+#: lib/depends.c:996
#, c-format
-msgid "%s: %s unsatisfied.\n"
+msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1010
+#: lib/depends.c:1016
#, fuzzy, c-format
-msgid "%s: (%s, %d) added to Depends cache.\n"
+msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "die Datei »%s« gehört zu keinem Paket\n"
#. requirements are not satisfied.
-#: lib/depends.c:1059
+#: lib/depends.c:1065
#, 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:1121
+#: lib/depends.c:1127
#, fuzzy, c-format
msgid "package %s conflicts: %s\n"
msgstr "Paket %s wird nicht in %s aufgeführt"
-#: lib/depends.c:1251
+#: lib/depends.c:1254
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr ""
msgstr ""
# , c-format
-#: lib/db1.c:419
+#: lib/db1.c:420
#, fuzzy, c-format
msgid "bad db file %s"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: lib/db1.c:424
+#: lib/db1.c:425
#, fuzzy, c-format
msgid "opening db file %s mode 0x%x\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
# , c-format
-#: lib/db1.c:432 lib/url.c:445
+#: lib/db1.c:434 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: lib/db1.c:448
+#: lib/db1.c:450
#, c-format
msgid "cannot get %s lock on database"
msgstr "kann %s lock für die Datenbank nicht bekommen"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "exclusive"
msgstr "exklusiv"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "shared"
msgstr "geteilt"
-#: lib/db2.c:133 lib/db3.c:456
+#: lib/db2.c:133
#, c-format
msgid "closed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:145 lib/db3.c:468
+#: lib/db2.c:145
#, c-format
msgid "removed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:182 lib/db3.c:505
+#: lib/db2.c:182
#, c-format
msgid "opening db environment %s/%s(%s) %s\n"
msgstr ""
-#: lib/db2.c:557 lib/db3.c:876
+#: lib/db2.c:557
#, c-format
msgid "closed db index %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:635 lib/db3.c:965
+#: lib/db2.c:635
#, c-format
msgid "opening db index %s/%s(%s) %s mode=0x%x\n"
msgstr ""
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
-#: lib/db3.c:1057
+#: lib/db3.c:464
+#, c-format
+msgid "closed db environment %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:476
+#, c-format
+msgid "removed db environment %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:513
+#, c-format
+msgid "opening db environment %s/%s %s\n"
+msgstr ""
+
+#: lib/db3.c:884
+#, c-format
+msgid "closed db index %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:975
+#, fuzzy, c-format
+msgid "opening db index %s/%s %s mode=0x%x\n"
+msgstr "Datenbank aus der vorhandenen neu erstellen"
+
+#: lib/db3.c:1078
#, fuzzy, c-format
-msgid "cannot get %s lock on %s/%s(%s)\n"
+msgid "cannot get %s lock on %s/%s\n"
msgstr "kann %s lock für die Datenbank nicht bekommen"
-#: lib/db3.c:1064
+#: lib/db3.c:1085
#, c-format
-msgid "locked db index %s/%s(%s)\n"
+msgid "locked db index %s/%s\n"
msgstr ""
#: lib/falloc.c:135
#. this would probably be a good place to check if disk space
#. was used up - if so, we should return a different error
-#: lib/install.c:364
+#: lib/install.c:365
#, c-format
msgid "unpacking of archive failed%s%s: %s"
msgstr ""
-#: lib/install.c:365
+#: lib/install.c:366
msgid " on file "
msgstr ""
-#: lib/install.c:409
+#: lib/install.c:410
#, fuzzy
msgid "installing a source package\n"
msgstr "Paket installieren"
-#: lib/install.c:429
+#: lib/install.c:430
#, fuzzy, c-format
msgid "cannot create sourcedir %s"
msgstr "kann Datei %s nicht öffnen: "
-#: lib/install.c:435 lib/install.c:465
+#: lib/install.c:436 lib/install.c:466
#, fuzzy, c-format
msgid "cannot write to %s"
msgstr "kann Datei %s nicht öffnen: "
-#: lib/install.c:439
+#: lib/install.c:440
#, c-format
msgid "sources in: %s\n"
msgstr ""
-#: lib/install.c:459
+#: lib/install.c:460
#, fuzzy, c-format
msgid "cannot create specdir %s"
msgstr "kann Datei %s nicht öffnen: "
# , c-format
-#: lib/install.c:469
+#: lib/install.c:470
#, fuzzy, c-format
msgid "spec file in: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: lib/install.c:503 lib/install.c:531
+#: lib/install.c:504 lib/install.c:532
#, fuzzy
msgid "source package contains no .spec file"
msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
-#: lib/install.c:553
+#: lib/install.c:554
#, c-format
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:555 lib/install.c:829 lib/uninstall.c:28
+#: lib/install.c:556 lib/install.c:830 lib/uninstall.c:28
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "umbennen von %s nach %s fehlgeschlagen: %s"
-#: lib/install.c:646
+#: lib/install.c:647
msgid "source package expected, binary found"
msgstr ""
# FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/install.c:701
+#: lib/install.c:702
#, fuzzy, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
-#: lib/install.c:759
+#: lib/install.c:760
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:764
+#: lib/install.c:765
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:789
+#: lib/install.c:790
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:825
+#: lib/install.c:826
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
msgid "package %s is not installed\n"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/query.c:683
-#, fuzzy
-msgid "rpmQuery: rpmdbOpen() failed\n"
-msgstr "%s: Öffnen fehlgeschlagen\n"
-
-#: lib/query.c:742
+#: lib/query.c:740
#, fuzzy
msgid "query package owning file"
msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
-#: lib/query.c:744
+#: lib/query.c:742
#, fuzzy
msgid "query packages in group"
msgstr "Paket hat keinen Namen"
-#: lib/query.c:746
+#: lib/query.c:744
#, fuzzy
msgid "query a package file"
msgstr "Anfrage an alle Pakete"
-#: lib/query.c:750
+#: lib/query.c:748
#, fuzzy
msgid "query a spec file"
msgstr "Anfrage von %s fehlgeschlagen\n"
-#: lib/query.c:752
+#: lib/query.c:750
#, fuzzy
msgid "query the pacakges triggered by the package"
msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
-#: lib/query.c:754
+#: lib/query.c:752
#, fuzzy
msgid "query the packages which require a capability"
msgstr "Anfrage nach Paketen, die die Fähigkeit <i> benötigen"
-#: lib/query.c:756
+#: lib/query.c:754
#, fuzzy
msgid "query the packages which provide a capability"
msgstr "Anfrage nach Paketen, die die Fähigkeit <i> bereitstellen"
-#: lib/query.c:795
+#: lib/query.c:793
#, fuzzy
msgid "list all configuration files"
msgstr "Nur Konfigurationsdateien auflisten (impliziert -l)"
-#: lib/query.c:797
+#: lib/query.c:795
#, fuzzy
msgid "list all documentation files"
msgstr "Dokumentation installieren"
-#: lib/query.c:799
+#: lib/query.c:797
#, fuzzy
msgid "dump basic file information"
msgstr "Paketinformationen anzeigen"
-#: lib/query.c:801
+#: lib/query.c:799
#, fuzzy
msgid "list files in package"
msgstr "Paket installieren"
-#: lib/query.c:805
+#: lib/query.c:803
msgid "use the following query format"
msgstr ""
-#: lib/query.c:807
+#: lib/query.c:805
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
-#: lib/query.c:809
+#: lib/query.c:807
msgid "display the states of the listed files"
msgstr ""
-#: lib/query.c:811
+#: lib/query.c:809
#, fuzzy
msgid "display a verbose file listing"
msgstr "Dateiliste des Pakets anzeigen"
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: lib/rpmdb.c:196
+#: lib/rpmdb.c:218
msgid ""
"\n"
-"--> This version of rpm was not compiled with support for db%d. Please "
-"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and "
-"correct your configuration.\n"
+"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
msgstr ""
-#: lib/rpmdb.c:223
+#. failed to open with any dbapi
+#: lib/rpmdb.c:249
+#, fuzzy, c-format
+msgid "dbiOpen: cannot open %s index"
+msgstr "Fehler: kann %s nicht öffnen\n"
+
+#: lib/rpmdb.c:257
msgid ""
"\n"
-"--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
-" db1 to db3 on-disk format.\n"
+"--> The database is in db%d format, not the suggested db%d format.\n"
+" Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
+" using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
+" to convert your database from db%d to db%d format, or configure\n"
+" \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#. XXX FIXME: dbNopen handles failures already.
-#: lib/rpmdb.c:239
-#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
-msgstr "Fehler: kann %s nicht öffnen\n"
+#: lib/rpmdb.c:270
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
-#: lib/rpmdb.c:293
+#: lib/rpmdb.c:335
#, fuzzy, c-format
msgid "error getting \"%s\" records from %s index"
msgstr "Fehler beim Eintrag %s von %s"
-#: lib/rpmdb.c:410
+#: lib/rpmdb.c:452
#, c-format
msgid "error storing record %s into %s"
msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
# FIXME
-#: lib/rpmdb.c:419
+#: lib/rpmdb.c:461
#, fuzzy, c-format
msgid "error removing record %s from %s"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
-#: lib/rpmdb.c:619 lib/rpmdb.c:2078
+#: lib/rpmdb.c:683 lib/rpmdb.c:2186
msgid "no dbpath has been set"
msgstr "»dbpath« ist nicht gesetzt"
-#: lib/rpmdb.c:708
+#: lib/rpmdb.c:780
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:912
+#: lib/rpmdb.c:984
#, fuzzy, c-format
msgid "cannot retrieve package \"%s\" from db"
msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
-#: lib/rpmdb.c:978 lib/rpmdb.c:1496 lib/uninstall.c:90
+#: lib/rpmdb.c:1050 lib/rpmdb.c:1560 lib/uninstall.c:90
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x"
msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen"
-#: lib/rpmdb.c:1451
-#, fuzzy, c-format
-msgid "key \"%s\" not found in %s"
-msgstr "Paket %s in %s nicht gefunden"
-
-#: lib/rpmdb.c:1459
-#, fuzzy, c-format
-msgid "key \"%s\" not removed from %s"
-msgstr "Paket %s in %s nicht gefunden"
-
-#: lib/rpmdb.c:1541
+#: lib/rpmdb.c:1611
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
# FIXME
-#: lib/rpmdb.c:1550
+#: lib/rpmdb.c:1622
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
# FIXME
-#: lib/rpmdb.c:1558
+#: lib/rpmdb.c:1631
#, fuzzy, c-format
-msgid "removing %d entries in %s index:\n"
+msgid "removing %d entries from %s index:\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1638 lib/rpmdb.c:1861
#, c-format
-msgid "\t%6d %s\n"
+msgid "%6d %s\n"
msgstr ""
# reservieren???
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1774
#, fuzzy
msgid "cannot allocate new instance in database"
msgstr "kann keinen Platz für die Datenbank bekommen"
-#: lib/rpmdb.c:1761
+#: lib/rpmdb.c:1829
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1777
+#: lib/rpmdb.c:1845
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1784
+#: lib/rpmdb.c:1854
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:1788
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
-#: lib/rpmdb.c:2103
+#: lib/rpmdb.c:2211
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: lib/rpmdb.c:2107
+#: lib/rpmdb.c:2215
#, c-format
msgid "temporary database %s already exists"
msgstr "die temporäre Datenbank %s existiert schon"
-#: lib/rpmdb.c:2113
+#: lib/rpmdb.c:2221
#, fuzzy, c-format
-msgid "creating directory: %s\n"
+msgid "creating directory %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/rpmdb.c:2115
+#: lib/rpmdb.c:2223
#, c-format
msgid "error creating directory %s: %s"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/rpmdb.c:2121
+#: lib/rpmdb.c:2230
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: lib/rpmdb.c:2131
+#: lib/rpmdb.c:2239
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: lib/rpmdb.c:2155
+#: lib/rpmdb.c:2262
#, fuzzy, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
"Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen"
-#: lib/rpmdb.c:2187
+#: lib/rpmdb.c:2294
#, c-format
msgid "cannot add record originally at %d"
msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d"
-#: lib/rpmdb.c:2205
-msgid "failed to rebuild database; original database remains in place\n"
+#: lib/rpmdb.c:2312
+msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2213
+#: lib/rpmdb.c:2320
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2215
+#: lib/rpmdb.c:2322
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
+#: lib/rpmdb.c:2332
+#, fuzzy, c-format
+msgid "removing directory %s\n"
+msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
+
# , c-format
-#: lib/rpmdb.c:2221
+#: lib/rpmdb.c:2334
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
msgid "running postuninstall script (if any)\n"
msgstr ""
-#: lib/uninstall.c:213
-msgid "removing database entry\n"
-msgstr ""
-
-#: lib/uninstall.c:397
+#: lib/uninstall.c:390
msgid "execution of script failed"
msgstr "Ausführung des Skripts fehlgeschlagen"
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: "
-#: lib/verify.c:381
#, fuzzy
-msgid "rpmVerify: rpmdbOpen() failed\n"
-msgstr "%s: Öffnen fehlgeschlagen\n"
+#~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
+#~ msgstr "die Datei »%s« gehört zu keinem Paket\n"
+
+#, fuzzy
+#~ msgid "%s: %s satisfied by Depends cache.\n"
+#~ msgstr "die Datei »%s« gehört zu keinem Paket\n"
+
+#, fuzzy
+#~ msgid "rpmQuery: rpmdbOpen() failed\n"
+#~ msgstr "%s: Öffnen fehlgeschlagen\n"
+
+#, fuzzy
+#~ msgid "key \"%s\" not found in %s"
+#~ msgstr "Paket %s in %s nicht gefunden"
+
+#, fuzzy
+#~ msgid "key \"%s\" not removed from %s"
+#~ msgstr "Paket %s in %s nicht gefunden"
+
+#, fuzzy
+#~ msgid "rpmVerify: rpmdbOpen() failed\n"
+#~ msgstr "%s: Öffnen fehlgeschlagen\n"
#~ msgid "cannot read header at %d for dependency check"
#~ msgstr "kann Kopfzeilen bei %d nicht lesen, um Abhängigkeiten zu prüfen"
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-05-02 04:48-0400\n"
+"POT-Creation-Date: 2000-05-06 19:31-0400\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"
"Content-Type: text/plain; charset=\n"
msgstr "pgp epäonnistui"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:439
+#: lib/depends.c:434
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:468
+#: lib/depends.c:463
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#: lib/depends.c:786
#, c-format
-msgid "%s: %s satisfied by added file list.\n"
+msgid "%s: %-45s YES (added files)\n"
msgstr ""
#: lib/depends.c:835
#, fuzzy, c-format
-msgid "%s: %s satisfied by added package.\n"
+msgid "%s: %-45s YES (added package)\n"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/depends.c:838
-#, fuzzy, c-format
-msgid "%s: %s satisfied by added package (shouldn't happen).\n"
-msgstr "tiedostoa %s ei omista mikään paketti\n"
+#: lib/depends.c:839
+#, c-format
+msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
+msgstr ""
-#: lib/depends.c:856
+#: lib/depends.c:858
#, c-format
-msgid "%s: %s satisfied by added provide.\n"
+msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:890
-#, fuzzy, c-format
-msgid "%s: %s satisfied by Depends cache.\n"
-msgstr "tiedostoa %s ei omista mikään paketti\n"
+#: lib/depends.c:901
+#, c-format
+msgid "%s: %-45s %-3s (cached)\n"
+msgstr ""
-#: lib/depends.c:904
+#: lib/depends.c:918
#, c-format
-msgid "%s: %s satisfied by rpmrc provides.\n"
+msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:932
+#: lib/depends.c:941
#, c-format
-msgid "%s: %s satisfied by db file lists.\n"
+msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:950
+#: lib/depends.c:954
#, c-format
-msgid "%s: %s satisfied by db provides.\n"
+msgid "%s: %-45s YES (db provides)\n"
msgstr ""
#: lib/depends.c:968
#, fuzzy, c-format
-msgid "%s: %s satisfied by db packages.\n"
+msgid "%s: %-45s YES (db packages)\n"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/depends.c:981
+#: lib/depends.c:985
#, c-format
-msgid "%s: %s satisfied by rpmlib version.\n"
+msgid "%s: %-45s YES (rpmlib version)\n"
msgstr ""
-#: lib/depends.c:991
+#: lib/depends.c:996
#, c-format
-msgid "%s: %s unsatisfied.\n"
+msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1010
+#: lib/depends.c:1016
#, fuzzy, c-format
-msgid "%s: (%s, %d) added to Depends cache.\n"
+msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "tiedostoa %s ei omista mikään paketti\n"
#. requirements are not satisfied.
-#: lib/depends.c:1059
+#: lib/depends.c:1065
#, fuzzy, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "paketti %s ei ole %s:ssä"
#. conflicts exist.
-#: lib/depends.c:1121
+#: lib/depends.c:1127
#, fuzzy, c-format
msgid "package %s conflicts: %s\n"
msgstr "paketti %s ei ole %s:ssä"
-#: lib/depends.c:1251
+#: lib/depends.c:1254
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr "silmukka edellytysten ketjussa: %s"
msgid "removed db file %s\n"
msgstr ""
-#: lib/db1.c:419
+#: lib/db1.c:420
#, fuzzy, c-format
msgid "bad db file %s"
msgstr "en voinut avata %s: %s"
-#: lib/db1.c:424
+#: lib/db1.c:425
#, fuzzy, c-format
msgid "opening db file %s mode 0x%x\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: lib/db1.c:432 lib/url.c:445
+#: lib/db1.c:434 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "en voinut avata %s: %s"
-#: lib/db1.c:448
+#: lib/db1.c:450
#, c-format
msgid "cannot get %s lock on database"
msgstr "en voi saada %s lukitusta tietokantaan"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "exclusive"
msgstr "poissulkevaa"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "shared"
msgstr "jaettua"
-#: lib/db2.c:133 lib/db3.c:456
+#: lib/db2.c:133
#, c-format
msgid "closed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:145 lib/db3.c:468
+#: lib/db2.c:145
#, c-format
msgid "removed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:182 lib/db3.c:505
+#: lib/db2.c:182
#, c-format
msgid "opening db environment %s/%s(%s) %s\n"
msgstr ""
-#: lib/db2.c:557 lib/db3.c:876
+#: lib/db2.c:557
#, c-format
msgid "closed db index %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:635 lib/db3.c:965
+#: lib/db2.c:635
#, c-format
msgid "opening db index %s/%s(%s) %s mode=0x%x\n"
msgstr ""
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
-#: lib/db3.c:1057
+#: lib/db3.c:464
+#, c-format
+msgid "closed db environment %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:476
+#, c-format
+msgid "removed db environment %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:513
+#, c-format
+msgid "opening db environment %s/%s %s\n"
+msgstr ""
+
+#: lib/db3.c:884
+#, c-format
+msgid "closed db index %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:975
+#, fuzzy, c-format
+msgid "opening db index %s/%s %s mode=0x%x\n"
+msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
+
+#: lib/db3.c:1078
#, fuzzy, c-format
-msgid "cannot get %s lock on %s/%s(%s)\n"
+msgid "cannot get %s lock on %s/%s\n"
msgstr "en voi saada %s lukitusta tietokantaan"
-#: lib/db3.c:1064
+#: lib/db3.c:1085
#, c-format
-msgid "locked db index %s/%s(%s)\n"
+msgid "locked db index %s/%s\n"
msgstr ""
#: lib/falloc.c:135
#. this would probably be a good place to check if disk space
#. was used up - if so, we should return a different error
-#: lib/install.c:364
+#: lib/install.c:365
#, c-format
msgid "unpacking of archive failed%s%s: %s"
msgstr ""
-#: lib/install.c:365
+#: lib/install.c:366
msgid " on file "
msgstr ""
-#: lib/install.c:409
+#: lib/install.c:410
#, fuzzy
msgid "installing a source package\n"
msgstr "asenna paketti"
-#: lib/install.c:429
+#: lib/install.c:430
#, fuzzy, c-format
msgid "cannot create sourcedir %s"
msgstr "en voinut avata tiedostoa %s: "
-#: lib/install.c:435 lib/install.c:465
+#: lib/install.c:436 lib/install.c:466
#, fuzzy, c-format
msgid "cannot write to %s"
msgstr "en voinut avata tiedostoa %s: "
-#: lib/install.c:439
+#: lib/install.c:440
#, c-format
msgid "sources in: %s\n"
msgstr ""
-#: lib/install.c:459
+#: lib/install.c:460
#, fuzzy, c-format
msgid "cannot create specdir %s"
msgstr "en voinut avata tiedostoa %s: "
-#: lib/install.c:469
+#: lib/install.c:470
#, fuzzy, c-format
msgid "spec file in: %s\n"
msgstr "en voinut avata %s: %s"
-#: lib/install.c:503 lib/install.c:531
+#: lib/install.c:504 lib/install.c:532
#, fuzzy
msgid "source package contains no .spec file"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: lib/install.c:553
+#: lib/install.c:554
#, c-format
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:555 lib/install.c:829 lib/uninstall.c:28
+#: lib/install.c:556 lib/install.c:830 lib/uninstall.c:28
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "%s:n nimeäminen %s:ksi epäonnistui: %s"
-#: lib/install.c:646
+#: lib/install.c:647
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:701
+#: lib/install.c:702
#, fuzzy, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n"
-#: lib/install.c:759
+#: lib/install.c:760
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:764
+#: lib/install.c:765
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:789
+#: lib/install.c:790
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:825
+#: lib/install.c:826
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
msgid "package %s is not installed\n"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/query.c:683
-#, fuzzy
-msgid "rpmQuery: rpmdbOpen() failed\n"
-msgstr "%s: avaus ei onnistunut\n"
-
-#: lib/query.c:742
+#: lib/query.c:740
#, fuzzy
msgid "query package owning file"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: lib/query.c:744
+#: lib/query.c:742
#, fuzzy
msgid "query packages in group"
msgstr "paketilla ei ole nimeä"
-#: lib/query.c:746
+#: lib/query.c:744
#, fuzzy
msgid "query a package file"
msgstr "kysele kaikki paketit"
-#: lib/query.c:750
+#: lib/query.c:748
#, fuzzy
msgid "query a spec file"
msgstr "%s:n kysely ei onnistunut\n"
-#: lib/query.c:752
+#: lib/query.c:750
#, fuzzy
msgid "query the pacakges triggered by the package"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: lib/query.c:754
+#: lib/query.c:752
#, fuzzy
msgid "query the packages which require a capability"
msgstr "kysele paketteja, jotka vaativat <i> ominaisuutta"
-#: lib/query.c:756
+#: lib/query.c:754
#, fuzzy
msgid "query the packages which provide a capability"
msgstr "kysele paketteja, jotka tarjoavat <i> ominaisuuden"
-#: lib/query.c:795
+#: lib/query.c:793
#, fuzzy
msgid "list all configuration files"
msgstr "listaa vain konfigurointiedostot (josta seuraa -l)"
-#: lib/query.c:797
+#: lib/query.c:795
#, fuzzy
msgid "list all documentation files"
msgstr "asenna dokumentaatio"
-#: lib/query.c:799
+#: lib/query.c:797
#, fuzzy
msgid "dump basic file information"
msgstr "näytä paketin tiedot"
-#: lib/query.c:801
+#: lib/query.c:799
#, fuzzy
msgid "list files in package"
msgstr "asenna paketti"
-#: lib/query.c:805
+#: lib/query.c:803
msgid "use the following query format"
msgstr ""
-#: lib/query.c:807
+#: lib/query.c:805
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: lib/query.c:809
+#: lib/query.c:807
msgid "display the states of the listed files"
msgstr ""
-#: lib/query.c:811
+#: lib/query.c:809
#, fuzzy
msgid "display a verbose file listing"
msgstr "näytä paketin tiedostolistaus"
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: lib/rpmdb.c:196
+#: lib/rpmdb.c:218
msgid ""
"\n"
-"--> This version of rpm was not compiled with support for db%d. Please "
-"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and "
-"correct your configuration.\n"
+"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
msgstr ""
-#: lib/rpmdb.c:223
+#. failed to open with any dbapi
+#: lib/rpmdb.c:249
+#, fuzzy, c-format
+msgid "dbiOpen: cannot open %s index"
+msgstr "virhe: en voi avata %s\n"
+
+#: lib/rpmdb.c:257
msgid ""
"\n"
-"--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
-" db1 to db3 on-disk format.\n"
+"--> The database is in db%d format, not the suggested db%d format.\n"
+" Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
+" using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
+" to convert your database from db%d to db%d format, or configure\n"
+" \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#. XXX FIXME: dbNopen handles failures already.
-#: lib/rpmdb.c:239
-#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
-msgstr "virhe: en voi avata %s\n"
+#: lib/rpmdb.c:270
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
-#: lib/rpmdb.c:293
+#: lib/rpmdb.c:335
#, fuzzy, c-format
msgid "error getting \"%s\" records from %s index"
msgstr "virhe luettaessa tietuetta %s %s:stä"
-#: lib/rpmdb.c:410
+#: lib/rpmdb.c:452
#, c-format
msgid "error storing record %s into %s"
msgstr "virhe talletettaessa tietuetta %s %s:ään"
-#: lib/rpmdb.c:419
+#: lib/rpmdb.c:461
#, fuzzy, c-format
msgid "error removing record %s from %s"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: lib/rpmdb.c:619 lib/rpmdb.c:2078
+#: lib/rpmdb.c:683 lib/rpmdb.c:2186
msgid "no dbpath has been set"
msgstr "dbpath ei ole asetettu"
-#: lib/rpmdb.c:708
+#: lib/rpmdb.c:780
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:912
+#: lib/rpmdb.c:984
#, fuzzy, c-format
msgid "cannot retrieve package \"%s\" from db"
msgstr "virhe: en voi avata %s%s/packages.rpm\n"
-#: lib/rpmdb.c:978 lib/rpmdb.c:1496 lib/uninstall.c:90
+#: lib/rpmdb.c:1050 lib/rpmdb.c:1560 lib/uninstall.c:90
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x"
msgstr "en voi lukea headeria %d:stä päivittäessä"
-#: lib/rpmdb.c:1451
-#, fuzzy, c-format
-msgid "key \"%s\" not found in %s"
-msgstr "paketti %s ei ole %s:ssä"
-
-#: lib/rpmdb.c:1459
-#, fuzzy, c-format
-msgid "key \"%s\" not removed from %s"
-msgstr "paketti %s ei ole %s:ssä"
-
-#: lib/rpmdb.c:1541
+#: lib/rpmdb.c:1611
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1550
+#: lib/rpmdb.c:1622
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: lib/rpmdb.c:1558
+#: lib/rpmdb.c:1631
#, fuzzy, c-format
-msgid "removing %d entries in %s index:\n"
+msgid "removing %d entries from %s index:\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1638 lib/rpmdb.c:1861
#, c-format
-msgid "\t%6d %s\n"
+msgid "%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1774
#, fuzzy
msgid "cannot allocate new instance in database"
msgstr "en voi varata tilaa tietokannalle"
-#: lib/rpmdb.c:1761
+#: lib/rpmdb.c:1829
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1777
+#: lib/rpmdb.c:1845
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1784
+#: lib/rpmdb.c:1854
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:1788
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
-#: lib/rpmdb.c:2103
+#: lib/rpmdb.c:2211
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: lib/rpmdb.c:2107
+#: lib/rpmdb.c:2215
#, c-format
msgid "temporary database %s already exists"
msgstr "väliaikainen tietokanta %s on jo olemassa"
-#: lib/rpmdb.c:2113
+#: lib/rpmdb.c:2221
#, fuzzy, c-format
-msgid "creating directory: %s\n"
+msgid "creating directory %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/rpmdb.c:2115
+#: lib/rpmdb.c:2223
#, c-format
msgid "error creating directory %s: %s"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/rpmdb.c:2121
+#: lib/rpmdb.c:2230
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: lib/rpmdb.c:2131
+#: lib/rpmdb.c:2239
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: lib/rpmdb.c:2155
+#: lib/rpmdb.c:2262
#, fuzzy, c-format
msgid "record number %d in database is bad -- skipping."
msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen"
-#: lib/rpmdb.c:2187
+#: lib/rpmdb.c:2294
#, c-format
msgid "cannot add record originally at %d"
msgstr "en voi lisätä tietuetta %d:stä"
-#: lib/rpmdb.c:2205
-msgid "failed to rebuild database; original database remains in place\n"
+#: lib/rpmdb.c:2312
+msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2213
+#: lib/rpmdb.c:2320
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2215
+#: lib/rpmdb.c:2322
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2221
+#: lib/rpmdb.c:2332
+#, fuzzy, c-format
+msgid "removing directory %s\n"
+msgstr "virhe luotaessa hakemistoa %s: %s"
+
+#: lib/rpmdb.c:2334
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "en voinut avata %s: %s"
msgid "running postuninstall script (if any)\n"
msgstr ""
-#: lib/uninstall.c:213
-msgid "removing database entry\n"
-msgstr ""
-
-#: lib/uninstall.c:397
+#: lib/uninstall.c:390
msgid "execution of script failed"
msgstr "skriptin ajo epäonnistui"
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:"
-#: lib/verify.c:381
#, fuzzy
-msgid "rpmVerify: rpmdbOpen() failed\n"
-msgstr "%s: avaus ei onnistunut\n"
+#~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
+#~ msgstr "tiedostoa %s ei omista mikään paketti\n"
+
+#, fuzzy
+#~ msgid "%s: %s satisfied by Depends cache.\n"
+#~ msgstr "tiedostoa %s ei omista mikään paketti\n"
+
+#, fuzzy
+#~ msgid "rpmQuery: rpmdbOpen() failed\n"
+#~ msgstr "%s: avaus ei onnistunut\n"
+
+#, fuzzy
+#~ msgid "key \"%s\" not found in %s"
+#~ msgstr "paketti %s ei ole %s:ssä"
+
+#, fuzzy
+#~ msgid "key \"%s\" not removed from %s"
+#~ msgstr "paketti %s ei ole %s:ssä"
+
+#, fuzzy
+#~ msgid "rpmVerify: rpmdbOpen() failed\n"
+#~ msgstr "%s: avaus ei onnistunut\n"
#~ msgid "cannot read header at %d for dependency check"
#~ msgstr "en voi lukea headeria %d:ssä riippuvuutta tarkistaessa"
msgid ""
-msgstr "POT-Creation-Date: 2000-05-02 04:48-0400\n"
+msgstr "POT-Creation-Date: 2000-05-06 19:31-0400\n"
#: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422
#, c-format
msgstr "La construction a échoué.\n"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:439
+#: lib/depends.c:434
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:468
+#: lib/depends.c:463
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#: lib/depends.c:786
#, c-format
-msgid "%s: %s satisfied by added file list.\n"
+msgid "%s: %-45s YES (added files)\n"
msgstr ""
#: lib/depends.c:835
#, c-format
-msgid "%s: %s satisfied by added package.\n"
+msgid "%s: %-45s YES (added package)\n"
msgstr ""
-#: lib/depends.c:838
+#: lib/depends.c:839
#, c-format
-msgid "%s: %s satisfied by added package (shouldn't happen).\n"
+msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
msgstr ""
-#: lib/depends.c:856
+#: lib/depends.c:858
#, c-format
-msgid "%s: %s satisfied by added provide.\n"
+msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:890
+#: lib/depends.c:901
#, c-format
-msgid "%s: %s satisfied by Depends cache.\n"
+msgid "%s: %-45s %-3s (cached)\n"
msgstr ""
-#: lib/depends.c:904
+#: lib/depends.c:918
#, c-format
-msgid "%s: %s satisfied by rpmrc provides.\n"
+msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:932
+#: lib/depends.c:941
#, c-format
-msgid "%s: %s satisfied by db file lists.\n"
+msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:950
+#: lib/depends.c:954
#, c-format
-msgid "%s: %s satisfied by db provides.\n"
+msgid "%s: %-45s YES (db provides)\n"
msgstr ""
#: lib/depends.c:968
#, c-format
-msgid "%s: %s satisfied by db packages.\n"
+msgid "%s: %-45s YES (db packages)\n"
msgstr ""
-#: lib/depends.c:981
+#: lib/depends.c:985
#, c-format
-msgid "%s: %s satisfied by rpmlib version.\n"
+msgid "%s: %-45s YES (rpmlib version)\n"
msgstr ""
-#: lib/depends.c:991
+#: lib/depends.c:996
#, c-format
-msgid "%s: %s unsatisfied.\n"
+msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1010
+#: lib/depends.c:1016
#, c-format
-msgid "%s: (%s, %d) added to Depends cache.\n"
+msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1059
+#: lib/depends.c:1065
#, 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:1121
+#: lib/depends.c:1127
#, fuzzy, c-format
msgid "package %s conflicts: %s\n"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: lib/depends.c:1251
+#: lib/depends.c:1254
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr ""
msgid "removed db file %s\n"
msgstr ""
-#: lib/db1.c:419
+#: lib/db1.c:420
#, fuzzy, c-format
msgid "bad db file %s"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/db1.c:424
+#: lib/db1.c:425
#, fuzzy, c-format
msgid "opening db file %s mode 0x%x\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/db1.c:432 lib/url.c:445
+#: lib/db1.c:434 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/db1.c:448
+#: lib/db1.c:450
#, fuzzy, c-format
msgid "cannot get %s lock on database"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "exclusive"
msgstr ""
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "shared"
msgstr ""
-#: lib/db2.c:133 lib/db3.c:456
+#: lib/db2.c:133
#, c-format
msgid "closed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:145 lib/db3.c:468
+#: lib/db2.c:145
#, c-format
msgid "removed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:182 lib/db3.c:505
+#: lib/db2.c:182
#, c-format
msgid "opening db environment %s/%s(%s) %s\n"
msgstr ""
-#: lib/db2.c:557 lib/db3.c:876
+#: lib/db2.c:557
#, c-format
msgid "closed db index %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:635 lib/db3.c:965
+#: lib/db2.c:635
#, c-format
msgid "opening db index %s/%s(%s) %s mode=0x%x\n"
msgstr ""
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
-#: lib/db3.c:1057
+#: lib/db3.c:464
+#, c-format
+msgid "closed db environment %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:476
+#, c-format
+msgid "removed db environment %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:513
+#, c-format
+msgid "opening db environment %s/%s %s\n"
+msgstr ""
+
+#: lib/db3.c:884
+#, c-format
+msgid "closed db index %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:975
+#, fuzzy, c-format
+msgid "opening db index %s/%s %s mode=0x%x\n"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: lib/db3.c:1078
#, fuzzy, c-format
-msgid "cannot get %s lock on %s/%s(%s)\n"
+msgid "cannot get %s lock on %s/%s\n"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: lib/db3.c:1064
+#: lib/db3.c:1085
#, c-format
-msgid "locked db index %s/%s(%s)\n"
+msgid "locked db index %s/%s\n"
msgstr ""
#: lib/falloc.c:135
#. this would probably be a good place to check if disk space
#. was used up - if so, we should return a different error
-#: lib/install.c:364
+#: lib/install.c:365
#, c-format
msgid "unpacking of archive failed%s%s: %s"
msgstr ""
-#: lib/install.c:365
+#: lib/install.c:366
msgid " on file "
msgstr ""
-#: lib/install.c:409
+#: lib/install.c:410
msgid "installing a source package\n"
msgstr ""
-#: lib/install.c:429
+#: lib/install.c:430
#, fuzzy, c-format
msgid "cannot create sourcedir %s"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/install.c:435 lib/install.c:465
+#: lib/install.c:436 lib/install.c:466
#, fuzzy, c-format
msgid "cannot write to %s"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/install.c:439
+#: lib/install.c:440
#, c-format
msgid "sources in: %s\n"
msgstr ""
-#: lib/install.c:459
+#: lib/install.c:460
#, fuzzy, c-format
msgid "cannot create specdir %s"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/install.c:469
+#: lib/install.c:470
#, c-format
msgid "spec file in: %s\n"
msgstr ""
-#: lib/install.c:503 lib/install.c:531
+#: lib/install.c:504 lib/install.c:532
#, fuzzy
msgid "source package contains no .spec file"
msgstr ""
" -f <file>+ - interroge le package à qui appartient <file>"
-#: lib/install.c:553
+#: lib/install.c:554
#, c-format
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:555 lib/install.c:829 lib/uninstall.c:28
+#: lib/install.c:556 lib/install.c:830 lib/uninstall.c:28
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:646
+#: lib/install.c:647
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:701
+#: lib/install.c:702
#, fuzzy, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/install.c:759
+#: lib/install.c:760
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:764
+#: lib/install.c:765
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:789
+#: lib/install.c:790
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:825
+#: lib/install.c:826
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
msgid "package %s is not installed\n"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/query.c:683
-msgid "rpmQuery: rpmdbOpen() failed\n"
-msgstr ""
-
-#: lib/query.c:742
+#: lib/query.c:740
#, fuzzy
msgid "query package owning file"
msgstr ""
" -f <file>+ - interroge le package à qui appartient <file>"
-#: lib/query.c:744
+#: lib/query.c:742
#, fuzzy
msgid "query packages in group"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: lib/query.c:746
+#: lib/query.c:744
#, fuzzy
msgid "query a package file"
msgstr ""
" -f <file>+ - interroge le package à qui appartient <file>"
-#: lib/query.c:750
+#: lib/query.c:748
msgid "query a spec file"
msgstr ""
-#: lib/query.c:752
+#: lib/query.c:750
#, fuzzy
msgid "query the pacakges triggered by the package"
msgstr ""
" -f <file>+ - interroge le package à qui appartient <file>"
-#: lib/query.c:754
+#: lib/query.c:752
msgid "query the packages which require a capability"
msgstr ""
-#: lib/query.c:756
+#: lib/query.c:754
msgid "query the packages which provide a capability"
msgstr ""
-#: lib/query.c:795
+#: lib/query.c:793
#, fuzzy
msgid "list all configuration files"
msgstr ""
" -c - donne uniquement la liste des fichiers de "
"configuration (implique -l)"
-#: lib/query.c:797
+#: lib/query.c:795
#, fuzzy
msgid "list all documentation files"
msgstr ""
" -d - donne uniquement la liste des fichiers de "
"documentation (implique -l)"
-#: lib/query.c:799
+#: lib/query.c:797
#, fuzzy
msgid "dump basic file information"
msgstr ""
" -i - affiche les informations relatives à un package"
-#: lib/query.c:801
+#: lib/query.c:799
msgid "list files in package"
msgstr ""
-#: lib/query.c:805
+#: lib/query.c:803
msgid "use the following query format"
msgstr ""
-#: lib/query.c:807
+#: lib/query.c:805
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr ""
" -f <file>+ - interroge le package à qui appartient <file>"
-#: lib/query.c:809
+#: lib/query.c:807
msgid "display the states of the listed files"
msgstr ""
-#: lib/query.c:811
+#: lib/query.c:809
#, fuzzy
msgid "display a verbose file listing"
msgstr " -l - affiche la liste des packages"
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: lib/rpmdb.c:196
+#: lib/rpmdb.c:218
msgid ""
"\n"
-"--> This version of rpm was not compiled with support for db%d. Please "
-"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and "
-"correct your configuration.\n"
+"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
msgstr ""
-#: lib/rpmdb.c:223
+#. failed to open with any dbapi
+#: lib/rpmdb.c:249
+#, fuzzy, c-format
+msgid "dbiOpen: cannot open %s index"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: lib/rpmdb.c:257
msgid ""
"\n"
-"--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
-" db1 to db3 on-disk format.\n"
+"--> The database is in db%d format, not the suggested db%d format.\n"
+" Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
+" using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
+" to convert your database from db%d to db%d format, or configure\n"
+" \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#. XXX FIXME: dbNopen handles failures already.
-#: lib/rpmdb.c:239
-#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
-msgstr "impossible d'ouvrir: %s\n"
+#: lib/rpmdb.c:270
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
-#: lib/rpmdb.c:293
+#: lib/rpmdb.c:335
#, fuzzy, c-format
msgid "error getting \"%s\" records from %s index"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmdb.c:410
+#: lib/rpmdb.c:452
#, c-format
msgid "error storing record %s into %s"
msgstr ""
-#: lib/rpmdb.c:419
+#: lib/rpmdb.c:461
#, fuzzy, c-format
msgid "error removing record %s from %s"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmdb.c:619 lib/rpmdb.c:2078
+#: lib/rpmdb.c:683 lib/rpmdb.c:2186
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:708
+#: lib/rpmdb.c:780
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:912
+#: lib/rpmdb.c:984
#, fuzzy, c-format
msgid "cannot retrieve package \"%s\" from db"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmdb.c:978 lib/rpmdb.c:1496 lib/uninstall.c:90
+#: lib/rpmdb.c:1050 lib/rpmdb.c:1560 lib/uninstall.c:90
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: lib/rpmdb.c:1451
-#, 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:1459
-#, fuzzy, c-format
-msgid "key \"%s\" not removed from %s"
-msgstr "aucun package n'a été spécifié pour la désinstallation"
-
-#: lib/rpmdb.c:1541
+#: lib/rpmdb.c:1611
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1550
+#: lib/rpmdb.c:1622
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1558
-#, c-format
-msgid "removing %d entries in %s index:\n"
-msgstr ""
+#: lib/rpmdb.c:1631
+#, fuzzy, c-format
+msgid "removing %d entries from %s index:\n"
+msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1638 lib/rpmdb.c:1861
#, c-format
-msgid "\t%6d %s\n"
+msgid "%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1774
msgid "cannot allocate new instance in database"
msgstr ""
-#: lib/rpmdb.c:1761
+#: lib/rpmdb.c:1829
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1777
+#: lib/rpmdb.c:1845
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1784
+#: lib/rpmdb.c:1854
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:1788
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
-#: lib/rpmdb.c:2103
+#: lib/rpmdb.c:2211
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmdb.c:2107
+#: lib/rpmdb.c:2215
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2113
-#, c-format
-msgid "creating directory: %s\n"
-msgstr ""
+#: lib/rpmdb.c:2221
+#, fuzzy, c-format
+msgid "creating directory %s\n"
+msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmdb.c:2115
+#: lib/rpmdb.c:2223
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2121
+#: lib/rpmdb.c:2230
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2131
+#: lib/rpmdb.c:2239
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2155
+#: lib/rpmdb.c:2262
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2187
+#: lib/rpmdb.c:2294
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2205
-msgid "failed to rebuild database; original database remains in place\n"
+#: lib/rpmdb.c:2312
+msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2213
+#: lib/rpmdb.c:2320
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2215
+#: lib/rpmdb.c:2322
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2221
+#: lib/rpmdb.c:2332
+#, fuzzy, c-format
+msgid "removing directory %s\n"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: lib/rpmdb.c:2334
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
msgid "running postuninstall script (if any)\n"
msgstr ""
-#: lib/uninstall.c:213
-msgid "removing database entry\n"
-msgstr ""
-
-#: lib/uninstall.c:397
+#: lib/uninstall.c:390
msgid "execution of script failed"
msgstr ""
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
-#: lib/verify.c:381
-msgid "rpmVerify: rpmdbOpen() failed\n"
-msgstr ""
+#, fuzzy
+#~ msgid "key \"%s\" not found in %s"
+#~ msgstr "aucun package n'a été spécifié pour la désinstallation"
+
+#, fuzzy
+#~ msgid "key \"%s\" not removed from %s"
+#~ msgstr "aucun package n'a été spécifié pour la désinstallation"
#, fuzzy
#~ msgid "cannot open file %s: %s"
msgid ""
msgstr ""
"Project-Id-Version: rpm-3.0.4\n"
-"POT-Creation-Date: 2000-05-02 04:48-0400\n"
+"POT-Creation-Date: 2000-05-06 19:31-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"
# build root [BuildRoot]
# net share [¥Í¥Ã¥È¶¦Í]
# reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.53 2000/05/02 08:54:02 jbj Exp $
+# $Id: ja.po,v 1.54 2000/05/07 00:53:12 jbj Exp $
#: rpm.c:200
#, c-format
msgid "rpm: %s\n"
msgstr "¼ºÇÔ - "
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:439
+#: lib/depends.c:434
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\"B\" ¤Î°Í¸À¤Ï epoch ¤òɬÍפȤ·¤Þ¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n"
"\tA %s\tB %s\n"
-#: lib/depends.c:468
+#: lib/depends.c:463
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#: lib/depends.c:786
-#, c-format
-msgid "%s: %s satisfied by added file list.\n"
+#, fuzzy, c-format
+msgid "%s: %-45s YES (added files)\n"
msgstr "%s: %s ¤Ï¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
#: lib/depends.c:835
#, fuzzy, c-format
-msgid "%s: %s satisfied by added package.\n"
+msgid "%s: %-45s YES (added package)\n"
msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
-#: lib/depends.c:838
-#, fuzzy, c-format
-msgid "%s: %s satisfied by added package (shouldn't happen).\n"
-msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
-
-#: lib/depends.c:856
+#: lib/depends.c:839
#, c-format
-msgid "%s: %s satisfied by added provide.\n"
-msgstr "%s: %s ¤Ï provide ¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
+msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
+msgstr ""
-#: lib/depends.c:890
+#: lib/depends.c:858
#, fuzzy, c-format
-msgid "%s: %s satisfied by Depends cache.\n"
-msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
+msgid "%s: %-45s YES (added provide)\n"
+msgstr "%s: %s ¤Ï provide ¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
-#: lib/depends.c:904
+#: lib/depends.c:901
#, c-format
-msgid "%s: %s satisfied by rpmrc provides.\n"
+msgid "%s: %-45s %-3s (cached)\n"
+msgstr ""
+
+#: lib/depends.c:918
+#, fuzzy, c-format
+msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
-#: lib/depends.c:932
+#: lib/depends.c:941
#, c-format
-msgid "%s: %s satisfied by db file lists.\n"
-msgstr "%s: %s ¤Ï db ¥Õ¥¡¥¤¥ë¤¬¥ê¥¹¥È¤òºî¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
+msgid "%s: %-45s YES (db files)\n"
+msgstr ""
-#: lib/depends.c:950
-#, c-format
-msgid "%s: %s satisfied by db provides.\n"
+#: lib/depends.c:954
+#, fuzzy, c-format
+msgid "%s: %-45s YES (db provides)\n"
msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
#: lib/depends.c:968
#, fuzzy, c-format
-msgid "%s: %s satisfied by db packages.\n"
+msgid "%s: %-45s YES (db packages)\n"
msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
-#: lib/depends.c:981
-#, c-format
-msgid "%s: %s satisfied by rpmlib version.\n"
+#: lib/depends.c:985
+#, fuzzy, c-format
+msgid "%s: %-45s YES (rpmlib version)\n"
msgstr "%s: %s ¤Ï rpmlib ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
-#: lib/depends.c:991
+#: lib/depends.c:996
#, c-format
-msgid "%s: %s unsatisfied.\n"
-msgstr "%s: %s ¤ÏËþ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
+msgid "%s: %-45s NO\n"
+msgstr ""
-#: lib/depends.c:1010
+#: lib/depends.c:1016
#, fuzzy, c-format
-msgid "%s: (%s, %d) added to Depends cache.\n"
+msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
#. requirements are not satisfied.
-#: lib/depends.c:1059
+#: lib/depends.c:1065
#, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n"
#. conflicts exist.
-#: lib/depends.c:1121
+#: lib/depends.c:1127
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹: %s\n"
-#: lib/depends.c:1251
+#: lib/depends.c:1254
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr "prerequisite ¥Á¥§¡¼¥ó¤Î¥ë¡¼¥×: %s"
msgid "removed db file %s\n"
msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
-#: lib/db1.c:419
+#: lib/db1.c:420
#, fuzzy, c-format
msgid "bad db file %s"
msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s"
-#: lib/db1.c:424
+#: lib/db1.c:425
#, fuzzy, c-format
msgid "opening db file %s mode 0x%x\n"
msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n"
-#: lib/db1.c:432 lib/url.c:445
+#: lib/db1.c:434 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
-#: lib/db1.c:448
+#: lib/db1.c:450
#, c-format
msgid "cannot get %s lock on database"
msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤¤Þ¤»¤ó"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "exclusive"
msgstr "½ü³°"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "shared"
msgstr "¶¦Í"
-#: lib/db2.c:133 lib/db3.c:456
+#: lib/db2.c:133
#, c-format
msgid "closed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:145 lib/db3.c:468
+#: lib/db2.c:145
#, c-format
msgid "removed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:182 lib/db3.c:505
+#: lib/db2.c:182
#, c-format
msgid "opening db environment %s/%s(%s) %s\n"
msgstr ""
-#: lib/db2.c:557 lib/db3.c:876
+#: lib/db2.c:557
#, c-format
msgid "closed db index %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:635 lib/db3.c:965
+#: lib/db2.c:635
#, c-format
msgid "opening db index %s/%s(%s) %s mode=0x%x\n"
msgstr ""
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
-#: lib/db3.c:1057
+#: lib/db3.c:464
+#, fuzzy, c-format
+msgid "closed db environment %s/%s\n"
+msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
+
+#: lib/db3.c:476
+#, fuzzy, c-format
+msgid "removed db environment %s/%s\n"
+msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
+
+#: lib/db3.c:513
+#, c-format
+msgid "opening db environment %s/%s %s\n"
+msgstr ""
+
+#: lib/db3.c:884
#, fuzzy, c-format
-msgid "cannot get %s lock on %s/%s(%s)\n"
+msgid "closed db index %s/%s\n"
+msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
+
+#: lib/db3.c:975
+#, fuzzy, c-format
+msgid "opening db index %s/%s %s mode=0x%x\n"
+msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n"
+
+#: lib/db3.c:1078
+#, fuzzy, c-format
+msgid "cannot get %s lock on %s/%s\n"
msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤¤Þ¤»¤ó"
-#: lib/db3.c:1064
+#: lib/db3.c:1085
#, fuzzy, c-format
-msgid "locked db index %s/%s(%s)\n"
+msgid "locked db index %s/%s\n"
msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
#: lib/falloc.c:135
#. this would probably be a good place to check if disk space
#. was used up - if so, we should return a different error
-#: lib/install.c:364
+#: lib/install.c:365
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s"
msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿Ä¹¤Ë¼ºÇÔ %s%s: %s"
-#: lib/install.c:365
+#: lib/install.c:366
#, fuzzy
msgid " on file "
msgstr "¥Õ¥¡¥¤¥ë¾å"
-#: lib/install.c:409
+#: lib/install.c:410
msgid "installing a source package\n"
msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Þ¤¹\n"
-#: lib/install.c:429
+#: lib/install.c:430
#, fuzzy, c-format
msgid "cannot create sourcedir %s"
msgstr "%s ¤òºîÀ®¤Ç¤¤Þ¤»¤ó: %s"
-#: lib/install.c:435 lib/install.c:465
+#: lib/install.c:436 lib/install.c:466
#, c-format
msgid "cannot write to %s"
msgstr "%s ¤Ø½ñ¤¹þ¤á¤Þ¤»¤ó"
-#: lib/install.c:439
+#: lib/install.c:440
#, c-format
msgid "sources in: %s\n"
msgstr "¥½¡¼¥¹¤Ï: %s\n"
-#: lib/install.c:459
+#: lib/install.c:460
#, fuzzy, c-format
msgid "cannot create specdir %s"
msgstr "%s ¤òºîÀ®¤Ç¤¤Þ¤»¤ó: %s"
-#: lib/install.c:469
+#: lib/install.c:470
#, c-format
msgid "spec file in: %s\n"
msgstr "spec ¥Õ¥¡¥¤¥ë¤Ï: %s\n"
-#: lib/install.c:503 lib/install.c:531
+#: lib/install.c:504 lib/install.c:532
msgid "source package contains no .spec file"
msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó"
-#: lib/install.c:553
+#: lib/install.c:554
#, c-format
msgid "renaming %s to %s\n"
msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n"
-#: lib/install.c:555 lib/install.c:829 lib/uninstall.c:28
+#: lib/install.c:556 lib/install.c:830 lib/uninstall.c:28
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "%s ¤ò %s ¤Ë¤¹¤ë̾Á°¤ÎÊѹ¹¤Ë¼ºÇÔ: %s"
-#: lib/install.c:646
+#: lib/install.c:647
msgid "source package expected, binary found"
msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Þ¤¹¡¢¥Ð¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Þ¤·¤¿"
-#: lib/install.c:701
+#: lib/install.c:702
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n"
-#: lib/install.c:759
+#: lib/install.c:760
msgid "stopping install as we're running --test\n"
msgstr "--test ¤ò¼Â¹Ô¤¹¤ë¤è¤¦¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤òÃæ»ß¤·¤Æ¤¤¤Þ¤¹\n"
-#: lib/install.c:764
+#: lib/install.c:765
msgid "running preinstall script (if any)\n"
msgstr "¥×¥ê¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n"
-#: lib/install.c:789
+#: lib/install.c:790
#, c-format
msgid "warning: %s created as %s"
msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆºîÀ®¤µ¤ì¤Þ¤¹"
-#: lib/install.c:825
+#: lib/install.c:826
#, c-format
msgid "warning: %s saved as %s"
msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆÊݸ¤µ¤ì¤Þ¤¹"
msgid "package %s is not installed\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
-#: lib/query.c:683
-#, fuzzy
-msgid "rpmQuery: rpmdbOpen() failed\n"
-msgstr "rpmQuery: rpmdbOpen() ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-
-#: lib/query.c:742
+#: lib/query.c:740
#, fuzzy
msgid "query package owning file"
msgstr "¥Õ¥¡¥¤¥ë¤ò½êͤ·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹"
-#: lib/query.c:744
+#: lib/query.c:742
#, fuzzy
msgid "query packages in group"
msgstr "¥°¥ë¡¼¥×Ãæ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹\n"
-#: lib/query.c:746
+#: lib/query.c:744
#, fuzzy
msgid "query a package file"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
-#: lib/query.c:750
+#: lib/query.c:748
#, fuzzy
msgid "query a spec file"
msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤òÌ䤤¹ç¤ï¤»¤Þ¤¹"
-#: lib/query.c:752
+#: lib/query.c:750
#, fuzzy
msgid "query the pacakges triggered by the package"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹"
-#: lib/query.c:754
+#: lib/query.c:752
#, fuzzy
msgid "query the packages which require a capability"
msgstr ""
"µ¡Ç½¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤Æ\n"
"Ì䤤¹ç¤ï¤»¤Þ¤¹"
-#: lib/query.c:756
+#: lib/query.c:754
#, fuzzy
msgid "query the packages which provide a capability"
msgstr "µ¡Ç½¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
-#: lib/query.c:795
+#: lib/query.c:793
#, fuzzy
msgid "list all configuration files"
msgstr "Á´¤Æ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤Þ¤¹"
-#: lib/query.c:797
+#: lib/query.c:795
#, fuzzy
msgid "list all documentation files"
msgstr "Á´¤Æ¤Î¥É¥¥å¥á¥ó¥È¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤Þ¤¹"
-#: lib/query.c:799
+#: lib/query.c:797
#, fuzzy
msgid "dump basic file information"
msgstr "´ðËÜŪ¤Ê¥Õ¥¡¥¤¥ë¾ðÊó¤ò¥À¥ó¥×¤·¤Þ¤¹"
-#: lib/query.c:801
+#: lib/query.c:799
#, fuzzy
msgid "list files in package"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤Þ¤¹\n"
-#: lib/query.c:805
+#: lib/query.c:803
msgid "use the following query format"
msgstr "°Ê²¼¤ÎÌ䤤¹ç¤ï¤»¥Õ¥©¡¼¥Þ¥Ã¥È¤ò»ÈÍѤ·¤Þ¤¹"
-#: lib/query.c:807
+#: lib/query.c:805
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "°Ê²¼¤Î¥«¥¿¥í¥°¤«¤é i18n ¥»¥¯¥·¥ç¥ó¤òÃÖ¤´¹¤¨¤Þ¤¹"
-#: lib/query.c:809
+#: lib/query.c:807
msgid "display the states of the listed files"
msgstr "Îóµó¤·¤¿¥Õ¥¡¥¤¥ë¤Î¾õÂÖ¤òɽ¼¨¤·¤Þ¤¹"
-#: lib/query.c:811
+#: lib/query.c:809
#, fuzzy
msgid "display a verbose file listing"
msgstr "¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤ò¾éŤËɽ¼¨¤·¤Þ¤¹"
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: lib/rpmdb.c:196
+#: lib/rpmdb.c:218
msgid ""
"\n"
-"--> This version of rpm was not compiled with support for db%d. Please "
-"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and "
-"correct your configuration.\n"
+"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
msgstr ""
-#: lib/rpmdb.c:223
+#. failed to open with any dbapi
+#: lib/rpmdb.c:249
+#, fuzzy, c-format
+msgid "dbiOpen: cannot open %s index"
+msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n"
+
+#: lib/rpmdb.c:257
msgid ""
"\n"
-"--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
-" db1 to db3 on-disk format.\n"
+"--> The database is in db%d format, not the suggested db%d format.\n"
+" Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
+" using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
+" to convert your database from db%d to db%d format, or configure\n"
+" \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#. XXX FIXME: dbNopen handles failures already.
-#: lib/rpmdb.c:239
-#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
-msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n"
+#: lib/rpmdb.c:270
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
-#: lib/rpmdb.c:293
+#: lib/rpmdb.c:335
#, fuzzy, c-format
msgid "error getting \"%s\" records from %s index"
msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)"
-#: lib/rpmdb.c:410
+#: lib/rpmdb.c:452
#, c-format
msgid "error storing record %s into %s"
msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ "
-#: lib/rpmdb.c:419
+#: lib/rpmdb.c:461
#, fuzzy, c-format
msgid "error removing record %s from %s"
msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼"
-#: lib/rpmdb.c:619 lib/rpmdb.c:2078
+#: lib/rpmdb.c:683 lib/rpmdb.c:2186
msgid "no dbpath has been set"
msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: lib/rpmdb.c:708
+#: lib/rpmdb.c:780
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:912
+#: lib/rpmdb.c:984
#, fuzzy, c-format
msgid "cannot retrieve package \"%s\" from db"
msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n"
-#: lib/rpmdb.c:978 lib/rpmdb.c:1496 lib/uninstall.c:90
+#: lib/rpmdb.c:1050 lib/rpmdb.c:1560 lib/uninstall.c:90
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x"
msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤¤Þ¤»¤ó"
-#: lib/rpmdb.c:1451
-#, fuzzy, c-format
-msgid "key \"%s\" not found in %s"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï %s Ãæ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó"
-
-#: lib/rpmdb.c:1459
-#, fuzzy, c-format
-msgid "key \"%s\" not removed from %s"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï %s Ãæ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó"
-
-#: lib/rpmdb.c:1541
+#: lib/rpmdb.c:1611
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥¨¥ó¥È¥ê¤òºï½ü¤·¤Þ¤¹\n"
-#: lib/rpmdb.c:1550
+#: lib/rpmdb.c:1622
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
-#: lib/rpmdb.c:1558
+#: lib/rpmdb.c:1631
#, fuzzy, c-format
-msgid "removing %d entries in %s index:\n"
+msgid "removing %d entries from %s index:\n"
msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n"
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1638 lib/rpmdb.c:1861
#, c-format
-msgid "\t%6d %s\n"
+msgid "%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1774
#, fuzzy
msgid "cannot allocate new instance in database"
msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹ÍѤζõ¤ÍÆÎ̤¬Â¤ê¤Þ¤»¤ó"
-#: lib/rpmdb.c:1761
+#: lib/rpmdb.c:1829
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1777
+#: lib/rpmdb.c:1845
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n"
-#: lib/rpmdb.c:1784
+#: lib/rpmdb.c:1854
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:1788
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
-#: lib/rpmdb.c:2103
+#: lib/rpmdb.c:2211
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n"
-#: lib/rpmdb.c:2107
+#: lib/rpmdb.c:2215
#, c-format
msgid "temporary database %s already exists"
msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹"
-#: lib/rpmdb.c:2113
-#, c-format
-msgid "creating directory: %s\n"
+#: lib/rpmdb.c:2221
+#, fuzzy, c-format
+msgid "creating directory %s\n"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
-#: lib/rpmdb.c:2115
+#: lib/rpmdb.c:2223
#, c-format
msgid "error creating directory %s: %s"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ÎºîÀ®¥¨¥é¡¼: %s"
-#: lib/rpmdb.c:2121
+#: lib/rpmdb.c:2230
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n"
-#: lib/rpmdb.c:2131
+#: lib/rpmdb.c:2239
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n"
-#: lib/rpmdb.c:2155
+#: lib/rpmdb.c:2262
#, fuzzy, c-format
msgid "record number %d in database is bad -- skipping."
msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥¥Ã¥×¤·¤Þ¤¹"
-#: lib/rpmdb.c:2187
+#: lib/rpmdb.c:2294
#, c-format
msgid "cannot add record originally at %d"
msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ¤Þ¤»¤ó"
-#: lib/rpmdb.c:2205
-msgid "failed to rebuild database; original database remains in place\n"
+#: lib/rpmdb.c:2312
+#, fuzzy
+msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n"
-#: lib/rpmdb.c:2213
+#: lib/rpmdb.c:2320
msgid "failed to replace old database with new database!\n"
msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n"
-#: lib/rpmdb.c:2215
+#: lib/rpmdb.c:2322
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤´¹¤¨¤Þ¤¹"
-#: lib/rpmdb.c:2221
+#: lib/rpmdb.c:2332
+#, fuzzy, c-format
+msgid "removing directory %s\n"
+msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
+
+#: lib/rpmdb.c:2334
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n"
msgid "running postuninstall script (if any)\n"
msgstr "¥Ý¥¹¥È¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n"
-#: lib/uninstall.c:213
-msgid "removing database entry\n"
-msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥¨¥ó¥È¥ê¤òºï½ü¤·¤Þ¤¹\n"
-
-#: lib/uninstall.c:397
+#: lib/uninstall.c:390
msgid "execution of script failed"
msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ"
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À¤òËþ¤¿¤·¤Æ¤¤¤Þ¤»¤ó:"
-#: lib/verify.c:381
#, fuzzy
-msgid "rpmVerify: rpmdbOpen() failed\n"
-msgstr "rpmVerify: rpmdbOen() ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
+#~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
+#~ msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
+
+#, fuzzy
+#~ msgid "%s: %s satisfied by Depends cache.\n"
+#~ msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
+
+#~ msgid "%s: %s satisfied by db file lists.\n"
+#~ msgstr "%s: %s ¤Ï db ¥Õ¥¡¥¤¥ë¤¬¥ê¥¹¥È¤òºî¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
+
+#~ msgid "%s: %s unsatisfied.\n"
+#~ msgstr "%s: %s ¤ÏËþ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
+
+#, fuzzy
+#~ msgid "rpmQuery: rpmdbOpen() failed\n"
+#~ msgstr "rpmQuery: rpmdbOpen() ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
+
+#, fuzzy
+#~ msgid "key \"%s\" not found in %s"
+#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï %s Ãæ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+
+#, fuzzy
+#~ msgid "key \"%s\" not removed from %s"
+#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï %s Ãæ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+
+#~ msgid "removing database entry\n"
+#~ msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥¨¥ó¥È¥ê¤òºï½ü¤·¤Þ¤¹\n"
+
+#, fuzzy
+#~ msgid "rpmVerify: rpmdbOpen() failed\n"
+#~ msgstr "rpmVerify: rpmdbOen() ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
#~ msgid "cannot read header at %d for dependency check"
#~ msgstr "°Í¸À¥Á¥§¥Ã¥¯¤Î¤¿¤á¤Ë %d ¤Ç¥Ø¥Ã¥À¤òÆɤá¤Þ¤»¤ó"
msgid ""
msgstr ""
"Project-Id-Version: rpm-3.0.2\n"
-"POT-Creation-Date: 2000-05-02 04:48-0400\n"
+"POT-Creation-Date: 2000-05-06 19:31-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"
msgstr " nie powiod³o siê -"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:439
+#: lib/depends.c:434
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:468
+#: lib/depends.c:463
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#: lib/depends.c:786
#, c-format
-msgid "%s: %s satisfied by added file list.\n"
+msgid "%s: %-45s YES (added files)\n"
msgstr ""
#: lib/depends.c:835
#, fuzzy, c-format
-msgid "%s: %s satisfied by added package.\n"
+msgid "%s: %-45s YES (added package)\n"
msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
-#: lib/depends.c:838
-#, fuzzy, c-format
-msgid "%s: %s satisfied by added package (shouldn't happen).\n"
-msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
+#: lib/depends.c:839
+#, c-format
+msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
+msgstr ""
-#: lib/depends.c:856
+#: lib/depends.c:858
#, c-format
-msgid "%s: %s satisfied by added provide.\n"
+msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:890
-#, fuzzy, c-format
-msgid "%s: %s satisfied by Depends cache.\n"
-msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
+#: lib/depends.c:901
+#, c-format
+msgid "%s: %-45s %-3s (cached)\n"
+msgstr ""
-#: lib/depends.c:904
+#: lib/depends.c:918
#, c-format
-msgid "%s: %s satisfied by rpmrc provides.\n"
+msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:932
+#: lib/depends.c:941
#, c-format
-msgid "%s: %s satisfied by db file lists.\n"
+msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:950
+#: lib/depends.c:954
#, c-format
-msgid "%s: %s satisfied by db provides.\n"
+msgid "%s: %-45s YES (db provides)\n"
msgstr ""
#: lib/depends.c:968
#, fuzzy, c-format
-msgid "%s: %s satisfied by db packages.\n"
+msgid "%s: %-45s YES (db packages)\n"
msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
-#: lib/depends.c:981
+#: lib/depends.c:985
#, c-format
-msgid "%s: %s satisfied by rpmlib version.\n"
+msgid "%s: %-45s YES (rpmlib version)\n"
msgstr ""
-#: lib/depends.c:991
+#: lib/depends.c:996
#, c-format
-msgid "%s: %s unsatisfied.\n"
+msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1010
+#: lib/depends.c:1016
#, fuzzy, c-format
-msgid "%s: (%s, %d) added to Depends cache.\n"
+msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
#. requirements are not satisfied.
-#: lib/depends.c:1059
+#: lib/depends.c:1065
#, 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:1121
+#: lib/depends.c:1127
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "pakiet %s jest w konflikcie: %s\n"
-#: lib/depends.c:1251
+#: lib/depends.c:1254
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr ""
msgid "removed db file %s\n"
msgstr "usuwanie indeksu plików dla %s\n"
-#: lib/db1.c:419
+#: lib/db1.c:420
#, fuzzy, c-format
msgid "bad db file %s"
msgstr "b³êdny status pliku: %s"
-#: lib/db1.c:424
+#: lib/db1.c:425
#, fuzzy, c-format
msgid "opening db file %s mode 0x%x\n"
msgstr "otwiernie bazê danych w trybie 0x%x w %s\n"
-#: lib/db1.c:432 lib/url.c:445
+#: lib/db1.c:434 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "nie mo¿na otworzyæ %s: %s"
-#: lib/db1.c:448
+#: lib/db1.c:450
#, c-format
msgid "cannot get %s lock on database"
msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "exclusive"
msgstr ""
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "shared"
msgstr ""
-#: lib/db2.c:133 lib/db3.c:456
+#: lib/db2.c:133
#, c-format
msgid "closed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:145 lib/db3.c:468
+#: lib/db2.c:145
#, c-format
msgid "removed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:182 lib/db3.c:505
+#: lib/db2.c:182
#, c-format
msgid "opening db environment %s/%s(%s) %s\n"
msgstr ""
-#: lib/db2.c:557 lib/db3.c:876
+#: lib/db2.c:557
#, c-format
msgid "closed db index %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:635 lib/db3.c:965
+#: lib/db2.c:635
#, c-format
msgid "opening db index %s/%s(%s) %s mode=0x%x\n"
msgstr ""
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
-#: lib/db3.c:1057
+#: lib/db3.c:464
+#, fuzzy, c-format
+msgid "closed db environment %s/%s\n"
+msgstr "usuwanie indeksu plików dla %s\n"
+
+#: lib/db3.c:476
+#, fuzzy, c-format
+msgid "removed db environment %s/%s\n"
+msgstr "usuwanie indeksu plików dla %s\n"
+
+#: lib/db3.c:513
+#, c-format
+msgid "opening db environment %s/%s %s\n"
+msgstr ""
+
+#: lib/db3.c:884
+#, fuzzy, c-format
+msgid "closed db index %s/%s\n"
+msgstr "usuwanie indeksu plików dla %s\n"
+
+#: lib/db3.c:975
+#, fuzzy, c-format
+msgid "opening db index %s/%s %s mode=0x%x\n"
+msgstr "otwiernie bazê danych w trybie 0x%x w %s\n"
+
+#: lib/db3.c:1078
#, fuzzy, c-format
-msgid "cannot get %s lock on %s/%s(%s)\n"
+msgid "cannot get %s lock on %s/%s\n"
msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe"
-#: lib/db3.c:1064
+#: lib/db3.c:1085
#, fuzzy, c-format
-msgid "locked db index %s/%s(%s)\n"
+msgid "locked db index %s/%s\n"
msgstr "usuwanie indeksu plików dla %s\n"
#: lib/falloc.c:135
#. this would probably be a good place to check if disk space
#. was used up - if so, we should return a different error
-#: lib/install.c:364
+#: lib/install.c:365
#, c-format
msgid "unpacking of archive failed%s%s: %s"
msgstr "rozpakowanie archiwum nie powiod³o siê %s%s: %s"
-#: lib/install.c:365
+#: lib/install.c:366
msgid " on file "
msgstr " na pliku "
-#: lib/install.c:409
+#: lib/install.c:410
msgid "installing a source package\n"
msgstr "instacja pakietu ¼ród³owego\n"
-#: lib/install.c:429
+#: lib/install.c:430
#, fuzzy, c-format
msgid "cannot create sourcedir %s"
msgstr "nie mo¿na utworzyæ %s"
-#: lib/install.c:435 lib/install.c:465
+#: lib/install.c:436 lib/install.c:466
#, c-format
msgid "cannot write to %s"
msgstr "nie mo¿na zapisaæ do %s"
-#: lib/install.c:439
+#: lib/install.c:440
#, c-format
msgid "sources in: %s\n"
msgstr "¼ród³a w: %s\n"
-#: lib/install.c:459
+#: lib/install.c:460
#, fuzzy, c-format
msgid "cannot create specdir %s"
msgstr "nie mo¿na utworzyæ %s"
-#: lib/install.c:469
+#: lib/install.c:470
#, c-format
msgid "spec file in: %s\n"
msgstr "plik spec w: %s\n"
-#: lib/install.c:503 lib/install.c:531
+#: lib/install.c:504 lib/install.c:532
msgid "source package contains no .spec file"
msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
-#: lib/install.c:553
+#: lib/install.c:554
#, c-format
msgid "renaming %s to %s\n"
msgstr "zmiana nazwy %s na %s\n"
-#: lib/install.c:555 lib/install.c:829 lib/uninstall.c:28
+#: lib/install.c:556 lib/install.c:830 lib/uninstall.c:28
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "zmiana nazwy z %s na %s nie powiod³a sie: %s"
-#: lib/install.c:646
+#: lib/install.c:647
msgid "source package expected, binary found"
msgstr "spodziewany pakiet ¼ród³owy a nie binarny"
-#: lib/install.c:701
+#: lib/install.c:702
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "pakiet: %s-%s-%s test plików = %d\n"
-#: lib/install.c:759
+#: lib/install.c:760
msgid "stopping install as we're running --test\n"
msgstr "przebieg testowy - instalacja zatrzymana\n"
-#: lib/install.c:764
+#: lib/install.c:765
msgid "running preinstall script (if any)\n"
msgstr "uruchamianie skryptu preinstall (je¶li istnieje)\n"
-#: lib/install.c:789
+#: lib/install.c:790
#, c-format
msgid "warning: %s created as %s"
msgstr "ostrze¿enie: %s utworzony jako %s"
-#: lib/install.c:825
+#: lib/install.c:826
#, c-format
msgid "warning: %s saved as %s"
msgstr "ostrze¿enie: %s zapisany jako %s"
msgid "package %s is not installed\n"
msgstr "pakiet %s nie jest zainstalowany\n"
-#: lib/query.c:683
-msgid "rpmQuery: rpmdbOpen() failed\n"
-msgstr "rpmQuery: rpmdbOpen() nie powiod³o siê\n"
-
-#: lib/query.c:742
+#: lib/query.c:740
msgid "query package owning file"
msgstr "sprawdzanie do jakiego pakietu nale¿y plik"
-#: lib/query.c:744
+#: lib/query.c:742
msgid "query packages in group"
msgstr "odpytywanie pakietów w grupie"
-#: lib/query.c:746
+#: lib/query.c:744
msgid "query a package file"
msgstr "odpytywanie pakietu"
-#: lib/query.c:750
+#: lib/query.c:748
msgid "query a spec file"
msgstr "odpytywanie pliku spec"
-#: lib/query.c:752
+#: lib/query.c:750
msgid "query the pacakges triggered by the package"
msgstr "odpytywanie pakietów zahaczanych przez pakiet"
-#: lib/query.c:754
+#: lib/query.c:752
msgid "query the packages which require a capability"
msgstr "odpytywanie pakietów wymagaj±cych zasobu"
-#: lib/query.c:756
+#: lib/query.c:754
msgid "query the packages which provide a capability"
msgstr "odpytywanie pakietów udostêpniaj±cych zasób"
-#: lib/query.c:795
+#: lib/query.c:793
msgid "list all configuration files"
msgstr "wy¶wietl wszystkie pliki konfiguracyjne"
-#: lib/query.c:797
+#: lib/query.c:795
msgid "list all documentation files"
msgstr "wy¶wietl wszystkie pliki dokumentacji"
-#: lib/query.c:799
+#: lib/query.c:797
msgid "dump basic file information"
msgstr "podaj postawowe informacje o pliku"
-#: lib/query.c:801
+#: lib/query.c:799
msgid "list files in package"
msgstr "wy¶wietl pliki zawarte w pakiecie"
-#: lib/query.c:805
+#: lib/query.c:803
msgid "use the following query format"
msgstr "u¿yj nastêpuj±cego formatu zapytania"
-#: lib/query.c:807
+#: lib/query.c:805
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
-#: lib/query.c:809
+#: lib/query.c:807
msgid "display the states of the listed files"
msgstr "wy¶wietl status pokazywanych plików"
-#: lib/query.c:811
+#: lib/query.c:809
msgid "display a verbose file listing"
msgstr "wy¶wietl wiêcej informacji o plikach z listy"
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: lib/rpmdb.c:196
+#: lib/rpmdb.c:218
msgid ""
"\n"
-"--> This version of rpm was not compiled with support for db%d. Please "
-"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and "
-"correct your configuration.\n"
+"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
msgstr ""
-#: lib/rpmdb.c:223
+#. failed to open with any dbapi
+#: lib/rpmdb.c:249
+#, fuzzy, c-format
+msgid "dbiOpen: cannot open %s index"
+msgstr "nie mo¿na otworzyæ %s\n"
+
+#: lib/rpmdb.c:257
msgid ""
"\n"
-"--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
-" db1 to db3 on-disk format.\n"
+"--> The database is in db%d format, not the suggested db%d format.\n"
+" Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
+" using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
+" to convert your database from db%d to db%d format, or configure\n"
+" \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#. XXX FIXME: dbNopen handles failures already.
-#: lib/rpmdb.c:239
-#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
-msgstr "nie mo¿na otworzyæ %s\n"
+#: lib/rpmdb.c:270
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
-#: lib/rpmdb.c:293
+#: lib/rpmdb.c:335
#, fuzzy, c-format
msgid "error getting \"%s\" records from %s index"
msgstr "b³±d pobierania rekordu %s z %s"
-#: lib/rpmdb.c:410
+#: lib/rpmdb.c:452
#, c-format
msgid "error storing record %s into %s"
msgstr "b³±d zapisywania rekordu %s do %s"
-#: lib/rpmdb.c:419
+#: lib/rpmdb.c:461
#, fuzzy, c-format
msgid "error removing record %s from %s"
msgstr "b³±d usuwania rekordu %s z %s"
-#: lib/rpmdb.c:619 lib/rpmdb.c:2078
+#: lib/rpmdb.c:683 lib/rpmdb.c:2186
msgid "no dbpath has been set"
msgstr "¶cie¿ka bazy danych nie zosta³a podana"
-#: lib/rpmdb.c:708
+#: lib/rpmdb.c:780
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
"nowym formacie"
#. error
-#: lib/rpmdb.c:912
+#: lib/rpmdb.c:984
#, fuzzy, c-format
msgid "cannot retrieve package \"%s\" from db"
msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
-#: lib/rpmdb.c:978 lib/rpmdb.c:1496 lib/uninstall.c:90
+#: lib/rpmdb.c:1050 lib/rpmdb.c:1560 lib/uninstall.c:90
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x"
msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla poszukiwania"
-#: lib/rpmdb.c:1451
-#, fuzzy, c-format
-msgid "key \"%s\" not found in %s"
-msgstr "pakiet %s nie znaleziony w %s"
-
-#: lib/rpmdb.c:1459
-#, fuzzy, c-format
-msgid "key \"%s\" not removed from %s"
-msgstr "pakiet %s nie znaleziony w %s"
-
-#: lib/rpmdb.c:1541
+#: lib/rpmdb.c:1611
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "usuwanie wpisu w bazie\n"
-#: lib/rpmdb.c:1550
+#: lib/rpmdb.c:1622
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "usuwanie indeksu grupy\n"
-#: lib/rpmdb.c:1558
+#: lib/rpmdb.c:1631
#, fuzzy, c-format
-msgid "removing %d entries in %s index:\n"
+msgid "removing %d entries from %s index:\n"
msgstr "usuwanie indeksu nazw\n"
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1638 lib/rpmdb.c:1861
#, c-format
-msgid "\t%6d %s\n"
+msgid "%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1774
#, fuzzy
msgid "cannot allocate new instance in database"
msgstr "nie mo¿na alokowaæ przestrzeni dla bazy danych"
-#: lib/rpmdb.c:1761
+#: lib/rpmdb.c:1829
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1777
+#: lib/rpmdb.c:1845
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "zmiana nazwy %s na %s\n"
-#: lib/rpmdb.c:1784
+#: lib/rpmdb.c:1854
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:1788
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
-#: lib/rpmdb.c:2103
+#: lib/rpmdb.c:2211
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "odbudowywujê bazê danych w rootdir %s\n"
-#: lib/rpmdb.c:2107
+#: lib/rpmdb.c:2215
#, c-format
msgid "temporary database %s already exists"
msgstr "tymczasowa baza danych %s ju¿ istnieje"
-#: lib/rpmdb.c:2113
-#, c-format
-msgid "creating directory: %s\n"
+#: lib/rpmdb.c:2221
+#, fuzzy, c-format
+msgid "creating directory %s\n"
msgstr "tworzenie katalogu: %s\n"
-#: lib/rpmdb.c:2115
+#: lib/rpmdb.c:2223
#, c-format
msgid "error creating directory %s: %s"
msgstr "b³±d przy tworzeniu katalogu %s: %s"
-#: lib/rpmdb.c:2121
+#: lib/rpmdb.c:2230
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "otwieranie starej bazy danych\n"
-#: lib/rpmdb.c:2131
+#: lib/rpmdb.c:2239
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "otwieranie nowej bazy danych\n"
-#: lib/rpmdb.c:2155
+#: lib/rpmdb.c:2262
#, fuzzy, c-format
msgid "record number %d in database is bad -- skipping."
msgstr "rekord numer %d w bazie danych jest b³êdny -- rekord pominiêto"
-#: lib/rpmdb.c:2187
+#: lib/rpmdb.c:2294
#, c-format
msgid "cannot add record originally at %d"
msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d"
-#: lib/rpmdb.c:2205
-msgid "failed to rebuild database; original database remains in place\n"
+#: lib/rpmdb.c:2312
+#, fuzzy
+msgid "failed to rebuild database: original database remains in place\n"
msgstr "przebudowanie bazy nie powiod³o siê; stara pozosta³a na miejscu\n"
-#: lib/rpmdb.c:2213
+#: lib/rpmdb.c:2320
msgid "failed to replace old database with new database!\n"
msgstr "zamiana starej bazy na now± nie powiod³a siê!\n"
-#: lib/rpmdb.c:2215
+#: lib/rpmdb.c:2322
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "naprawcze zastêpowanie plików w %s plikami z %s"
-#: lib/rpmdb.c:2221
+#: lib/rpmdb.c:2332
+#, fuzzy, c-format
+msgid "removing directory %s\n"
+msgstr "tworzenie katalogu: %s\n"
+
+#: lib/rpmdb.c:2334
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n"
msgid "running postuninstall script (if any)\n"
msgstr "uruchamianie skryptu postinstalacyjnego (je¦li istnieje)\n"
-#: lib/uninstall.c:213
-msgid "removing database entry\n"
-msgstr "usuwanie wpisu w bazie\n"
-
-#: lib/uninstall.c:397
+#: lib/uninstall.c:390
msgid "execution of script failed"
msgstr "wykonanie skryptu nie powiod³o siê"
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: "
-#: lib/verify.c:381
-msgid "rpmVerify: rpmdbOpen() failed\n"
-msgstr "rpmVerify: rpmdbOpen() nie powiod³o siê\n"
+#, fuzzy
+#~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
+#~ msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
+
+#, fuzzy
+#~ msgid "%s: %s satisfied by Depends cache.\n"
+#~ msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
+
+#~ msgid "rpmQuery: rpmdbOpen() failed\n"
+#~ msgstr "rpmQuery: rpmdbOpen() nie powiod³o siê\n"
+
+#, fuzzy
+#~ msgid "key \"%s\" not found in %s"
+#~ msgstr "pakiet %s nie znaleziony w %s"
+
+#, fuzzy
+#~ msgid "key \"%s\" not removed from %s"
+#~ msgstr "pakiet %s nie znaleziony w %s"
+
+#~ msgid "removing database entry\n"
+#~ msgstr "usuwanie wpisu w bazie\n"
+
+#~ msgid "rpmVerify: rpmdbOpen() failed\n"
+#~ msgstr "rpmVerify: rpmdbOpen() nie powiod³o siê\n"
#~ msgid "cannot read header at %d for dependency check"
#~ msgstr "nie mo¿na odczytaæ nag³ówka %d dla sprawdzenia zale¿no¶ci"
# Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
#
msgid ""
-msgstr "POT-Creation-Date: 2000-05-02 04:48-0400\n"
+msgstr "POT-Creation-Date: 2000-05-06 19:31-0400\n"
#: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422
#, c-format
msgstr "Construção falhou.\n"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:439
+#: lib/depends.c:434
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:468
+#: lib/depends.c:463
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#: lib/depends.c:786
#, c-format
-msgid "%s: %s satisfied by added file list.\n"
+msgid "%s: %-45s YES (added files)\n"
msgstr ""
#: lib/depends.c:835
#, c-format
-msgid "%s: %s satisfied by added package.\n"
+msgid "%s: %-45s YES (added package)\n"
msgstr ""
-#: lib/depends.c:838
+#: lib/depends.c:839
#, c-format
-msgid "%s: %s satisfied by added package (shouldn't happen).\n"
+msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
msgstr ""
-#: lib/depends.c:856
+#: lib/depends.c:858
#, c-format
-msgid "%s: %s satisfied by added provide.\n"
+msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:890
+#: lib/depends.c:901
#, c-format
-msgid "%s: %s satisfied by Depends cache.\n"
+msgid "%s: %-45s %-3s (cached)\n"
msgstr ""
-#: lib/depends.c:904
+#: lib/depends.c:918
#, c-format
-msgid "%s: %s satisfied by rpmrc provides.\n"
+msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:932
+#: lib/depends.c:941
#, c-format
-msgid "%s: %s satisfied by db file lists.\n"
+msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:950
+#: lib/depends.c:954
#, c-format
-msgid "%s: %s satisfied by db provides.\n"
+msgid "%s: %-45s YES (db provides)\n"
msgstr ""
#: lib/depends.c:968
#, c-format
-msgid "%s: %s satisfied by db packages.\n"
+msgid "%s: %-45s YES (db packages)\n"
msgstr ""
-#: lib/depends.c:981
+#: lib/depends.c:985
#, c-format
-msgid "%s: %s satisfied by rpmlib version.\n"
+msgid "%s: %-45s YES (rpmlib version)\n"
msgstr ""
-#: lib/depends.c:991
+#: lib/depends.c:996
#, c-format
-msgid "%s: %s unsatisfied.\n"
+msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1010
+#: lib/depends.c:1016
#, c-format
-msgid "%s: (%s, %d) added to Depends cache.\n"
+msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1059
+#: lib/depends.c:1065
#, 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:1121
+#: lib/depends.c:1127
#, fuzzy, c-format
msgid "package %s conflicts: %s\n"
msgstr "não foi passado pacote para desinstalação"
-#: lib/depends.c:1251
+#: lib/depends.c:1254
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr ""
msgstr ""
# , c-format
-#: lib/db1.c:419
+#: lib/db1.c:420
#, fuzzy, c-format
msgid "bad db file %s"
msgstr "Não consegui abrir: %s\n"
-#: lib/db1.c:424
+#: lib/db1.c:425
#, fuzzy, c-format
msgid "opening db file %s mode 0x%x\n"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
# , c-format
-#: lib/db1.c:432 lib/url.c:445
+#: lib/db1.c:434 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "Não consegui abrir: %s\n"
-#: lib/db1.c:448
+#: lib/db1.c:450
#, fuzzy, c-format
msgid "cannot get %s lock on database"
msgstr "não foi passado pacote para desinstalação"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "exclusive"
msgstr ""
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "shared"
msgstr ""
-#: lib/db2.c:133 lib/db3.c:456
+#: lib/db2.c:133
#, c-format
msgid "closed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:145 lib/db3.c:468
+#: lib/db2.c:145
#, c-format
msgid "removed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:182 lib/db3.c:505
+#: lib/db2.c:182
#, c-format
msgid "opening db environment %s/%s(%s) %s\n"
msgstr ""
-#: lib/db2.c:557 lib/db3.c:876
+#: lib/db2.c:557
#, c-format
msgid "closed db index %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:635 lib/db3.c:965
+#: lib/db2.c:635
#, c-format
msgid "opening db index %s/%s(%s) %s mode=0x%x\n"
msgstr ""
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
-#: lib/db3.c:1057
+#: lib/db3.c:464
+#, c-format
+msgid "closed db environment %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:476
+#, c-format
+msgid "removed db environment %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:513
+#, c-format
+msgid "opening db environment %s/%s %s\n"
+msgstr ""
+
+#: lib/db3.c:884
+#, c-format
+msgid "closed db index %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:975
#, fuzzy, c-format
-msgid "cannot get %s lock on %s/%s(%s)\n"
+msgid "opening db index %s/%s %s mode=0x%x\n"
+msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
+
+#: lib/db3.c:1078
+#, fuzzy, c-format
+msgid "cannot get %s lock on %s/%s\n"
msgstr "não foi passado pacote para desinstalação"
-#: lib/db3.c:1064
+#: lib/db3.c:1085
#, c-format
-msgid "locked db index %s/%s(%s)\n"
+msgid "locked db index %s/%s\n"
msgstr ""
#: lib/falloc.c:135
#. this would probably be a good place to check if disk space
#. was used up - if so, we should return a different error
-#: lib/install.c:364
+#: lib/install.c:365
#, c-format
msgid "unpacking of archive failed%s%s: %s"
msgstr ""
-#: lib/install.c:365
+#: lib/install.c:366
msgid " on file "
msgstr ""
-#: lib/install.c:409
+#: lib/install.c:410
#, fuzzy
msgid "installing a source package\n"
msgstr "instale pacote"
# , c-format
-#: lib/install.c:429
+#: lib/install.c:430
#, fuzzy, c-format
msgid "cannot create sourcedir %s"
msgstr "Não consegui abrir: %s\n"
# , c-format
-#: lib/install.c:435 lib/install.c:465
+#: lib/install.c:436 lib/install.c:466
#, fuzzy, c-format
msgid "cannot write to %s"
msgstr "Não consegui abrir: %s\n"
-#: lib/install.c:439
+#: lib/install.c:440
#, c-format
msgid "sources in: %s\n"
msgstr ""
# , c-format
-#: lib/install.c:459
+#: lib/install.c:460
#, fuzzy, c-format
msgid "cannot create specdir %s"
msgstr "Não consegui abrir: %s\n"
-#: lib/install.c:469
+#: lib/install.c:470
#, c-format
msgid "spec file in: %s\n"
msgstr ""
-#: lib/install.c:503 lib/install.c:531
+#: lib/install.c:504 lib/install.c:532
#, fuzzy
msgid "source package contains no .spec file"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: lib/install.c:553
+#: lib/install.c:554
#, c-format
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:555 lib/install.c:829 lib/uninstall.c:28
+#: lib/install.c:556 lib/install.c:830 lib/uninstall.c:28
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:646
+#: lib/install.c:647
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:701
+#: lib/install.c:702
#, fuzzy, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "não foi passado pacote para instalação"
-#: lib/install.c:759
+#: lib/install.c:760
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:764
+#: lib/install.c:765
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:789
+#: lib/install.c:790
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:825
+#: lib/install.c:826
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
msgid "package %s is not installed\n"
msgstr "não foi passado pacote para instalação"
-#: lib/query.c:683
-msgid "rpmQuery: rpmdbOpen() failed\n"
-msgstr ""
-
-#: lib/query.c:742
+#: lib/query.c:740
#, fuzzy
msgid "query package owning file"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: lib/query.c:744
+#: lib/query.c:742
#, fuzzy
msgid "query packages in group"
msgstr "não foi passado pacote para desinstalação"
-#: lib/query.c:746
+#: lib/query.c:744
#, fuzzy
msgid "query a package file"
msgstr "pesquise todos os pacotes"
-#: lib/query.c:750
+#: lib/query.c:748
#, fuzzy
msgid "query a spec file"
msgstr "pesquise todos os pacotes"
-#: lib/query.c:752
+#: lib/query.c:750
#, fuzzy
msgid "query the pacakges triggered by the package"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: lib/query.c:754
+#: lib/query.c:752
#, fuzzy
msgid "query the packages which require a capability"
msgstr "pesquise pacotes que requerem capacidade <i>"
-#: lib/query.c:756
+#: lib/query.c:754
#, fuzzy
msgid "query the packages which provide a capability"
msgstr "pesquise pacotes que fornecem a capacidade <i>"
-#: lib/query.c:795
+#: lib/query.c:793
#, fuzzy
msgid "list all configuration files"
msgstr "liste somente os arquivos de configuração (implica -l)"
-#: lib/query.c:797
+#: lib/query.c:795
#, fuzzy
msgid "list all documentation files"
msgstr "instale documentação"
-#: lib/query.c:799
+#: lib/query.c:797
#, fuzzy
msgid "dump basic file information"
msgstr "mostre informação do pacote"
-#: lib/query.c:801
+#: lib/query.c:799
#, fuzzy
msgid "list files in package"
msgstr "instale pacote"
-#: lib/query.c:805
+#: lib/query.c:803
msgid "use the following query format"
msgstr ""
-#: lib/query.c:807
+#: lib/query.c:805
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: lib/query.c:809
+#: lib/query.c:807
msgid "display the states of the listed files"
msgstr ""
-#: lib/query.c:811
+#: lib/query.c:809
#, fuzzy
msgid "display a verbose file listing"
msgstr "mostre a lista de arquivos do pacote"
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: lib/rpmdb.c:196
-msgid ""
-"\n"
-"--> This version of rpm was not compiled with support for db%d. Please "
-"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and "
-"correct your configuration.\n"
-msgstr ""
-
-#: lib/rpmdb.c:223
+#: lib/rpmdb.c:218
msgid ""
"\n"
-"--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
-" db1 to db3 on-disk format.\n"
+"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
"\n"
msgstr ""
# , c-format
-#. XXX FIXME: dbNopen handles failures already.
-#: lib/rpmdb.c:239
+#. failed to open with any dbapi
+#: lib/rpmdb.c:249
#, fuzzy, c-format
msgid "dbiOpen: cannot open %s index"
msgstr "Não consegui abrir: %s\n"
+#: lib/rpmdb.c:257
+msgid ""
+"\n"
+"--> The database is in db%d format, not the suggested db%d format.\n"
+" Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
+" using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
+" to convert your database from db%d to db%d format, or configure\n"
+" \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:270
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
# , c-format
-#: lib/rpmdb.c:293
+#: lib/rpmdb.c:335
#, fuzzy, c-format
msgid "error getting \"%s\" records from %s index"
msgstr "Não consegui abrir: %s\n"
-#: lib/rpmdb.c:410
+#: lib/rpmdb.c:452
#, c-format
msgid "error storing record %s into %s"
msgstr ""
# , c-format
-#: lib/rpmdb.c:419
+#: lib/rpmdb.c:461
#, fuzzy, c-format
msgid "error removing record %s from %s"
msgstr "Não consegui abrir: %s\n"
-#: lib/rpmdb.c:619 lib/rpmdb.c:2078
+#: lib/rpmdb.c:683 lib/rpmdb.c:2186
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:708
+#: lib/rpmdb.c:780
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
# , c-format
#. error
-#: lib/rpmdb.c:912
+#: lib/rpmdb.c:984
#, fuzzy, c-format
msgid "cannot retrieve package \"%s\" from db"
msgstr "Não consegui abrir: %s\n"
-#: lib/rpmdb.c:978 lib/rpmdb.c:1496 lib/uninstall.c:90
+#: lib/rpmdb.c:1050 lib/rpmdb.c:1560 lib/uninstall.c:90
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x"
msgstr "não foi passado pacote para desinstalação"
-#: lib/rpmdb.c:1451
-#, fuzzy, c-format
-msgid "key \"%s\" not found in %s"
-msgstr "não foi passado pacote para desinstalação"
-
-#: lib/rpmdb.c:1459
-#, fuzzy, c-format
-msgid "key \"%s\" not removed from %s"
-msgstr "não foi passado pacote para desinstalação"
-
-#: lib/rpmdb.c:1541
+#: lib/rpmdb.c:1611
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1550
+#: lib/rpmdb.c:1622
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1558
-#, c-format
-msgid "removing %d entries in %s index:\n"
-msgstr ""
+# , c-format
+#: lib/rpmdb.c:1631
+#, fuzzy, c-format
+msgid "removing %d entries from %s index:\n"
+msgstr "Não consegui abrir: %s\n"
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1638 lib/rpmdb.c:1861
#, c-format
-msgid "\t%6d %s\n"
+msgid "%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1774
msgid "cannot allocate new instance in database"
msgstr ""
-#: lib/rpmdb.c:1761
+#: lib/rpmdb.c:1829
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1777
+#: lib/rpmdb.c:1845
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1784
+#: lib/rpmdb.c:1854
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:1788
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
-#: lib/rpmdb.c:2103
+#: lib/rpmdb.c:2211
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
-#: lib/rpmdb.c:2107
+#: lib/rpmdb.c:2215
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2113
-#, c-format
-msgid "creating directory: %s\n"
-msgstr ""
+# , c-format
+#: lib/rpmdb.c:2221
+#, fuzzy, c-format
+msgid "creating directory %s\n"
+msgstr "Não consegui abrir: %s\n"
-#: lib/rpmdb.c:2115
+#: lib/rpmdb.c:2223
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2121
+#: lib/rpmdb.c:2230
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
-#: lib/rpmdb.c:2131
+#: lib/rpmdb.c:2239
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
-#: lib/rpmdb.c:2155
+#: lib/rpmdb.c:2262
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2187
+#: lib/rpmdb.c:2294
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2205
-msgid "failed to rebuild database; original database remains in place\n"
+#: lib/rpmdb.c:2312
+msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2213
+#: lib/rpmdb.c:2320
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2215
+#: lib/rpmdb.c:2322
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
+# "Project-Id-Version: rpm-2.5.3\n"
+# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
+# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
+# "Language-Team: Portuguese <pt@li.org>\n"
+# "MIME-Version: 1.0\n"
+# "Content-Type: text/plain; charset=ISO-8859-1\n"
+# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: lib/rpmdb.c:2221
+#: lib/rpmdb.c:2332
+#, fuzzy, c-format
+msgid "removing directory %s\n"
+msgstr "RPM versão %s\n"
+
+# , c-format
+#: lib/rpmdb.c:2334
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "Não consegui abrir: %s\n"
msgid "running postuninstall script (if any)\n"
msgstr ""
-#: lib/uninstall.c:213
-msgid "removing database entry\n"
-msgstr ""
-
-#: lib/uninstall.c:397
+#: lib/uninstall.c:390
msgid "execution of script failed"
msgstr ""
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
-#: lib/verify.c:381
-msgid "rpmVerify: rpmdbOpen() failed\n"
-msgstr ""
+#, fuzzy
+#~ msgid "key \"%s\" not found in %s"
+#~ msgstr "não foi passado pacote para desinstalação"
+
+#, fuzzy
+#~ msgid "key \"%s\" not removed from %s"
+#~ msgstr "não foi passado pacote para desinstalação"
#, fuzzy
#~ msgid "searching for package %s\n"
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-02 04:48-0400\n"
+"POT-Creation-Date: 2000-05-06 19:31-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"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:439
+#: lib/depends.c:434
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:468
+#: lib/depends.c:463
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#: lib/depends.c:786
#, c-format
-msgid "%s: %s satisfied by added file list.\n"
+msgid "%s: %-45s YES (added files)\n"
msgstr ""
#: lib/depends.c:835
#, c-format
-msgid "%s: %s satisfied by added package.\n"
+msgid "%s: %-45s YES (added package)\n"
msgstr ""
-#: lib/depends.c:838
+#: lib/depends.c:839
#, c-format
-msgid "%s: %s satisfied by added package (shouldn't happen).\n"
+msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
msgstr ""
-#: lib/depends.c:856
+#: lib/depends.c:858
#, c-format
-msgid "%s: %s satisfied by added provide.\n"
+msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:890
+#: lib/depends.c:901
#, c-format
-msgid "%s: %s satisfied by Depends cache.\n"
+msgid "%s: %-45s %-3s (cached)\n"
msgstr ""
-#: lib/depends.c:904
+#: lib/depends.c:918
#, c-format
-msgid "%s: %s satisfied by rpmrc provides.\n"
+msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:932
+#: lib/depends.c:941
#, c-format
-msgid "%s: %s satisfied by db file lists.\n"
+msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:950
+#: lib/depends.c:954
#, c-format
-msgid "%s: %s satisfied by db provides.\n"
+msgid "%s: %-45s YES (db provides)\n"
msgstr ""
#: lib/depends.c:968
#, c-format
-msgid "%s: %s satisfied by db packages.\n"
+msgid "%s: %-45s YES (db packages)\n"
msgstr ""
-#: lib/depends.c:981
+#: lib/depends.c:985
#, c-format
-msgid "%s: %s satisfied by rpmlib version.\n"
+msgid "%s: %-45s YES (rpmlib version)\n"
msgstr ""
-#: lib/depends.c:991
+#: lib/depends.c:996
#, c-format
-msgid "%s: %s unsatisfied.\n"
+msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1010
+#: lib/depends.c:1016
#, c-format
-msgid "%s: (%s, %d) added to Depends cache.\n"
+msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1059
+#: lib/depends.c:1065
#, c-format
msgid "package %s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1121
+#: lib/depends.c:1127
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
-#: lib/depends.c:1251
+#: lib/depends.c:1254
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr ""
msgid "removed db file %s\n"
msgstr ""
-#: lib/db1.c:419
+#: lib/db1.c:420
#, c-format
msgid "bad db file %s"
msgstr ""
-#: lib/db1.c:424
+#: lib/db1.c:425
#, c-format
msgid "opening db file %s mode 0x%x\n"
msgstr ""
-#: lib/db1.c:432 lib/url.c:445
+#: lib/db1.c:434 lib/url.c:445
#, c-format
msgid "failed to open %s: %s\n"
msgstr ""
-#: lib/db1.c:448
+#: lib/db1.c:450
#, c-format
msgid "cannot get %s lock on database"
msgstr ""
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "exclusive"
msgstr ""
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "shared"
msgstr ""
-#: lib/db2.c:133 lib/db3.c:456
+#: lib/db2.c:133
#, c-format
msgid "closed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:145 lib/db3.c:468
+#: lib/db2.c:145
#, c-format
msgid "removed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:182 lib/db3.c:505
+#: lib/db2.c:182
#, c-format
msgid "opening db environment %s/%s(%s) %s\n"
msgstr ""
-#: lib/db2.c:557 lib/db3.c:876
+#: lib/db2.c:557
#, c-format
msgid "closed db index %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:635 lib/db3.c:965
+#: lib/db2.c:635
#, c-format
msgid "opening db index %s/%s(%s) %s mode=0x%x\n"
msgstr ""
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
-#: lib/db3.c:1057
+#: lib/db3.c:464
#, c-format
-msgid "cannot get %s lock on %s/%s(%s)\n"
+msgid "closed db environment %s/%s\n"
msgstr ""
-#: lib/db3.c:1064
+#: lib/db3.c:476
#, c-format
-msgid "locked db index %s/%s(%s)\n"
+msgid "removed db environment %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:513
+#, c-format
+msgid "opening db environment %s/%s %s\n"
+msgstr ""
+
+#: lib/db3.c:884
+#, c-format
+msgid "closed db index %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:975
+#, c-format
+msgid "opening db index %s/%s %s mode=0x%x\n"
+msgstr ""
+
+#: lib/db3.c:1078
+#, c-format
+msgid "cannot get %s lock on %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:1085
+#, c-format
+msgid "locked db index %s/%s\n"
msgstr ""
#: lib/falloc.c:135
#. this would probably be a good place to check if disk space
#. was used up - if so, we should return a different error
-#: lib/install.c:364
+#: lib/install.c:365
#, c-format
msgid "unpacking of archive failed%s%s: %s"
msgstr ""
-#: lib/install.c:365
+#: lib/install.c:366
msgid " on file "
msgstr ""
-#: lib/install.c:409
+#: lib/install.c:410
msgid "installing a source package\n"
msgstr ""
-#: lib/install.c:429
+#: lib/install.c:430
#, c-format
msgid "cannot create sourcedir %s"
msgstr ""
-#: lib/install.c:435 lib/install.c:465
+#: lib/install.c:436 lib/install.c:466
#, c-format
msgid "cannot write to %s"
msgstr ""
-#: lib/install.c:439
+#: lib/install.c:440
#, c-format
msgid "sources in: %s\n"
msgstr ""
-#: lib/install.c:459
+#: lib/install.c:460
#, c-format
msgid "cannot create specdir %s"
msgstr ""
-#: lib/install.c:469
+#: lib/install.c:470
#, c-format
msgid "spec file in: %s\n"
msgstr ""
-#: lib/install.c:503 lib/install.c:531
+#: lib/install.c:504 lib/install.c:532
msgid "source package contains no .spec file"
msgstr ""
-#: lib/install.c:553
+#: lib/install.c:554
#, c-format
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:555 lib/install.c:829 lib/uninstall.c:28
+#: lib/install.c:556 lib/install.c:830 lib/uninstall.c:28
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:646
+#: lib/install.c:647
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:701
+#: lib/install.c:702
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr ""
-#: lib/install.c:759
+#: lib/install.c:760
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:764
+#: lib/install.c:765
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:789
+#: lib/install.c:790
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:825
+#: lib/install.c:826
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
msgid "package %s is not installed\n"
msgstr ""
-#: lib/query.c:683
-msgid "rpmQuery: rpmdbOpen() failed\n"
-msgstr ""
-
-#: lib/query.c:742
+#: lib/query.c:740
msgid "query package owning file"
msgstr ""
-#: lib/query.c:744
+#: lib/query.c:742
msgid "query packages in group"
msgstr ""
-#: lib/query.c:746
+#: lib/query.c:744
msgid "query a package file"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:748
msgid "query a spec file"
msgstr ""
-#: lib/query.c:752
+#: lib/query.c:750
msgid "query the pacakges triggered by the package"
msgstr ""
-#: lib/query.c:754
+#: lib/query.c:752
msgid "query the packages which require a capability"
msgstr ""
-#: lib/query.c:756
+#: lib/query.c:754
msgid "query the packages which provide a capability"
msgstr ""
-#: lib/query.c:795
+#: lib/query.c:793
msgid "list all configuration files"
msgstr ""
-#: lib/query.c:797
+#: lib/query.c:795
msgid "list all documentation files"
msgstr ""
-#: lib/query.c:799
+#: lib/query.c:797
msgid "dump basic file information"
msgstr ""
-#: lib/query.c:801
+#: lib/query.c:799
msgid "list files in package"
msgstr ""
-#: lib/query.c:805
+#: lib/query.c:803
msgid "use the following query format"
msgstr ""
-#: lib/query.c:807
+#: lib/query.c:805
msgid "substitute i18n sections into spec file"
msgstr ""
-#: lib/query.c:809
+#: lib/query.c:807
msgid "display the states of the listed files"
msgstr ""
-#: lib/query.c:811
+#: lib/query.c:809
msgid "display a verbose file listing"
msgstr ""
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: lib/rpmdb.c:196
+#: lib/rpmdb.c:218
msgid ""
"\n"
-"--> This version of rpm was not compiled with support for db%d. Please "
-"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and "
-"correct your configuration.\n"
+"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#. failed to open with any dbapi
+#: lib/rpmdb.c:249
+#, c-format
+msgid "dbiOpen: cannot open %s index"
msgstr ""
-#: lib/rpmdb.c:223
+#: lib/rpmdb.c:257
msgid ""
"\n"
-"--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
-" db1 to db3 on-disk format.\n"
+"--> The database is in db%d format, not the suggested db%d format.\n"
+" Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
+" using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
+" to convert your database from db%d to db%d format, or configure\n"
+" \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#. XXX FIXME: dbNopen handles failures already.
-#: lib/rpmdb.c:239
-#, c-format
-msgid "dbiOpen: cannot open %s index"
+#: lib/rpmdb.c:270
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
msgstr ""
-#: lib/rpmdb.c:293
+#: lib/rpmdb.c:335
#, c-format
msgid "error getting \"%s\" records from %s index"
msgstr ""
-#: lib/rpmdb.c:410
+#: lib/rpmdb.c:452
#, c-format
msgid "error storing record %s into %s"
msgstr ""
-#: lib/rpmdb.c:419
+#: lib/rpmdb.c:461
#, c-format
msgid "error removing record %s from %s"
msgstr ""
-#: lib/rpmdb.c:619 lib/rpmdb.c:2078
+#: lib/rpmdb.c:683 lib/rpmdb.c:2186
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:708
+#: lib/rpmdb.c:780
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:912
+#: lib/rpmdb.c:984
#, c-format
msgid "cannot retrieve package \"%s\" from db"
msgstr ""
-#: lib/rpmdb.c:978 lib/rpmdb.c:1496 lib/uninstall.c:90
+#: lib/rpmdb.c:1050 lib/rpmdb.c:1560 lib/uninstall.c:90
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:1451
-#, c-format
-msgid "key \"%s\" not found in %s"
-msgstr ""
-
-#: lib/rpmdb.c:1459
-#, c-format
-msgid "key \"%s\" not removed from %s"
-msgstr ""
-
-#: lib/rpmdb.c:1541
+#: lib/rpmdb.c:1611
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1550
+#: lib/rpmdb.c:1622
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1558
+#: lib/rpmdb.c:1631
#, c-format
-msgid "removing %d entries in %s index:\n"
+msgid "removing %d entries from %s index:\n"
msgstr ""
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1638 lib/rpmdb.c:1861
#, c-format
-msgid "\t%6d %s\n"
+msgid "%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1774
msgid "cannot allocate new instance in database"
msgstr ""
-#: lib/rpmdb.c:1761
+#: lib/rpmdb.c:1829
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1777
+#: lib/rpmdb.c:1845
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1784
+#: lib/rpmdb.c:1854
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:1788
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
-#: lib/rpmdb.c:2103
+#: lib/rpmdb.c:2211
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: lib/rpmdb.c:2107
+#: lib/rpmdb.c:2215
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2113
+#: lib/rpmdb.c:2221
#, c-format
-msgid "creating directory: %s\n"
+msgid "creating directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2115
+#: lib/rpmdb.c:2223
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2121
+#: lib/rpmdb.c:2230
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2131
+#: lib/rpmdb.c:2239
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2155
+#: lib/rpmdb.c:2262
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2187
+#: lib/rpmdb.c:2294
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2205
-msgid "failed to rebuild database; original database remains in place\n"
+#: lib/rpmdb.c:2312
+msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2213
+#: lib/rpmdb.c:2320
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2215
+#: lib/rpmdb.c:2322
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2221
+#: lib/rpmdb.c:2332
+#, c-format
+msgid "removing directory %s\n"
+msgstr ""
+
+#: lib/rpmdb.c:2334
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
msgid "running postuninstall script (if any)\n"
msgstr ""
-#: lib/uninstall.c:213
-msgid "removing database entry\n"
-msgstr ""
-
-#: lib/uninstall.c:397
+#: lib/uninstall.c:390
msgid "execution of script failed"
msgstr ""
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
-
-#: lib/verify.c:381
-msgid "rpmVerify: rpmdbOpen() failed\n"
-msgstr ""
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-05-02 04:48-0400\n"
+"POT-Creation-Date: 2000-05-06 19:31-0400\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=koi8-r\n"
"Content-Transfer-Encoding: 8bit\n"
msgstr "ÎÅ ÕÄÁÌÏÓØ - "
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:439
+#: lib/depends.c:434
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:468
+#: lib/depends.c:463
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#: lib/depends.c:786
#, c-format
-msgid "%s: %s satisfied by added file list.\n"
+msgid "%s: %-45s YES (added files)\n"
msgstr ""
#: lib/depends.c:835
#, fuzzy, c-format
-msgid "%s: %s satisfied by added package.\n"
+msgid "%s: %-45s YES (added package)\n"
msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n"
-#: lib/depends.c:838
-#, fuzzy, c-format
-msgid "%s: %s satisfied by added package (shouldn't happen).\n"
-msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n"
+#: lib/depends.c:839
+#, c-format
+msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
+msgstr ""
-#: lib/depends.c:856
+#: lib/depends.c:858
#, c-format
-msgid "%s: %s satisfied by added provide.\n"
+msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:890
-#, fuzzy, c-format
-msgid "%s: %s satisfied by Depends cache.\n"
-msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n"
+#: lib/depends.c:901
+#, c-format
+msgid "%s: %-45s %-3s (cached)\n"
+msgstr ""
-#: lib/depends.c:904
+#: lib/depends.c:918
#, c-format
-msgid "%s: %s satisfied by rpmrc provides.\n"
+msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:932
+#: lib/depends.c:941
#, c-format
-msgid "%s: %s satisfied by db file lists.\n"
+msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:950
+#: lib/depends.c:954
#, c-format
-msgid "%s: %s satisfied by db provides.\n"
+msgid "%s: %-45s YES (db provides)\n"
msgstr ""
#: lib/depends.c:968
#, fuzzy, c-format
-msgid "%s: %s satisfied by db packages.\n"
+msgid "%s: %-45s YES (db packages)\n"
msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n"
-#: lib/depends.c:981
+#: lib/depends.c:985
#, c-format
-msgid "%s: %s satisfied by rpmlib version.\n"
+msgid "%s: %-45s YES (rpmlib version)\n"
msgstr ""
-#: lib/depends.c:991
+#: lib/depends.c:996
#, c-format
-msgid "%s: %s unsatisfied.\n"
+msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1010
+#: lib/depends.c:1016
#, fuzzy, c-format
-msgid "%s: (%s, %d) added to Depends cache.\n"
+msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n"
#. requirements are not satisfied.
-#: lib/depends.c:1059
+#: lib/depends.c:1065
#, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
#. conflicts exist.
-#: lib/depends.c:1121
+#: lib/depends.c:1127
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "ÐÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n"
-#: lib/depends.c:1251
+#: lib/depends.c:1254
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr "ÚÁÍËÎÕÔÙÊ ÃÉËÌ × ÃÅÐÏÞËÅ ÔÒÅÂÏ×ÁÎÉÊ ÄÌÑ ÕÓÔÁÎÏ×ËÉ: %s"
msgid "removed db file %s\n"
msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n"
-#: lib/db1.c:419
+#: lib/db1.c:420
#, fuzzy, c-format
msgid "bad db file %s"
msgstr "ÎÅ×ÅÒÎÏÅ ÓÏÓÔÏÑÎÉÅ ÆÁÊÌÁ: %s"
-#: lib/db1.c:424
+#: lib/db1.c:425
#, fuzzy, c-format
msgid "opening db file %s mode 0x%x\n"
msgstr "ÏÔËÒÙ×ÁÀ ÂÁÚÕ × ÒÅÖÉÍÅ 0x%x × %s\n"
-#: lib/db1.c:432 lib/url.c:445
+#: lib/db1.c:434 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s: %s"
-#: lib/db1.c:448
+#: lib/db1.c:450
#, c-format
msgid "cannot get %s lock on database"
msgstr "ÎÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ %s ÄÏÓÔÕÐ Ë ÂÁÚÅ ÄÁÎÎÙÈ"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "exclusive"
msgstr "ÉÓËÌÀÞÉÔÅÌØÎÙÊ"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "shared"
msgstr "ÒÁÚÄÅÌÑÅÍÙÊ"
-#: lib/db2.c:133 lib/db3.c:456
+#: lib/db2.c:133
#, c-format
msgid "closed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:145 lib/db3.c:468
+#: lib/db2.c:145
#, c-format
msgid "removed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:182 lib/db3.c:505
+#: lib/db2.c:182
#, c-format
msgid "opening db environment %s/%s(%s) %s\n"
msgstr ""
-#: lib/db2.c:557 lib/db3.c:876
+#: lib/db2.c:557
#, c-format
msgid "closed db index %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:635 lib/db3.c:965
+#: lib/db2.c:635
#, c-format
msgid "opening db index %s/%s(%s) %s mode=0x%x\n"
msgstr ""
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
-#: lib/db3.c:1057
+#: lib/db3.c:464
+#, fuzzy, c-format
+msgid "closed db environment %s/%s\n"
+msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n"
+
+#: lib/db3.c:476
+#, fuzzy, c-format
+msgid "removed db environment %s/%s\n"
+msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n"
+
+#: lib/db3.c:513
+#, c-format
+msgid "opening db environment %s/%s %s\n"
+msgstr ""
+
+#: lib/db3.c:884
+#, fuzzy, c-format
+msgid "closed db index %s/%s\n"
+msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n"
+
+#: lib/db3.c:975
+#, fuzzy, c-format
+msgid "opening db index %s/%s %s mode=0x%x\n"
+msgstr "ÏÔËÒÙ×ÁÀ ÂÁÚÕ × ÒÅÖÉÍÅ 0x%x × %s\n"
+
+#: lib/db3.c:1078
#, fuzzy, c-format
-msgid "cannot get %s lock on %s/%s(%s)\n"
+msgid "cannot get %s lock on %s/%s\n"
msgstr "ÎÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ %s ÄÏÓÔÕÐ Ë ÂÁÚÅ ÄÁÎÎÙÈ"
-#: lib/db3.c:1064
+#: lib/db3.c:1085
#, fuzzy, c-format
-msgid "locked db index %s/%s(%s)\n"
+msgid "locked db index %s/%s\n"
msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n"
#: lib/falloc.c:135
#. this would probably be a good place to check if disk space
#. was used up - if so, we should return a different error
-#: lib/install.c:364
+#: lib/install.c:365
#, c-format
msgid "unpacking of archive failed%s%s: %s"
msgstr "ÒÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s"
-#: lib/install.c:365
+#: lib/install.c:366
msgid " on file "
msgstr " ÎÁ ÆÁÊÌÅ "
-#: lib/install.c:409
+#: lib/install.c:410
msgid "installing a source package\n"
msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÉÓÈÏÄÎÙÊ ÐÁËÅÔ\n"
-#: lib/install.c:429
+#: lib/install.c:430
#, fuzzy, c-format
msgid "cannot create sourcedir %s"
msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s"
-#: lib/install.c:435 lib/install.c:465
+#: lib/install.c:436 lib/install.c:466
#, c-format
msgid "cannot write to %s"
msgstr "ÎÅ ÍÏÇÕ ÐÉÓÁÔØ × %s"
-#: lib/install.c:439
+#: lib/install.c:440
#, c-format
msgid "sources in: %s\n"
msgstr "ÉÓÈÏÄÎÉËÉ ×: %s\n"
-#: lib/install.c:459
+#: lib/install.c:460
#, fuzzy, c-format
msgid "cannot create specdir %s"
msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s"
-#: lib/install.c:469
+#: lib/install.c:470
#, c-format
msgid "spec file in: %s\n"
msgstr "ÆÁÊÌ spec ×: %s\n"
-#: lib/install.c:503 lib/install.c:531
+#: lib/install.c:504 lib/install.c:532
msgid "source package contains no .spec file"
msgstr "ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ .spec"
-#: lib/install.c:553
+#: lib/install.c:554
#, c-format
msgid "renaming %s to %s\n"
msgstr "ÐÅÒÅÉÍÅÎÏ×Ù×ÁÀ %s × %s\n"
-#: lib/install.c:555 lib/install.c:829 lib/uninstall.c:28
+#: lib/install.c:556 lib/install.c:830 lib/uninstall.c:28
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "ÏÛÉÂËÁ ÐÅÒÅÉÍÅÎÏ×ÁÎÉÑ %s × %s: %s"
-#: lib/install.c:646
+#: lib/install.c:647
msgid "source package expected, binary found"
msgstr "ÏÖÉÄÁÌÓÑ ÉÓÈÏÄÎÙÊ ÐÁËÅÔ, ÎÁÊÄÅÎ ÂÉÎÁÒÎÙÊ"
-#: lib/install.c:701
+#: lib/install.c:702
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "ÐÁËÅÔ: %s-%s-%s ÆÁÊÌÏ×; test = %d\n"
-#: lib/install.c:759
+#: lib/install.c:760
msgid "stopping install as we're running --test\n"
msgstr "ÏÓÔÁÎÁ×ÌÉ×ÁÀ ÕÓÔÁÎÏ×ËÕ, Ô.Ë. ÍÙ ÉÓÐÏÌÎÑÅÍ --test\n"
-#: lib/install.c:764
+#: lib/install.c:765
msgid "running preinstall script (if any)\n"
msgstr "ÉÓÐÏÌÎÑÀ ÓËÒÉÐÔ preinstall (ÅÓÌÉ ÅÓÔØ)\n"
-#: lib/install.c:789
+#: lib/install.c:790
#, c-format
msgid "warning: %s created as %s"
msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s ÓÏÚÄÁÎ ËÁË %s"
-#: lib/install.c:825
+#: lib/install.c:826
#, c-format
msgid "warning: %s saved as %s"
msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s ÓÏÈÒÁÎÅÎ ËÁË %s"
msgid "package %s is not installed\n"
msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
-#: lib/query.c:683
-msgid "rpmQuery: rpmdbOpen() failed\n"
-msgstr "rpmQuery: ÎÅÕÄÁÞÁ rpmdbOpen()\n"
-
-#: lib/query.c:742
+#: lib/query.c:740
msgid "query package owning file"
msgstr "ÎÁÊÔÉ ÐÁËÅÔ, ËÏÔÏÒÏÍÕ ÐÒÉÎÁÄÌÅÖÉÔ ÆÁÊÌ"
-#: lib/query.c:744
+#: lib/query.c:742
msgid "query packages in group"
msgstr "ÚÁÐÒÏÓ ÐÁËÅÔÏ× × ÇÒÕÐÐÅ"
-#: lib/query.c:746
+#: lib/query.c:744
msgid "query a package file"
msgstr "ÚÁÐÒÏÓÉÔØ ÆÁÊÌ ÐÁËÅÔÁ"
-#: lib/query.c:750
+#: lib/query.c:748
msgid "query a spec file"
msgstr "ÚÁÐÒÏÓÉÔØ spec-ÆÁÊÌ"
-#: lib/query.c:752
+#: lib/query.c:750
msgid "query the pacakges triggered by the package"
msgstr "ÚÁÐÒÏÓÉÔØ ÐÁËÅÔÙ Ó ÔÒÉÇÇÅÒ-ÓËÒÉÐÔÁÍÉ ÎÁ ÐÁËÅÔ"
-#: lib/query.c:754
+#: lib/query.c:752
msgid "query the packages which require a capability"
msgstr "ÎÁÊÔÉ ÐÁËÅÔÙ, ÔÒÅÂÕÀÝÉÅ ÓÅÒ×ÉÓÁ"
-#: lib/query.c:756
+#: lib/query.c:754
msgid "query the packages which provide a capability"
msgstr "ÎÁÊÔÉ ÐÁËÅÔÙ, ÐÒÅÄÏÓÔÁ×ÌÑÀÝÉÅ ÓÅÒ×ÉÓ"
-#: lib/query.c:795
+#: lib/query.c:793
msgid "list all configuration files"
msgstr "ÐÏËÁÚÁÔØ ×ÓÅ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ ÆÁÊÌÙ"
-#: lib/query.c:797
+#: lib/query.c:795
msgid "list all documentation files"
msgstr "ÐÏËÁÚÁÔØ ×ÓÅ ÆÁÊÌÙ ÄÏËÕÍÅÎÔÁÃÉÉ"
-#: lib/query.c:799
+#: lib/query.c:797
msgid "dump basic file information"
msgstr "×Ù×ÅÓÔÉ ÂÁÚÏ×ÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÆÁÊÌÅ"
-#: lib/query.c:801
+#: lib/query.c:799
msgid "list files in package"
msgstr "ÐÏËÁÚÁÔØ ÆÁÊÌÙ ÐÁËÅÔÁ"
-#: lib/query.c:805
+#: lib/query.c:803
msgid "use the following query format"
msgstr "ÉÓÐ. ÓÌÅÄÕÀÝÉÊ ÆÏÒÍÁÔ ÚÁÐÒÏÓÁ"
-#: lib/query.c:807
+#: lib/query.c:805
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "ÐÏÄÓÔÁ×ÉÔØ ÓÅËÃÉÉ i18n ÉÚ ÓÌÅÄÕÀÝÅÇÏ ËÁÔÁÌÏÇÁ"
-#: lib/query.c:809
+#: lib/query.c:807
msgid "display the states of the listed files"
msgstr "ÐÏËÁÚÁÔØ ÓÏÓÔÏÑÎÉÅ ÐÏËÁÚÁÎÎÙÈ ÆÁÊÌÏ×"
-#: lib/query.c:811
+#: lib/query.c:809
msgid "display a verbose file listing"
msgstr "×Ù×ÅÓÔÉ ÄÅÔÁÌØÎÙÊ ÓÐÉÓÏË ÆÁÊÌÏ× ÐÁËÅÔÁ"
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: lib/rpmdb.c:196
+#: lib/rpmdb.c:218
msgid ""
"\n"
-"--> This version of rpm was not compiled with support for db%d. Please "
-"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and "
-"correct your configuration.\n"
+"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
msgstr ""
-#: lib/rpmdb.c:223
+#. failed to open with any dbapi
+#: lib/rpmdb.c:249
+#, fuzzy, c-format
+msgid "dbiOpen: cannot open %s index"
+msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s\n"
+
+#: lib/rpmdb.c:257
msgid ""
"\n"
-"--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
-" db1 to db3 on-disk format.\n"
+"--> The database is in db%d format, not the suggested db%d format.\n"
+" Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
+" using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
+" to convert your database from db%d to db%d format, or configure\n"
+" \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#. XXX FIXME: dbNopen handles failures already.
-#: lib/rpmdb.c:239
-#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
-msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s\n"
+#: lib/rpmdb.c:270
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
-#: lib/rpmdb.c:293
+#: lib/rpmdb.c:335
#, fuzzy, c-format
msgid "error getting \"%s\" records from %s index"
msgstr "ÏÛÉÂËÁ ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s"
-#: lib/rpmdb.c:410
+#: lib/rpmdb.c:452
#, c-format
msgid "error storing record %s into %s"
msgstr "ÏÛÉÂËÁ ÓÏÈÒÁÎÅÎÉÑ ÚÁÐÉÓÉ %s × %s"
-#: lib/rpmdb.c:419
+#: lib/rpmdb.c:461
#, fuzzy, c-format
msgid "error removing record %s from %s"
msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s"
-#: lib/rpmdb.c:619 lib/rpmdb.c:2078
+#: lib/rpmdb.c:683 lib/rpmdb.c:2186
msgid "no dbpath has been set"
msgstr "ÎÅ ÕÓÔÁÎÏ×ÌÅÎÁ dbpath"
-#: lib/rpmdb.c:708
+#: lib/rpmdb.c:780
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
"ÂÁÚÙ ÎÏ×ÏÇÏ ÆÏÒÍÁÔÁ"
#. error
-#: lib/rpmdb.c:912
+#: lib/rpmdb.c:984
#, fuzzy, c-format
msgid "cannot retrieve package \"%s\" from db"
msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s/packages.rpm\n"
-#: lib/rpmdb.c:978 lib/rpmdb.c:1496 lib/uninstall.c:90
+#: lib/rpmdb.c:1050 lib/rpmdb.c:1560 lib/uninstall.c:90
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x"
msgstr "ÎÅ ÍÏÇÕ ÐÒÏÞÅÓÔØ ÈÅÄÅÒ × %d ÄÌÑ ÐÏÉÓËÁ"
-#: lib/rpmdb.c:1451
-#, fuzzy, c-format
-msgid "key \"%s\" not found in %s"
-msgstr "ÐÁËÅÔ %s ÎÅ ÎÁÊÄÅÎ × %s"
-
-#: lib/rpmdb.c:1459
-#, fuzzy, c-format
-msgid "key \"%s\" not removed from %s"
-msgstr "ÐÁËÅÔ %s ÎÅ ÎÁÊÄÅÎ × %s"
-
-#: lib/rpmdb.c:1541
+#: lib/rpmdb.c:1611
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "ÕÄÁÌÑÀ ÚÁÐÉÓØ ÂÁÚÙ ÄÁÎÎÙÈ\n"
-#: lib/rpmdb.c:1550
+#: lib/rpmdb.c:1622
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÇÒÕÐÐ\n"
-#: lib/rpmdb.c:1558
+#: lib/rpmdb.c:1631
#, fuzzy, c-format
-msgid "removing %d entries in %s index:\n"
+msgid "removing %d entries from %s index:\n"
msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÉÍÅÎ\n"
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1638 lib/rpmdb.c:1861
#, c-format
-msgid "\t%6d %s\n"
+msgid "%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1774
#, fuzzy
msgid "cannot allocate new instance in database"
msgstr "ÎÅ ÍÏÇÕ ×ÙÄÅÌÉÔØ ÍÅÓÔÏ ÄÌÑ ÂÁÚÙ ÄÁÎÎÙÈ"
-#: lib/rpmdb.c:1761
+#: lib/rpmdb.c:1829
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1777
+#: lib/rpmdb.c:1845
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "ÐÅÒÅÉÍÅÎÏ×Ù×ÁÀ %s × %s\n"
-#: lib/rpmdb.c:1784
+#: lib/rpmdb.c:1854
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:1788
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
-#: lib/rpmdb.c:2103
+#: lib/rpmdb.c:2211
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÀ ÂÁÚÕ × ËÏÒÎÅ×ÏÍ ËÁÔÁÌÏÇÅ %s\n"
-#: lib/rpmdb.c:2107
+#: lib/rpmdb.c:2215
#, c-format
msgid "temporary database %s already exists"
msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ"
-#: lib/rpmdb.c:2113
-#, c-format
-msgid "creating directory: %s\n"
+#: lib/rpmdb.c:2221
+#, fuzzy, c-format
+msgid "creating directory %s\n"
msgstr "ÓÏÚÄÁÀ ËÁÔÁÌÏÇ: %s\n"
-#: lib/rpmdb.c:2115
+#: lib/rpmdb.c:2223
#, c-format
msgid "error creating directory %s: %s"
msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ËÁÔÁÌÏÇÁ %s: %s"
-#: lib/rpmdb.c:2121
+#: lib/rpmdb.c:2230
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "ÏÔËÒÙ×ÁÀ ÓÔÁÒÕÀ ÂÁÚÕ\n"
-#: lib/rpmdb.c:2131
+#: lib/rpmdb.c:2239
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "ÏÔËÒÙ×ÁÀ ÎÏ×ÕÀ ÂÁÚÕ\n"
-#: lib/rpmdb.c:2155
+#: lib/rpmdb.c:2262
#, fuzzy, c-format
msgid "record number %d in database is bad -- skipping."
msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %d × ÂÁÚÅ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÀ"
-#: lib/rpmdb.c:2187
+#: lib/rpmdb.c:2294
#, c-format
msgid "cannot add record originally at %d"
msgstr "ÎÅ ÍÏÇÕ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %d)"
-#: lib/rpmdb.c:2205
-msgid "failed to rebuild database; original database remains in place\n"
+#: lib/rpmdb.c:2312
+#, fuzzy
+msgid "failed to rebuild database: original database remains in place\n"
msgstr "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n"
-#: lib/rpmdb.c:2213
+#: lib/rpmdb.c:2320
msgid "failed to replace old database with new database!\n"
msgstr "ÚÁÍÅÎÁ ÓÔÁÒÏÊ ÂÁÚÙ ÎÁ ÎÏ×ÕÀ ÎÅ ÕÄÁÌÁÓØ!\n"
-#: lib/rpmdb.c:2215
+#: lib/rpmdb.c:2322
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÚÁÍÅÎÑÅÔ ÆÁÊÌÙ × %s ÆÁÊÌÁÍÉ ÉÚ %s"
-#: lib/rpmdb.c:2221
+#: lib/rpmdb.c:2332
+#, fuzzy, c-format
+msgid "removing directory %s\n"
+msgstr "ÓÏÚÄÁÀ ËÁÔÁÌÏÇ: %s\n"
+
+#: lib/rpmdb.c:2334
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "ÕÄÁÌÅÎÉÅ ËÁÔÁÌÏÇÁ %s ÎÅ ÕÄÁÌÏÓØ: %s\n"
msgid "running postuninstall script (if any)\n"
msgstr "ÉÓÐÏÌÎÑÀ ÓËÒÉÐÔ postuninstall (ÅÓÌÉ ÅÓÔØ)\n"
-#: lib/uninstall.c:213
-msgid "removing database entry\n"
-msgstr "ÕÄÁÌÑÀ ÚÁÐÉÓØ ÂÁÚÙ ÄÁÎÎÙÈ\n"
-
-#: lib/uninstall.c:397
+#: lib/uninstall.c:390
msgid "execution of script failed"
msgstr "ÏÛÉÂËÁ ÉÓÐÏÌÎÅÎÉÑ ÓËÒÉÐÔÁ"
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: "
-#: lib/verify.c:381
-msgid "rpmVerify: rpmdbOpen() failed\n"
-msgstr "rpmVerify: ÎÅÕÄÁÞÁ rpmdbOpen()\n"
+#, fuzzy
+#~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
+#~ msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n"
+
+#, fuzzy
+#~ msgid "%s: %s satisfied by Depends cache.\n"
+#~ msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n"
+
+#~ msgid "rpmQuery: rpmdbOpen() failed\n"
+#~ msgstr "rpmQuery: ÎÅÕÄÁÞÁ rpmdbOpen()\n"
+
+#, fuzzy
+#~ msgid "key \"%s\" not found in %s"
+#~ msgstr "ÐÁËÅÔ %s ÎÅ ÎÁÊÄÅÎ × %s"
+
+#, fuzzy
+#~ msgid "key \"%s\" not removed from %s"
+#~ msgstr "ÐÁËÅÔ %s ÎÅ ÎÁÊÄÅÎ × %s"
+
+#~ msgid "removing database entry\n"
+#~ msgstr "ÕÄÁÌÑÀ ÚÁÐÉÓØ ÂÁÚÙ ÄÁÎÎÙÈ\n"
+
+#~ msgid "rpmVerify: rpmdbOpen() failed\n"
+#~ msgstr "rpmVerify: ÎÅÕÄÁÞÁ rpmdbOpen()\n"
#~ msgid "cannot read header at %d for dependency check"
#~ msgstr "ÎÅ ÍÏÇÕ ÐÒÏÞÅÓÔØ ÈÅÄÅÒ × %d ÄÌÑ ÐÒÏ×ÅÒËÉ ÚÁ×ÉÓÉÍÏÓÔÅÊ"
msgid ""
msgstr ""
"Project-Id-Version: rpm 2.93\n"
-"POT-Creation-Date: 2000-05-02 04:48-0400\n"
+"POT-Creation-Date: 2000-05-06 19:31-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"
msgstr " zlyhalo - "
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:439
+#: lib/depends.c:434
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:468
+#: lib/depends.c:463
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#: lib/depends.c:786
#, c-format
-msgid "%s: %s satisfied by added file list.\n"
+msgid "%s: %-45s YES (added files)\n"
msgstr ""
#: lib/depends.c:835
#, fuzzy, c-format
-msgid "%s: %s satisfied by added package.\n"
+msgid "%s: %-45s YES (added package)\n"
msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
-#: lib/depends.c:838
-#, fuzzy, c-format
-msgid "%s: %s satisfied by added package (shouldn't happen).\n"
-msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
+#: lib/depends.c:839
+#, c-format
+msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
+msgstr ""
-#: lib/depends.c:856
+#: lib/depends.c:858
#, c-format
-msgid "%s: %s satisfied by added provide.\n"
+msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:890
-#, fuzzy, c-format
-msgid "%s: %s satisfied by Depends cache.\n"
-msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
+#: lib/depends.c:901
+#, c-format
+msgid "%s: %-45s %-3s (cached)\n"
+msgstr ""
-#: lib/depends.c:904
+#: lib/depends.c:918
#, c-format
-msgid "%s: %s satisfied by rpmrc provides.\n"
+msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:932
+#: lib/depends.c:941
#, c-format
-msgid "%s: %s satisfied by db file lists.\n"
+msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:950
+#: lib/depends.c:954
#, c-format
-msgid "%s: %s satisfied by db provides.\n"
+msgid "%s: %-45s YES (db provides)\n"
msgstr ""
#: lib/depends.c:968
#, fuzzy, c-format
-msgid "%s: %s satisfied by db packages.\n"
+msgid "%s: %-45s YES (db packages)\n"
msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
-#: lib/depends.c:981
+#: lib/depends.c:985
#, c-format
-msgid "%s: %s satisfied by rpmlib version.\n"
+msgid "%s: %-45s YES (rpmlib version)\n"
msgstr ""
-#: lib/depends.c:991
+#: lib/depends.c:996
#, c-format
-msgid "%s: %s unsatisfied.\n"
+msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1010
+#: lib/depends.c:1016
#, fuzzy, c-format
-msgid "%s: (%s, %d) added to Depends cache.\n"
+msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
#. requirements are not satisfied.
-#: lib/depends.c:1059
+#: lib/depends.c:1065
#, 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:1121
+#: lib/depends.c:1127
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "balík %s koliduje: %s\n"
-#: lib/depends.c:1251
+#: lib/depends.c:1254
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr "sluèka v re»azi po¾iadaviek: %s"
msgid "removed db file %s\n"
msgstr "odstraòuje sa index súborov pre %s\n"
-#: lib/db1.c:419
+#: lib/db1.c:420
#, fuzzy, c-format
msgid "bad db file %s"
msgstr "chybný stav súboru: %s"
-#: lib/db1.c:424
+#: lib/db1.c:425
#, fuzzy, c-format
msgid "opening db file %s mode 0x%x\n"
msgstr "otvára sa databáza s právami 0x%x v %s\n"
-#: lib/db1.c:432 lib/url.c:445
+#: lib/db1.c:434 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "nepodarilo sa otvori» %s: %s"
-#: lib/db1.c:448
+#: lib/db1.c:450
#, c-format
msgid "cannot get %s lock on database"
msgstr "nie je mo¾né získa» %s zámok pre databázu"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "exclusive"
msgstr "výhradný"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "shared"
msgstr "zdieµaný"
-#: lib/db2.c:133 lib/db3.c:456
+#: lib/db2.c:133
#, c-format
msgid "closed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:145 lib/db3.c:468
+#: lib/db2.c:145
#, c-format
msgid "removed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:182 lib/db3.c:505
+#: lib/db2.c:182
#, c-format
msgid "opening db environment %s/%s(%s) %s\n"
msgstr ""
-#: lib/db2.c:557 lib/db3.c:876
+#: lib/db2.c:557
#, c-format
msgid "closed db index %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:635 lib/db3.c:965
+#: lib/db2.c:635
#, c-format
msgid "opening db index %s/%s(%s) %s mode=0x%x\n"
msgstr ""
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
-#: lib/db3.c:1057
+#: lib/db3.c:464
+#, fuzzy, c-format
+msgid "closed db environment %s/%s\n"
+msgstr "odstraòuje sa index súborov pre %s\n"
+
+#: lib/db3.c:476
+#, fuzzy, c-format
+msgid "removed db environment %s/%s\n"
+msgstr "odstraòuje sa index súborov pre %s\n"
+
+#: lib/db3.c:513
+#, c-format
+msgid "opening db environment %s/%s %s\n"
+msgstr ""
+
+#: lib/db3.c:884
+#, fuzzy, c-format
+msgid "closed db index %s/%s\n"
+msgstr "odstraòuje sa index súborov pre %s\n"
+
+#: lib/db3.c:975
+#, fuzzy, c-format
+msgid "opening db index %s/%s %s mode=0x%x\n"
+msgstr "otvára sa databáza s právami 0x%x v %s\n"
+
+#: lib/db3.c:1078
#, fuzzy, c-format
-msgid "cannot get %s lock on %s/%s(%s)\n"
+msgid "cannot get %s lock on %s/%s\n"
msgstr "nie je mo¾né získa» %s zámok pre databázu"
-#: lib/db3.c:1064
+#: lib/db3.c:1085
#, fuzzy, c-format
-msgid "locked db index %s/%s(%s)\n"
+msgid "locked db index %s/%s\n"
msgstr "odstraòuje sa index súborov pre %s\n"
#: lib/falloc.c:135
#. this would probably be a good place to check if disk space
#. was used up - if so, we should return a different error
-#: lib/install.c:364
+#: lib/install.c:365
#, c-format
msgid "unpacking of archive failed%s%s: %s"
msgstr "rozbalenie archívu zlyhalo%s%s: %s"
-#: lib/install.c:365
+#: lib/install.c:366
msgid " on file "
msgstr " pre súbor "
-#: lib/install.c:409
+#: lib/install.c:410
msgid "installing a source package\n"
msgstr "in¹taluje sa zdrojový balík\n"
-#: lib/install.c:429
+#: lib/install.c:430
#, fuzzy, c-format
msgid "cannot create sourcedir %s"
msgstr "nie je mo¾né zapísa» do %s: "
-#: lib/install.c:435 lib/install.c:465
+#: lib/install.c:436 lib/install.c:466
#, c-format
msgid "cannot write to %s"
msgstr "nie je mo¾né zapísa» do %s: "
-#: lib/install.c:439
+#: lib/install.c:440
#, c-format
msgid "sources in: %s\n"
msgstr "zdroje v: %s\n"
-#: lib/install.c:459
+#: lib/install.c:460
#, fuzzy, c-format
msgid "cannot create specdir %s"
msgstr "nie je mo¾né zapísa» do %s: "
-#: lib/install.c:469
+#: lib/install.c:470
#, c-format
msgid "spec file in: %s\n"
msgstr "spec-súbor v: %s\n"
-#: lib/install.c:503 lib/install.c:531
+#: lib/install.c:504 lib/install.c:532
msgid "source package contains no .spec file"
msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor"
-#: lib/install.c:553
+#: lib/install.c:554
#, c-format
msgid "renaming %s to %s\n"
msgstr "premenováva sa %s na %s\n"
-#: lib/install.c:555 lib/install.c:829 lib/uninstall.c:28
+#: lib/install.c:556 lib/install.c:830 lib/uninstall.c:28
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "premenovanie %s na %s zlyhalo: %s"
-#: lib/install.c:646
+#: lib/install.c:647
msgid "source package expected, binary found"
msgstr "oèakávaný zdrojový balík, nájdený binárny"
-#: lib/install.c:701
+#: lib/install.c:702
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "balík: %s-%s-%s test súborov = %d\n"
-#: lib/install.c:759
+#: lib/install.c:760
msgid "stopping install as we're running --test\n"
msgstr "in¹talácia zastavená kvôli re¾imu --test\n"
-#: lib/install.c:764
+#: lib/install.c:765
msgid "running preinstall script (if any)\n"
msgstr "vykonávajú sa predin¹talaèné skripty (ak existujú)\n"
-#: lib/install.c:789
+#: lib/install.c:790
#, c-format
msgid "warning: %s created as %s"
msgstr "varovanie: %s vytvorené ako %s"
-#: lib/install.c:825
+#: lib/install.c:826
#, c-format
msgid "warning: %s saved as %s"
msgstr "varovanie: %s uchovaný ako %s"
msgid "package %s is not installed\n"
msgstr "balík %s nie je nain¹talovaný\n"
-#: lib/query.c:683
-msgid "rpmQuery: rpmdbOpen() failed\n"
-msgstr "rpmQuery: rpmdbOpen() zlyhalo\n"
-
-#: lib/query.c:742
+#: lib/query.c:740
msgid "query package owning file"
msgstr "opýta» sa balíku vlastniaceho súbor"
-#: lib/query.c:744
+#: lib/query.c:742
msgid "query packages in group"
msgstr "opýta» sa v¹etkých balíkov v skupine"
-#: lib/query.c:746
+#: lib/query.c:744
msgid "query a package file"
msgstr "opýta» sa súboru balíka"
-#: lib/query.c:750
+#: lib/query.c:748
msgid "query a spec file"
msgstr "opýta» sa spec súboru"
-#: lib/query.c:752
+#: lib/query.c:750
msgid "query the pacakges triggered by the package"
msgstr "opýta» sa balíkov spustených balíkom"
-#: lib/query.c:754
+#: lib/query.c:752
msgid "query the packages which require a capability"
msgstr "opýta» sa balíkov vy¾adujúcich schopnos»"
-#: lib/query.c:756
+#: lib/query.c:754
msgid "query the packages which provide a capability"
msgstr "opýta» sa balíkov poskytujúcich schopnos»"
-#: lib/query.c:795
+#: lib/query.c:793
msgid "list all configuration files"
msgstr "zobrazi» v¹etky konfiguraèné súbory"
-#: lib/query.c:797
+#: lib/query.c:795
#, fuzzy
msgid "list all documentation files"
msgstr "zobrazi» v¹etky dokumentaèné súbory"
-#: lib/query.c:799
+#: lib/query.c:797
msgid "dump basic file information"
msgstr "zobrazi» základné informácie o balíku"
-#: lib/query.c:801
+#: lib/query.c:799
msgid "list files in package"
msgstr "zobrazi» súbory v balíku"
-#: lib/query.c:805
+#: lib/query.c:803
msgid "use the following query format"
msgstr "pou¾i» nasledovný formát otázky"
-#: lib/query.c:807
+#: lib/query.c:805
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor"
-#: lib/query.c:809
+#: lib/query.c:807
msgid "display the states of the listed files"
msgstr "zobrazii» stav daných súborov"
-#: lib/query.c:811
+#: lib/query.c:809
msgid "display a verbose file listing"
msgstr "zobrazi» podrobný zoznam súborov balíka"
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: lib/rpmdb.c:196
+#: lib/rpmdb.c:218
msgid ""
"\n"
-"--> This version of rpm was not compiled with support for db%d. Please "
-"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and "
-"correct your configuration.\n"
+"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
msgstr ""
-#: lib/rpmdb.c:223
+#. failed to open with any dbapi
+#: lib/rpmdb.c:249
+#, fuzzy, c-format
+msgid "dbiOpen: cannot open %s index"
+msgstr "nie je mo¾né otvori» %s\n"
+
+#: lib/rpmdb.c:257
msgid ""
"\n"
-"--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
-" db1 to db3 on-disk format.\n"
+"--> The database is in db%d format, not the suggested db%d format.\n"
+" Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
+" using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
+" to convert your database from db%d to db%d format, or configure\n"
+" \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#. XXX FIXME: dbNopen handles failures already.
-#: lib/rpmdb.c:239
-#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
-msgstr "nie je mo¾né otvori» %s\n"
+#: lib/rpmdb.c:270
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
-#: lib/rpmdb.c:293
+#: lib/rpmdb.c:335
#, fuzzy, c-format
msgid "error getting \"%s\" records from %s index"
msgstr "chyba pri naèítaní záznamu %s z %s"
-#: lib/rpmdb.c:410
+#: lib/rpmdb.c:452
#, c-format
msgid "error storing record %s into %s"
msgstr "chyba pri zápise záznamu %s do %s"
-#: lib/rpmdb.c:419
+#: lib/rpmdb.c:461
#, fuzzy, c-format
msgid "error removing record %s from %s"
msgstr "chyba pri odstraòovaní záznamu %s z %s"
-#: lib/rpmdb.c:619 lib/rpmdb.c:2078
+#: lib/rpmdb.c:683 lib/rpmdb.c:2186
msgid "no dbpath has been set"
msgstr "nebola nastavená ¾iadna dbpath"
-#: lib/rpmdb.c:708
+#: lib/rpmdb.c:780
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
"databázy v novom formáte"
#. error
-#: lib/rpmdb.c:912
+#: lib/rpmdb.c:984
#, fuzzy, c-format
msgid "cannot retrieve package \"%s\" from db"
msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
-#: lib/rpmdb.c:978 lib/rpmdb.c:1496 lib/uninstall.c:90
+#: lib/rpmdb.c:1050 lib/rpmdb.c:1560 lib/uninstall.c:90
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x"
msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie"
-#: lib/rpmdb.c:1451
-#, fuzzy, c-format
-msgid "key \"%s\" not found in %s"
-msgstr "balík %s nebol nájdený v %s"
-
-#: lib/rpmdb.c:1459
-#, fuzzy, c-format
-msgid "key \"%s\" not removed from %s"
-msgstr "balík %s nebol nájdený v %s"
-
-#: lib/rpmdb.c:1541
+#: lib/rpmdb.c:1611
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "odstraòuje sa záznam z databázy\n"
-#: lib/rpmdb.c:1550
+#: lib/rpmdb.c:1622
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstraòuje sa index skupín\n"
-#: lib/rpmdb.c:1558
+#: lib/rpmdb.c:1631
#, fuzzy, c-format
-msgid "removing %d entries in %s index:\n"
+msgid "removing %d entries from %s index:\n"
msgstr "odstraòuje sa index názvov\n"
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1638 lib/rpmdb.c:1861
#, c-format
-msgid "\t%6d %s\n"
+msgid "%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1774
#, fuzzy
msgid "cannot allocate new instance in database"
msgstr "nie je mo¾né prideli» miesto pre databázu"
-#: lib/rpmdb.c:1761
+#: lib/rpmdb.c:1829
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1777
+#: lib/rpmdb.c:1845
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "premenováva sa %s na %s\n"
-#: lib/rpmdb.c:1784
+#: lib/rpmdb.c:1854
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:1788
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
-#: lib/rpmdb.c:2103
+#: lib/rpmdb.c:2211
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "znovu sa vytvára databáza v adresári %s\n"
-#: lib/rpmdb.c:2107
+#: lib/rpmdb.c:2215
#, c-format
msgid "temporary database %s already exists"
msgstr "doèasná databáza %s u¾ existuje"
-#: lib/rpmdb.c:2113
-#, c-format
-msgid "creating directory: %s\n"
+#: lib/rpmdb.c:2221
+#, fuzzy, c-format
+msgid "creating directory %s\n"
msgstr "vytvára sa adresár %s\n"
-#: lib/rpmdb.c:2115
+#: lib/rpmdb.c:2223
#, c-format
msgid "error creating directory %s: %s"
msgstr "chyba pri vytváraní adresára %s: %s"
-#: lib/rpmdb.c:2121
+#: lib/rpmdb.c:2230
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "otvára sa stará databáza\n"
-#: lib/rpmdb.c:2131
+#: lib/rpmdb.c:2239
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "otvára sa nová databáza\n"
-#: lib/rpmdb.c:2155
+#: lib/rpmdb.c:2262
#, fuzzy, c-format
msgid "record number %d in database is bad -- skipping."
msgstr "záznam èíslo %d v databáze je chybný -- bol vynechaný"
-#: lib/rpmdb.c:2187
+#: lib/rpmdb.c:2294
#, c-format
msgid "cannot add record originally at %d"
msgstr "nie je mo¾né prida» záznam pôvodne na %d"
-#: lib/rpmdb.c:2205
-msgid "failed to rebuild database; original database remains in place\n"
+#: lib/rpmdb.c:2312
+#, fuzzy
+msgid "failed to rebuild database: original database remains in place\n"
msgstr "nepodarilo sa znovu vytvori» databázu; zostáva pôvodná\n"
-#: lib/rpmdb.c:2213
+#: lib/rpmdb.c:2320
msgid "failed to replace old database with new database!\n"
msgstr "nepodarilo sa nahradi» starú databázu novou!\n"
-#: lib/rpmdb.c:2215
+#: lib/rpmdb.c:2322
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "nahradí súbory v %s súbormi z %s kvôli obnove"
-#: lib/rpmdb.c:2221
+#: lib/rpmdb.c:2332
+#, fuzzy, c-format
+msgid "removing directory %s\n"
+msgstr "vytvára sa adresár %s\n"
+
+#: lib/rpmdb.c:2334
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "nepodarilo sa odstráni» adresár %s: %s\n"
msgid "running postuninstall script (if any)\n"
msgstr "vykonávajú sa postdein¹talaèné skripty (ak existujú)\n"
-#: lib/uninstall.c:213
-msgid "removing database entry\n"
-msgstr "odstraòuje sa záznam z databázy\n"
-
-#: lib/uninstall.c:397
+#: lib/uninstall.c:390
msgid "execution of script failed"
msgstr "vykonanie skriptu zlyhalo"
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: "
-#: lib/verify.c:381
#, fuzzy
-msgid "rpmVerify: rpmdbOpen() failed\n"
-msgstr "rpmQuery: rpmdbOpen() zlyhalo\n"
+#~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
+#~ msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
+
+#, fuzzy
+#~ msgid "%s: %s satisfied by Depends cache.\n"
+#~ msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
+
+#~ msgid "rpmQuery: rpmdbOpen() failed\n"
+#~ msgstr "rpmQuery: rpmdbOpen() zlyhalo\n"
+
+#, fuzzy
+#~ msgid "key \"%s\" not found in %s"
+#~ msgstr "balík %s nebol nájdený v %s"
+
+#, fuzzy
+#~ msgid "key \"%s\" not removed from %s"
+#~ msgstr "balík %s nebol nájdený v %s"
+
+#~ msgid "removing database entry\n"
+#~ msgstr "odstraòuje sa záznam z databázy\n"
+
+#, fuzzy
+#~ msgid "rpmVerify: rpmdbOpen() failed\n"
+#~ msgstr "rpmQuery: rpmdbOpen() zlyhalo\n"
#~ msgid "cannot read header at %d for dependency check"
#~ msgstr "nie je mo¾né preèíta» hlavièku na %d pre kontrolu závislostí"
# -*- 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.38 2000/05/02 08:54:03 jbj Exp $
+# $Id: sl.po,v 1.39 2000/05/07 00:53:15 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-05-02 04:48-0400\n"
+"POT-Creation-Date: 2000-05-06 19:31-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"
msgstr " neuspe¹no - "
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:439
+#: lib/depends.c:434
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n"
"\tA %s\tB %s\n"
-#: lib/depends.c:468
+#: lib/depends.c:463
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
#: lib/depends.c:786
-#, c-format
-msgid "%s: %s satisfied by added file list.\n"
+#, fuzzy, c-format
+msgid "%s: %-45s YES (added files)\n"
msgstr "%s: %s zadovoljen ob dodatnem seznamu datotek.\n"
#: lib/depends.c:835
-#, c-format
-msgid "%s: %s satisfied by added package.\n"
-msgstr "%s: %s zadovoljen ob dodatnem paketu.\n"
-
-#: lib/depends.c:838
#, fuzzy, c-format
-msgid "%s: %s satisfied by added package (shouldn't happen).\n"
+msgid "%s: %-45s YES (added package)\n"
msgstr "%s: %s zadovoljen ob dodatnem paketu.\n"
-#: lib/depends.c:856
+#: lib/depends.c:839
#, c-format
-msgid "%s: %s satisfied by added provide.\n"
-msgstr "%s: %s zadovoljen ob dodatni ponudbi.\n"
+msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
+msgstr ""
-#: lib/depends.c:890
+#: lib/depends.c:858
#, fuzzy, c-format
-msgid "%s: %s satisfied by Depends cache.\n"
-msgstr "%s: %s zadovoljen ob dodatnem paketu.\n"
+msgid "%s: %-45s YES (added provide)\n"
+msgstr "%s: %s zadovoljen ob dodatni ponudbi.\n"
-#: lib/depends.c:904
+#: lib/depends.c:901
#, c-format
-msgid "%s: %s satisfied by rpmrc provides.\n"
+msgid "%s: %-45s %-3s (cached)\n"
+msgstr ""
+
+#: lib/depends.c:918
+#, fuzzy, c-format
+msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr "%s: %s zadovoljen ob dodatnem ponudbi rpmrc.\n"
-#: lib/depends.c:932
+#: lib/depends.c:941
#, c-format
-msgid "%s: %s satisfied by db file lists.\n"
-msgstr "%s: %s zadovoljen ob seznamu datotek db.\n"
+msgid "%s: %-45s YES (db files)\n"
+msgstr ""
-#: lib/depends.c:950
-#, c-format
-msgid "%s: %s satisfied by db provides.\n"
+#: lib/depends.c:954
+#, fuzzy, c-format
+msgid "%s: %-45s YES (db provides)\n"
msgstr "%s: %s zadovoljen ob ponudbi db.\n"
#: lib/depends.c:968
-#, c-format
-msgid "%s: %s satisfied by db packages.\n"
+#, fuzzy, c-format
+msgid "%s: %-45s YES (db packages)\n"
msgstr "%s: %s zadovoljen ob paketih db.\n"
-#: lib/depends.c:981
-#, c-format
-msgid "%s: %s satisfied by rpmlib version.\n"
+#: lib/depends.c:985
+#, fuzzy, c-format
+msgid "%s: %-45s YES (rpmlib version)\n"
msgstr "%s: %s zadovoljen ob razlièici rpmlib.\n"
-#: lib/depends.c:991
+#: lib/depends.c:996
#, c-format
-msgid "%s: %s unsatisfied.\n"
-msgstr "%s: %s nezadovoljen.\n"
+msgid "%s: %-45s NO\n"
+msgstr ""
-#: lib/depends.c:1010
+#: lib/depends.c:1016
#, fuzzy, c-format
-msgid "%s: (%s, %d) added to Depends cache.\n"
+msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "%s: %s zadovoljen ob dodatnem paketu.\n"
#. requirements are not satisfied.
-#: lib/depends.c:1059
+#: lib/depends.c:1065
#, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "paket %s zahteva, a ni zadovoljeno: %s\n"
#. conflicts exist.
-#: lib/depends.c:1121
+#: lib/depends.c:1127
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "paket %s v sporu: %s\n"
-#: lib/depends.c:1251
+#: lib/depends.c:1254
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr "zanka v predpogojevani verigi: %s"
msgid "removed db file %s\n"
msgstr "odstranjujemo seznam datotek za %s\n"
-#: lib/db1.c:419
+#: lib/db1.c:420
#, fuzzy, c-format
msgid "bad db file %s"
msgstr "okvarjeno stanje datoteke: %s"
-#: lib/db1.c:424
+#: lib/db1.c:425
#, fuzzy, c-format
msgid "opening db file %s mode 0x%x\n"
msgstr "odpiramo datoteko z naèinom 0x%x v %s\n"
-#: lib/db1.c:432 lib/url.c:445
+#: lib/db1.c:434 lib/url.c:445
#, c-format
msgid "failed to open %s: %s\n"
msgstr "neuspe¹no odpiranje %s: %s\n"
-#: lib/db1.c:448
+#: lib/db1.c:450
#, c-format
msgid "cannot get %s lock on database"
msgstr "datoteke ni mo¾no %s zakleniti"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "exclusive"
msgstr "izkljuèujoèe"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "shared"
msgstr "deljeno"
-#: lib/db2.c:133 lib/db3.c:456
+#: lib/db2.c:133
#, c-format
msgid "closed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:145 lib/db3.c:468
+#: lib/db2.c:145
#, c-format
msgid "removed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:182 lib/db3.c:505
+#: lib/db2.c:182
#, c-format
msgid "opening db environment %s/%s(%s) %s\n"
msgstr ""
-#: lib/db2.c:557 lib/db3.c:876
+#: lib/db2.c:557
#, c-format
msgid "closed db index %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:635 lib/db3.c:965
+#: lib/db2.c:635
#, c-format
msgid "opening db index %s/%s(%s) %s mode=0x%x\n"
msgstr ""
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
-#: lib/db3.c:1057
+#: lib/db3.c:464
+#, fuzzy, c-format
+msgid "closed db environment %s/%s\n"
+msgstr "odstranjujemo seznam datotek za %s\n"
+
+#: lib/db3.c:476
+#, fuzzy, c-format
+msgid "removed db environment %s/%s\n"
+msgstr "odstranjujemo seznam datotek za %s\n"
+
+#: lib/db3.c:513
+#, c-format
+msgid "opening db environment %s/%s %s\n"
+msgstr ""
+
+#: lib/db3.c:884
+#, fuzzy, c-format
+msgid "closed db index %s/%s\n"
+msgstr "odstranjujemo seznam datotek za %s\n"
+
+#: lib/db3.c:975
+#, fuzzy, c-format
+msgid "opening db index %s/%s %s mode=0x%x\n"
+msgstr "odpiramo datoteko z naèinom 0x%x v %s\n"
+
+#: lib/db3.c:1078
#, fuzzy, c-format
-msgid "cannot get %s lock on %s/%s(%s)\n"
+msgid "cannot get %s lock on %s/%s\n"
msgstr "datoteke ni mo¾no %s zakleniti"
-#: lib/db3.c:1064
+#: lib/db3.c:1085
#, fuzzy, c-format
-msgid "locked db index %s/%s(%s)\n"
+msgid "locked db index %s/%s\n"
msgstr "odstranjujemo seznam datotek za %s\n"
#: lib/falloc.c:135
#. this would probably be a good place to check if disk space
#. was used up - if so, we should return a different error
-#: lib/install.c:364
+#: lib/install.c:365
#, c-format
msgid "unpacking of archive failed%s%s: %s"
msgstr "razpakiranje arhiva neuspe¹no%s%s: %s"
-#: lib/install.c:365
+#: lib/install.c:366
msgid " on file "
msgstr " pri datoteki "
-#: lib/install.c:409
+#: lib/install.c:410
msgid "installing a source package\n"
msgstr "name¹èanje izvornega paketa\n"
-#: lib/install.c:429
+#: lib/install.c:430
#, c-format
msgid "cannot create sourcedir %s"
msgstr "ni mo¾no ustvariti izvornega imenika %s"
-#: lib/install.c:435 lib/install.c:465
+#: lib/install.c:436 lib/install.c:466
#, c-format
msgid "cannot write to %s"
msgstr "ni mo¾no pisanje na %s"
-#: lib/install.c:439
+#: lib/install.c:440
#, c-format
msgid "sources in: %s\n"
msgstr "izvori v: %s\n"
-#: lib/install.c:459
+#: lib/install.c:460
#, c-format
msgid "cannot create specdir %s"
msgstr "ni mo¾no ustvariti imenika z doloèili spec %s"
-#: lib/install.c:469
+#: lib/install.c:470
#, c-format
msgid "spec file in: %s\n"
msgstr "datoteka spec v: %s\n"
-#: lib/install.c:503 lib/install.c:531
+#: lib/install.c:504 lib/install.c:532
msgid "source package contains no .spec file"
msgstr "izvorni paket ne vsebuje datoteke .spec"
-#: lib/install.c:553
+#: lib/install.c:554
#, c-format
msgid "renaming %s to %s\n"
msgstr "preimenujemo %s v %s\n"
-#: lib/install.c:555 lib/install.c:829 lib/uninstall.c:28
+#: lib/install.c:556 lib/install.c:830 lib/uninstall.c:28
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "preimenovanje %s v %s neuspe¹no: %s"
-#: lib/install.c:646
+#: lib/install.c:647
msgid "source package expected, binary found"
msgstr "prièakovan izvorni paket, najden binarni"
-#: lib/install.c:701
+#: lib/install.c:702
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "paket: %s-%s-%s datoteke test = %d\n"
-#: lib/install.c:759
+#: lib/install.c:760
msgid "stopping install as we're running --test\n"
msgstr "ustavljamo namestitev ker teèemo kot --test\n"
-#: lib/install.c:764
+#: lib/install.c:765
msgid "running preinstall script (if any)\n"
msgstr "poganjamo prednamestitvene skripte (èe obstajajo)\n"
-#: lib/install.c:789
+#: lib/install.c:790
#, c-format
msgid "warning: %s created as %s"
msgstr "opozorilo: %s ustvarjen kot %s"
-#: lib/install.c:825
+#: lib/install.c:826
#, c-format
msgid "warning: %s saved as %s"
msgstr "opozorilo: %s shranjen kot %s"
msgid "package %s is not installed\n"
msgstr "paket %s ni name¹èen\n"
-#: lib/query.c:683
-msgid "rpmQuery: rpmdbOpen() failed\n"
-msgstr "rpmQuery: rpmdbOpen() neuspe¹en\n"
-
-#: lib/query.c:742
+#: lib/query.c:740
msgid "query package owning file"
msgstr "poizvedba po paketu, ki vsebuje datoteko"
-#: lib/query.c:744
+#: lib/query.c:742
msgid "query packages in group"
msgstr "poizvedba po paketu v skupini"
-#: lib/query.c:746
+#: lib/query.c:744
msgid "query a package file"
msgstr "poizvedba po paketu"
-#: lib/query.c:750
+#: lib/query.c:748
msgid "query a spec file"
msgstr "poizvedba po datoteki spec"
-#: lib/query.c:752
+#: lib/query.c:750
msgid "query the pacakges triggered by the package"
msgstr "poizvedba po paketih, ki jih spro¾i paket"
-#: lib/query.c:754
+#: lib/query.c:752
msgid "query the packages which require a capability"
msgstr "poizvedba po paketih, ki zahtevajo zmo¾nost"
-#: lib/query.c:756
+#: lib/query.c:754
msgid "query the packages which provide a capability"
msgstr "poizvedba po paketih, ki nudijo zmo¾nost"
-#: lib/query.c:795
+#: lib/query.c:793
msgid "list all configuration files"
msgstr "seznam vseh nastavitvenih datotek"
-#: lib/query.c:797
+#: lib/query.c:795
msgid "list all documentation files"
msgstr "seznam vseh dokumentacijskih datotek"
-#: lib/query.c:799
+#: lib/query.c:797
msgid "dump basic file information"
msgstr "iznos osnovnih podatkov o datoteki"
-#: lib/query.c:801
+#: lib/query.c:799
msgid "list files in package"
msgstr "seznam datotek v paketu"
-#: lib/query.c:805
+#: lib/query.c:803
msgid "use the following query format"
msgstr "uporabi naslednjo obliko poizvedbe"
-#: lib/query.c:807
+#: lib/query.c:805
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "zamenjamo razdelje I18N z naslednjim katalogom"
-#: lib/query.c:809
+#: lib/query.c:807
msgid "display the states of the listed files"
msgstr "izpis stanja seznama datotek"
-#: lib/query.c:811
+#: lib/query.c:809
msgid "display a verbose file listing"
msgstr "izpis ob¹irnega seznama datotek"
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: lib/rpmdb.c:196
+#: lib/rpmdb.c:218
msgid ""
"\n"
-"--> This version of rpm was not compiled with support for db%d. Please "
-"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and "
-"correct your configuration.\n"
+"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
msgstr ""
-#: lib/rpmdb.c:223
+#. failed to open with any dbapi
+#: lib/rpmdb.c:249
+#, fuzzy, c-format
+msgid "dbiOpen: cannot open %s index"
+msgstr "ni mo¾no odpreti %s: %s\n"
+
+#: lib/rpmdb.c:257
msgid ""
"\n"
-"--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
-" db1 to db3 on-disk format.\n"
+"--> The database is in db%d format, not the suggested db%d format.\n"
+" Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
+" using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
+" to convert your database from db%d to db%d format, or configure\n"
+" \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#. XXX FIXME: dbNopen handles failures already.
-#: lib/rpmdb.c:239
-#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
-msgstr "ni mo¾no odpreti %s: %s\n"
+#: lib/rpmdb.c:270
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
-#: lib/rpmdb.c:293
+#: lib/rpmdb.c:335
#, fuzzy, c-format
msgid "error getting \"%s\" records from %s index"
msgstr "napaka pri branju zapisa %s iz %s"
-#: lib/rpmdb.c:410
+#: lib/rpmdb.c:452
#, c-format
msgid "error storing record %s into %s"
msgstr "napaka pri pisanju zapisa %s v %s"
-#: lib/rpmdb.c:419
+#: lib/rpmdb.c:461
#, fuzzy, c-format
msgid "error removing record %s from %s"
msgstr "napaka pri brisanju zapisa %s iz %s"
-#: lib/rpmdb.c:619 lib/rpmdb.c:2078
+#: lib/rpmdb.c:683 lib/rpmdb.c:2186
msgid "no dbpath has been set"
msgstr "dbpath ni nastavljena"
-#: lib/rpmdb.c:708
+#: lib/rpmdb.c:780
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:912
+#: lib/rpmdb.c:984
#, fuzzy, c-format
msgid "cannot retrieve package \"%s\" from db"
msgstr "paketa ni mo¾no odpreti: %s\n"
-#: lib/rpmdb.c:978 lib/rpmdb.c:1496 lib/uninstall.c:90
+#: lib/rpmdb.c:1050 lib/rpmdb.c:1560 lib/uninstall.c:90
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x"
msgstr "ni mo¾no prebrati glave pri %d za vpogled"
-#: lib/rpmdb.c:1451
-#, fuzzy, c-format
-msgid "key \"%s\" not found in %s"
-msgstr "paketa %s ni najti v %s"
-
-#: lib/rpmdb.c:1459
-#, fuzzy, c-format
-msgid "key \"%s\" not removed from %s"
-msgstr "paketa %s ni najti v %s"
-
-#: lib/rpmdb.c:1541
+#: lib/rpmdb.c:1611
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "odstranjujemo vnose v podatkovni zbirki\n"
-#: lib/rpmdb.c:1550
+#: lib/rpmdb.c:1622
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstranjujemo seznam skupin\n"
-#: lib/rpmdb.c:1558
+#: lib/rpmdb.c:1631
#, fuzzy, c-format
-msgid "removing %d entries in %s index:\n"
+msgid "removing %d entries from %s index:\n"
msgstr "odstranjujemo seznam imen\n"
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1638 lib/rpmdb.c:1861
#, c-format
-msgid "\t%6d %s\n"
+msgid "%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1774
#, fuzzy
msgid "cannot allocate new instance in database"
msgstr "ni mo¾no zagotoviti prostora za podatkovno zbirko"
-#: lib/rpmdb.c:1761
+#: lib/rpmdb.c:1829
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1777
+#: lib/rpmdb.c:1845
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "preimenujemo %s v %s\n"
-#: lib/rpmdb.c:1784
+#: lib/rpmdb.c:1854
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:1788
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
-#: lib/rpmdb.c:2103
+#: lib/rpmdb.c:2211
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n"
-#: lib/rpmdb.c:2107
+#: lib/rpmdb.c:2215
#, c-format
msgid "temporary database %s already exists"
msgstr "zaèasna podatkovna zbirka %s ¾e obstaja"
-#: lib/rpmdb.c:2113
-#, c-format
-msgid "creating directory: %s\n"
+#: lib/rpmdb.c:2221
+#, fuzzy, c-format
+msgid "creating directory %s\n"
msgstr "ustvarjamo imenik: %s\n"
-#: lib/rpmdb.c:2115
+#: lib/rpmdb.c:2223
#, c-format
msgid "error creating directory %s: %s"
msgstr "napaka pri ustvarjanju imenika %s: %s"
-#: lib/rpmdb.c:2121
+#: lib/rpmdb.c:2230
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "odpiramo staro podatkovno zbirko\n"
-#: lib/rpmdb.c:2131
+#: lib/rpmdb.c:2239
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "odpiramo novo podatkovno zbirko\n"
-#: lib/rpmdb.c:2155
+#: lib/rpmdb.c:2262
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr "zapis ¹t. %d v zbirki je okvarjen -- preskakujemo."
-#: lib/rpmdb.c:2187
+#: lib/rpmdb.c:2294
#, c-format
msgid "cannot add record originally at %d"
msgstr "zapisa ni mo¾no dodati na %d"
-#: lib/rpmdb.c:2205
-msgid "failed to rebuild database; original database remains in place\n"
+#: lib/rpmdb.c:2312
+#, fuzzy
+msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"ponovna izgradnja podatkovne zbirke neuspe¹na; stara ostaja na istem mestu\n"
-#: lib/rpmdb.c:2213
+#: lib/rpmdb.c:2320
msgid "failed to replace old database with new database!\n"
msgstr "zamenjava stare podatkovne zbirke z novo neuspe¹na!\n"
-#: lib/rpmdb.c:2215
+#: lib/rpmdb.c:2322
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "posku¹amo povrniti z nadomestitvijo datotek v %s z datotekami iz %s"
-#: lib/rpmdb.c:2221
+#: lib/rpmdb.c:2332
+#, fuzzy, c-format
+msgid "removing directory %s\n"
+msgstr "ustvarjamo imenik: %s\n"
+
+#: lib/rpmdb.c:2334
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "neuspe¹na odstranitev imenika %s: %s\n"
msgid "running postuninstall script (if any)\n"
msgstr "poganjamo poodnamestitvene skripte (èe obstajajo)\n"
-#: lib/uninstall.c:213
-msgid "removing database entry\n"
-msgstr "odstranjujemo vnose v podatkovni zbirki\n"
-
-#: lib/uninstall.c:397
+#: lib/uninstall.c:390
msgid "execution of script failed"
msgstr "skript se ni uspe¹no izvedel"
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: "
-#: lib/verify.c:381
-msgid "rpmVerify: rpmdbOpen() failed\n"
-msgstr "rpmVerify: rpmdbOpen() neuspe¹en\n"
+#, fuzzy
+#~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
+#~ msgstr "%s: %s zadovoljen ob dodatnem paketu.\n"
+
+#, fuzzy
+#~ msgid "%s: %s satisfied by Depends cache.\n"
+#~ msgstr "%s: %s zadovoljen ob dodatnem paketu.\n"
+
+#~ msgid "%s: %s satisfied by db file lists.\n"
+#~ msgstr "%s: %s zadovoljen ob seznamu datotek db.\n"
+
+#~ msgid "%s: %s unsatisfied.\n"
+#~ msgstr "%s: %s nezadovoljen.\n"
+
+#~ msgid "rpmQuery: rpmdbOpen() failed\n"
+#~ msgstr "rpmQuery: rpmdbOpen() neuspe¹en\n"
+
+#, fuzzy
+#~ msgid "key \"%s\" not found in %s"
+#~ msgstr "paketa %s ni najti v %s"
+
+#, fuzzy
+#~ msgid "key \"%s\" not removed from %s"
+#~ msgstr "paketa %s ni najti v %s"
+
+#~ msgid "removing database entry\n"
+#~ msgstr "odstranjujemo vnose v podatkovni zbirki\n"
+
+#~ msgid "rpmVerify: rpmdbOpen() failed\n"
+#~ msgstr "rpmVerify: rpmdbOpen() neuspe¹en\n"
#~ msgid "cannot read header at %d for dependency check"
#~ msgstr "ni mo¾no prebrati glave pri %d za preizkus soodvisnosti"
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-05-02 04:48-0400\n"
+"POT-Creation-Date: 2000-05-06 19:31-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"
msgstr "PGP omanuo"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:439
+#: lib/depends.c:434
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:468
+#: lib/depends.c:463
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#: lib/depends.c:786
#, c-format
-msgid "%s: %s satisfied by added file list.\n"
+msgid "%s: %-45s YES (added files)\n"
msgstr ""
#: lib/depends.c:835
#, fuzzy, c-format
-msgid "%s: %s satisfied by added package.\n"
+msgid "%s: %-45s YES (added package)\n"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/depends.c:838
-#, fuzzy, c-format
-msgid "%s: %s satisfied by added package (shouldn't happen).\n"
-msgstr "datoteka %s ne pripada nijednom paketu\n"
+#: lib/depends.c:839
+#, c-format
+msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
+msgstr ""
-#: lib/depends.c:856
+#: lib/depends.c:858
#, c-format
-msgid "%s: %s satisfied by added provide.\n"
+msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:890
-#, fuzzy, c-format
-msgid "%s: %s satisfied by Depends cache.\n"
-msgstr "datoteka %s ne pripada nijednom paketu\n"
+#: lib/depends.c:901
+#, c-format
+msgid "%s: %-45s %-3s (cached)\n"
+msgstr ""
-#: lib/depends.c:904
+#: lib/depends.c:918
#, c-format
-msgid "%s: %s satisfied by rpmrc provides.\n"
+msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:932
+#: lib/depends.c:941
#, c-format
-msgid "%s: %s satisfied by db file lists.\n"
+msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:950
+#: lib/depends.c:954
#, c-format
-msgid "%s: %s satisfied by db provides.\n"
+msgid "%s: %-45s YES (db provides)\n"
msgstr ""
#: lib/depends.c:968
#, fuzzy, c-format
-msgid "%s: %s satisfied by db packages.\n"
+msgid "%s: %-45s YES (db packages)\n"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/depends.c:981
+#: lib/depends.c:985
#, c-format
-msgid "%s: %s satisfied by rpmlib version.\n"
+msgid "%s: %-45s YES (rpmlib version)\n"
msgstr ""
-#: lib/depends.c:991
+#: lib/depends.c:996
#, c-format
-msgid "%s: %s unsatisfied.\n"
+msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1010
+#: lib/depends.c:1016
#, fuzzy, c-format
-msgid "%s: (%s, %d) added to Depends cache.\n"
+msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "datoteka %s ne pripada nijednom paketu\n"
#. requirements are not satisfied.
-#: lib/depends.c:1059
+#: lib/depends.c:1065
#, fuzzy, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "paket %s nije naveden u %s"
#. conflicts exist.
-#: lib/depends.c:1121
+#: lib/depends.c:1127
#, fuzzy, c-format
msgid "package %s conflicts: %s\n"
msgstr "paket %s nije naveden u %s"
-#: lib/depends.c:1251
+#: lib/depends.c:1254
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr "petlja u lancu: %s"
msgid "removed db file %s\n"
msgstr ""
-#: lib/db1.c:419
+#: lib/db1.c:420
#, fuzzy, c-format
msgid "bad db file %s"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/db1.c:424
+#: lib/db1.c:425
#, fuzzy, c-format
msgid "opening db file %s mode 0x%x\n"
msgstr "rekreiraj bazu podataka iz postojeæe baze"
-#: lib/db1.c:432 lib/url.c:445
+#: lib/db1.c:434 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/db1.c:448
+#: lib/db1.c:450
#, c-format
msgid "cannot get %s lock on database"
msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "exclusive"
msgstr "ekskluzivno"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "shared"
msgstr "deljeno"
-#: lib/db2.c:133 lib/db3.c:456
+#: lib/db2.c:133
#, c-format
msgid "closed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:145 lib/db3.c:468
+#: lib/db2.c:145
#, c-format
msgid "removed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:182 lib/db3.c:505
+#: lib/db2.c:182
#, c-format
msgid "opening db environment %s/%s(%s) %s\n"
msgstr ""
-#: lib/db2.c:557 lib/db3.c:876
+#: lib/db2.c:557
#, c-format
msgid "closed db index %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:635 lib/db3.c:965
+#: lib/db2.c:635
#, c-format
msgid "opening db index %s/%s(%s) %s mode=0x%x\n"
msgstr ""
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
-#: lib/db3.c:1057
+#: lib/db3.c:464
+#, c-format
+msgid "closed db environment %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:476
+#, c-format
+msgid "removed db environment %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:513
+#, c-format
+msgid "opening db environment %s/%s %s\n"
+msgstr ""
+
+#: lib/db3.c:884
+#, c-format
+msgid "closed db index %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:975
+#, fuzzy, c-format
+msgid "opening db index %s/%s %s mode=0x%x\n"
+msgstr "rekreiraj bazu podataka iz postojeæe baze"
+
+#: lib/db3.c:1078
#, fuzzy, c-format
-msgid "cannot get %s lock on %s/%s(%s)\n"
+msgid "cannot get %s lock on %s/%s\n"
msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka"
-#: lib/db3.c:1064
+#: lib/db3.c:1085
#, c-format
-msgid "locked db index %s/%s(%s)\n"
+msgid "locked db index %s/%s\n"
msgstr ""
#: lib/falloc.c:135
#. this would probably be a good place to check if disk space
#. was used up - if so, we should return a different error
-#: lib/install.c:364
+#: lib/install.c:365
#, c-format
msgid "unpacking of archive failed%s%s: %s"
msgstr ""
-#: lib/install.c:365
+#: lib/install.c:366
msgid " on file "
msgstr ""
-#: lib/install.c:409
+#: lib/install.c:410
#, fuzzy
msgid "installing a source package\n"
msgstr "instaliraj paket"
-#: lib/install.c:429
+#: lib/install.c:430
#, fuzzy, c-format
msgid "cannot create sourcedir %s"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: lib/install.c:435 lib/install.c:465
+#: lib/install.c:436 lib/install.c:466
#, fuzzy, c-format
msgid "cannot write to %s"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: lib/install.c:439
+#: lib/install.c:440
#, c-format
msgid "sources in: %s\n"
msgstr ""
-#: lib/install.c:459
+#: lib/install.c:460
#, fuzzy, c-format
msgid "cannot create specdir %s"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: lib/install.c:469
+#: lib/install.c:470
#, fuzzy, c-format
msgid "spec file in: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/install.c:503 lib/install.c:531
+#: lib/install.c:504 lib/install.c:532
#, fuzzy
msgid "source package contains no .spec file"
msgstr "upit nad paketom koji ima <datoteku>"
-#: lib/install.c:553
+#: lib/install.c:554
#, c-format
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:555 lib/install.c:829 lib/uninstall.c:28
+#: lib/install.c:556 lib/install.c:830 lib/uninstall.c:28
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "preimenovanje %s u %s nije uspelo: %s"
-#: lib/install.c:646
+#: lib/install.c:647
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:701
+#: lib/install.c:702
#, fuzzy, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
-#: lib/install.c:759
+#: lib/install.c:760
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:764
+#: lib/install.c:765
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:789
+#: lib/install.c:790
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:825
+#: lib/install.c:826
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
msgid "package %s is not installed\n"
msgstr "paket %s nije instaliran\n"
-#: lib/query.c:683
-#, fuzzy
-msgid "rpmQuery: rpmdbOpen() failed\n"
-msgstr "%s: Neuspelo otvaranje\n"
-
-#: lib/query.c:742
+#: lib/query.c:740
#, fuzzy
msgid "query package owning file"
msgstr "upit nad paketom koji ima <datoteku>"
-#: lib/query.c:744
+#: lib/query.c:742
#, fuzzy
msgid "query packages in group"
msgstr "paket nema imena"
-#: lib/query.c:746
+#: lib/query.c:744
#, fuzzy
msgid "query a package file"
msgstr "upit nad svim paketima"
-#: lib/query.c:750
+#: lib/query.c:748
#, fuzzy
msgid "query a spec file"
msgstr "upit nad %s neuspeo\n"
-#: lib/query.c:752
+#: lib/query.c:750
#, fuzzy
msgid "query the pacakges triggered by the package"
msgstr "upit nad paketom koji ima <datoteku>"
-#: lib/query.c:754
+#: lib/query.c:752
#, fuzzy
msgid "query the packages which require a capability"
msgstr "upit za pakete koji zahtevaju <i> svojstvo"
-#: lib/query.c:756
+#: lib/query.c:754
#, fuzzy
msgid "query the packages which provide a capability"
msgstr "upit za pakete koji omoguæavaju <i> svojstvo"
-#: lib/query.c:795
+#: lib/query.c:793
#, fuzzy
msgid "list all configuration files"
msgstr "prika¾i samo konfiguracione datoteke (povlaèi -i)"
-#: lib/query.c:797
+#: lib/query.c:795
#, fuzzy
msgid "list all documentation files"
msgstr "instaliraj dokumentaciju"
-#: lib/query.c:799
+#: lib/query.c:797
#, fuzzy
msgid "dump basic file information"
msgstr "prika¾i informacije o paketu"
-#: lib/query.c:801
+#: lib/query.c:799
#, fuzzy
msgid "list files in package"
msgstr "instaliraj paket"
-#: lib/query.c:805
+#: lib/query.c:803
msgid "use the following query format"
msgstr ""
-#: lib/query.c:807
+#: lib/query.c:805
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "upit nad paketom koji ima <datoteku>"
-#: lib/query.c:809
+#: lib/query.c:807
msgid "display the states of the listed files"
msgstr ""
-#: lib/query.c:811
+#: lib/query.c:809
#, fuzzy
msgid "display a verbose file listing"
msgstr "prika¾i listu datoteka u paketu"
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: lib/rpmdb.c:196
+#: lib/rpmdb.c:218
msgid ""
"\n"
-"--> This version of rpm was not compiled with support for db%d. Please "
-"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and "
-"correct your configuration.\n"
+"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
msgstr ""
-#: lib/rpmdb.c:223
+#. failed to open with any dbapi
+#: lib/rpmdb.c:249
+#, fuzzy, c-format
+msgid "dbiOpen: cannot open %s index"
+msgstr "gre¹ka: ne mogu da otvorim %s\n"
+
+#: lib/rpmdb.c:257
msgid ""
"\n"
-"--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
-" db1 to db3 on-disk format.\n"
+"--> The database is in db%d format, not the suggested db%d format.\n"
+" Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
+" using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
+" to convert your database from db%d to db%d format, or configure\n"
+" \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#. XXX FIXME: dbNopen handles failures already.
-#: lib/rpmdb.c:239
-#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
-msgstr "gre¹ka: ne mogu da otvorim %s\n"
+#: lib/rpmdb.c:270
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
-#: lib/rpmdb.c:293
+#: lib/rpmdb.c:335
#, fuzzy, c-format
msgid "error getting \"%s\" records from %s index"
msgstr "gre¹ka kod uzimanja sloga %s iz %s"
-#: lib/rpmdb.c:410
+#: lib/rpmdb.c:452
#, c-format
msgid "error storing record %s into %s"
msgstr "gre¹ka zapisivanja sloga %s u %s"
-#: lib/rpmdb.c:419
+#: lib/rpmdb.c:461
#, fuzzy, c-format
msgid "error removing record %s from %s"
msgstr "gre¹ka uklanjanja sloga %s u %s"
-#: lib/rpmdb.c:619 lib/rpmdb.c:2078
+#: lib/rpmdb.c:683 lib/rpmdb.c:2186
msgid "no dbpath has been set"
msgstr "dbpath nije odreðen"
-#: lib/rpmdb.c:708
+#: lib/rpmdb.c:780
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:912
+#: lib/rpmdb.c:984
#, 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:978 lib/rpmdb.c:1496 lib/uninstall.c:90
+#: lib/rpmdb.c:1050 lib/rpmdb.c:1560 lib/uninstall.c:90
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x"
msgstr "ne mogu da proèitam zaglavlje na %d za proveru"
-#: lib/rpmdb.c:1451
-#, fuzzy, c-format
-msgid "key \"%s\" not found in %s"
-msgstr "paket %s nije naðen u %s"
-
-#: lib/rpmdb.c:1459
-#, fuzzy, c-format
-msgid "key \"%s\" not removed from %s"
-msgstr "paket %s nije naðen u %s"
-
-#: lib/rpmdb.c:1541
+#: lib/rpmdb.c:1611
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1550
+#: lib/rpmdb.c:1622
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "gre¹ka uklanjanja sloga %s u %s"
-#: lib/rpmdb.c:1558
+#: lib/rpmdb.c:1631
#, fuzzy, c-format
-msgid "removing %d entries in %s index:\n"
+msgid "removing %d entries from %s index:\n"
msgstr "gre¹ka uklanjanja sloga %s u %s"
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1638 lib/rpmdb.c:1861
#, c-format
-msgid "\t%6d %s\n"
+msgid "%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1774
#, fuzzy
msgid "cannot allocate new instance in database"
msgstr "ne mogu da zauzmem prostor za bazu podataka"
-#: lib/rpmdb.c:1761
+#: lib/rpmdb.c:1829
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1777
+#: lib/rpmdb.c:1845
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1784
+#: lib/rpmdb.c:1854
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:1788
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
-#: lib/rpmdb.c:2103
+#: lib/rpmdb.c:2211
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "rekreiraj bazu podataka iz postojeæe baze"
-#: lib/rpmdb.c:2107
+#: lib/rpmdb.c:2215
#, c-format
msgid "temporary database %s already exists"
msgstr "privremena baza podataka %s veæ postoji"
-#: lib/rpmdb.c:2113
+#: lib/rpmdb.c:2221
#, fuzzy, c-format
-msgid "creating directory: %s\n"
+msgid "creating directory %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-#: lib/rpmdb.c:2115
+#: lib/rpmdb.c:2223
#, c-format
msgid "error creating directory %s: %s"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-#: lib/rpmdb.c:2121
+#: lib/rpmdb.c:2230
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "rekreiraj bazu podataka iz postojeæe baze"
-#: lib/rpmdb.c:2131
+#: lib/rpmdb.c:2239
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "rekreiraj bazu podataka iz postojeæe baze"
-#: lib/rpmdb.c:2155
+#: lib/rpmdb.c:2262
#, fuzzy, c-format
msgid "record number %d in database is bad -- skipping."
msgstr "slog broj %d u bazi podataka je neispravan -- preskaèem ga"
-#: lib/rpmdb.c:2187
+#: lib/rpmdb.c:2294
#, c-format
msgid "cannot add record originally at %d"
msgstr "ne mogu da dodam slog originalno na %d"
-#: lib/rpmdb.c:2205
-msgid "failed to rebuild database; original database remains in place\n"
+#: lib/rpmdb.c:2312
+msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2213
+#: lib/rpmdb.c:2320
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2215
+#: lib/rpmdb.c:2322
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2221
+#: lib/rpmdb.c:2332
+#, fuzzy, c-format
+msgid "removing directory %s\n"
+msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
+
+#: lib/rpmdb.c:2334
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
msgid "running postuninstall script (if any)\n"
msgstr ""
-#: lib/uninstall.c:213
-msgid "removing database entry\n"
-msgstr ""
-
-#: lib/uninstall.c:397
+#: lib/uninstall.c:390
msgid "execution of script failed"
msgstr "neuspelo izvr¹avanje skripta"
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "Nezadovoljene meðuzavisnosti za %s-%s-%s: "
-#: lib/verify.c:381
#, fuzzy
-msgid "rpmVerify: rpmdbOpen() failed\n"
-msgstr "%s: Neuspelo otvaranje\n"
+#~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
+#~ msgstr "datoteka %s ne pripada nijednom paketu\n"
+
+#, fuzzy
+#~ msgid "%s: %s satisfied by Depends cache.\n"
+#~ msgstr "datoteka %s ne pripada nijednom paketu\n"
+
+#, fuzzy
+#~ msgid "rpmQuery: rpmdbOpen() failed\n"
+#~ msgstr "%s: Neuspelo otvaranje\n"
+
+#, fuzzy
+#~ msgid "key \"%s\" not found in %s"
+#~ msgstr "paket %s nije naðen u %s"
+
+#, fuzzy
+#~ msgid "key \"%s\" not removed from %s"
+#~ msgstr "paket %s nije naðen u %s"
+
+#, fuzzy
+#~ msgid "rpmVerify: rpmdbOpen() failed\n"
+#~ msgstr "%s: Neuspelo otvaranje\n"
#~ msgid "cannot read header at %d for dependency check"
#~ msgstr "ne mogu da proèitam zaglavlje na %s za proveru zavisnosti"
# Swedish messages for RPM
# Copyright © 1999 Free Software Foundation, Inc.
# Göran Uddeborg <göran@uddeborg.pp.se>, 1999, 2000.
-# $Revision: 1.98 $
+# $Revision: 1.99 $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-05-02 04:48-0400\n"
+"POT-Creation-Date: 2000-05-06 19:31-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"
msgstr " misslyckades - "
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:439
+#: lib/depends.c:434
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\"B\"-beroendet beghöver en epok (antar samma som \"A\")\n"
" A %s B %s\n"
-#: lib/depends.c:468
+#: lib/depends.c:463
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
#: lib/depends.c:786
-#, c-format
-msgid "%s: %s satisfied by added file list.\n"
+#, fuzzy, c-format
+msgid "%s: %-45s YES (added files)\n"
msgstr "%s: %s uppfyllt av tillagd fillista.\n"
#: lib/depends.c:835
-#, c-format
-msgid "%s: %s satisfied by added package.\n"
-msgstr "%s: %s uppfyllt av tillagt paket.\n"
-
-#: lib/depends.c:838
#, fuzzy, c-format
-msgid "%s: %s satisfied by added package (shouldn't happen).\n"
+msgid "%s: %-45s YES (added package)\n"
msgstr "%s: %s uppfyllt av tillagt paket.\n"
-#: lib/depends.c:856
+#: lib/depends.c:839
#, c-format
-msgid "%s: %s satisfied by added provide.\n"
-msgstr "%s: %s uppfyllt av tillagt tillhandahållande (provide).\n"
+msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
+msgstr ""
-#: lib/depends.c:890
+#: lib/depends.c:858
#, fuzzy, c-format
-msgid "%s: %s satisfied by Depends cache.\n"
-msgstr "%s: %s uppfyllt av tillagt paket.\n"
+msgid "%s: %-45s YES (added provide)\n"
+msgstr "%s: %s uppfyllt av tillagt tillhandahållande (provide).\n"
-#: lib/depends.c:904
+#: lib/depends.c:901
#, c-format
-msgid "%s: %s satisfied by rpmrc provides.\n"
+msgid "%s: %-45s %-3s (cached)\n"
+msgstr ""
+
+#: lib/depends.c:918
+#, fuzzy, c-format
+msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr "%s: %s uppfyllt av tillhandahållanden (provides) från rpmrc.\n"
-#: lib/depends.c:932
+#: lib/depends.c:941
#, c-format
-msgid "%s: %s satisfied by db file lists.\n"
-msgstr "%s: %s uppfyllt av fillistor från db.\n"
+msgid "%s: %-45s YES (db files)\n"
+msgstr ""
-#: lib/depends.c:950
-#, c-format
-msgid "%s: %s satisfied by db provides.\n"
+#: lib/depends.c:954
+#, fuzzy, c-format
+msgid "%s: %-45s YES (db provides)\n"
msgstr "%s: %s uppfyllt av tillhandahållanden (provides) från db.\n"
#: lib/depends.c:968
-#, c-format
-msgid "%s: %s satisfied by db packages.\n"
+#, fuzzy, c-format
+msgid "%s: %-45s YES (db packages)\n"
msgstr "%s: %s uppfyllt av db-paket.\n"
-#: lib/depends.c:981
-#, c-format
-msgid "%s: %s satisfied by rpmlib version.\n"
+#: lib/depends.c:985
+#, fuzzy, c-format
+msgid "%s: %-45s YES (rpmlib version)\n"
msgstr "%s: %s uppfyllt av rpmlib-version.\n"
-#: lib/depends.c:991
+#: lib/depends.c:996
#, c-format
-msgid "%s: %s unsatisfied.\n"
-msgstr "%s: %s ej uppfyllt.\n"
+msgid "%s: %-45s NO\n"
+msgstr ""
-#: lib/depends.c:1010
+#: lib/depends.c:1016
#, fuzzy, c-format
-msgid "%s: (%s, %d) added to Depends cache.\n"
+msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "%s: %s uppfyllt av tillagt paket.\n"
#. requirements are not satisfied.
-#: lib/depends.c:1059
+#: lib/depends.c:1065
#, c-format
msgid "package %s require not satisfied: %s\n"
msgstr "paket %s behov inte uppfyllda: %s\n"
#. conflicts exist.
-#: lib/depends.c:1121
+#: lib/depends.c:1127
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "paket %s står i konflikt: %s\n"
-#: lib/depends.c:1251
+#: lib/depends.c:1254
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr "cirkularitet i kedja av förutsättningar: %s"
msgid "removed db file %s\n"
msgstr "tar bort filindex för %s\n"
-#: lib/db1.c:419
+#: lib/db1.c:420
#, fuzzy, c-format
msgid "bad db file %s"
msgstr "felaktig filstatus: %s"
-#: lib/db1.c:424
+#: lib/db1.c:425
#, fuzzy, c-format
msgid "opening db file %s mode 0x%x\n"
msgstr "öppnar databas med rättighet 0x%x i %s\n"
-#: lib/db1.c:432 lib/url.c:445
+#: lib/db1.c:434 lib/url.c:445
#, c-format
msgid "failed to open %s: %s\n"
msgstr "kunde inte öppna %s: %s\n"
-#: lib/db1.c:448
+#: lib/db1.c:450
#, c-format
msgid "cannot get %s lock on database"
msgstr "kan inte få %s lås på databas"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "exclusive"
msgstr "uteslutande"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "shared"
msgstr "delat"
-#: lib/db2.c:133 lib/db3.c:456
+#: lib/db2.c:133
#, c-format
msgid "closed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:145 lib/db3.c:468
+#: lib/db2.c:145
#, c-format
msgid "removed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:182 lib/db3.c:505
+#: lib/db2.c:182
#, c-format
msgid "opening db environment %s/%s(%s) %s\n"
msgstr ""
-#: lib/db2.c:557 lib/db3.c:876
+#: lib/db2.c:557
#, c-format
msgid "closed db index %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:635 lib/db3.c:965
+#: lib/db2.c:635
#, c-format
msgid "opening db index %s/%s(%s) %s mode=0x%x\n"
msgstr ""
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
-#: lib/db3.c:1057
+#: lib/db3.c:464
+#, fuzzy, c-format
+msgid "closed db environment %s/%s\n"
+msgstr "tar bort filindex för %s\n"
+
+#: lib/db3.c:476
+#, fuzzy, c-format
+msgid "removed db environment %s/%s\n"
+msgstr "tar bort filindex för %s\n"
+
+#: lib/db3.c:513
+#, c-format
+msgid "opening db environment %s/%s %s\n"
+msgstr ""
+
+#: lib/db3.c:884
+#, fuzzy, c-format
+msgid "closed db index %s/%s\n"
+msgstr "tar bort filindex för %s\n"
+
+#: lib/db3.c:975
+#, fuzzy, c-format
+msgid "opening db index %s/%s %s mode=0x%x\n"
+msgstr "öppnar databas med rättighet 0x%x i %s\n"
+
+#: lib/db3.c:1078
#, fuzzy, c-format
-msgid "cannot get %s lock on %s/%s(%s)\n"
+msgid "cannot get %s lock on %s/%s\n"
msgstr "kan inte få %s lås på databas"
-#: lib/db3.c:1064
+#: lib/db3.c:1085
#, fuzzy, c-format
-msgid "locked db index %s/%s(%s)\n"
+msgid "locked db index %s/%s\n"
msgstr "tar bort filindex för %s\n"
#: lib/falloc.c:135
#. this would probably be a good place to check if disk space
#. was used up - if so, we should return a different error
-#: lib/install.c:364
+#: lib/install.c:365
#, c-format
msgid "unpacking of archive failed%s%s: %s"
msgstr "uppackning av arkiv misslyckades%s%s: %s"
-#: lib/install.c:365
+#: lib/install.c:366
msgid " on file "
msgstr " vid fil "
-#: lib/install.c:409
+#: lib/install.c:410
msgid "installing a source package\n"
msgstr "installerar källpaket\n"
-#: lib/install.c:429
+#: lib/install.c:430
#, c-format
msgid "cannot create sourcedir %s"
msgstr "kan inte skapa källkatalog %s"
-#: lib/install.c:435 lib/install.c:465
+#: lib/install.c:436 lib/install.c:466
#, c-format
msgid "cannot write to %s"
msgstr "kan inte skriva till %s"
-#: lib/install.c:439
+#: lib/install.c:440
#, c-format
msgid "sources in: %s\n"
msgstr "källkod i: %s\n"
-#: lib/install.c:459
+#: lib/install.c:460
#, c-format
msgid "cannot create specdir %s"
msgstr "kan inte skapa spec-katalog %s"
-#: lib/install.c:469
+#: lib/install.c:470
#, c-format
msgid "spec file in: %s\n"
msgstr "spec-fil i: %s\n"
-#: lib/install.c:503 lib/install.c:531
+#: lib/install.c:504 lib/install.c:532
msgid "source package contains no .spec file"
msgstr "källpaket innehåller ingen spec-fil"
-#: lib/install.c:553
+#: lib/install.c:554
#, c-format
msgid "renaming %s to %s\n"
msgstr "byter namn på %s till %s\n"
-#: lib/install.c:555 lib/install.c:829 lib/uninstall.c:28
+#: lib/install.c:556 lib/install.c:830 lib/uninstall.c:28
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "namnbyte från %s till %s misslyckades: %s"
-#: lib/install.c:646
+#: lib/install.c:647
msgid "source package expected, binary found"
msgstr "källpaket förväntades, fann binärpaket"
-#: lib/install.c:701
+#: lib/install.c:702
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "paket: %s-%s-%s filtest = %d\n"
-#: lib/install.c:759
+#: lib/install.c:760
msgid "stopping install as we're running --test\n"
msgstr "avbryter installation eftersom vi kör --test\n"
-#: lib/install.c:764
+#: lib/install.c:765
msgid "running preinstall script (if any)\n"
msgstr "kör (eventuellt) preinstalltionsskript\n"
-#: lib/install.c:789
+#: lib/install.c:790
#, c-format
msgid "warning: %s created as %s"
msgstr "varning: %s skapades som %s"
-#: lib/install.c:825
+#: lib/install.c:826
#, c-format
msgid "warning: %s saved as %s"
msgstr "varning: %s sparades som %s"
msgid "package %s is not installed\n"
msgstr "paket %s är inte installerat\n"
-#: lib/query.c:683
-msgid "rpmQuery: rpmdbOpen() failed\n"
-msgstr "rpmQuery: rpmdbOpen() misslyckades\n"
-
-#: lib/query.c:742
+#: lib/query.c:740
msgid "query package owning file"
msgstr "undersök paket som äger fil"
-#: lib/query.c:744
+#: lib/query.c:742
msgid "query packages in group"
msgstr "undersök paket i grupp"
-#: lib/query.c:746
+#: lib/query.c:744
msgid "query a package file"
msgstr "undersök en paketfil"
-#: lib/query.c:750
+#: lib/query.c:748
msgid "query a spec file"
msgstr "fråga om en spec-fil"
-#: lib/query.c:752
+#: lib/query.c:750
msgid "query the pacakges triggered by the package"
msgstr "undersök paket utlösta av paketet"
-#: lib/query.c:754
+#: lib/query.c:752
msgid "query the packages which require a capability"
msgstr "fråga om paket som behöver en egenskap"
-#: lib/query.c:756
+#: lib/query.c:754
msgid "query the packages which provide a capability"
msgstr "fråga om paket som tillhandahåller en egenskap"
-#: lib/query.c:795
+#: lib/query.c:793
msgid "list all configuration files"
msgstr "lista alla konfigurationsfiler"
-#: lib/query.c:797
+#: lib/query.c:795
msgid "list all documentation files"
msgstr "lista alla dokumentationsfiler"
-#: lib/query.c:799
+#: lib/query.c:797
msgid "dump basic file information"
msgstr "visa filinformation"
-#: lib/query.c:801
+#: lib/query.c:799
msgid "list files in package"
msgstr "lista filer i paketet"
-#: lib/query.c:805
+#: lib/query.c:803
msgid "use the following query format"
msgstr "använd följande frågeformat"
-#: lib/query.c:807
+#: lib/query.c:805
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "ersätt översatta sektioner från följande katalog"
-#: lib/query.c:809
+#: lib/query.c:807
msgid "display the states of the listed files"
msgstr "visa tillstånd för de listade filerna"
-#: lib/query.c:811
+#: lib/query.c:809
msgid "display a verbose file listing"
msgstr "visa en utförlig fillistning"
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: lib/rpmdb.c:196
+#: lib/rpmdb.c:218
msgid ""
"\n"
-"--> This version of rpm was not compiled with support for db%d. Please "
-"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and "
-"correct your configuration.\n"
+"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
msgstr ""
-#: lib/rpmdb.c:223
+#. failed to open with any dbapi
+#: lib/rpmdb.c:249
+#, fuzzy, c-format
+msgid "dbiOpen: cannot open %s index"
+msgstr "kan inte öppna %s: %s\n"
+
+#: lib/rpmdb.c:257
msgid ""
"\n"
-"--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
-" db1 to db3 on-disk format.\n"
+"--> The database is in db%d format, not the suggested db%d format.\n"
+" Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
+" using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
+" to convert your database from db%d to db%d format, or configure\n"
+" \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#. XXX FIXME: dbNopen handles failures already.
-#: lib/rpmdb.c:239
-#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
-msgstr "kan inte öppna %s: %s\n"
+#: lib/rpmdb.c:270
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
-#: lib/rpmdb.c:293
+#: lib/rpmdb.c:335
#, fuzzy, c-format
msgid "error getting \"%s\" records from %s index"
msgstr "fel när post %s hämtades från %s"
-#: lib/rpmdb.c:410
+#: lib/rpmdb.c:452
#, c-format
msgid "error storing record %s into %s"
msgstr "fel när post %s sparades i %s"
-#: lib/rpmdb.c:419
+#: lib/rpmdb.c:461
#, fuzzy, c-format
msgid "error removing record %s from %s"
msgstr "fel när post %s togs bort ur %s"
-#: lib/rpmdb.c:619 lib/rpmdb.c:2078
+#: lib/rpmdb.c:683 lib/rpmdb.c:2186
msgid "no dbpath has been set"
msgstr "ingen dbpath har satts"
-#: lib/rpmdb.c:708
+#: lib/rpmdb.c:780
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
"i nytt format"
#. error
-#: lib/rpmdb.c:912
+#: lib/rpmdb.c:984
#, fuzzy, c-format
msgid "cannot retrieve package \"%s\" from db"
msgstr "kan inte öppna paket: %s\n"
-#: lib/rpmdb.c:978 lib/rpmdb.c:1496 lib/uninstall.c:90
+#: lib/rpmdb.c:1050 lib/rpmdb.c:1560 lib/uninstall.c:90
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x"
msgstr "kan inte läsa huvud vid %d för uppslagning"
-#: lib/rpmdb.c:1451
-#, fuzzy, c-format
-msgid "key \"%s\" not found in %s"
-msgstr "fann ej paket %s i %s"
-
-#: lib/rpmdb.c:1459
-#, fuzzy, c-format
-msgid "key \"%s\" not removed from %s"
-msgstr "fann ej paket %s i %s"
-
-#: lib/rpmdb.c:1541
+#: lib/rpmdb.c:1611
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "tar bort databasposter\n"
-#: lib/rpmdb.c:1550
+#: lib/rpmdb.c:1622
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "tar bort gruppindex\n"
-#: lib/rpmdb.c:1558
+#: lib/rpmdb.c:1631
#, fuzzy, c-format
-msgid "removing %d entries in %s index:\n"
+msgid "removing %d entries from %s index:\n"
msgstr "tar bort namnindex\n"
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1638 lib/rpmdb.c:1861
#, c-format
-msgid "\t%6d %s\n"
+msgid "%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1774
#, fuzzy
msgid "cannot allocate new instance in database"
msgstr "kan inte allokera plats för databas"
-#: lib/rpmdb.c:1761
+#: lib/rpmdb.c:1829
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1777
+#: lib/rpmdb.c:1845
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "byter namn på %s till %s\n"
-#: lib/rpmdb.c:1784
+#: lib/rpmdb.c:1854
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:1788
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
-#: lib/rpmdb.c:2103
+#: lib/rpmdb.c:2211
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "bygger om databas %s till %s\n"
-#: lib/rpmdb.c:2107
+#: lib/rpmdb.c:2215
#, c-format
msgid "temporary database %s already exists"
msgstr "tillfällig databas %s existerar redan"
-#: lib/rpmdb.c:2113
-#, c-format
-msgid "creating directory: %s\n"
+#: lib/rpmdb.c:2221
+#, fuzzy, c-format
+msgid "creating directory %s\n"
msgstr "skapar katalog: %s\n"
-#: lib/rpmdb.c:2115
+#: lib/rpmdb.c:2223
#, c-format
msgid "error creating directory %s: %s"
msgstr "fel när katalog skapades %s: %s"
-#: lib/rpmdb.c:2121
+#: lib/rpmdb.c:2230
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "öppnar gammal databas\n"
-#: lib/rpmdb.c:2131
+#: lib/rpmdb.c:2239
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "öppnar ny databas\n"
-#: lib/rpmdb.c:2155
+#: lib/rpmdb.c:2262
#, fuzzy, c-format
msgid "record number %d in database is bad -- skipping."
msgstr "post nummer %d i databasen är felaktig -- hoppar över den"
-#: lib/rpmdb.c:2187
+#: lib/rpmdb.c:2294
#, c-format
msgid "cannot add record originally at %d"
msgstr "kan inte lägga till post ursprungligen vid %d"
-#: lib/rpmdb.c:2205
-msgid "failed to rebuild database; original database remains in place\n"
+#: lib/rpmdb.c:2312
+#, fuzzy
+msgid "failed to rebuild database: original database remains in place\n"
msgstr "kunde inte bygga om databasen; orginaldatabasen finns kvar\n"
-#: lib/rpmdb.c:2213
+#: lib/rpmdb.c:2320
msgid "failed to replace old database with new database!\n"
msgstr "kunde inte ersätta gammal databas med ny databas!\n"
-#: lib/rpmdb.c:2215
+#: lib/rpmdb.c:2322
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "byt ut filer i %s med filer från %s för att återställa"
-#: lib/rpmdb.c:2221
+#: lib/rpmdb.c:2332
+#, fuzzy, c-format
+msgid "removing directory %s\n"
+msgstr "skapar katalog: %s\n"
+
+#: lib/rpmdb.c:2334
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "kunde inte ta bort katalogen %s: %s\n"
msgid "running postuninstall script (if any)\n"
msgstr "kör (eventuellt) postavinstallationsskript\n"
-#: lib/uninstall.c:213
-msgid "removing database entry\n"
-msgstr "tar bort databasposter\n"
-
-#: lib/uninstall.c:397
+#: lib/uninstall.c:390
msgid "execution of script failed"
msgstr "skriptkörning misslyckades"
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "Ouppfyllda beroenden för %s-%s-%s: "
-#: lib/verify.c:381
-msgid "rpmVerify: rpmdbOpen() failed\n"
-msgstr "rpmVerify: rpmdbOpen() misslyckades\n"
+#, fuzzy
+#~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
+#~ msgstr "%s: %s uppfyllt av tillagt paket.\n"
+
+#, fuzzy
+#~ msgid "%s: %s satisfied by Depends cache.\n"
+#~ msgstr "%s: %s uppfyllt av tillagt paket.\n"
+
+#~ msgid "%s: %s satisfied by db file lists.\n"
+#~ msgstr "%s: %s uppfyllt av fillistor från db.\n"
+
+#~ msgid "%s: %s unsatisfied.\n"
+#~ msgstr "%s: %s ej uppfyllt.\n"
+
+#~ msgid "rpmQuery: rpmdbOpen() failed\n"
+#~ msgstr "rpmQuery: rpmdbOpen() misslyckades\n"
+
+#, fuzzy
+#~ msgid "key \"%s\" not found in %s"
+#~ msgstr "fann ej paket %s i %s"
+
+#, fuzzy
+#~ msgid "key \"%s\" not removed from %s"
+#~ msgstr "fann ej paket %s i %s"
+
+#~ msgid "removing database entry\n"
+#~ msgstr "tar bort databasposter\n"
+
+#~ msgid "rpmVerify: rpmdbOpen() failed\n"
+#~ msgstr "rpmVerify: rpmdbOpen() misslyckades\n"
#~ msgid "cannot read header at %d for dependency check"
#~ msgstr "kan inte läsa huvud vid %d för beroendekontroll"
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-02 04:48-0400\n"
+"POT-Creation-Date: 2000-05-06 19:31-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"
msgstr "PGP hata verdi"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:439
+#: lib/depends.c:434
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:468
+#: lib/depends.c:463
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#: lib/depends.c:786
#, c-format
-msgid "%s: %s satisfied by added file list.\n"
+msgid "%s: %-45s YES (added files)\n"
msgstr ""
#: lib/depends.c:835
#, fuzzy, c-format
-msgid "%s: %s satisfied by added package.\n"
+msgid "%s: %-45s YES (added package)\n"
msgstr "%s dosyasý, hiç bir pakete ait deðil\n"
-#: lib/depends.c:838
-#, fuzzy, c-format
-msgid "%s: %s satisfied by added package (shouldn't happen).\n"
-msgstr "%s dosyasý, hiç bir pakete ait deðil\n"
+#: lib/depends.c:839
+#, c-format
+msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
+msgstr ""
-#: lib/depends.c:856
+#: lib/depends.c:858
#, c-format
-msgid "%s: %s satisfied by added provide.\n"
+msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:890
-#, fuzzy, c-format
-msgid "%s: %s satisfied by Depends cache.\n"
-msgstr "%s dosyasý, hiç bir pakete ait deðil\n"
+#: lib/depends.c:901
+#, c-format
+msgid "%s: %-45s %-3s (cached)\n"
+msgstr ""
-#: lib/depends.c:904
+#: lib/depends.c:918
#, c-format
-msgid "%s: %s satisfied by rpmrc provides.\n"
+msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:932
+#: lib/depends.c:941
#, c-format
-msgid "%s: %s satisfied by db file lists.\n"
+msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:950
+#: lib/depends.c:954
#, c-format
-msgid "%s: %s satisfied by db provides.\n"
+msgid "%s: %-45s YES (db provides)\n"
msgstr ""
#: lib/depends.c:968
#, fuzzy, c-format
-msgid "%s: %s satisfied by db packages.\n"
+msgid "%s: %-45s YES (db packages)\n"
msgstr "%s dosyasý, hiç bir pakete ait deðil\n"
-#: lib/depends.c:981
+#: lib/depends.c:985
#, c-format
-msgid "%s: %s satisfied by rpmlib version.\n"
+msgid "%s: %-45s YES (rpmlib version)\n"
msgstr ""
-#: lib/depends.c:991
+#: lib/depends.c:996
#, c-format
-msgid "%s: %s unsatisfied.\n"
+msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1010
+#: lib/depends.c:1016
#, fuzzy, c-format
-msgid "%s: (%s, %d) added to Depends cache.\n"
+msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "%s dosyasý, hiç bir pakete ait deðil\n"
#. requirements are not satisfied.
-#: lib/depends.c:1059
+#: lib/depends.c:1065
#, 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:1121
+#: lib/depends.c:1127
#, fuzzy, c-format
msgid "package %s conflicts: %s\n"
msgstr "%s paketi %s altýnda gözükmüyor"
-#: lib/depends.c:1251
+#: lib/depends.c:1254
#, c-format
msgid "loop in prerequisite chain: %s"
msgstr "gerekenler zincirinde döngü: %s"
msgid "removed db file %s\n"
msgstr ""
-#: lib/db1.c:419
+#: lib/db1.c:420
#, fuzzy, c-format
msgid "bad db file %s"
msgstr "%s açýlamadý: %s"
-#: lib/db1.c:424
+#: lib/db1.c:425
#, fuzzy, c-format
msgid "opening db file %s mode 0x%x\n"
msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
-#: lib/db1.c:432 lib/url.c:445
+#: lib/db1.c:434 lib/url.c:445
#, fuzzy, c-format
msgid "failed to open %s: %s\n"
msgstr "%s açýlamadý: %s"
-#: lib/db1.c:448
+#: lib/db1.c:450
#, c-format
msgid "cannot get %s lock on database"
msgstr "Veritabaný için %s kilit (lock) alýnamadý"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "exclusive"
msgstr "özel"
-#: lib/db1.c:449 lib/db3.c:1059
+#: lib/db1.c:451 lib/db3.c:1080
msgid "shared"
msgstr "paylaþýlan (shared)"
-#: lib/db2.c:133 lib/db3.c:456
+#: lib/db2.c:133
#, c-format
msgid "closed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:145 lib/db3.c:468
+#: lib/db2.c:145
#, c-format
msgid "removed db environment %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:182 lib/db3.c:505
+#: lib/db2.c:182
#, c-format
msgid "opening db environment %s/%s(%s) %s\n"
msgstr ""
-#: lib/db2.c:557 lib/db3.c:876
+#: lib/db2.c:557
#, c-format
msgid "closed db index %s/%s(%s)\n"
msgstr ""
-#: lib/db2.c:635 lib/db3.c:965
+#: lib/db2.c:635
#, c-format
msgid "opening db index %s/%s(%s) %s mode=0x%x\n"
msgstr ""
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
-#: lib/db3.c:1057
+#: lib/db3.c:464
+#, c-format
+msgid "closed db environment %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:476
+#, c-format
+msgid "removed db environment %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:513
+#, c-format
+msgid "opening db environment %s/%s %s\n"
+msgstr ""
+
+#: lib/db3.c:884
+#, c-format
+msgid "closed db index %s/%s\n"
+msgstr ""
+
+#: lib/db3.c:975
+#, fuzzy, c-format
+msgid "opening db index %s/%s %s mode=0x%x\n"
+msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
+
+#: lib/db3.c:1078
#, fuzzy, c-format
-msgid "cannot get %s lock on %s/%s(%s)\n"
+msgid "cannot get %s lock on %s/%s\n"
msgstr "Veritabaný için %s kilit (lock) alýnamadý"
-#: lib/db3.c:1064
+#: lib/db3.c:1085
#, c-format
-msgid "locked db index %s/%s(%s)\n"
+msgid "locked db index %s/%s\n"
msgstr ""
#: lib/falloc.c:135
#. this would probably be a good place to check if disk space
#. was used up - if so, we should return a different error
-#: lib/install.c:364
+#: lib/install.c:365
#, c-format
msgid "unpacking of archive failed%s%s: %s"
msgstr ""
-#: lib/install.c:365
+#: lib/install.c:366
msgid " on file "
msgstr ""
-#: lib/install.c:409
+#: lib/install.c:410
#, fuzzy
msgid "installing a source package\n"
msgstr "paket yüklemek"
-#: lib/install.c:429
+#: lib/install.c:430
#, fuzzy, c-format
msgid "cannot create sourcedir %s"
msgstr "%s dosyasý açýlamýyor: "
-#: lib/install.c:435 lib/install.c:465
+#: lib/install.c:436 lib/install.c:466
#, fuzzy, c-format
msgid "cannot write to %s"
msgstr "%s dosyasý açýlamýyor: "
-#: lib/install.c:439
+#: lib/install.c:440
#, c-format
msgid "sources in: %s\n"
msgstr ""
-#: lib/install.c:459
+#: lib/install.c:460
#, fuzzy, c-format
msgid "cannot create specdir %s"
msgstr "%s dosyasý açýlamýyor: "
-#: lib/install.c:469
+#: lib/install.c:470
#, fuzzy, c-format
msgid "spec file in: %s\n"
msgstr "%s açýlamadý: %s"
-#: lib/install.c:503 lib/install.c:531
+#: lib/install.c:504 lib/install.c:532
#, fuzzy
msgid "source package contains no .spec file"
msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
-#: lib/install.c:553
+#: lib/install.c:554
#, c-format
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:555 lib/install.c:829 lib/uninstall.c:28
+#: lib/install.c:556 lib/install.c:830 lib/uninstall.c:28
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "%s 'nin isminin %s 'ye çevrilmesinde belirtilen hata oluþtu: %s"
-#: lib/install.c:646
+#: lib/install.c:647
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:701
+#: lib/install.c:702
#, fuzzy, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n"
-#: lib/install.c:759
+#: lib/install.c:760
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:764
+#: lib/install.c:765
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:789
+#: lib/install.c:790
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:825
+#: lib/install.c:826
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
msgid "package %s is not installed\n"
msgstr "%s pakedi yüklenmemiþ\n"
-#: lib/query.c:683
-#, fuzzy
-msgid "rpmQuery: rpmdbOpen() failed\n"
-msgstr "%s: Eriþilemedi\n"
-
-#: lib/query.c:742
+#: lib/query.c:740
#, fuzzy
msgid "query package owning file"
msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
-#: lib/query.c:744
+#: lib/query.c:742
#, fuzzy
msgid "query packages in group"
msgstr "pakedin adý yok :-)"
-#: lib/query.c:746
+#: lib/query.c:744
#, fuzzy
msgid "query a package file"
msgstr "Tüm paketleri sorgulama"
-#: lib/query.c:750
+#: lib/query.c:748
#, fuzzy
msgid "query a spec file"
msgstr "%s 'nin sorgulamasý baþarýsýzlýkla sonuçlandý\n"
-#: lib/query.c:752
+#: lib/query.c:750
#, fuzzy
msgid "query the pacakges triggered by the package"
msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
-#: lib/query.c:754
+#: lib/query.c:752
#, fuzzy
msgid "query the packages which require a capability"
msgstr "<i> yeteneðine ihtiyaç duyan paketleri sorgulama"
-#: lib/query.c:756
+#: lib/query.c:754
#, fuzzy
msgid "query the packages which provide a capability"
msgstr "<i> yeteneði olan paketleri sorgulama"
-#: lib/query.c:795
+#: lib/query.c:793
#, fuzzy
msgid "list all configuration files"
msgstr ""
"sadece yapýlandýrma (configuration) dosyalarýný gösterir (impliziert -l)"
-#: lib/query.c:797
+#: lib/query.c:795
#, fuzzy
msgid "list all documentation files"
msgstr "paket ile gelen belgeleri de yükler"
-#: lib/query.c:799
+#: lib/query.c:797
#, fuzzy
msgid "dump basic file information"
msgstr "Paket bilgisini gösterme"
-#: lib/query.c:801
+#: lib/query.c:799
#, fuzzy
msgid "list files in package"
msgstr "paket yüklemek"
-#: lib/query.c:805
+#: lib/query.c:803
msgid "use the following query format"
msgstr ""
-#: lib/query.c:807
+#: lib/query.c:805
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
-#: lib/query.c:809
+#: lib/query.c:807
msgid "display the states of the listed files"
msgstr ""
-#: lib/query.c:811
+#: lib/query.c:809
#, fuzzy
msgid "display a verbose file listing"
msgstr "Paketin içerdiði dosyalarý gösterme"
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: lib/rpmdb.c:196
+#: lib/rpmdb.c:218
msgid ""
"\n"
-"--> This version of rpm was not compiled with support for db%d. Please "
-"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and "
-"correct your configuration.\n"
+"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
msgstr ""
-#: lib/rpmdb.c:223
+#. failed to open with any dbapi
+#: lib/rpmdb.c:249
+#, fuzzy, c-format
+msgid "dbiOpen: cannot open %s index"
+msgstr "hata: %s eriþilemiyor\n"
+
+#: lib/rpmdb.c:257
msgid ""
"\n"
-"--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
-" db1 to db3 on-disk format.\n"
+"--> The database is in db%d format, not the suggested db%d format.\n"
+" Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
+" using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
+" to convert your database from db%d to db%d format, or configure\n"
+" \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#. XXX FIXME: dbNopen handles failures already.
-#: lib/rpmdb.c:239
-#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
-msgstr "hata: %s eriþilemiyor\n"
+#: lib/rpmdb.c:270
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
+" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+" and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
-#: lib/rpmdb.c:293
+#: lib/rpmdb.c:335
#, fuzzy, c-format
msgid "error getting \"%s\" records from %s index"
msgstr "%s kaydýna %s dosyasýnda eriþilemiyor:"
-#: lib/rpmdb.c:410
+#: lib/rpmdb.c:452
#, c-format
msgid "error storing record %s into %s"
msgstr "%s kaydý %s dosyasýna yazýlamýyor"
-#: lib/rpmdb.c:419
+#: lib/rpmdb.c:461
#, fuzzy, c-format
msgid "error removing record %s from %s"
msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
-#: lib/rpmdb.c:619 lib/rpmdb.c:2078
+#: lib/rpmdb.c:683 lib/rpmdb.c:2186
msgid "no dbpath has been set"
msgstr "dbpath deðeri girilmemiþ"
-#: lib/rpmdb.c:708
+#: lib/rpmdb.c:780
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:912
+#: lib/rpmdb.c:984
#, fuzzy, c-format
msgid "cannot retrieve package \"%s\" from db"
msgstr "hata: %s%s/packages.rpm açýlamýyor\n"
-#: lib/rpmdb.c:978 lib/rpmdb.c:1496 lib/uninstall.c:90
+#: lib/rpmdb.c:1050 lib/rpmdb.c:1560 lib/uninstall.c:90
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x"
msgstr "%d kaydýndan baþlýk bilgisi okunamadý"
-#: lib/rpmdb.c:1451
-#, fuzzy, c-format
-msgid "key \"%s\" not found in %s"
-msgstr "%s pakedi %s içerisinde bulunamadý"
-
-#: lib/rpmdb.c:1459
-#, fuzzy, c-format
-msgid "key \"%s\" not removed from %s"
-msgstr "%s pakedi %s içerisinde bulunamadý"
-
-#: lib/rpmdb.c:1541
+#: lib/rpmdb.c:1611
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1550
+#: lib/rpmdb.c:1622
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
-#: lib/rpmdb.c:1558
+#: lib/rpmdb.c:1631
#, fuzzy, c-format
-msgid "removing %d entries in %s index:\n"
+msgid "removing %d entries from %s index:\n"
msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1638 lib/rpmdb.c:1861
#, c-format
-msgid "\t%6d %s\n"
+msgid "%6d %s\n"
msgstr ""
# reservieren???
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1774
#, fuzzy
msgid "cannot allocate new instance in database"
msgstr "Veritabaný için yer bulunamadý"
-#: lib/rpmdb.c:1761
+#: lib/rpmdb.c:1829
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1777
+#: lib/rpmdb.c:1845
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1784
+#: lib/rpmdb.c:1854
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:1788
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
-#: lib/rpmdb.c:2103
+#: lib/rpmdb.c:2211
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
-#: lib/rpmdb.c:2107
+#: lib/rpmdb.c:2215
#, c-format
msgid "temporary database %s already exists"
msgstr "geçici veritabaný %s mevcut"
-#: lib/rpmdb.c:2113
+#: lib/rpmdb.c:2221
#, fuzzy, c-format
-msgid "creating directory: %s\n"
+msgid "creating directory %s\n"
msgstr "%s dizinin oluþturulmasýnda hata: %s"
-#: lib/rpmdb.c:2115
+#: lib/rpmdb.c:2223
#, c-format
msgid "error creating directory %s: %s"
msgstr "%s dizinin oluþturulmasýnda hata: %s"
-#: lib/rpmdb.c:2121
+#: lib/rpmdb.c:2230
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
-#: lib/rpmdb.c:2131
+#: lib/rpmdb.c:2239
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
-#: lib/rpmdb.c:2155
+#: lib/rpmdb.c:2262
#, fuzzy, c-format
msgid "record number %d in database is bad -- skipping."
msgstr "veritabanýndaki %d numaralý kayýt hatalý -- atlanýyor"
-#: lib/rpmdb.c:2187
+#: lib/rpmdb.c:2294
#, c-format
msgid "cannot add record originally at %d"
msgstr "%d de yer alan kayýt saklayamýyor"
-#: lib/rpmdb.c:2205
-msgid "failed to rebuild database; original database remains in place\n"
+#: lib/rpmdb.c:2312
+msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2213
+#: lib/rpmdb.c:2320
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2215
+#: lib/rpmdb.c:2322
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2221
+#: lib/rpmdb.c:2332
+#, fuzzy, c-format
+msgid "removing directory %s\n"
+msgstr "%s dizinin oluþturulmasýnda hata: %s"
+
+#: lib/rpmdb.c:2334
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "%s açýlamadý: %s"
msgid "running postuninstall script (if any)\n"
msgstr ""
-#: lib/uninstall.c:213
-msgid "removing database entry\n"
-msgstr ""
-
-#: lib/uninstall.c:397
+#: lib/uninstall.c:390
msgid "execution of script failed"
msgstr "betik (script) çalýþtýrýlamadý "
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "%s-%s-%s 'nin baðýmlýlýk sorunlarý: "
-#: lib/verify.c:381
#, fuzzy
-msgid "rpmVerify: rpmdbOpen() failed\n"
-msgstr "%s: Eriþilemedi\n"
+#~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
+#~ msgstr "%s dosyasý, hiç bir pakete ait deðil\n"
+
+#, fuzzy
+#~ msgid "%s: %s satisfied by Depends cache.\n"
+#~ msgstr "%s dosyasý, hiç bir pakete ait deðil\n"
+
+#, fuzzy
+#~ msgid "rpmQuery: rpmdbOpen() failed\n"
+#~ msgstr "%s: Eriþilemedi\n"
+
+#, fuzzy
+#~ msgid "key \"%s\" not found in %s"
+#~ msgstr "%s pakedi %s içerisinde bulunamadý"
+
+#, fuzzy
+#~ msgid "key \"%s\" not removed from %s"
+#~ msgstr "%s pakedi %s içerisinde bulunamadý"
+
+#, fuzzy
+#~ msgid "rpmVerify: rpmdbOpen() failed\n"
+#~ msgstr "%s: Eriþilemedi\n"
#~ msgid "cannot read header at %d for dependency check"
#~ msgstr "baðýmlýlýk sorgulamasý için %d numaralý baþlýk okunamýyor"
Name: rpm
%define version 3.1
Version: %{version}
-Release: 0.14
+Release: 0.15
Group: System Environment/Base
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
Copyright: GPL
/usr/include/popt.h
%changelog
+* Sat May 6 2000 Jeff Johnson <jbj@redhat.com>
+- finish db1 and db3 cleanup.
+
* Tue May 2 2000 Jeff Johnson <jbj@redhat.com>
- first try at db1 -> db3 stability.
# Build policies enabled from command line. Last policy applies.
rpm alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+'
-# Preferred db interface:
-# 0 linux glibc libdb1 routines.
-# 1 db_185.h interface in db2/db3 libdb.a.
+# Choose db interface:
+# 0 same as 1
+# 1 native db1 interface (e.g. linux glibc libdb1 routines).
# 2 native db2 interface.
# 3 native db3 interface.
-rpm alias --preferdb --define '_preferdb !#:+'
+# -1 db3 -> db2 -> db1 (as available).
+#
+# There are two macros so that --rebuilddb can convert db1 -> db3
+rpm alias --dbapi --define '_dbapi !#:+'
+rpm alias --rebuilddbapi --define '_dbapi_rebuild !#:+'
+
+rpm alias --rebuilddbpath --define '_dbapath_rebuild !#:+'
projects / tools / librpm-tizen.git / commitdiff