From: jbj Date: Tue, 2 May 2000 08:30:31 +0000 (+0000) Subject: Add usedbenv (disabled) to use db3 as db1 was used. X-Git-Tag: rpm-4.4-release~2221 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c19f4c1c317aab49e57f2f9c81b4c031e99f0734;p=platform%2Fupstream%2Frpm.git Add usedbenv (disabled) to use db3 as db1 was used. Configure to accept any db api (but rebuild will switch to db3). Rename *_major to *_api throughout. Always open Depends with O_CREAT|O_RDWR. db1.c: use good ol' requredby.rpm name, not requiredbyindex.rpm. db1.c: hide pkgs FD_t in dbi_db, eliminate dbi_pkgs. depends.c: Skip Depends caching on dbiPut failure (e.g. perms). rpmdb.c: remove _useDbiMajor, pass dbapi on call. rpmdb.c: repair rot in rpmdbRemoveDatabase()/rpmdbMoveDatabase(). rpmdb.c: disable ^C hack in signal block/unblock. CVS patchset: 3712 CVS date: 2000/05/02 08:30:31 --- diff --git a/lib/db1.c b/lib/db1.c index e5e827b..6328a73 100644 --- a/lib/db1.c +++ b/lib/db1.c @@ -43,7 +43,7 @@ char * db1basename (int rpmtag) { case RPMTAG_NAME: base = "nameindex.rpm"; break; case RPMTAG_BASENAMES: base = "fileindex.rpm"; break; case RPMTAG_GROUP: base = "groupindex.rpm"; break; - case RPMTAG_REQUIRENAME: base = "requiredbyindex.rpm"; break; + case RPMTAG_REQUIRENAME: base = "requiredby.rpm"; break; case RPMTAG_PROVIDENAME: base = "providesindex.rpm"; break; case RPMTAG_CONFLICTNAME: base = "conflictsindex.rpm"; break; case RPMTAG_TRIGGERNAME: base = "triggerindex.rpm"; break; @@ -67,7 +67,7 @@ static int cvtdberr(dbiIndex dbi, const char * msg, int error, int printit) { rc = 1; if (printit && rc) { - fprintf(stderr, "*** db%d %s rc %d error %d\n", dbi->dbi_major, msg, + fprintf(stderr, "*** db%d %s rc %d error %d\n", dbi->dbi_api, msg, rc, error); } @@ -75,18 +75,20 @@ static int cvtdberr(dbiIndex dbi, const char * msg, int error, int printit) { } static int db1sync(dbiIndex dbi, unsigned int flags) { - DB * db = dbi->dbi_db; int rc = 0; - if (dbi->dbi_rpmtag == RPMDBI_PACKAGES) { - int fdno = Fileno(dbi->dbi_pkgs); - if (fdno >= 0) - rc = fsync(fdno); + if (dbi->dbi_db) { + if (dbi->dbi_rpmtag == RPMDBI_PACKAGES) { + FD_t pkgs = dbi->dbi_db; + int fdno = Fileno(pkgs); + if (fdno >= 0) + rc = fsync(fdno); + } else { + DB * db = dbi->dbi_db; + rc = db->sync(db, flags); + } } - if (db) - rc = db->sync(db, flags); - switch (rc) { default: case RET_ERROR: /* -1 */ @@ -202,14 +204,15 @@ static int db1cget(dbiIndex dbi, void ** keyp, size_t * keylen, if (datalen) data.size = *datalen; if (dbi->dbi_rpmtag == RPMDBI_PACKAGES) { + FD_t pkgs = dbi->dbi_db; unsigned int offset; unsigned int newSize; if (key.data == NULL) { /* XXX simulated DB_NEXT */ if (dbi->dbi_lastoffset == 0) { - dbi->dbi_lastoffset = fadFirstOffset(dbi->dbi_pkgs); + dbi->dbi_lastoffset = fadFirstOffset(pkgs); } else { - dbi->dbi_lastoffset = fadNextOffset(dbi->dbi_pkgs, dbi->dbi_lastoffset); + dbi->dbi_lastoffset = fadNextOffset(pkgs, dbi->dbi_lastoffset); } key.data = &dbi->dbi_lastoffset; key.size = sizeof(dbi->dbi_lastoffset); @@ -220,7 +223,7 @@ static int db1cget(dbiIndex dbi, void ** keyp, size_t * keylen, newSize = data.size; if (offset == 0) { /* XXX simulated offset 0 record */ - offset = fadAlloc(dbi->dbi_pkgs, newSize); + offset = fadAlloc(pkgs, newSize); if (offset == 0) return -1; offset--; /* XXX hack: caller will increment */ @@ -229,7 +232,7 @@ static int db1cget(dbiIndex dbi, void ** keyp, size_t * keylen, memcpy(data.data, &offset, sizeof(offset)); data.size = sizeof(offset); } else { /* XXX simulated retrieval */ - data.data = doGetRecord(dbi->dbi_pkgs, offset); + data.data = doGetRecord(pkgs, offset); data.size = 0; /* XXX WRONG */ if (data.data == NULL) rc = 1; @@ -278,9 +281,10 @@ static int db1cdel(dbiIndex dbi, const void * keyp, size_t keylen, int rc = 0; if (dbi->dbi_rpmtag == RPMDBI_PACKAGES) { + FD_t pkgs = dbi->dbi_db; unsigned int offset; memcpy(&offset, keyp, sizeof(offset)); - fadFree(dbi->dbi_pkgs, offset); + fadFree(pkgs, offset); } else { DBT key; DB * db = dbi->dbi_db; @@ -311,6 +315,7 @@ static int db1cput(dbiIndex dbi, const void * keyp, size_t keylen, data.size = datalen; if (dbi->dbi_rpmtag == RPMDBI_PACKAGES) { + FD_t pkgs = dbi->dbi_db; unsigned int offset; memcpy(&offset, key.data, sizeof(offset)); @@ -324,10 +329,10 @@ static int db1cput(dbiIndex dbi, const void * keyp, size_t keylen, Header h = headerLoad(data.data); int newSize = headerSizeof(h, HEADER_MAGIC_NO); - (void)Fseek(dbi->dbi_pkgs, offset, SEEK_SET); - fdSetContentLength(dbi->dbi_pkgs, newSize); - rc = headerWrite(dbi->dbi_pkgs, h, HEADER_MAGIC_NO); - fdSetContentLength(dbi->dbi_pkgs, -1); + (void)Fseek(pkgs, offset, SEEK_SET); + fdSetContentLength(pkgs, newSize); + rc = headerWrite(pkgs, h, HEADER_MAGIC_NO); + fdSetContentLength(pkgs, -1); if (rc) rc = -1; headerFree(h); @@ -343,7 +348,6 @@ static int db1cput(dbiIndex dbi, const void * keyp, size_t keylen, } static int db1close(dbiIndex dbi, unsigned int flags) { - DB * db = dbi->dbi_db; rpmdb rpmdb = dbi->dbi_rpmdb; const char * base = db1basename(dbi->dbi_rpmtag); const char * urlfn = rpmGenPath(rpmdb->db_root, rpmdb->db_home, base); @@ -352,18 +356,20 @@ static int db1close(dbiIndex dbi, unsigned int flags) { (void) urlPath(urlfn, &fn); - if (dbi->dbi_rpmtag == RPMDBI_PACKAGES) { - FD_t pkgs; - if ((pkgs = dbi->dbi_pkgs) != NULL) - Fclose(pkgs); - dbi->dbi_pkgs = NULL; - } - - if (db) { - rc = db->close(db); + if (dbi->dbi_db) { + if (dbi->dbi_rpmtag == RPMDBI_PACKAGES) { + FD_t pkgs = dbi->dbi_db; + rc = Fclose(pkgs); + } else { + DB * db = dbi->dbi_db; + rc = db->close(db); + } dbi->dbi_db = NULL; } + if (dbi->dbi_debug) + fprintf(stderr, "db1close: rc %d db %p\n", rc, dbi->dbi_db); + switch (rc) { default: case RET_ERROR: /* -1 */ @@ -404,7 +410,7 @@ static int db1open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip) *dbip = NULL; if ((dbi = db3New(rpmdb, rpmtag)) == NULL) return 1; - dbi->dbi_major = DB_VERSION_MAJOR; + dbi->dbi_api = DB_VERSION_MAJOR; base = db1basename(rpmtag); urlfn = rpmGenPath(rpmdb->db_root, rpmdb->db_home, base); @@ -439,29 +445,33 @@ static int db1open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip) l.l_type = (dbi->dbi_mode & O_RDWR) ? F_WRLCK : F_RDLCK; if (Fcntl(pkgs, F_SETLK, (void *) &l)) { - rpmError(RPMERR_FLOCK, _("cannot get %s lock on database"), - ((dbi->dbi_mode & O_RDWR) ? _("exclusive") : _("shared"))); - rc = 1; - goto exit; + rpmError(RPMERR_FLOCK, _("cannot get %s lock on database"), + ((dbi->dbi_mode & O_RDWR) ? _("exclusive") : _("shared"))); + rc = 1; + goto exit; } } - dbi->dbi_pkgs = pkgs; + dbi->dbi_db = pkgs; } else { void * dbopeninfo = NULL; + int dbimode = dbi->dbi_mode; + + if (dbi->dbi_temporary) + dbimode |= (O_CREAT | O_RDWR); - dbi->dbi_db = dbopen(fn, dbi->dbi_mode, dbi->dbi_perms, + 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); } exit: - if (rc == 0 && dbip) { - rc = 0; + if (rc == 0 && dbi->dbi_db != NULL && dbip) *dbip = dbi; - } else { - rc = 1; - db3Free(dbi); - } + else + db1close(dbi, 0); if (base) { xfree(base); diff --git a/lib/db2.c b/lib/db2.c index 4926762..3e06a92 100644 --- a/lib/db2.c +++ b/lib/db2.c @@ -104,7 +104,7 @@ static int cvtdberr(dbiIndex dbi, const char * msg, int error, int printit) { rc = -1; if (printit && rc) { - fprintf(stderr, "*** db%d %s rc %d %s\n", dbi->dbi_major, msg, + fprintf(stderr, "*** db%d %s rc %d %s\n", dbi->dbi_api, msg, rc, db_strerror(error)); } @@ -600,7 +600,7 @@ static int db2open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip) *dbip = NULL; if ((dbi = db3New(rpmdb, rpmtag)) == NULL) return 1; - dbi->dbi_major = DB_VERSION_MAJOR; + dbi->dbi_api = DB_VERSION_MAJOR; urlfn = rpmGenPath( (dbi->dbi_root ? dbi->dbi_root : rpmdb->db_root), diff --git a/lib/db3.c b/lib/db3.c index c3e4cc9..a9b85ff 100644 --- a/lib/db3.c +++ b/lib/db3.c @@ -73,13 +73,9 @@ struct dbOption rdbOptions[] = { { "mode", POPT_ARG_INT, &db3dbi.dbi_mode, 0 }, { "perms", POPT_ARG_INT, &db3dbi.dbi_perms, 0 }, - { "db3", POPT_ARG_VAL, &db3dbi.dbi_major, 3 }, - { "db2", POPT_ARG_VAL, &db3dbi.dbi_major, 2 }, - { "db1", POPT_ARG_VAL, &db3dbi.dbi_major, 1 }, - { "db0", POPT_ARG_VAL, &db3dbi.dbi_major, 0 }, - { "teardown", POPT_ARG_NONE, &db3dbi.dbi_tear_down, 0 }, { "usecursors",POPT_ARG_NONE, &db3dbi.dbi_use_cursors, 0 }, + { "usedbenv", POPT_ARG_NONE, &db3dbi.dbi_use_dbenv, 0 }, { "rmwcursor", POPT_ARG_NONE, &db3dbi.dbi_get_rmw_cursor, 0 }, { "nofsync", POPT_ARG_NONE, &db3dbi.dbi_no_fsync, 0 }, { "nodbsync", POPT_ARG_NONE, &db3dbi.dbi_no_dbsync, 0 }, @@ -431,7 +427,7 @@ static int cvtdberr(dbiIndex dbi, const char * msg, int error, int printit) { rc = -1; if (printit && rc) { - fprintf(stderr, "*** db%d %s rc %d %s\n", dbi->dbi_major, msg, + fprintf(stderr, "*** db%d %s rc %d %s\n", dbi->dbi_api, msg, rc, db_strerror(error)); } @@ -442,7 +438,7 @@ static int db_fini(dbiIndex dbi, const char * dbhome, const char * dbfile, const char * dbsubfile) { rpmdb rpmdb = dbi->dbi_rpmdb; - DB_ENV * dbenv = (DB_ENV *)dbi->dbi_dbenv; + DB_ENV * dbenv = dbi->dbi_dbenv; #if defined(__USE_DB3) char **dbconfig = NULL; @@ -457,8 +453,8 @@ static int db_fini(dbiIndex dbi, const char * dbhome, const char * dbfile, 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(%s)\n"), + dbhome, dbfile, dbsubfile); if (rpmdb->db_remove_env || dbi->dbi_tear_down) { int xx; @@ -470,7 +466,7 @@ static int db_fini(dbiIndex dbi, const char * dbhome, const char * dbfile, if (dbfile) rpmMessage(RPMMESS_DEBUG, _("removed db environment %s/%s(%s)\n"), - dbhome, dbfile, dbsubfile); + dbhome, dbfile, dbsubfile); } @@ -887,7 +883,8 @@ static int db3close(dbiIndex dbi, unsigned int flags) dbi->dbi_dbinfo = NULL; } - xx = db_fini(dbi, dbhome, dbfile, dbsubfile); + if (dbi->dbi_use_dbenv) + xx = db_fini(dbi, dbhome, dbfile, dbsubfile); #else /* __USE_DB2 || __USE_DB3 */ @@ -907,6 +904,7 @@ static int db3close(dbiIndex dbi, unsigned int flags) 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; @@ -923,6 +921,7 @@ static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip) *dbip = NULL; if ((dbi = db3New(rpmdb, rpmtag)) == NULL) return 1; + dbi->dbi_api = DB_VERSION_MAJOR; urlfn = rpmGenPath( (dbi->dbi_root ? dbi->dbi_root : rpmdb->db_root), @@ -943,16 +942,25 @@ static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip) } oflags = (dbi->dbi_oeflags | dbi->dbi_oflags); + oflags &= ~DB_TRUNCATE; /* XXX this is dangerous */ + #if 0 /* XXX rpmdb: illegal flag combination specified to DB->open */ if ( dbi->dbi_mode & O_EXCL) oflags |= DB_EXCL; #endif - if(!(dbi->dbi_mode & O_RDWR)) oflags |= DB_RDONLY; - if ( dbi->dbi_mode & O_CREAT) oflags |= DB_CREATE; - if ( dbi->dbi_mode & O_TRUNC) oflags |= DB_TRUNCATE; + if (dbi->dbi_temporary) { + oflags &= ~DB_RDONLY; + oflags |= DB_CREATE; + } else { + if(!(dbi->dbi_mode & O_RDWR)) oflags |= DB_RDONLY; + if ( dbi->dbi_mode & O_CREAT) oflags |= DB_CREATE; + if ( dbi->dbi_mode & O_TRUNC) oflags |= DB_TRUNCATE; + } - rc = db_init(dbi, dbhome, dbfile, dbsubfile, &dbenv); dbi->dbi_dbinfo = 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); @@ -1011,11 +1019,18 @@ static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip) } dbi->dbi_dbinfo = NULL; - rc = db->open(db, dbfile, dbsubfile, + 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; + + rc = db->open(db, dbpath, dbsubfile, dbi->dbi_type, oflags, dbi->dbi_perms); rc = cvtdberr(dbi, "db->open", rc, _debug); - if (dbi->dbi_get_rmw_cursor) { + if (rc == 0 && dbi->dbi_get_rmw_cursor) { DBC * dbcursor = NULL; int xx; xx = db->cursor(db, txnid, &dbcursor, @@ -1025,7 +1040,7 @@ static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip) } else dbi->dbi_rmw = NULL; - if (dbi->dbi_lockdbfd) { + if (rc == 0 && dbi->dbi_lockdbfd) { int fdno = -1; if (!(db->fd(db, &fdno) == 0 && fdno >= 0)) { @@ -1045,7 +1060,7 @@ static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip) dbhome, dbfile, dbsubfile); rc = 1; } else if (dbfile) { - rpmMessage(RPMMESS_VERBOSE, + rpmMessage(RPMMESS_DEBUG, _("locked db index %s/%s(%s)\n"), dbhome, dbfile, dbsubfile); } @@ -1090,15 +1105,13 @@ static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip) dbi->dbi_db = dbopen(dbfile, dbi->dbi_mode, dbi->dbi_perms, dbi->dbi_type, dbopeninfo); + if (dbi->dbi_db == NULL) rc = 1; #endif /* __USE_DB2 || __USE_DB3 */ - if (rc == 0 && dbi->dbi_db != NULL && dbip != NULL) { - rc = 0; + if (rc == 0 && dbi->dbi_db != NULL && dbip != NULL) *dbip = dbi; - } else { - rc = 1; + else db3close(dbi, 0); - } if (urlfn) xfree(urlfn); diff --git a/lib/depends.c b/lib/depends.c index 8d3152e..21da26d 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -871,6 +871,7 @@ static int unsatisfiedDepend(rpmTransactionSet rpmdep, const char * keyName, const char * keyEVR, int keyFlags, /*@out@*/ struct availablePackage ** suggestion) { + static int _cacheDependsRC = 1; rpmdbMatchIterator mi; Header h; int rc = 0; /* assume dependency is satisfied */ @@ -878,7 +879,11 @@ static int unsatisfiedDepend(rpmTransactionSet rpmdep, if (suggestion) *suggestion = NULL; - { mi = rpmdbInitIterator(rpmdep->db, RPMDBI_DEPENDS, keyDepend, 0); + /* + * 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); @@ -987,14 +992,24 @@ static int unsatisfiedDepend(rpmTransactionSet rpmdep, rc = 1; /* dependency is unsatisfied */ exit: - { dbiIndex dbi; - if ((dbi = dbiOpen(rpmdep->db, RPMDBI_DEPENDS, 0)) != NULL) { + /* + * If dbiOpen/dbiPut fails (e.g. permissions), we can't cache. + */ + if (_cacheDependsRC) { + dbiIndex dbi; + dbi = dbiOpen(rpmdep->db, RPMDBI_DEPENDS, 0); + if (dbi == NULL) { + _cacheDependsRC = 0; + } else { int xx; xx = dbiCopen(dbi, NULL, 0); xx = dbiPut(dbi, keyDepend, strlen(keyDepend), &rc, sizeof(rc), 0); - xx = dbiCclose(dbi, NULL, 0); - if (xx == 0) + if (xx) { + _cacheDependsRC = 0; + } else { rpmMessage(RPMMESS_DEBUG, _("%s: (%s, %d) added to Depends cache.\n"), keyType, keyDepend, rc); + } + xx = dbiCclose(dbi, NULL, 0); } } return rc; diff --git a/lib/rpmdb.c b/lib/rpmdb.c index 5803efb..be50750 100644 --- a/lib/rpmdb.c +++ b/lib/rpmdb.c @@ -20,7 +20,6 @@ static int _debug = 0; extern int _noDirTokens; -int _useDbiMajor = 3; int _filterDbDups = 0; /* Filter duplicate entries ? (bug in pre rpm-3.0.4) */ #define _DBI_FLAGS 0 @@ -175,7 +174,7 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, unsigned int flags) { int dbix; dbiIndex dbi = NULL; - int major; + int _dbapi; int rc = 0; dbix = dbiTagToDbix(rpmtag); @@ -186,14 +185,14 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, unsigned int flags) if ((dbi = rpmdb->_dbi[dbix]) != NULL) return dbi; - major = rpmdb->db_major; + _dbapi = rpmdb->db_api; - switch (major) { + switch (_dbapi) { case 3: case 2: case 1: case 0: - if (mydbvecs[major] == NULL) { + if (mydbvecs[_dbapi] == NULL) { 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\ @@ -204,22 +203,23 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, unsigned int flags) break; } errno = 0; - rc = (*mydbvecs[major]->open) (rpmdb, rpmtag, &dbi); - if (rc == 0 && dbi) - dbi->dbi_vec = mydbvecs[major]; + rc = (*mydbvecs[_dbapi]->open) (rpmdb, rpmtag, &dbi); + if (rc == 0 && dbi) { + dbi->dbi_vec = mydbvecs[_dbapi]; + } break; case -1: - major = 4; - while (major-- > 1) { - if (mydbvecs[major] == NULL) + _dbapi = 4; + while (_dbapi-- > 1) { + if (mydbvecs[_dbapi] == NULL) continue; errno = 0; - rc = (*mydbvecs[major]->open) (rpmdb, rpmtag, &dbi); + rc = (*mydbvecs[_dbapi]->open) (rpmdb, rpmtag, &dbi); if (rc == 0 && dbi) { - dbi->dbi_vec = mydbvecs[major]; + dbi->dbi_vec = mydbvecs[_dbapi]; break; } - if (rc == 1 && major == 3) { + 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\ @@ -227,14 +227,15 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, unsigned int flags) ")); } } - if (rpmdb->db_major == -1) - rpmdb->db_major = major; + if (rpmdb->db_api == -1) + rpmdb->db_api = _dbapi; break; } if (rc == 0) { 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); @@ -510,8 +511,8 @@ static void blockSignals(rpmdb rpmdb, sigset_t * oldMask) { sigset_t newMask; - /* XXX HACK permit ^C aborts for now ... */ - if (!(rpmdb && rpmdb->db_major == 3)) { + /* XXX HACK (disabled) permit ^C aborts for now ... */ + if (!(rpmdb && rpmdb->db_api == 4)) { sigfillset(&newMask); /* block all signals */ sigprocmask(SIG_BLOCK, &newMask, oldMask); } @@ -522,8 +523,8 @@ static void blockSignals(rpmdb rpmdb, sigset_t * oldMask) */ static void unblockSignals(rpmdb rpmdb, sigset_t * oldMask) { - /* XXX HACK permit ^C aborts for now ... */ - if (!(rpmdb && rpmdb->db_major == 3)) { + /* XXX HACK (disabled) permit ^C aborts for now ... */ + if (!(rpmdb && rpmdb->db_api == 4)) { sigprocmask(SIG_SETMASK, oldMask, NULL); } } @@ -594,7 +595,6 @@ static /*@only@*/ rpmdb newRpmdb(const char * root, const char * home, static int _initialized = 0; if (!_initialized) { - _useDbiMajor = rpmExpandNumeric("%{_dbapi}"); _filterDbDups = rpmExpandNumeric("%{_filterdbdups}"); _initialized = 1; } @@ -622,7 +622,6 @@ static /*@only@*/ rpmdb newRpmdb(const char * root, const char * home, } if (rpmdb->db_errpfx) rpmdb->db_errpfx = xstrdup(rpmdb->db_errpfx); - rpmdb->db_major = _useDbiMajor; rpmdb->db_remove_env = 0; rpmdb->db_filter_dups = _filterDbDups; rpmdb->db_ndbi = dbiTagsMax; @@ -635,8 +634,8 @@ errxit: return NULL; } -static int openDatabase(const char * prefix, const char * dbpath, rpmdb *dbp, - int mode, int perms, int flags) +static int openDatabase(const char * prefix, const char * dbpath, int _dbapi, + rpmdb *dbp, int mode, int perms, int flags) { rpmdb rpmdb; int rc; @@ -655,6 +654,7 @@ static int openDatabase(const char * prefix, const char * dbpath, rpmdb *dbp, return 1; rpmdb = newRpmdb(prefix, dbpath, mode, perms, flags); + rpmdb->db_api = _dbapi; { int dbix; @@ -679,7 +679,7 @@ static int openDatabase(const char * prefix, const char * dbpath, rpmdb *dbp, case RPMDBI_PACKAGES: if (dbi == NULL) rc |= 1; #if 0 - if (rpmdb->db_major == 3) + if (rpmdb->db_api == 3) #endif goto exit; break; @@ -730,15 +730,17 @@ exit: /* XXX python/rpmmodule.c */ int rpmdbOpen (const char * prefix, rpmdb *dbp, int mode, int perms) { - return openDatabase(prefix, NULL, dbp, mode, perms, 0); + int _dbapi = rpmExpandNumeric("%{_dbapi}"); + return openDatabase(prefix, NULL, _dbapi, dbp, mode, perms, 0); } int rpmdbInit (const char * prefix, int perms) { rpmdb rpmdb = NULL; + int _dbapi = rpmExpandNumeric("%{_dbapi}"); int rc; - rc = openDatabase(prefix, NULL, &rpmdb, (O_CREAT | O_RDWR), perms, RPMDB_FLAG_JUSTCHECK); + rc = openDatabase(prefix, NULL, _dbapi, &rpmdb, (O_CREAT | O_RDWR), perms, RPMDB_FLAG_JUSTCHECK); if (rpmdb) { rpmdbClose(rpmdb); rpmdb = NULL; @@ -1836,130 +1838,6 @@ exit: return rc; } -static void rpmdbRemoveDatabase(const char * rootdir, const char * dbpath) -{ - int i; - char * filename; - - i = strlen(dbpath); - if (dbpath[i - 1] != '/') { - filename = alloca(i); - strcpy(filename, dbpath); - filename[i] = '/'; - filename[i + 1] = '\0'; - dbpath = filename; - } - - filename = alloca(strlen(rootdir) + strlen(dbpath) + 40); - - { int i; - - for (i = 0; i < dbiTagsMax; i++) { - const char * base = db1basename(dbiTags[i]); - sprintf(filename, "%s/%s/%s", rootdir, dbpath, base); - unlink(filename); - xfree(base); - } - for (i = 0; i < 16; i++) { - sprintf(filename, "%s/%s/__db.%03d", rootdir, dbpath, i); - unlink(filename); - } - for (i = 0; i < 4; i++) { - sprintf(filename, "%s/%s/packages.db%d", rootdir, dbpath, i); - unlink(filename); - } - } - - sprintf(filename, "%s/%s", rootdir, dbpath); - rmdir(filename); - -} - -static int rpmdbMoveDatabase(const char * rootdir, const char * olddbpath, - const char * newdbpath) -{ - int i; - char * ofilename, * nfilename; - int rc = 0; - - i = strlen(olddbpath); - if (olddbpath[i - 1] != '/') { - ofilename = alloca(i + 2); - strcpy(ofilename, olddbpath); - ofilename[i] = '/'; - ofilename[i + 1] = '\0'; - olddbpath = ofilename; - } - - i = strlen(newdbpath); - if (newdbpath[i - 1] != '/') { - nfilename = alloca(i + 2); - strcpy(nfilename, newdbpath); - nfilename[i] = '/'; - nfilename[i + 1] = '\0'; - newdbpath = nfilename; - } - - ofilename = alloca(strlen(rootdir) + strlen(olddbpath) + 40); - nfilename = alloca(strlen(rootdir) + strlen(newdbpath) + 40); - - switch(_useDbiMajor) { - case 3: - { int i; - sprintf(ofilename, "%s/%s/%s", rootdir, olddbpath, "packages.db3"); - sprintf(nfilename, "%s/%s/%s", rootdir, newdbpath, "packages.db3"); - (void)rpmCleanPath(ofilename); - (void)rpmCleanPath(nfilename); - if (Rename(ofilename, nfilename)) rc = 1; - for (i = 0; i < 16; i++) { - sprintf(ofilename, "%s/%s/__db.%03d", rootdir, olddbpath, i); - (void)rpmCleanPath(ofilename); - if (!rpmfileexists(ofilename)) - continue; - sprintf(nfilename, "%s/%s/__db.%03d", rootdir, newdbpath, i); - (void)rpmCleanPath(nfilename); - if (Rename(ofilename, nfilename)) rc = 1; - } - for (i = 0; i < 4; i++) { - sprintf(ofilename, "%s/%s/packages.db%d", rootdir, olddbpath, i); - (void)rpmCleanPath(ofilename); - if (!rpmfileexists(ofilename)) - continue; - sprintf(nfilename, "%s/%s/packages.db%d", rootdir, newdbpath, i); - (void)rpmCleanPath(nfilename); - if (Rename(ofilename, nfilename)) rc = 1; - } - } break; - case 2: - case 1: - case 0: - { int i; - for (i = 0; i < dbiTagsMax; i++) { - const char * base = db1basename(dbiTags[i]); - sprintf(ofilename, "%s/%s/%s", rootdir, olddbpath, base); - sprintf(nfilename, "%s/%s/%s", rootdir, newdbpath, base); - (void)rpmCleanPath(ofilename); - (void)rpmCleanPath(nfilename); - if (Rename(ofilename, nfilename)) - rc = 1; - xfree(base); - } - for (i = 0; i < 16; i++) { - sprintf(ofilename, "%s/%s/__db.%03d", rootdir, olddbpath, i); - (void)rpmCleanPath(ofilename); - if (rpmfileexists(ofilename)) - unlink(ofilename); - sprintf(nfilename, "%s/%s/__db.%03d", rootdir, newdbpath, i); - (void)rpmCleanPath(nfilename); - if (rpmfileexists(nfilename)) - unlink(nfilename); - } - } break; - } - - return rc; -} - /* XXX transaction.c */ int rpmdbFindFpList(rpmdb rpmdb, fingerPrint * fpList, dbiIndexSet * matchList, int numItems) @@ -2050,6 +1928,135 @@ int rpmdbFindFpList(rpmdb rpmdb, fingerPrint * fpList, dbiIndexSet * matchList, } +static int rpmdbRemoveDatabase(const char * rootdir, + const char * dbpath, int _dbapi) +{ + int i; + char * filename; + int xx; + +fprintf(stderr, "*** rpmdbRemoveDatabase(%s, %s,%d)\n", rootdir, dbpath, _dbapi); + i = strlen(dbpath); + if (dbpath[i - 1] != '/') { + filename = alloca(i); + strcpy(filename, dbpath); + filename[i] = '/'; + filename[i + 1] = '\0'; + dbpath = filename; + } + + filename = alloca(strlen(rootdir) + strlen(dbpath) + 40); + + switch (_dbapi) { + case 3: + for (i = 0; i < dbiTagsMax; i++) { + const char * base = tagName(dbiTags[i]); + sprintf(filename, "%s/%s/%s", rootdir, dbpath, base); + (void)rpmCleanPath(filename); + xx = unlink(filename); + } + for (i = 0; i < 16; i++) { + sprintf(filename, "%s/%s/__db.%03d", rootdir, dbpath, i); + xx = unlink(filename); + } + break; + case 2: + case 1: + case 0: + for (i = 0; i < dbiTagsMax; i++) { + const char * base = db1basename(dbiTags[i]); + sprintf(filename, "%s/%s/%s", rootdir, dbpath, base); + xx = unlink(filename); + xfree(base); + } + break; + } + + sprintf(filename, "%s/%s", rootdir, dbpath); + xx = rmdir(filename); + + return 0; +} + +static int rpmdbMoveDatabase(const char * rootdir, + const char * olddbpath, int _olddbapi, + const char * newdbpath, int _newdbapi) +{ + int i; + char * ofilename, * nfilename; + int rc = 0; + int xx; + +fprintf(stderr, "*** rpmdbMoveDatabase(%s, %s,%d, %s,%d)\n", rootdir, olddbpath, _olddbapi, newdbpath, _newdbapi); + i = strlen(olddbpath); + if (olddbpath[i - 1] != '/') { + ofilename = alloca(i + 2); + strcpy(ofilename, olddbpath); + ofilename[i] = '/'; + ofilename[i + 1] = '\0'; + olddbpath = ofilename; + } + + i = strlen(newdbpath); + if (newdbpath[i - 1] != '/') { + nfilename = alloca(i + 2); + strcpy(nfilename, newdbpath); + nfilename[i] = '/'; + nfilename[i + 1] = '\0'; + newdbpath = nfilename; + } + + ofilename = alloca(strlen(rootdir) + strlen(olddbpath) + 40); + nfilename = alloca(strlen(rootdir) + strlen(newdbpath) + 40); + + switch (_olddbapi) { + case 3: + for (i = 0; i < dbiTagsMax; i++) { + const char * base = tagName(dbiTags[i]); + sprintf(ofilename, "%s/%s/%s", rootdir, olddbpath, base); + (void)rpmCleanPath(ofilename); + if (!rpmfileexists(ofilename)) + continue; + sprintf(nfilename, "%s/%s/%s", rootdir, newdbpath, base); + (void)rpmCleanPath(nfilename); + if ((xx = Rename(ofilename, nfilename)) != 0) + rc = 1; + } + for (i = 0; i < 16; i++) { + sprintf(ofilename, "%s/%s/__db.%03d", rootdir, olddbpath, i); + (void)rpmCleanPath(ofilename); + if (!rpmfileexists(ofilename)) + continue; + sprintf(nfilename, "%s/%s/__db.%03d", rootdir, newdbpath, i); + (void)rpmCleanPath(nfilename); + if ((xx = Rename(ofilename, nfilename)) != 0) + rc = 1; + } + break; + case 2: + case 1: + case 0: + for (i = 0; i < dbiTagsMax; i++) { + const char * base = db1basename(dbiTags[i]); + sprintf(ofilename, "%s/%s/%s", rootdir, olddbpath, base); + (void)rpmCleanPath(ofilename); + if (!rpmfileexists(ofilename)) + continue; + sprintf(nfilename, "%s/%s/%s", rootdir, newdbpath, base); + (void)rpmCleanPath(nfilename); + if ((xx = Rename(ofilename, nfilename)) != 0) + rc = 1; + xfree(base); + } + break; + } + if (rc || _olddbapi == _newdbapi) + return rc; + + rc = rpmdbRemoveDatabase(rootdir, newdbpath, _newdbapi); + return rc; +} + int rpmdbRebuild(const char * rootdir) { rpmdb olddb; @@ -2062,11 +2069,11 @@ int rpmdbRebuild(const char * rootdir) int nocleanup = 1; int failed = 0; int rc = 0; - int _old_db_api; - int _new_db_api; + int _dbapi; + int _dbapi_rebuild; - _old_db_api = rpmExpandNumeric("%{_dbapi}"); - _new_db_api = rpmExpandNumeric("%{_dbapi_rebuild}"); + _dbapi = rpmExpandNumeric("%{_dbapi}"); + _dbapi_rebuild = rpmExpandNumeric("%{_dbapi_rebuild}"); tfn = rpmGetPath("%{_dbpath}", NULL); if (!(tfn && tfn[0] != '%')) { @@ -2113,23 +2120,25 @@ int rpmdbRebuild(const char * rootdir) goto exit; } - _useDbiMajor = ((_old_db_api >= 0) ? (_old_db_api & 0x03) : -1); - rpmMessage(RPMMESS_DEBUG, _("opening old database with dbi_major %d\n"), - _useDbiMajor); - if (openDatabase(rootdir, dbpath, &olddb, O_RDONLY, 0644, + rpmMessage(RPMMESS_DEBUG, _("opening old database with dbapi %d\n"), + _dbapi); + if (openDatabase(rootdir, dbpath, _dbapi, &olddb, O_RDONLY, 0644, RPMDB_FLAG_MINIMAL)) { rc = 1; goto exit; } + if ((_dbapi = olddb->db_api) == 0) + _dbapi = 1; - _useDbiMajor = ((_new_db_api >= 0) ? (_new_db_api & 0x03) : -1); - rpmMessage(RPMMESS_DEBUG, _("opening new database with dbi_major %d\n"), - _useDbiMajor); - if (openDatabase(rootdir, newdbpath, &newdb, O_RDWR | O_CREAT, 0644, 0)) { + rpmMessage(RPMMESS_DEBUG, _("opening new database with dbapi %d\n"), + _dbapi_rebuild); + if (openDatabase(rootdir, newdbpath, _dbapi_rebuild, &newdb, O_RDWR | O_CREAT, 0644, 0)) { rc = 1; goto exit; } - + if ((_dbapi_rebuild = newdb->db_api) == 0) + _dbapi_rebuild = 1; + { Header h = NULL; rpmdbMatchIterator mi; #define _RECNUM rpmdbGetIteratorOffset(mi) @@ -2198,11 +2207,11 @@ int rpmdbRebuild(const char * rootdir) rpmMessage(RPMMESS_NORMAL, _("failed to rebuild database; original database " "remains in place\n")); - rpmdbRemoveDatabase(rootdir, newdbpath); + rpmdbRemoveDatabase(rootdir, newdbpath, _dbapi_rebuild); rc = 1; goto exit; } else if (!nocleanup) { - if (rpmdbMoveDatabase(rootdir, newdbpath, dbpath)) { + if (rpmdbMoveDatabase(rootdir, newdbpath, _dbapi_rebuild, dbpath, _dbapi)) { rpmMessage(RPMMESS_ERROR, _("failed to replace old database with new " "database!\n")); rpmMessage(RPMMESS_ERROR, _("replace files in %s with files from %s " @@ -2217,7 +2226,7 @@ int rpmdbRebuild(const char * rootdir) rc = 0; exit: - if (rootdbpath) xfree(rootdbpath); + if (rootdbpath) xfree(rootdbpath); if (newrootdbpath) xfree(newrootdbpath); return rc; diff --git a/lib/rpmdb.h b/lib/rpmdb.h index f20b1d8..1fedcbf 100644 --- a/lib/rpmdb.h +++ b/lib/rpmdb.h @@ -153,10 +153,11 @@ struct _dbiIndex { int dbi_type; /* db2 -> db1 (as available). # # There are two macros so that --rebuilddb can convert db1 -> db3 -%_dbapi 1 +%_dbapi -1 %_dbapi_rebuild 3 # # token Berkeley db flag or value # ================================================= -# recover DB_RECOVER -# recover_fatal DB_RECOVER_FATAL -# create DB_CREATE -# lockdown DB_LOCKDOWN -# cdb DB_INIT_CDB -# lock DB_INIT_LOCK -# log DB_INIT_LOG -# mpool DB_INIT_MPOOL -# txn DB_INIT_TXN -# nommap DB_NOMMAP -# private DB_PRIVATE -# shared DB_SYSTEM_MEM -# thread DB_THREAD -# txn_nosync DB_TXN_NOSYNC # hash DB_HASH # -# See http://www.sleepycat.com for Berkeley db-3.0.55 configuration. -# -# The (intended) default value for rpm-3.1 on Red Hat Linux is -# db3:hash:mpool:cdb:usecursors:mp_mmapsize=8Mb:mp_size=8Mb:pagesize=512 +# See http://www.sleepycat.com for Berkeley db-3.0.55 documentation. # # Additional rpm specific configuration: # usecursors Should DB3 cursors be used in get/put/del ? +# lockdbfd Should the file be locked using fcntl shared/exclusive locks? # -%__dbi_major db%{_dbapi} %__dbi_type hash -%__dbi_flags mpool:cdb %__dbi_other usecursors -%__dbi_verbose verbose -%__dbi_mp_mmapsize mp_mmapsize=16Mb -%__dbi_mp_size mp_size=512Kb -%__dbi_pagesize pagesize=512 %__dbi_perms perms=0644 # This is a colon (or white space) separated list of tokens for Berkeley # dbi configuration. %_dbi_config \ - %{__dbi_major}\ %{__dbi_type}\ - %{__dbi_flags}\ %{__dbi_other}\ - %{__dbi_verbose}\ - %{__dbi_mp_mmapsize}\ - %{__dbi_mp_size}\ - %{__dbi_pagesize}\ %{__dbi_perms}\ %{nil} # The list of tags for which indices will be built. %_dbi_indices Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Depends +# "Packages" needs fcntl shared/exclusive lock. +%_dbi_config_Packages %{_dbi_config}:lockdbfd + # "Depends" is a per-transaction cache of known dependency resolutions. %_dbi_config_Depends %{_dbi_config}:temporary diff --git a/po/cs.po b/po/cs.po index e88a750..163f33f 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-05-01 13:41-0400\n" +"POT-Creation-Date: 2000-05-02 04:23-0400\n" "PO-Revision-Date: 1998-10-10 10:10+0200\n" "Last-Translator: Pavel Makovec \n" "Language-Team: Czech \n" @@ -2129,152 +2129,152 @@ msgstr " msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:885 +#: 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:899 +#: lib/depends.c:904 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:927 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:945 +#: lib/depends.c:950 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:963 +#: lib/depends.c:968 #, fuzzy, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "¾ádný balíèek nevlastní soubor %s\n" -#: lib/depends.c:976 +#: lib/depends.c:981 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:991 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1010 #, fuzzy, c-format msgid "%s: (%s, %d) added to Depends cache.\n" msgstr "¾ádný balíèek nevlastní soubor %s\n" #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1059 #, 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:1106 +#: lib/depends.c:1121 #, c-format msgid "package %s conflicts: %s\n" msgstr "balíèek %s koliduje: %s\n" -#: lib/depends.c:1236 +#: lib/depends.c:1251 #, c-format msgid "loop in prerequisite chain: %s" msgstr "smyèka v øetìzu podmínek: %s" -#: lib/db1.c:380 +#: lib/db1.c:386 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:383 +#: lib/db1.c:389 #, fuzzy, c-format msgid "removed db file %s\n" msgstr "odstraòuje se rejstøík souborù pro %s\n" -#: lib/db1.c:413 +#: lib/db1.c:419 #, fuzzy, c-format msgid "bad db file %s" msgstr "nelze provést statistiku %s: %s" -#: lib/db1.c:418 +#: lib/db1.c:424 #, 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:426 lib/url.c:445 +#: lib/db1.c:432 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "nelze otevøít %s: %s" -#: lib/db1.c:442 +#: lib/db1.c:448 #, c-format msgid "cannot get %s lock on database" msgstr "nelze získat %s zámek k databázi" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "exclusive" msgstr "výhradní" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "shared" msgstr "sdílený" -#: lib/db2.c:133 lib/db3.c:460 +#: lib/db2.c:133 lib/db3.c:456 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:145 lib/db3.c:472 +#: lib/db2.c:145 lib/db3.c:468 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:182 lib/db3.c:509 +#: lib/db2.c:182 lib/db3.c:505 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:557 lib/db3.c:880 +#: lib/db2.c:557 lib/db3.c:876 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:635 lib/db3.c:957 +#: lib/db2.c:635 lib/db3.c:965 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:253 +#: lib/db3.c:249 #, c-format msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:281 +#: lib/db3.c:277 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:289 +#: lib/db3.c:285 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:297 +#: lib/db3.c:293 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:1042 +#: lib/db3.c:1057 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s(%s)\n" msgstr "nelze získat %s zámek k databázi" -#: lib/db3.c:1049 +#: lib/db3.c:1064 #, fuzzy, c-format msgid "locked db index %s/%s(%s)\n" msgstr "odstraòuje se rejstøík souborù pro %s\n" @@ -2977,12 +2977,12 @@ msgstr "" msgid "OK" msgstr "OK" -#: lib/rpmdb.c:94 +#: lib/rpmdb.c:93 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:197 +#: lib/rpmdb.c:196 msgid "" "\n" "--> This version of rpm was not compiled with support for db%d. Please " @@ -2998,27 +2998,28 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:238 +#. 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:292 +#: lib/rpmdb.c:293 #, 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:409 +#: lib/rpmdb.c:410 #, c-format msgid "error storing record %s into %s" msgstr "chyba pøi ukládání záznamu %s do %s" -#: lib/rpmdb.c:418 +#: lib/rpmdb.c:419 #, 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:2073 +#: lib/rpmdb.c:619 lib/rpmdb.c:2080 msgid "no dbpath has been set" msgstr "nebyla nastavena dbpath" @@ -3029,125 +3030,125 @@ msgid "" msgstr "" #. error -#: lib/rpmdb.c:910 +#: lib/rpmdb.c:912 #, fuzzy, c-format msgid "cannot retrieve package \"%s\" from db" msgstr "chyba: nelze otevøít %s%s/packages.rpm\n" -#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90 +#: lib/rpmdb.c:978 lib/rpmdb.c:1496 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:1449 +#: lib/rpmdb.c:1451 #, fuzzy, c-format msgid "key \"%s\" not found in %s" msgstr "balíèek %s nenalezen v %s" -#: lib/rpmdb.c:1457 +#: lib/rpmdb.c:1459 #, fuzzy, c-format msgid "key \"%s\" not removed from %s" msgstr "balíèek %s nenalezen v %s" -#: lib/rpmdb.c:1539 +#: lib/rpmdb.c:1541 #, fuzzy, c-format msgid "removing 0 %s entries.\n" msgstr "odstraòuje se polo¾ka databáze\n" -#: lib/rpmdb.c:1548 +#: lib/rpmdb.c:1550 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuje se rejstøík skupin\n" -#: lib/rpmdb.c:1556 +#: lib/rpmdb.c:1558 #, fuzzy, c-format msgid "removing %d entries in %s index:\n" msgstr "odstraòuje se rejstøík názvù\n" -#: lib/rpmdb.c:1560 +#: lib/rpmdb.c:1562 #, c-format msgid "\t%6d %s\n" msgstr "" -#: lib/rpmdb.c:1710 +#: lib/rpmdb.c:1712 #, fuzzy msgid "cannot allocate new instance in database" msgstr "nelze alokovat prostor pro databázi" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1761 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1775 +#: lib/rpmdb.c:1777 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "Probíhá získávání %s jako %s\n" -#: lib/rpmdb.c:1782 +#: lib/rpmdb.c:1784 #, c-format msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1786 +#: lib/rpmdb.c:1788 #, c-format msgid "%6d %s\n" msgstr "" -#: lib/rpmdb.c:2098 +#: lib/rpmdb.c:2105 #, 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:2102 +#: lib/rpmdb.c:2109 #, c-format msgid "temporary database %s already exists" msgstr "doèasná databáze %s ji¾ existuje" -#: lib/rpmdb.c:2108 +#: lib/rpmdb.c:2115 #, c-format msgid "creating directory: %s\n" msgstr "vytváøí se adresáø: %s\n" -#: lib/rpmdb.c:2110 +#: lib/rpmdb.c:2117 #, c-format msgid "error creating directory %s: %s" msgstr "chyba pøi vytváøení adresáøe %s: %s" -#: lib/rpmdb.c:2117 +#: lib/rpmdb.c:2123 #, fuzzy, c-format -msgid "opening old database with dbi_major %d\n" +msgid "opening old database with dbapi %d\n" msgstr "otevírá se stará databáze\n" -#: lib/rpmdb.c:2126 +#: lib/rpmdb.c:2133 #, fuzzy, c-format -msgid "opening new database with dbi_major %d\n" +msgid "opening new database with dbapi %d\n" msgstr "otevírá se nová databáze\n" -#: lib/rpmdb.c:2148 +#: lib/rpmdb.c:2157 #, 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:2180 +#: lib/rpmdb.c:2189 #, c-format msgid "cannot add record originally at %d" msgstr "nelze pøidat záznam - pùvodnì u %d" -#: lib/rpmdb.c:2198 +#: lib/rpmdb.c:2207 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:2206 +#: lib/rpmdb.c:2215 msgid "failed to replace old database with new database!\n" msgstr "starou databázi nelze nahradit novou databází!\n" -#: lib/rpmdb.c:2208 +#: lib/rpmdb.c:2217 #, 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:2214 +#: lib/rpmdb.c:2223 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "nelze odstranit %s: %s\n" diff --git a/po/de.po b/po/de.po index 7c5a27c..fb2f9c2 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 2.5.2\n" -"POT-Creation-Date: 2000-05-01 13:41-0400\n" +"POT-Creation-Date: 2000-05-02 04:23-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -2230,154 +2230,154 @@ msgstr "die Datei msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:885 +#: 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:899 +#: lib/depends.c:904 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:927 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:945 +#: lib/depends.c:950 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:963 +#: lib/depends.c:968 #, fuzzy, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:976 +#: lib/depends.c:981 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:991 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1010 #, fuzzy, c-format msgid "%s: (%s, %d) added to Depends cache.\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1059 #, 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:1106 +#: lib/depends.c:1121 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" -#: lib/depends.c:1236 +#: lib/depends.c:1251 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" -#: lib/db1.c:380 +#: lib/db1.c:386 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:383 +#: lib/db1.c:389 #, c-format msgid "removed db file %s\n" msgstr "" # , c-format -#: lib/db1.c:413 +#: lib/db1.c:419 #, fuzzy, c-format msgid "bad db file %s" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/db1.c:418 +#: lib/db1.c:424 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "Datenbank aus der vorhandenen neu erstellen" # , c-format -#: lib/db1.c:426 lib/url.c:445 +#: lib/db1.c:432 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/db1.c:442 +#: lib/db1.c:448 #, c-format msgid "cannot get %s lock on database" msgstr "kann %s lock für die Datenbank nicht bekommen" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "exclusive" msgstr "exklusiv" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "shared" msgstr "geteilt" -#: lib/db2.c:133 lib/db3.c:460 +#: lib/db2.c:133 lib/db3.c:456 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:145 lib/db3.c:472 +#: lib/db2.c:145 lib/db3.c:468 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:182 lib/db3.c:509 +#: lib/db2.c:182 lib/db3.c:505 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:557 lib/db3.c:880 +#: lib/db2.c:557 lib/db3.c:876 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:635 lib/db3.c:957 +#: lib/db2.c:635 lib/db3.c:965 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:253 +#: lib/db3.c:249 #, c-format msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:281 +#: lib/db3.c:277 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:289 +#: lib/db3.c:285 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:297 +#: lib/db3.c:293 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:1042 +#: lib/db3.c:1057 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s(%s)\n" msgstr "kann %s lock für die Datenbank nicht bekommen" -#: lib/db3.c:1049 +#: lib/db3.c:1064 #, c-format msgid "locked db index %s/%s(%s)\n" msgstr "" @@ -3093,12 +3093,12 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmdb.c:94 +#: lib/rpmdb.c:93 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:197 +#: lib/rpmdb.c:196 msgid "" "\n" "--> This version of rpm was not compiled with support for db%d. Please " @@ -3114,28 +3114,29 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:238 +#. 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:292 +#: lib/rpmdb.c:293 #, fuzzy, c-format msgid "error getting \"%s\" records from %s index" msgstr "Fehler beim Eintrag %s von %s" -#: lib/rpmdb.c:409 +#: lib/rpmdb.c:410 #, c-format msgid "error storing record %s into %s" msgstr "Fehler bei Schreiben des Eintrags %s nach %s" # FIXME -#: lib/rpmdb.c:418 +#: lib/rpmdb.c:419 #, 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:2073 +#: lib/rpmdb.c:619 lib/rpmdb.c:2080 msgid "no dbpath has been set" msgstr "»dbpath« ist nicht gesetzt" @@ -3146,130 +3147,130 @@ msgid "" msgstr "" #. error -#: lib/rpmdb.c:910 +#: lib/rpmdb.c:912 #, fuzzy, c-format msgid "cannot retrieve package \"%s\" from db" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" -#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90 +#: lib/rpmdb.c:978 lib/rpmdb.c:1496 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:1449 +#: lib/rpmdb.c:1451 #, fuzzy, c-format msgid "key \"%s\" not found in %s" msgstr "Paket %s in %s nicht gefunden" -#: lib/rpmdb.c:1457 +#: lib/rpmdb.c:1459 #, fuzzy, c-format msgid "key \"%s\" not removed from %s" msgstr "Paket %s in %s nicht gefunden" -#: lib/rpmdb.c:1539 +#: lib/rpmdb.c:1541 #, c-format msgid "removing 0 %s entries.\n" msgstr "" # FIXME -#: lib/rpmdb.c:1548 +#: lib/rpmdb.c:1550 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" # FIXME -#: lib/rpmdb.c:1556 +#: lib/rpmdb.c:1558 #, fuzzy, c-format msgid "removing %d entries in %s index:\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: lib/rpmdb.c:1560 +#: lib/rpmdb.c:1562 #, c-format msgid "\t%6d %s\n" msgstr "" # reservieren??? -#: lib/rpmdb.c:1710 +#: lib/rpmdb.c:1712 #, fuzzy msgid "cannot allocate new instance in database" msgstr "kann keinen Platz für die Datenbank bekommen" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1761 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1775 +#: lib/rpmdb.c:1777 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1782 +#: lib/rpmdb.c:1784 #, c-format msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1786 +#: lib/rpmdb.c:1788 #, c-format msgid "%6d %s\n" msgstr "" -#: lib/rpmdb.c:2098 +#: lib/rpmdb.c:2105 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: lib/rpmdb.c:2102 +#: lib/rpmdb.c:2109 #, c-format msgid "temporary database %s already exists" msgstr "die temporäre Datenbank %s existiert schon" -#: lib/rpmdb.c:2108 +#: lib/rpmdb.c:2115 #, fuzzy, c-format msgid "creating directory: %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/rpmdb.c:2110 +#: lib/rpmdb.c:2117 #, c-format msgid "error creating directory %s: %s" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/rpmdb.c:2117 +#: lib/rpmdb.c:2123 #, fuzzy, c-format -msgid "opening old database with dbi_major %d\n" +msgid "opening old database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: lib/rpmdb.c:2126 +#: lib/rpmdb.c:2133 #, fuzzy, c-format -msgid "opening new database with dbi_major %d\n" +msgid "opening new database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: lib/rpmdb.c:2148 +#: lib/rpmdb.c:2157 #, 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:2180 +#: lib/rpmdb.c:2189 #, c-format msgid "cannot add record originally at %d" msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d" -#: lib/rpmdb.c:2198 +#: lib/rpmdb.c:2207 msgid "failed to rebuild database; original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2206 +#: lib/rpmdb.c:2215 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2208 +#: lib/rpmdb.c:2217 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" # , c-format -#: lib/rpmdb.c:2214 +#: lib/rpmdb.c:2223 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" diff --git a/po/fi.po b/po/fi.po index 34580e4..e03b3d5 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-05-01 13:41-0400\n" +"POT-Creation-Date: 2000-05-02 04:23-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -2167,152 +2167,152 @@ msgstr "tiedostoa %s ei omista mik msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:885 +#: 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:899 +#: lib/depends.c:904 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:927 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:945 +#: lib/depends.c:950 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:963 +#: lib/depends.c:968 #, fuzzy, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:976 +#: lib/depends.c:981 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:991 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1010 #, fuzzy, c-format msgid "%s: (%s, %d) added to Depends cache.\n" msgstr "tiedostoa %s ei omista mikään paketti\n" #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1059 #, fuzzy, c-format msgid "package %s require not satisfied: %s\n" msgstr "paketti %s ei ole %s:ssä" #. conflicts exist. -#: lib/depends.c:1106 +#: lib/depends.c:1121 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: lib/depends.c:1236 +#: lib/depends.c:1251 #, c-format msgid "loop in prerequisite chain: %s" msgstr "silmukka edellytysten ketjussa: %s" -#: lib/db1.c:380 +#: lib/db1.c:386 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:383 +#: lib/db1.c:389 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:413 +#: lib/db1.c:419 #, fuzzy, c-format msgid "bad db file %s" msgstr "en voinut avata %s: %s" -#: lib/db1.c:418 +#: lib/db1.c:424 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: lib/db1.c:426 lib/url.c:445 +#: lib/db1.c:432 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/db1.c:442 +#: lib/db1.c:448 #, c-format msgid "cannot get %s lock on database" msgstr "en voi saada %s lukitusta tietokantaan" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "exclusive" msgstr "poissulkevaa" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "shared" msgstr "jaettua" -#: lib/db2.c:133 lib/db3.c:460 +#: lib/db2.c:133 lib/db3.c:456 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:145 lib/db3.c:472 +#: lib/db2.c:145 lib/db3.c:468 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:182 lib/db3.c:509 +#: lib/db2.c:182 lib/db3.c:505 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:557 lib/db3.c:880 +#: lib/db2.c:557 lib/db3.c:876 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:635 lib/db3.c:957 +#: lib/db2.c:635 lib/db3.c:965 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:253 +#: lib/db3.c:249 #, c-format msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:281 +#: lib/db3.c:277 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:289 +#: lib/db3.c:285 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:297 +#: lib/db3.c:293 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:1042 +#: lib/db3.c:1057 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s(%s)\n" msgstr "en voi saada %s lukitusta tietokantaan" -#: lib/db3.c:1049 +#: lib/db3.c:1064 #, c-format msgid "locked db index %s/%s(%s)\n" msgstr "" @@ -3015,12 +3015,12 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmdb.c:94 +#: lib/rpmdb.c:93 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:197 +#: lib/rpmdb.c:196 msgid "" "\n" "--> This version of rpm was not compiled with support for db%d. Please " @@ -3036,27 +3036,28 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:238 +#. 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:292 +#: lib/rpmdb.c:293 #, fuzzy, c-format msgid "error getting \"%s\" records from %s index" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: lib/rpmdb.c:409 +#: lib/rpmdb.c:410 #, c-format msgid "error storing record %s into %s" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: lib/rpmdb.c:418 +#: lib/rpmdb.c:419 #, fuzzy, c-format msgid "error removing record %s from %s" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: lib/rpmdb.c:619 lib/rpmdb.c:2073 +#: lib/rpmdb.c:619 lib/rpmdb.c:2080 msgid "no dbpath has been set" msgstr "dbpath ei ole asetettu" @@ -3067,125 +3068,125 @@ msgid "" msgstr "" #. error -#: lib/rpmdb.c:910 +#: lib/rpmdb.c:912 #, fuzzy, c-format msgid "cannot retrieve package \"%s\" from db" msgstr "virhe: en voi avata %s%s/packages.rpm\n" -#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90 +#: lib/rpmdb.c:978 lib/rpmdb.c:1496 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:1449 +#: lib/rpmdb.c:1451 #, fuzzy, c-format msgid "key \"%s\" not found in %s" msgstr "paketti %s ei ole %s:ssä" -#: lib/rpmdb.c:1457 +#: lib/rpmdb.c:1459 #, fuzzy, c-format msgid "key \"%s\" not removed from %s" msgstr "paketti %s ei ole %s:ssä" -#: lib/rpmdb.c:1539 +#: lib/rpmdb.c:1541 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1548 +#: lib/rpmdb.c:1550 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: lib/rpmdb.c:1556 +#: lib/rpmdb.c:1558 #, fuzzy, c-format msgid "removing %d entries in %s index:\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: lib/rpmdb.c:1560 +#: lib/rpmdb.c:1562 #, c-format msgid "\t%6d %s\n" msgstr "" -#: lib/rpmdb.c:1710 +#: lib/rpmdb.c:1712 #, fuzzy msgid "cannot allocate new instance in database" msgstr "en voi varata tilaa tietokannalle" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1761 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1775 +#: lib/rpmdb.c:1777 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1782 +#: lib/rpmdb.c:1784 #, c-format msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1786 +#: lib/rpmdb.c:1788 #, c-format msgid "%6d %s\n" msgstr "" -#: lib/rpmdb.c:2098 +#: lib/rpmdb.c:2105 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: lib/rpmdb.c:2102 +#: lib/rpmdb.c:2109 #, c-format msgid "temporary database %s already exists" msgstr "väliaikainen tietokanta %s on jo olemassa" -#: lib/rpmdb.c:2108 +#: lib/rpmdb.c:2115 #, fuzzy, c-format msgid "creating directory: %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/rpmdb.c:2110 +#: lib/rpmdb.c:2117 #, c-format msgid "error creating directory %s: %s" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/rpmdb.c:2117 +#: lib/rpmdb.c:2123 #, fuzzy, c-format -msgid "opening old database with dbi_major %d\n" +msgid "opening old database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: lib/rpmdb.c:2126 +#: lib/rpmdb.c:2133 #, fuzzy, c-format -msgid "opening new database with dbi_major %d\n" +msgid "opening new database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: lib/rpmdb.c:2148 +#: lib/rpmdb.c:2157 #, fuzzy, c-format msgid "record number %d in database is bad -- skipping." msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen" -#: lib/rpmdb.c:2180 +#: lib/rpmdb.c:2189 #, c-format msgid "cannot add record originally at %d" msgstr "en voi lisätä tietuetta %d:stä" -#: lib/rpmdb.c:2198 +#: lib/rpmdb.c:2207 msgid "failed to rebuild database; original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2206 +#: lib/rpmdb.c:2215 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2208 +#: lib/rpmdb.c:2217 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2214 +#: lib/rpmdb.c:2223 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "en voinut avata %s: %s" diff --git a/po/fr.po b/po/fr.po index 9dc27fd..23d95b9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,5 +1,5 @@ msgid "" -msgstr "POT-Creation-Date: 2000-05-01 13:41-0400\n" +msgstr "POT-Creation-Date: 2000-05-02 04:23-0400\n" #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422 #, c-format @@ -2168,152 +2168,152 @@ msgstr "" msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:885 +#: lib/depends.c:890 #, c-format msgid "%s: %s satisfied by Depends cache.\n" msgstr "" -#: lib/depends.c:899 +#: lib/depends.c:904 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:927 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:945 +#: lib/depends.c:950 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:963 +#: lib/depends.c:968 #, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "" -#: lib/depends.c:976 +#: lib/depends.c:981 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:991 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1010 #, c-format msgid "%s: (%s, %d) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1059 #, 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:1106 +#: lib/depends.c:1121 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: lib/depends.c:1236 +#: lib/depends.c:1251 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" -#: lib/db1.c:380 +#: lib/db1.c:386 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:383 +#: lib/db1.c:389 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:413 +#: lib/db1.c:419 #, fuzzy, c-format msgid "bad db file %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/db1.c:418 +#: lib/db1.c:424 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/db1.c:426 lib/url.c:445 +#: lib/db1.c:432 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/db1.c:442 +#: lib/db1.c:448 #, 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:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "exclusive" msgstr "" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "shared" msgstr "" -#: lib/db2.c:133 lib/db3.c:460 +#: lib/db2.c:133 lib/db3.c:456 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:145 lib/db3.c:472 +#: lib/db2.c:145 lib/db3.c:468 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:182 lib/db3.c:509 +#: lib/db2.c:182 lib/db3.c:505 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:557 lib/db3.c:880 +#: lib/db2.c:557 lib/db3.c:876 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:635 lib/db3.c:957 +#: lib/db2.c:635 lib/db3.c:965 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:253 +#: lib/db3.c:249 #, c-format msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:281 +#: lib/db3.c:277 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:289 +#: lib/db3.c:285 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:297 +#: lib/db3.c:293 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:1042 +#: lib/db3.c:1057 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s(%s)\n" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: lib/db3.c:1049 +#: lib/db3.c:1064 #, c-format msgid "locked db index %s/%s(%s)\n" msgstr "" @@ -3018,12 +3018,12 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmdb.c:94 +#: lib/rpmdb.c:93 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:197 +#: lib/rpmdb.c:196 msgid "" "\n" "--> This version of rpm was not compiled with support for db%d. Please " @@ -3039,27 +3039,28 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:238 +#. 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:292 +#: lib/rpmdb.c:293 #, fuzzy, c-format msgid "error getting \"%s\" records from %s index" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:409 +#: lib/rpmdb.c:410 #, c-format msgid "error storing record %s into %s" msgstr "" -#: lib/rpmdb.c:418 +#: lib/rpmdb.c:419 #, fuzzy, c-format msgid "error removing record %s from %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:619 lib/rpmdb.c:2073 +#: lib/rpmdb.c:619 lib/rpmdb.c:2080 msgid "no dbpath has been set" msgstr "" @@ -3070,124 +3071,124 @@ msgid "" msgstr "" #. error -#: lib/rpmdb.c:910 +#: lib/rpmdb.c:912 #, fuzzy, c-format msgid "cannot retrieve package \"%s\" from db" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90 +#: lib/rpmdb.c:978 lib/rpmdb.c:1496 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:1449 +#: 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:1457 +#: 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:1539 +#: lib/rpmdb.c:1541 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1548 +#: lib/rpmdb.c:1550 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1556 +#: lib/rpmdb.c:1558 #, c-format msgid "removing %d entries in %s index:\n" msgstr "" -#: lib/rpmdb.c:1560 +#: lib/rpmdb.c:1562 #, c-format msgid "\t%6d %s\n" msgstr "" -#: lib/rpmdb.c:1710 +#: lib/rpmdb.c:1712 msgid "cannot allocate new instance in database" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1761 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1775 +#: lib/rpmdb.c:1777 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1782 +#: lib/rpmdb.c:1784 #, c-format msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1786 +#: lib/rpmdb.c:1788 #, c-format msgid "%6d %s\n" msgstr "" -#: lib/rpmdb.c:2098 +#: lib/rpmdb.c:2105 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:2102 +#: lib/rpmdb.c:2109 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2108 +#: lib/rpmdb.c:2115 #, c-format msgid "creating directory: %s\n" msgstr "" -#: lib/rpmdb.c:2110 +#: lib/rpmdb.c:2117 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2117 +#: lib/rpmdb.c:2123 #, c-format -msgid "opening old database with dbi_major %d\n" +msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2126 +#: lib/rpmdb.c:2133 #, c-format -msgid "opening new database with dbi_major %d\n" +msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2148 +#: lib/rpmdb.c:2157 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2180 +#: lib/rpmdb.c:2189 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2198 +#: lib/rpmdb.c:2207 msgid "failed to rebuild database; original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2206 +#: lib/rpmdb.c:2215 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2208 +#: lib/rpmdb.c:2217 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2214 +#: lib/rpmdb.c:2223 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" diff --git a/po/ja.po b/po/ja.po index 43f1abc..868b463 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm-3.0.4\n" -"POT-Creation-Date: 2000-05-01 13:41-0400\n" +"POT-Creation-Date: 2000-05-02 04:23-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -193,7 +193,7 @@ msgstr "copyright # build root [BuildRoot] # net share [¥Í¥Ã¥È¶¦Í­] # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë] -# $Id: ja.po,v 1.51 2000/05/01 17:50:36 jbj Exp $ +# $Id: ja.po,v 1.52 2000/05/02 08:30:32 jbj Exp $ #: rpm.c:200 #, c-format msgid "rpm: %s\n" @@ -2137,152 +2137,152 @@ msgstr "%s: %s msgid "%s: %s satisfied by added provide.\n" msgstr "%s: %s ¤Ï provide ¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:885 +#: lib/depends.c:890 #, fuzzy, c-format msgid "%s: %s satisfied by Depends cache.\n" msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:899 +#: lib/depends.c:904 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:927 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "%s: %s ¤Ï db ¥Õ¥¡¥¤¥ë¤¬¥ê¥¹¥È¤òºî¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:945 +#: lib/depends.c:950 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:963 +#: lib/depends.c:968 #, fuzzy, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" -#: lib/depends.c:976 +#: lib/depends.c:981 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "%s: %s ¤Ï rpmlib ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" -#: lib/depends.c:986 +#: lib/depends.c:991 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "%s: %s ¤ÏËþ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" -#: lib/depends.c:997 +#: lib/depends.c:1010 #, fuzzy, c-format msgid "%s: (%s, %d) added to Depends cache.\n" msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1059 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" #. conflicts exist. -#: lib/depends.c:1106 +#: lib/depends.c:1121 #, c-format msgid "package %s conflicts: %s\n" msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹: %s\n" -#: lib/depends.c:1236 +#: lib/depends.c:1251 #, c-format msgid "loop in prerequisite chain: %s" msgstr "prerequisite ¥Á¥§¡¼¥ó¤Î¥ë¡¼¥×: %s" -#: lib/db1.c:380 +#: lib/db1.c:386 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:383 +#: lib/db1.c:389 #, fuzzy, c-format msgid "removed db file %s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: lib/db1.c:413 +#: lib/db1.c:419 #, fuzzy, c-format msgid "bad db file %s" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/db1.c:418 +#: lib/db1.c:424 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n" -#: lib/db1.c:426 lib/url.c:445 +#: lib/db1.c:432 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" -#: lib/db1.c:442 +#: lib/db1.c:448 #, c-format msgid "cannot get %s lock on database" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "exclusive" msgstr "½ü³°" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "shared" msgstr "¶¦Í­" -#: lib/db2.c:133 lib/db3.c:460 +#: lib/db2.c:133 lib/db3.c:456 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:145 lib/db3.c:472 +#: lib/db2.c:145 lib/db3.c:468 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:182 lib/db3.c:509 +#: lib/db2.c:182 lib/db3.c:505 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:557 lib/db3.c:880 +#: lib/db2.c:557 lib/db3.c:876 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:635 lib/db3.c:957 +#: lib/db2.c:635 lib/db3.c:965 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:253 +#: lib/db3.c:249 #, c-format msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:281 +#: lib/db3.c:277 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:289 +#: lib/db3.c:285 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:297 +#: lib/db3.c:293 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:1042 +#: lib/db3.c:1057 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s(%s)\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó" -#: lib/db3.c:1049 +#: lib/db3.c:1064 #, fuzzy, c-format msgid "locked db index %s/%s(%s)\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" @@ -2999,12 +2999,12 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmdb.c:94 +#: lib/rpmdb.c:93 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:197 +#: lib/rpmdb.c:196 msgid "" "\n" "--> This version of rpm was not compiled with support for db%d. Please " @@ -3020,27 +3020,28 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:238 +#. 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:292 +#: lib/rpmdb.c:293 #, fuzzy, c-format msgid "error getting \"%s\" records from %s index" msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" -#: lib/rpmdb.c:409 +#: lib/rpmdb.c:410 #, c-format msgid "error storing record %s into %s" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: lib/rpmdb.c:418 +#: lib/rpmdb.c:419 #, fuzzy, c-format msgid "error removing record %s from %s" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼" -#: lib/rpmdb.c:619 lib/rpmdb.c:2073 +#: lib/rpmdb.c:619 lib/rpmdb.c:2080 msgid "no dbpath has been set" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" @@ -3051,126 +3052,126 @@ msgid "" msgstr "" #. error -#: lib/rpmdb.c:910 +#: lib/rpmdb.c:912 #, fuzzy, c-format msgid "cannot retrieve package \"%s\" from db" msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90 +#: lib/rpmdb.c:978 lib/rpmdb.c:1496 lib/uninstall.c:90 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: lib/rpmdb.c:1449 +#: lib/rpmdb.c:1451 #, fuzzy, c-format msgid "key \"%s\" not found in %s" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï %s Ãæ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: lib/rpmdb.c:1457 +#: lib/rpmdb.c:1459 #, fuzzy, c-format msgid "key \"%s\" not removed from %s" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï %s Ãæ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: lib/rpmdb.c:1539 +#: lib/rpmdb.c:1541 #, fuzzy, c-format msgid "removing 0 %s entries.\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥¨¥ó¥È¥ê¤òºï½ü¤·¤Þ¤¹\n" -#: lib/rpmdb.c:1548 +#: lib/rpmdb.c:1550 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: lib/rpmdb.c:1556 +#: lib/rpmdb.c:1558 #, fuzzy, c-format msgid "removing %d entries in %s index:\n" msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n" -#: lib/rpmdb.c:1560 +#: lib/rpmdb.c:1562 #, c-format msgid "\t%6d %s\n" msgstr "" -#: lib/rpmdb.c:1710 +#: lib/rpmdb.c:1712 #, fuzzy msgid "cannot allocate new instance in database" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹ÍѤζõ¤­ÍÆÎ̤¬Â­¤ê¤Þ¤»¤ó" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1761 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1775 +#: lib/rpmdb.c:1777 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: lib/rpmdb.c:1782 +#: lib/rpmdb.c:1784 #, c-format msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1786 +#: lib/rpmdb.c:1788 #, c-format msgid "%6d %s\n" msgstr "" -#: lib/rpmdb.c:2098 +#: lib/rpmdb.c:2105 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n" -#: lib/rpmdb.c:2102 +#: lib/rpmdb.c:2109 #, c-format msgid "temporary database %s already exists" msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹" -#: lib/rpmdb.c:2108 +#: lib/rpmdb.c:2115 #, c-format msgid "creating directory: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: lib/rpmdb.c:2110 +#: lib/rpmdb.c:2117 #, c-format msgid "error creating directory %s: %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ÎºîÀ®¥¨¥é¡¼: %s" -#: lib/rpmdb.c:2117 +#: lib/rpmdb.c:2123 #, fuzzy, c-format -msgid "opening old database with dbi_major %d\n" +msgid "opening old database with dbapi %d\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: lib/rpmdb.c:2126 +#: lib/rpmdb.c:2133 #, fuzzy, c-format -msgid "opening new database with dbi_major %d\n" +msgid "opening new database with dbapi %d\n" msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: lib/rpmdb.c:2148 +#: lib/rpmdb.c:2157 #, fuzzy, c-format msgid "record number %d in database is bad -- skipping." msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Þ¤¹" -#: lib/rpmdb.c:2180 +#: lib/rpmdb.c:2189 #, c-format msgid "cannot add record originally at %d" msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ­¤Þ¤»¤ó" -#: lib/rpmdb.c:2198 +#: lib/rpmdb.c:2207 msgid "failed to rebuild database; original database remains in place\n" msgstr "" "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n" -#: lib/rpmdb.c:2206 +#: lib/rpmdb.c:2215 msgid "failed to replace old database with new database!\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤­´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n" -#: lib/rpmdb.c:2208 +#: lib/rpmdb.c:2217 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤­´¹¤¨¤Þ¤¹" -#: lib/rpmdb.c:2214 +#: lib/rpmdb.c:2223 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n" diff --git a/po/pl.po b/po/pl.po index 209b088..d4dff4b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm-3.0.2\n" -"POT-Creation-Date: 2000-05-01 13:41-0400\n" +"POT-Creation-Date: 2000-05-02 04:23-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -2088,152 +2088,152 @@ msgstr "plik %s nie nale msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:885 +#: 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:899 +#: lib/depends.c:904 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:927 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:945 +#: lib/depends.c:950 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:963 +#: lib/depends.c:968 #, fuzzy, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:976 +#: lib/depends.c:981 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:991 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1010 #, fuzzy, c-format msgid "%s: (%s, %d) added to Depends cache.\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1059 #, 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:1106 +#: lib/depends.c:1121 #, c-format msgid "package %s conflicts: %s\n" msgstr "pakiet %s jest w konflikcie: %s\n" -#: lib/depends.c:1236 +#: lib/depends.c:1251 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" -#: lib/db1.c:380 +#: lib/db1.c:386 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:383 +#: lib/db1.c:389 #, fuzzy, c-format msgid "removed db file %s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: lib/db1.c:413 +#: lib/db1.c:419 #, fuzzy, c-format msgid "bad db file %s" msgstr "b³êdny status pliku: %s" -#: lib/db1.c:418 +#: lib/db1.c:424 #, 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:426 lib/url.c:445 +#: lib/db1.c:432 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s" -#: lib/db1.c:442 +#: lib/db1.c:448 #, c-format msgid "cannot get %s lock on database" msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "exclusive" msgstr "" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "shared" msgstr "" -#: lib/db2.c:133 lib/db3.c:460 +#: lib/db2.c:133 lib/db3.c:456 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:145 lib/db3.c:472 +#: lib/db2.c:145 lib/db3.c:468 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:182 lib/db3.c:509 +#: lib/db2.c:182 lib/db3.c:505 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:557 lib/db3.c:880 +#: lib/db2.c:557 lib/db3.c:876 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:635 lib/db3.c:957 +#: lib/db2.c:635 lib/db3.c:965 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:253 +#: lib/db3.c:249 #, c-format msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:281 +#: lib/db3.c:277 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:289 +#: lib/db3.c:285 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:297 +#: lib/db3.c:293 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:1042 +#: lib/db3.c:1057 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s(%s)\n" msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe" -#: lib/db3.c:1049 +#: lib/db3.c:1064 #, fuzzy, c-format msgid "locked db index %s/%s(%s)\n" msgstr "usuwanie indeksu plików dla %s\n" @@ -2919,12 +2919,12 @@ msgstr ")" msgid "OK" msgstr "OK" -#: lib/rpmdb.c:94 +#: lib/rpmdb.c:93 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:197 +#: lib/rpmdb.c:196 msgid "" "\n" "--> This version of rpm was not compiled with support for db%d. Please " @@ -2940,27 +2940,28 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:238 +#. 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:292 +#: lib/rpmdb.c:293 #, fuzzy, c-format msgid "error getting \"%s\" records from %s index" msgstr "b³±d pobierania rekordu %s z %s" -#: lib/rpmdb.c:409 +#: lib/rpmdb.c:410 #, c-format msgid "error storing record %s into %s" msgstr "b³±d zapisywania rekordu %s do %s" -#: lib/rpmdb.c:418 +#: lib/rpmdb.c:419 #, 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:2073 +#: lib/rpmdb.c:619 lib/rpmdb.c:2080 msgid "no dbpath has been set" msgstr "¶cie¿ka bazy danych nie zosta³a podana" @@ -2973,125 +2974,125 @@ msgstr "" "nowym formacie" #. error -#: lib/rpmdb.c:910 +#: lib/rpmdb.c:912 #, fuzzy, c-format msgid "cannot retrieve package \"%s\" from db" msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" -#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90 +#: lib/rpmdb.c:978 lib/rpmdb.c:1496 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:1449 +#: lib/rpmdb.c:1451 #, fuzzy, c-format msgid "key \"%s\" not found in %s" msgstr "pakiet %s nie znaleziony w %s" -#: lib/rpmdb.c:1457 +#: lib/rpmdb.c:1459 #, fuzzy, c-format msgid "key \"%s\" not removed from %s" msgstr "pakiet %s nie znaleziony w %s" -#: lib/rpmdb.c:1539 +#: lib/rpmdb.c:1541 #, fuzzy, c-format msgid "removing 0 %s entries.\n" msgstr "usuwanie wpisu w bazie\n" -#: lib/rpmdb.c:1548 +#: lib/rpmdb.c:1550 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "usuwanie indeksu grupy\n" -#: lib/rpmdb.c:1556 +#: lib/rpmdb.c:1558 #, fuzzy, c-format msgid "removing %d entries in %s index:\n" msgstr "usuwanie indeksu nazw\n" -#: lib/rpmdb.c:1560 +#: lib/rpmdb.c:1562 #, c-format msgid "\t%6d %s\n" msgstr "" -#: lib/rpmdb.c:1710 +#: lib/rpmdb.c:1712 #, fuzzy msgid "cannot allocate new instance in database" msgstr "nie mo¿na alokowaæ przestrzeni dla bazy danych" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1761 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1775 +#: lib/rpmdb.c:1777 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: lib/rpmdb.c:1782 +#: lib/rpmdb.c:1784 #, c-format msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1786 +#: lib/rpmdb.c:1788 #, c-format msgid "%6d %s\n" msgstr "" -#: lib/rpmdb.c:2098 +#: lib/rpmdb.c:2105 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "odbudowywujê bazê danych w rootdir %s\n" -#: lib/rpmdb.c:2102 +#: lib/rpmdb.c:2109 #, c-format msgid "temporary database %s already exists" msgstr "tymczasowa baza danych %s ju¿ istnieje" -#: lib/rpmdb.c:2108 +#: lib/rpmdb.c:2115 #, c-format msgid "creating directory: %s\n" msgstr "tworzenie katalogu: %s\n" -#: lib/rpmdb.c:2110 +#: lib/rpmdb.c:2117 #, c-format msgid "error creating directory %s: %s" msgstr "b³±d przy tworzeniu katalogu %s: %s" -#: lib/rpmdb.c:2117 +#: lib/rpmdb.c:2123 #, fuzzy, c-format -msgid "opening old database with dbi_major %d\n" +msgid "opening old database with dbapi %d\n" msgstr "otwieranie starej bazy danych\n" -#: lib/rpmdb.c:2126 +#: lib/rpmdb.c:2133 #, fuzzy, c-format -msgid "opening new database with dbi_major %d\n" +msgid "opening new database with dbapi %d\n" msgstr "otwieranie nowej bazy danych\n" -#: lib/rpmdb.c:2148 +#: lib/rpmdb.c:2157 #, 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:2180 +#: lib/rpmdb.c:2189 #, c-format msgid "cannot add record originally at %d" msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d" -#: lib/rpmdb.c:2198 +#: lib/rpmdb.c:2207 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:2206 +#: lib/rpmdb.c:2215 msgid "failed to replace old database with new database!\n" msgstr "zamiana starej bazy na now± nie powiod³a siê!\n" -#: lib/rpmdb.c:2208 +#: lib/rpmdb.c:2217 #, 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:2214 +#: lib/rpmdb.c:2223 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index cefc9c6..0330d2b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,7 +2,7 @@ # Revised by Arnaldo Carvalho de Melo , 1998. # msgid "" -msgstr "POT-Creation-Date: 2000-05-01 13:41-0400\n" +msgstr "POT-Creation-Date: 2000-05-02 04:23-0400\n" #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422 #, c-format @@ -2229,154 +2229,154 @@ msgstr "" msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:885 +#: lib/depends.c:890 #, c-format msgid "%s: %s satisfied by Depends cache.\n" msgstr "" -#: lib/depends.c:899 +#: lib/depends.c:904 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:927 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:945 +#: lib/depends.c:950 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:963 +#: lib/depends.c:968 #, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "" -#: lib/depends.c:976 +#: lib/depends.c:981 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:991 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1010 #, c-format msgid "%s: (%s, %d) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1059 #, 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:1106 +#: lib/depends.c:1121 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "não foi passado pacote para desinstalação" -#: lib/depends.c:1236 +#: lib/depends.c:1251 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" -#: lib/db1.c:380 +#: lib/db1.c:386 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:383 +#: lib/db1.c:389 #, c-format msgid "removed db file %s\n" msgstr "" # , c-format -#: lib/db1.c:413 +#: lib/db1.c:419 #, fuzzy, c-format msgid "bad db file %s" msgstr "Não consegui abrir: %s\n" -#: lib/db1.c:418 +#: lib/db1.c:424 #, 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:426 lib/url.c:445 +#: lib/db1.c:432 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "Não consegui abrir: %s\n" -#: lib/db1.c:442 +#: lib/db1.c:448 #, fuzzy, c-format msgid "cannot get %s lock on database" msgstr "não foi passado pacote para desinstalação" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "exclusive" msgstr "" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "shared" msgstr "" -#: lib/db2.c:133 lib/db3.c:460 +#: lib/db2.c:133 lib/db3.c:456 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:145 lib/db3.c:472 +#: lib/db2.c:145 lib/db3.c:468 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:182 lib/db3.c:509 +#: lib/db2.c:182 lib/db3.c:505 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:557 lib/db3.c:880 +#: lib/db2.c:557 lib/db3.c:876 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:635 lib/db3.c:957 +#: lib/db2.c:635 lib/db3.c:965 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:253 +#: lib/db3.c:249 #, c-format msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:281 +#: lib/db3.c:277 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:289 +#: lib/db3.c:285 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:297 +#: lib/db3.c:293 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:1042 +#: lib/db3.c:1057 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s(%s)\n" msgstr "não foi passado pacote para desinstalação" -#: lib/db3.c:1049 +#: lib/db3.c:1064 #, c-format msgid "locked db index %s/%s(%s)\n" msgstr "" @@ -3088,12 +3088,12 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmdb.c:94 +#: lib/rpmdb.c:93 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:197 +#: lib/rpmdb.c:196 msgid "" "\n" "--> This version of rpm was not compiled with support for db%d. Please " @@ -3110,29 +3110,30 @@ msgid "" msgstr "" # , c-format -#: lib/rpmdb.c:238 +#. XXX FIXME: dbNopen handles failures already. +#: lib/rpmdb.c:239 #, fuzzy, c-format msgid "dbiOpen: cannot open %s index" msgstr "Não consegui abrir: %s\n" # , c-format -#: lib/rpmdb.c:292 +#: lib/rpmdb.c:293 #, fuzzy, c-format msgid "error getting \"%s\" records from %s index" msgstr "Não consegui abrir: %s\n" -#: lib/rpmdb.c:409 +#: lib/rpmdb.c:410 #, c-format msgid "error storing record %s into %s" msgstr "" # , c-format -#: lib/rpmdb.c:418 +#: lib/rpmdb.c:419 #, fuzzy, c-format msgid "error removing record %s from %s" msgstr "Não consegui abrir: %s\n" -#: lib/rpmdb.c:619 lib/rpmdb.c:2073 +#: lib/rpmdb.c:619 lib/rpmdb.c:2080 msgid "no dbpath has been set" msgstr "" @@ -3144,125 +3145,125 @@ msgstr "" # , c-format #. error -#: lib/rpmdb.c:910 +#: lib/rpmdb.c:912 #, fuzzy, c-format msgid "cannot retrieve package \"%s\" from db" msgstr "Não consegui abrir: %s\n" -#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90 +#: lib/rpmdb.c:978 lib/rpmdb.c:1496 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:1449 +#: 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:1457 +#: 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:1539 +#: lib/rpmdb.c:1541 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1548 +#: lib/rpmdb.c:1550 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1556 +#: lib/rpmdb.c:1558 #, c-format msgid "removing %d entries in %s index:\n" msgstr "" -#: lib/rpmdb.c:1560 +#: lib/rpmdb.c:1562 #, c-format msgid "\t%6d %s\n" msgstr "" -#: lib/rpmdb.c:1710 +#: lib/rpmdb.c:1712 msgid "cannot allocate new instance in database" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1761 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1775 +#: lib/rpmdb.c:1777 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1782 +#: lib/rpmdb.c:1784 #, c-format msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1786 +#: lib/rpmdb.c:1788 #, c-format msgid "%6d %s\n" msgstr "" -#: lib/rpmdb.c:2098 +#: lib/rpmdb.c:2105 #, 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:2102 +#: lib/rpmdb.c:2109 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2108 +#: lib/rpmdb.c:2115 #, c-format msgid "creating directory: %s\n" msgstr "" -#: lib/rpmdb.c:2110 +#: lib/rpmdb.c:2117 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2117 +#: lib/rpmdb.c:2123 #, fuzzy, c-format -msgid "opening old database with dbi_major %d\n" +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:2126 +#: lib/rpmdb.c:2133 #, fuzzy, c-format -msgid "opening new database with dbi_major %d\n" +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:2148 +#: lib/rpmdb.c:2157 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2180 +#: lib/rpmdb.c:2189 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2198 +#: lib/rpmdb.c:2207 msgid "failed to rebuild database; original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2206 +#: lib/rpmdb.c:2215 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2208 +#: lib/rpmdb.c:2217 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" # , c-format -#: lib/rpmdb.c:2214 +#: lib/rpmdb.c:2223 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Não consegui abrir: %s\n" diff --git a/po/rpm.pot b/po/rpm.pot index 7ae4d0b..2017dce 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-05-01 13:41-0400\n" +"POT-Creation-Date: 2000-05-02 04:23-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2019,152 +2019,152 @@ msgstr "" msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:885 +#: lib/depends.c:890 #, c-format msgid "%s: %s satisfied by Depends cache.\n" msgstr "" -#: lib/depends.c:899 +#: lib/depends.c:904 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:927 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:945 +#: lib/depends.c:950 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:963 +#: lib/depends.c:968 #, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "" -#: lib/depends.c:976 +#: lib/depends.c:981 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:991 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1010 #, c-format msgid "%s: (%s, %d) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1059 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1106 +#: lib/depends.c:1121 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1236 +#: lib/depends.c:1251 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" -#: lib/db1.c:380 +#: lib/db1.c:386 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:383 +#: lib/db1.c:389 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:413 +#: lib/db1.c:419 #, c-format msgid "bad db file %s" msgstr "" -#: lib/db1.c:418 +#: lib/db1.c:424 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" -#: lib/db1.c:426 lib/url.c:445 +#: lib/db1.c:432 lib/url.c:445 #, c-format msgid "failed to open %s: %s\n" msgstr "" -#: lib/db1.c:442 +#: lib/db1.c:448 #, c-format msgid "cannot get %s lock on database" msgstr "" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "exclusive" msgstr "" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "shared" msgstr "" -#: lib/db2.c:133 lib/db3.c:460 +#: lib/db2.c:133 lib/db3.c:456 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:145 lib/db3.c:472 +#: lib/db2.c:145 lib/db3.c:468 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:182 lib/db3.c:509 +#: lib/db2.c:182 lib/db3.c:505 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:557 lib/db3.c:880 +#: lib/db2.c:557 lib/db3.c:876 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:635 lib/db3.c:957 +#: lib/db2.c:635 lib/db3.c:965 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:253 +#: lib/db3.c:249 #, c-format msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:281 +#: lib/db3.c:277 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:289 +#: lib/db3.c:285 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:297 +#: lib/db3.c:293 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:1042 +#: lib/db3.c:1057 #, c-format msgid "cannot get %s lock on %s/%s(%s)\n" msgstr "" -#: lib/db3.c:1049 +#: lib/db3.c:1064 #, c-format msgid "locked db index %s/%s(%s)\n" msgstr "" @@ -2843,12 +2843,12 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmdb.c:94 +#: lib/rpmdb.c:93 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:197 +#: lib/rpmdb.c:196 msgid "" "\n" "--> This version of rpm was not compiled with support for db%d. Please " @@ -2864,27 +2864,28 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:238 +#. XXX FIXME: dbNopen handles failures already. +#: lib/rpmdb.c:239 #, c-format msgid "dbiOpen: cannot open %s index" msgstr "" -#: lib/rpmdb.c:292 +#: lib/rpmdb.c:293 #, c-format msgid "error getting \"%s\" records from %s index" msgstr "" -#: lib/rpmdb.c:409 +#: lib/rpmdb.c:410 #, c-format msgid "error storing record %s into %s" msgstr "" -#: lib/rpmdb.c:418 +#: lib/rpmdb.c:419 #, c-format msgid "error removing record %s from %s" msgstr "" -#: lib/rpmdb.c:619 lib/rpmdb.c:2073 +#: lib/rpmdb.c:619 lib/rpmdb.c:2080 msgid "no dbpath has been set" msgstr "" @@ -2895,124 +2896,124 @@ msgid "" msgstr "" #. error -#: lib/rpmdb.c:910 +#: lib/rpmdb.c:912 #, c-format msgid "cannot retrieve package \"%s\" from db" msgstr "" -#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90 +#: lib/rpmdb.c:978 lib/rpmdb.c:1496 lib/uninstall.c:90 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" -#: lib/rpmdb.c:1449 +#: lib/rpmdb.c:1451 #, c-format msgid "key \"%s\" not found in %s" msgstr "" -#: lib/rpmdb.c:1457 +#: lib/rpmdb.c:1459 #, c-format msgid "key \"%s\" not removed from %s" msgstr "" -#: lib/rpmdb.c:1539 +#: lib/rpmdb.c:1541 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1548 +#: lib/rpmdb.c:1550 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1556 +#: lib/rpmdb.c:1558 #, c-format msgid "removing %d entries in %s index:\n" msgstr "" -#: lib/rpmdb.c:1560 +#: lib/rpmdb.c:1562 #, c-format msgid "\t%6d %s\n" msgstr "" -#: lib/rpmdb.c:1710 +#: lib/rpmdb.c:1712 msgid "cannot allocate new instance in database" msgstr "" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1761 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1775 +#: lib/rpmdb.c:1777 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1782 +#: lib/rpmdb.c:1784 #, c-format msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1786 +#: lib/rpmdb.c:1788 #, c-format msgid "%6d %s\n" msgstr "" -#: lib/rpmdb.c:2098 +#: lib/rpmdb.c:2105 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: lib/rpmdb.c:2102 +#: lib/rpmdb.c:2109 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2108 +#: lib/rpmdb.c:2115 #, c-format msgid "creating directory: %s\n" msgstr "" -#: lib/rpmdb.c:2110 +#: lib/rpmdb.c:2117 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2117 +#: lib/rpmdb.c:2123 #, c-format -msgid "opening old database with dbi_major %d\n" +msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2126 +#: lib/rpmdb.c:2133 #, c-format -msgid "opening new database with dbi_major %d\n" +msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2148 +#: lib/rpmdb.c:2157 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2180 +#: lib/rpmdb.c:2189 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2198 +#: lib/rpmdb.c:2207 msgid "failed to rebuild database; original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2206 +#: lib/rpmdb.c:2215 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2208 +#: lib/rpmdb.c:2217 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2214 +#: lib/rpmdb.c:2223 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 2780520..642eca2 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-05-01 13:41-0400\n" +"POT-Creation-Date: 2000-05-02 04:23-0400\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" @@ -2095,152 +2095,152 @@ msgstr " msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:885 +#: lib/depends.c:890 #, fuzzy, c-format msgid "%s: %s satisfied by Depends cache.\n" msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n" -#: lib/depends.c:899 +#: lib/depends.c:904 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:927 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:945 +#: lib/depends.c:950 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:963 +#: lib/depends.c:968 #, fuzzy, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n" -#: lib/depends.c:976 +#: lib/depends.c:981 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:991 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1010 #, fuzzy, c-format msgid "%s: (%s, %d) added to Depends cache.\n" msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n" #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1059 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" #. conflicts exist. -#: lib/depends.c:1106 +#: lib/depends.c:1121 #, c-format msgid "package %s conflicts: %s\n" msgstr "ÐÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n" -#: lib/depends.c:1236 +#: lib/depends.c:1251 #, c-format msgid "loop in prerequisite chain: %s" msgstr "ÚÁÍËÎÕÔÙÊ ÃÉËÌ × ÃÅÐÏÞËÅ ÔÒÅÂÏ×ÁÎÉÊ ÄÌÑ ÕÓÔÁÎÏ×ËÉ: %s" -#: lib/db1.c:380 +#: lib/db1.c:386 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:383 +#: lib/db1.c:389 #, fuzzy, c-format msgid "removed db file %s\n" msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n" -#: lib/db1.c:413 +#: lib/db1.c:419 #, fuzzy, c-format msgid "bad db file %s" msgstr "ÎÅ×ÅÒÎÏÅ ÓÏÓÔÏÑÎÉÅ ÆÁÊÌÁ: %s" -#: lib/db1.c:418 +#: lib/db1.c:424 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "ÏÔËÒÙ×ÁÀ ÂÁÚÕ × ÒÅÖÉÍÅ 0x%x × %s\n" -#: lib/db1.c:426 lib/url.c:445 +#: lib/db1.c:432 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s: %s" -#: lib/db1.c:442 +#: lib/db1.c:448 #, c-format msgid "cannot get %s lock on database" msgstr "ÎÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ %s ÄÏÓÔÕÐ Ë ÂÁÚÅ ÄÁÎÎÙÈ" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "exclusive" msgstr "ÉÓËÌÀÞÉÔÅÌØÎÙÊ" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "shared" msgstr "ÒÁÚÄÅÌÑÅÍÙÊ" -#: lib/db2.c:133 lib/db3.c:460 +#: lib/db2.c:133 lib/db3.c:456 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:145 lib/db3.c:472 +#: lib/db2.c:145 lib/db3.c:468 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:182 lib/db3.c:509 +#: lib/db2.c:182 lib/db3.c:505 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:557 lib/db3.c:880 +#: lib/db2.c:557 lib/db3.c:876 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:635 lib/db3.c:957 +#: lib/db2.c:635 lib/db3.c:965 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:253 +#: lib/db3.c:249 #, c-format msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:281 +#: lib/db3.c:277 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:289 +#: lib/db3.c:285 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:297 +#: lib/db3.c:293 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:1042 +#: lib/db3.c:1057 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s(%s)\n" msgstr "ÎÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ %s ÄÏÓÔÕÐ Ë ÂÁÚÅ ÄÁÎÎÙÈ" -#: lib/db3.c:1049 +#: lib/db3.c:1064 #, fuzzy, c-format msgid "locked db index %s/%s(%s)\n" msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n" @@ -2923,12 +2923,12 @@ msgstr ")" msgid "OK" msgstr "Ok" -#: lib/rpmdb.c:94 +#: lib/rpmdb.c:93 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:197 +#: lib/rpmdb.c:196 msgid "" "\n" "--> This version of rpm was not compiled with support for db%d. Please " @@ -2944,27 +2944,28 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:238 +#. 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:292 +#: lib/rpmdb.c:293 #, fuzzy, c-format msgid "error getting \"%s\" records from %s index" msgstr "ÏÛÉÂËÁ ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s" -#: lib/rpmdb.c:409 +#: lib/rpmdb.c:410 #, c-format msgid "error storing record %s into %s" msgstr "ÏÛÉÂËÁ ÓÏÈÒÁÎÅÎÉÑ ÚÁÐÉÓÉ %s × %s" -#: lib/rpmdb.c:418 +#: lib/rpmdb.c:419 #, fuzzy, c-format msgid "error removing record %s from %s" msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s" -#: lib/rpmdb.c:619 lib/rpmdb.c:2073 +#: lib/rpmdb.c:619 lib/rpmdb.c:2080 msgid "no dbpath has been set" msgstr "ÎÅ ÕÓÔÁÎÏ×ÌÅÎÁ dbpath" @@ -2977,125 +2978,125 @@ msgstr "" "ÂÁÚÙ ÎÏ×ÏÇÏ ÆÏÒÍÁÔÁ" #. error -#: lib/rpmdb.c:910 +#: lib/rpmdb.c:912 #, fuzzy, c-format msgid "cannot retrieve package \"%s\" from db" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s/packages.rpm\n" -#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90 +#: lib/rpmdb.c:978 lib/rpmdb.c:1496 lib/uninstall.c:90 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "ÎÅ ÍÏÇÕ ÐÒÏÞÅÓÔØ ÈÅÄÅÒ × %d ÄÌÑ ÐÏÉÓËÁ" -#: lib/rpmdb.c:1449 +#: lib/rpmdb.c:1451 #, fuzzy, c-format msgid "key \"%s\" not found in %s" msgstr "ÐÁËÅÔ %s ÎÅ ÎÁÊÄÅÎ × %s" -#: lib/rpmdb.c:1457 +#: lib/rpmdb.c:1459 #, fuzzy, c-format msgid "key \"%s\" not removed from %s" msgstr "ÐÁËÅÔ %s ÎÅ ÎÁÊÄÅÎ × %s" -#: lib/rpmdb.c:1539 +#: lib/rpmdb.c:1541 #, fuzzy, c-format msgid "removing 0 %s entries.\n" msgstr "ÕÄÁÌÑÀ ÚÁÐÉÓØ ÂÁÚÙ ÄÁÎÎÙÈ\n" -#: lib/rpmdb.c:1548 +#: lib/rpmdb.c:1550 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÇÒÕÐÐ\n" -#: lib/rpmdb.c:1556 +#: lib/rpmdb.c:1558 #, fuzzy, c-format msgid "removing %d entries in %s index:\n" msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÉÍÅÎ\n" -#: lib/rpmdb.c:1560 +#: lib/rpmdb.c:1562 #, c-format msgid "\t%6d %s\n" msgstr "" -#: lib/rpmdb.c:1710 +#: lib/rpmdb.c:1712 #, fuzzy msgid "cannot allocate new instance in database" msgstr "ÎÅ ÍÏÇÕ ×ÙÄÅÌÉÔØ ÍÅÓÔÏ ÄÌÑ ÂÁÚÙ ÄÁÎÎÙÈ" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1761 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1775 +#: lib/rpmdb.c:1777 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "ÐÅÒÅÉÍÅÎÏ×Ù×ÁÀ %s × %s\n" -#: lib/rpmdb.c:1782 +#: lib/rpmdb.c:1784 #, c-format msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1786 +#: lib/rpmdb.c:1788 #, c-format msgid "%6d %s\n" msgstr "" -#: lib/rpmdb.c:2098 +#: lib/rpmdb.c:2105 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÀ ÂÁÚÕ × ËÏÒÎÅ×ÏÍ ËÁÔÁÌÏÇÅ %s\n" -#: lib/rpmdb.c:2102 +#: lib/rpmdb.c:2109 #, c-format msgid "temporary database %s already exists" msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ" -#: lib/rpmdb.c:2108 +#: lib/rpmdb.c:2115 #, c-format msgid "creating directory: %s\n" msgstr "ÓÏÚÄÁÀ ËÁÔÁÌÏÇ: %s\n" -#: lib/rpmdb.c:2110 +#: lib/rpmdb.c:2117 #, c-format msgid "error creating directory %s: %s" msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ËÁÔÁÌÏÇÁ %s: %s" -#: lib/rpmdb.c:2117 +#: lib/rpmdb.c:2123 #, fuzzy, c-format -msgid "opening old database with dbi_major %d\n" +msgid "opening old database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÀ ÓÔÁÒÕÀ ÂÁÚÕ\n" -#: lib/rpmdb.c:2126 +#: lib/rpmdb.c:2133 #, fuzzy, c-format -msgid "opening new database with dbi_major %d\n" +msgid "opening new database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÀ ÎÏ×ÕÀ ÂÁÚÕ\n" -#: lib/rpmdb.c:2148 +#: lib/rpmdb.c:2157 #, fuzzy, c-format msgid "record number %d in database is bad -- skipping." msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %d × ÂÁÚÅ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÀ" -#: lib/rpmdb.c:2180 +#: lib/rpmdb.c:2189 #, c-format msgid "cannot add record originally at %d" msgstr "ÎÅ ÍÏÇÕ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %d)" -#: lib/rpmdb.c:2198 +#: lib/rpmdb.c:2207 msgid "failed to rebuild database; original database remains in place\n" msgstr "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n" -#: lib/rpmdb.c:2206 +#: lib/rpmdb.c:2215 msgid "failed to replace old database with new database!\n" msgstr "ÚÁÍÅÎÁ ÓÔÁÒÏÊ ÂÁÚÙ ÎÁ ÎÏ×ÕÀ ÎÅ ÕÄÁÌÁÓØ!\n" -#: lib/rpmdb.c:2208 +#: lib/rpmdb.c:2217 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÚÁÍÅÎÑÅÔ ÆÁÊÌÙ × %s ÆÁÊÌÁÍÉ ÉÚ %s" -#: lib/rpmdb.c:2214 +#: lib/rpmdb.c:2223 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "ÕÄÁÌÅÎÉÅ ËÁÔÁÌÏÇÁ %s ÎÅ ÕÄÁÌÏÓØ: %s\n" diff --git a/po/sk.po b/po/sk.po index 43a2d55..160a13c 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 2.93\n" -"POT-Creation-Date: 2000-05-01 13:41-0400\n" +"POT-Creation-Date: 2000-05-02 04:23-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -2098,152 +2098,152 @@ msgstr "s msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:885 +#: 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:899 +#: lib/depends.c:904 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:927 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:945 +#: lib/depends.c:950 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:963 +#: lib/depends.c:968 #, fuzzy, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:976 +#: lib/depends.c:981 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:991 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1010 #, fuzzy, c-format msgid "%s: (%s, %d) added to Depends cache.\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1059 #, 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:1106 +#: lib/depends.c:1121 #, c-format msgid "package %s conflicts: %s\n" msgstr "balík %s koliduje: %s\n" -#: lib/depends.c:1236 +#: lib/depends.c:1251 #, c-format msgid "loop in prerequisite chain: %s" msgstr "sluèka v re»azi po¾iadaviek: %s" -#: lib/db1.c:380 +#: lib/db1.c:386 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:383 +#: lib/db1.c:389 #, fuzzy, c-format msgid "removed db file %s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: lib/db1.c:413 +#: lib/db1.c:419 #, fuzzy, c-format msgid "bad db file %s" msgstr "chybný stav súboru: %s" -#: lib/db1.c:418 +#: lib/db1.c:424 #, 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:426 lib/url.c:445 +#: lib/db1.c:432 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" -#: lib/db1.c:442 +#: lib/db1.c:448 #, 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:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "exclusive" msgstr "výhradný" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "shared" msgstr "zdieµaný" -#: lib/db2.c:133 lib/db3.c:460 +#: lib/db2.c:133 lib/db3.c:456 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:145 lib/db3.c:472 +#: lib/db2.c:145 lib/db3.c:468 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:182 lib/db3.c:509 +#: lib/db2.c:182 lib/db3.c:505 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:557 lib/db3.c:880 +#: lib/db2.c:557 lib/db3.c:876 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:635 lib/db3.c:957 +#: lib/db2.c:635 lib/db3.c:965 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:253 +#: lib/db3.c:249 #, c-format msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:281 +#: lib/db3.c:277 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:289 +#: lib/db3.c:285 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:297 +#: lib/db3.c:293 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:1042 +#: lib/db3.c:1057 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s(%s)\n" msgstr "nie je mo¾né získa» %s zámok pre databázu" -#: lib/db3.c:1049 +#: lib/db3.c:1064 #, fuzzy, c-format msgid "locked db index %s/%s(%s)\n" msgstr "odstraòuje sa index súborov pre %s\n" @@ -2927,12 +2927,12 @@ msgstr ")" msgid "OK" msgstr "V PORIADKU" -#: lib/rpmdb.c:94 +#: lib/rpmdb.c:93 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:197 +#: lib/rpmdb.c:196 msgid "" "\n" "--> This version of rpm was not compiled with support for db%d. Please " @@ -2948,27 +2948,28 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:238 +#. 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:292 +#: lib/rpmdb.c:293 #, fuzzy, c-format msgid "error getting \"%s\" records from %s index" msgstr "chyba pri naèítaní záznamu %s z %s" -#: lib/rpmdb.c:409 +#: lib/rpmdb.c:410 #, c-format msgid "error storing record %s into %s" msgstr "chyba pri zápise záznamu %s do %s" -#: lib/rpmdb.c:418 +#: lib/rpmdb.c:419 #, 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:2073 +#: lib/rpmdb.c:619 lib/rpmdb.c:2080 msgid "no dbpath has been set" msgstr "nebola nastavená ¾iadna dbpath" @@ -2981,125 +2982,125 @@ msgstr "" "databázy v novom formáte" #. error -#: lib/rpmdb.c:910 +#: lib/rpmdb.c:912 #, fuzzy, c-format msgid "cannot retrieve package \"%s\" from db" msgstr "nie je mo¾né otvori» %s/packages.rpm\n" -#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90 +#: lib/rpmdb.c:978 lib/rpmdb.c:1496 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:1449 +#: 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:1457 +#: 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:1539 +#: lib/rpmdb.c:1541 #, fuzzy, c-format msgid "removing 0 %s entries.\n" msgstr "odstraòuje sa záznam z databázy\n" -#: lib/rpmdb.c:1548 +#: lib/rpmdb.c:1550 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuje sa index skupín\n" -#: lib/rpmdb.c:1556 +#: lib/rpmdb.c:1558 #, fuzzy, c-format msgid "removing %d entries in %s index:\n" msgstr "odstraòuje sa index názvov\n" -#: lib/rpmdb.c:1560 +#: lib/rpmdb.c:1562 #, c-format msgid "\t%6d %s\n" msgstr "" -#: lib/rpmdb.c:1710 +#: lib/rpmdb.c:1712 #, fuzzy msgid "cannot allocate new instance in database" msgstr "nie je mo¾né prideli» miesto pre databázu" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1761 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1775 +#: lib/rpmdb.c:1777 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: lib/rpmdb.c:1782 +#: lib/rpmdb.c:1784 #, c-format msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1786 +#: lib/rpmdb.c:1788 #, c-format msgid "%6d %s\n" msgstr "" -#: lib/rpmdb.c:2098 +#: lib/rpmdb.c:2105 #, 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:2102 +#: lib/rpmdb.c:2109 #, c-format msgid "temporary database %s already exists" msgstr "doèasná databáza %s u¾ existuje" -#: lib/rpmdb.c:2108 +#: lib/rpmdb.c:2115 #, c-format msgid "creating directory: %s\n" msgstr "vytvára sa adresár %s\n" -#: lib/rpmdb.c:2110 +#: lib/rpmdb.c:2117 #, c-format msgid "error creating directory %s: %s" msgstr "chyba pri vytváraní adresára %s: %s" -#: lib/rpmdb.c:2117 +#: lib/rpmdb.c:2123 #, fuzzy, c-format -msgid "opening old database with dbi_major %d\n" +msgid "opening old database with dbapi %d\n" msgstr "otvára sa stará databáza\n" -#: lib/rpmdb.c:2126 +#: lib/rpmdb.c:2133 #, fuzzy, c-format -msgid "opening new database with dbi_major %d\n" +msgid "opening new database with dbapi %d\n" msgstr "otvára sa nová databáza\n" -#: lib/rpmdb.c:2148 +#: lib/rpmdb.c:2157 #, 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:2180 +#: lib/rpmdb.c:2189 #, c-format msgid "cannot add record originally at %d" msgstr "nie je mo¾né prida» záznam pôvodne na %d" -#: lib/rpmdb.c:2198 +#: lib/rpmdb.c:2207 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:2206 +#: lib/rpmdb.c:2215 msgid "failed to replace old database with new database!\n" msgstr "nepodarilo sa nahradi» starú databázu novou!\n" -#: lib/rpmdb.c:2208 +#: lib/rpmdb.c:2217 #, 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:2214 +#: lib/rpmdb.c:2223 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nepodarilo sa odstráni» adresár %s: %s\n" diff --git a/po/sl.po b/po/sl.po index d7d4b5c..ed79718 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin , 2000. -# $Id: sl.po,v 1.36 2000/05/01 17:50:36 jbj Exp $ +# $Id: sl.po,v 1.37 2000/05/02 08:30:33 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 3.0.4\n" -"POT-Creation-Date: 2000-05-01 13:41-0400\n" +"POT-Creation-Date: 2000-05-02 04:23-0400\n" "PO-Revision-Date: 2000-02-17 22:25+01:00\n" "Last-Translator: Primo¾ Peterlin \n" "Language-Team: Slovenian \n" @@ -2081,152 +2081,152 @@ msgstr "%s: %s zadovoljen ob dodatnem paketu.\n" msgid "%s: %s satisfied by added provide.\n" msgstr "%s: %s zadovoljen ob dodatni ponudbi.\n" -#: lib/depends.c:885 +#: lib/depends.c:890 #, fuzzy, c-format msgid "%s: %s satisfied by Depends cache.\n" msgstr "%s: %s zadovoljen ob dodatnem paketu.\n" -#: lib/depends.c:899 +#: lib/depends.c:904 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "%s: %s zadovoljen ob dodatnem ponudbi rpmrc.\n" -#: lib/depends.c:927 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "%s: %s zadovoljen ob seznamu datotek db.\n" -#: lib/depends.c:945 +#: lib/depends.c:950 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "%s: %s zadovoljen ob ponudbi db.\n" -#: lib/depends.c:963 +#: lib/depends.c:968 #, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "%s: %s zadovoljen ob paketih db.\n" -#: lib/depends.c:976 +#: lib/depends.c:981 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "%s: %s zadovoljen ob razlièici rpmlib.\n" -#: lib/depends.c:986 +#: lib/depends.c:991 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "%s: %s nezadovoljen.\n" -#: lib/depends.c:997 +#: lib/depends.c:1010 #, fuzzy, c-format msgid "%s: (%s, %d) added to Depends cache.\n" msgstr "%s: %s zadovoljen ob dodatnem paketu.\n" #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1059 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "paket %s zahteva, a ni zadovoljeno: %s\n" #. conflicts exist. -#: lib/depends.c:1106 +#: lib/depends.c:1121 #, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s v sporu: %s\n" -#: lib/depends.c:1236 +#: lib/depends.c:1251 #, c-format msgid "loop in prerequisite chain: %s" msgstr "zanka v predpogojevani verigi: %s" -#: lib/db1.c:380 +#: lib/db1.c:386 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:383 +#: lib/db1.c:389 #, fuzzy, c-format msgid "removed db file %s\n" msgstr "odstranjujemo seznam datotek za %s\n" -#: lib/db1.c:413 +#: lib/db1.c:419 #, fuzzy, c-format msgid "bad db file %s" msgstr "okvarjeno stanje datoteke: %s" -#: lib/db1.c:418 +#: lib/db1.c:424 #, 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:426 lib/url.c:445 +#: lib/db1.c:432 lib/url.c:445 #, c-format msgid "failed to open %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" -#: lib/db1.c:442 +#: lib/db1.c:448 #, c-format msgid "cannot get %s lock on database" msgstr "datoteke ni mo¾no %s zakleniti" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "exclusive" msgstr "izkljuèujoèe" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "shared" msgstr "deljeno" -#: lib/db2.c:133 lib/db3.c:460 +#: lib/db2.c:133 lib/db3.c:456 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:145 lib/db3.c:472 +#: lib/db2.c:145 lib/db3.c:468 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:182 lib/db3.c:509 +#: lib/db2.c:182 lib/db3.c:505 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:557 lib/db3.c:880 +#: lib/db2.c:557 lib/db3.c:876 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:635 lib/db3.c:957 +#: lib/db2.c:635 lib/db3.c:965 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:253 +#: lib/db3.c:249 #, c-format msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:281 +#: lib/db3.c:277 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:289 +#: lib/db3.c:285 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:297 +#: lib/db3.c:293 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:1042 +#: lib/db3.c:1057 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s(%s)\n" msgstr "datoteke ni mo¾no %s zakleniti" -#: lib/db3.c:1049 +#: lib/db3.c:1064 #, fuzzy, c-format msgid "locked db index %s/%s(%s)\n" msgstr "odstranjujemo seznam datotek za %s\n" @@ -2912,12 +2912,12 @@ msgstr ")" msgid "OK" msgstr "V REDU" -#: lib/rpmdb.c:94 +#: lib/rpmdb.c:93 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:197 +#: lib/rpmdb.c:196 msgid "" "\n" "--> This version of rpm was not compiled with support for db%d. Please " @@ -2933,27 +2933,28 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:238 +#. 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:292 +#: lib/rpmdb.c:293 #, fuzzy, c-format msgid "error getting \"%s\" records from %s index" msgstr "napaka pri branju zapisa %s iz %s" -#: lib/rpmdb.c:409 +#: lib/rpmdb.c:410 #, c-format msgid "error storing record %s into %s" msgstr "napaka pri pisanju zapisa %s v %s" -#: lib/rpmdb.c:418 +#: lib/rpmdb.c:419 #, 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:2073 +#: lib/rpmdb.c:619 lib/rpmdb.c:2080 msgid "no dbpath has been set" msgstr "dbpath ni nastavljena" @@ -2964,126 +2965,126 @@ msgid "" msgstr "staro obliko podatkove zbirke pretvorite v novo z --rebuilddb" #. error -#: lib/rpmdb.c:910 +#: lib/rpmdb.c:912 #, fuzzy, c-format msgid "cannot retrieve package \"%s\" from db" msgstr "paketa ni mo¾no odpreti: %s\n" -#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90 +#: lib/rpmdb.c:978 lib/rpmdb.c:1496 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:1449 +#: lib/rpmdb.c:1451 #, fuzzy, c-format msgid "key \"%s\" not found in %s" msgstr "paketa %s ni najti v %s" -#: lib/rpmdb.c:1457 +#: lib/rpmdb.c:1459 #, fuzzy, c-format msgid "key \"%s\" not removed from %s" msgstr "paketa %s ni najti v %s" -#: lib/rpmdb.c:1539 +#: lib/rpmdb.c:1541 #, fuzzy, c-format msgid "removing 0 %s entries.\n" msgstr "odstranjujemo vnose v podatkovni zbirki\n" -#: lib/rpmdb.c:1548 +#: lib/rpmdb.c:1550 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstranjujemo seznam skupin\n" -#: lib/rpmdb.c:1556 +#: lib/rpmdb.c:1558 #, fuzzy, c-format msgid "removing %d entries in %s index:\n" msgstr "odstranjujemo seznam imen\n" -#: lib/rpmdb.c:1560 +#: lib/rpmdb.c:1562 #, c-format msgid "\t%6d %s\n" msgstr "" -#: lib/rpmdb.c:1710 +#: lib/rpmdb.c:1712 #, fuzzy msgid "cannot allocate new instance in database" msgstr "ni mo¾no zagotoviti prostora za podatkovno zbirko" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1761 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1775 +#: lib/rpmdb.c:1777 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "preimenujemo %s v %s\n" -#: lib/rpmdb.c:1782 +#: lib/rpmdb.c:1784 #, c-format msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1786 +#: lib/rpmdb.c:1788 #, c-format msgid "%6d %s\n" msgstr "" -#: lib/rpmdb.c:2098 +#: lib/rpmdb.c:2105 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n" -#: lib/rpmdb.c:2102 +#: lib/rpmdb.c:2109 #, c-format msgid "temporary database %s already exists" msgstr "zaèasna podatkovna zbirka %s ¾e obstaja" -#: lib/rpmdb.c:2108 +#: lib/rpmdb.c:2115 #, c-format msgid "creating directory: %s\n" msgstr "ustvarjamo imenik: %s\n" -#: lib/rpmdb.c:2110 +#: lib/rpmdb.c:2117 #, c-format msgid "error creating directory %s: %s" msgstr "napaka pri ustvarjanju imenika %s: %s" -#: lib/rpmdb.c:2117 +#: lib/rpmdb.c:2123 #, fuzzy, c-format -msgid "opening old database with dbi_major %d\n" +msgid "opening old database with dbapi %d\n" msgstr "odpiramo staro podatkovno zbirko\n" -#: lib/rpmdb.c:2126 +#: lib/rpmdb.c:2133 #, fuzzy, c-format -msgid "opening new database with dbi_major %d\n" +msgid "opening new database with dbapi %d\n" msgstr "odpiramo novo podatkovno zbirko\n" -#: lib/rpmdb.c:2148 +#: lib/rpmdb.c:2157 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "zapis ¹t. %d v zbirki je okvarjen -- preskakujemo." -#: lib/rpmdb.c:2180 +#: lib/rpmdb.c:2189 #, c-format msgid "cannot add record originally at %d" msgstr "zapisa ni mo¾no dodati na %d" -#: lib/rpmdb.c:2198 +#: lib/rpmdb.c:2207 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:2206 +#: lib/rpmdb.c:2215 msgid "failed to replace old database with new database!\n" msgstr "zamenjava stare podatkovne zbirke z novo neuspe¹na!\n" -#: lib/rpmdb.c:2208 +#: lib/rpmdb.c:2217 #, 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:2214 +#: lib/rpmdb.c:2223 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspe¹na odstranitev imenika %s: %s\n" diff --git a/po/sr.po b/po/sr.po index 94be8d2..1e048cd 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-05-01 13:41-0400\n" +"POT-Creation-Date: 2000-05-02 04:23-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" "From: Erik Troan \n" @@ -2128,152 +2128,152 @@ msgstr "datoteka %s ne pripada nijednom paketu\n" msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:885 +#: 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:899 +#: lib/depends.c:904 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:927 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:945 +#: lib/depends.c:950 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:963 +#: lib/depends.c:968 #, fuzzy, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:976 +#: lib/depends.c:981 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:991 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1010 #, fuzzy, c-format msgid "%s: (%s, %d) added to Depends cache.\n" msgstr "datoteka %s ne pripada nijednom paketu\n" #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1059 #, fuzzy, c-format msgid "package %s require not satisfied: %s\n" msgstr "paket %s nije naveden u %s" #. conflicts exist. -#: lib/depends.c:1106 +#: lib/depends.c:1121 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s nije naveden u %s" -#: lib/depends.c:1236 +#: lib/depends.c:1251 #, c-format msgid "loop in prerequisite chain: %s" msgstr "petlja u lancu: %s" -#: lib/db1.c:380 +#: lib/db1.c:386 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:383 +#: lib/db1.c:389 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:413 +#: lib/db1.c:419 #, fuzzy, c-format msgid "bad db file %s" msgstr "neuspelo otvaranje %s: %s" -#: lib/db1.c:418 +#: lib/db1.c:424 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: lib/db1.c:426 lib/url.c:445 +#: lib/db1.c:432 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/db1.c:442 +#: lib/db1.c:448 #, c-format msgid "cannot get %s lock on database" msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "exclusive" msgstr "ekskluzivno" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "shared" msgstr "deljeno" -#: lib/db2.c:133 lib/db3.c:460 +#: lib/db2.c:133 lib/db3.c:456 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:145 lib/db3.c:472 +#: lib/db2.c:145 lib/db3.c:468 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:182 lib/db3.c:509 +#: lib/db2.c:182 lib/db3.c:505 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:557 lib/db3.c:880 +#: lib/db2.c:557 lib/db3.c:876 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:635 lib/db3.c:957 +#: lib/db2.c:635 lib/db3.c:965 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:253 +#: lib/db3.c:249 #, c-format msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:281 +#: lib/db3.c:277 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:289 +#: lib/db3.c:285 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:297 +#: lib/db3.c:293 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:1042 +#: lib/db3.c:1057 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s(%s)\n" msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka" -#: lib/db3.c:1049 +#: lib/db3.c:1064 #, c-format msgid "locked db index %s/%s(%s)\n" msgstr "" @@ -2975,12 +2975,12 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmdb.c:94 +#: lib/rpmdb.c:93 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:197 +#: lib/rpmdb.c:196 msgid "" "\n" "--> This version of rpm was not compiled with support for db%d. Please " @@ -2996,27 +2996,28 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:238 +#. 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:292 +#: lib/rpmdb.c:293 #, fuzzy, c-format msgid "error getting \"%s\" records from %s index" msgstr "gre¹ka kod uzimanja sloga %s iz %s" -#: lib/rpmdb.c:409 +#: lib/rpmdb.c:410 #, c-format msgid "error storing record %s into %s" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: lib/rpmdb.c:418 +#: lib/rpmdb.c:419 #, 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:2073 +#: lib/rpmdb.c:619 lib/rpmdb.c:2080 msgid "no dbpath has been set" msgstr "dbpath nije odreðen" @@ -3027,125 +3028,125 @@ msgid "" msgstr "" #. error -#: lib/rpmdb.c:910 +#: lib/rpmdb.c:912 #, 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:976 lib/rpmdb.c:1494 lib/uninstall.c:90 +#: lib/rpmdb.c:978 lib/rpmdb.c:1496 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:1449 +#: 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:1457 +#: 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:1539 +#: lib/rpmdb.c:1541 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1548 +#: lib/rpmdb.c:1550 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: lib/rpmdb.c:1556 +#: lib/rpmdb.c:1558 #, fuzzy, c-format msgid "removing %d entries in %s index:\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: lib/rpmdb.c:1560 +#: lib/rpmdb.c:1562 #, c-format msgid "\t%6d %s\n" msgstr "" -#: lib/rpmdb.c:1710 +#: lib/rpmdb.c:1712 #, fuzzy msgid "cannot allocate new instance in database" msgstr "ne mogu da zauzmem prostor za bazu podataka" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1761 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1775 +#: lib/rpmdb.c:1777 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1782 +#: lib/rpmdb.c:1784 #, c-format msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1786 +#: lib/rpmdb.c:1788 #, c-format msgid "%6d %s\n" msgstr "" -#: lib/rpmdb.c:2098 +#: lib/rpmdb.c:2105 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: lib/rpmdb.c:2102 +#: lib/rpmdb.c:2109 #, c-format msgid "temporary database %s already exists" msgstr "privremena baza podataka %s veæ postoji" -#: lib/rpmdb.c:2108 +#: lib/rpmdb.c:2115 #, fuzzy, c-format msgid "creating directory: %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/rpmdb.c:2110 +#: lib/rpmdb.c:2117 #, c-format msgid "error creating directory %s: %s" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/rpmdb.c:2117 +#: lib/rpmdb.c:2123 #, fuzzy, c-format -msgid "opening old database with dbi_major %d\n" +msgid "opening old database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: lib/rpmdb.c:2126 +#: lib/rpmdb.c:2133 #, fuzzy, c-format -msgid "opening new database with dbi_major %d\n" +msgid "opening new database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: lib/rpmdb.c:2148 +#: lib/rpmdb.c:2157 #, 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:2180 +#: lib/rpmdb.c:2189 #, c-format msgid "cannot add record originally at %d" msgstr "ne mogu da dodam slog originalno na %d" -#: lib/rpmdb.c:2198 +#: lib/rpmdb.c:2207 msgid "failed to rebuild database; original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2206 +#: lib/rpmdb.c:2215 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2208 +#: lib/rpmdb.c:2217 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2214 +#: lib/rpmdb.c:2223 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspelo otvaranje %s: %s" diff --git a/po/sv.po b/po/sv.po index 2487140..7354dda 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,12 +1,12 @@ # Swedish messages for RPM # Copyright © 1999 Free Software Foundation, Inc. # Göran Uddeborg , 1999, 2000. -# $Revision: 1.96 $ +# $Revision: 1.97 $ # msgid "" msgstr "" "Project-Id-Version: rpm 3.0.4\n" -"POT-Creation-Date: 2000-05-01 13:41-0400\n" +"POT-Creation-Date: 2000-05-02 04:23-0400\n" "PO-Revision-Date: 2000-02-21 12:20+0100\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -2070,152 +2070,152 @@ msgstr "%s: %s uppfyllt av tillagt paket.\n" msgid "%s: %s satisfied by added provide.\n" msgstr "%s: %s uppfyllt av tillagt tillhandahållande (provide).\n" -#: lib/depends.c:885 +#: lib/depends.c:890 #, fuzzy, c-format msgid "%s: %s satisfied by Depends cache.\n" msgstr "%s: %s uppfyllt av tillagt paket.\n" -#: lib/depends.c:899 +#: lib/depends.c:904 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "%s: %s uppfyllt av tillhandahållanden (provides) från rpmrc.\n" -#: lib/depends.c:927 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "%s: %s uppfyllt av fillistor från db.\n" -#: lib/depends.c:945 +#: lib/depends.c:950 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "%s: %s uppfyllt av tillhandahållanden (provides) från db.\n" -#: lib/depends.c:963 +#: lib/depends.c:968 #, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "%s: %s uppfyllt av db-paket.\n" -#: lib/depends.c:976 +#: lib/depends.c:981 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "%s: %s uppfyllt av rpmlib-version.\n" -#: lib/depends.c:986 +#: lib/depends.c:991 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "%s: %s ej uppfyllt.\n" -#: lib/depends.c:997 +#: lib/depends.c:1010 #, fuzzy, c-format msgid "%s: (%s, %d) added to Depends cache.\n" msgstr "%s: %s uppfyllt av tillagt paket.\n" #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1059 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "paket %s behov inte uppfyllda: %s\n" #. conflicts exist. -#: lib/depends.c:1106 +#: lib/depends.c:1121 #, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s står i konflikt: %s\n" -#: lib/depends.c:1236 +#: lib/depends.c:1251 #, c-format msgid "loop in prerequisite chain: %s" msgstr "cirkularitet i kedja av förutsättningar: %s" -#: lib/db1.c:380 +#: lib/db1.c:386 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:383 +#: lib/db1.c:389 #, fuzzy, c-format msgid "removed db file %s\n" msgstr "tar bort filindex för %s\n" -#: lib/db1.c:413 +#: lib/db1.c:419 #, fuzzy, c-format msgid "bad db file %s" msgstr "felaktig filstatus: %s" -#: lib/db1.c:418 +#: lib/db1.c:424 #, 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:426 lib/url.c:445 +#: lib/db1.c:432 lib/url.c:445 #, c-format msgid "failed to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" -#: lib/db1.c:442 +#: lib/db1.c:448 #, c-format msgid "cannot get %s lock on database" msgstr "kan inte få %s lås på databas" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "exclusive" msgstr "uteslutande" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "shared" msgstr "delat" -#: lib/db2.c:133 lib/db3.c:460 +#: lib/db2.c:133 lib/db3.c:456 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:145 lib/db3.c:472 +#: lib/db2.c:145 lib/db3.c:468 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:182 lib/db3.c:509 +#: lib/db2.c:182 lib/db3.c:505 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:557 lib/db3.c:880 +#: lib/db2.c:557 lib/db3.c:876 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:635 lib/db3.c:957 +#: lib/db2.c:635 lib/db3.c:965 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:253 +#: lib/db3.c:249 #, c-format msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:281 +#: lib/db3.c:277 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:289 +#: lib/db3.c:285 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:297 +#: lib/db3.c:293 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:1042 +#: lib/db3.c:1057 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s(%s)\n" msgstr "kan inte få %s lås på databas" -#: lib/db3.c:1049 +#: lib/db3.c:1064 #, fuzzy, c-format msgid "locked db index %s/%s(%s)\n" msgstr "tar bort filindex för %s\n" @@ -2904,12 +2904,12 @@ msgstr ")" msgid "OK" msgstr "OK" -#: lib/rpmdb.c:94 +#: lib/rpmdb.c:93 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:197 +#: lib/rpmdb.c:196 msgid "" "\n" "--> This version of rpm was not compiled with support for db%d. Please " @@ -2925,27 +2925,28 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:238 +#. 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:292 +#: lib/rpmdb.c:293 #, 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:409 +#: lib/rpmdb.c:410 #, c-format msgid "error storing record %s into %s" msgstr "fel när post %s sparades i %s" -#: lib/rpmdb.c:418 +#: lib/rpmdb.c:419 #, 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:2073 +#: lib/rpmdb.c:619 lib/rpmdb.c:2080 msgid "no dbpath has been set" msgstr "ingen dbpath har satts" @@ -2958,125 +2959,125 @@ msgstr "" "i nytt format" #. error -#: lib/rpmdb.c:910 +#: lib/rpmdb.c:912 #, fuzzy, c-format msgid "cannot retrieve package \"%s\" from db" msgstr "kan inte öppna paket: %s\n" -#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90 +#: lib/rpmdb.c:978 lib/rpmdb.c:1496 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:1449 +#: lib/rpmdb.c:1451 #, fuzzy, c-format msgid "key \"%s\" not found in %s" msgstr "fann ej paket %s i %s" -#: lib/rpmdb.c:1457 +#: lib/rpmdb.c:1459 #, fuzzy, c-format msgid "key \"%s\" not removed from %s" msgstr "fann ej paket %s i %s" -#: lib/rpmdb.c:1539 +#: lib/rpmdb.c:1541 #, fuzzy, c-format msgid "removing 0 %s entries.\n" msgstr "tar bort databasposter\n" -#: lib/rpmdb.c:1548 +#: lib/rpmdb.c:1550 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "tar bort gruppindex\n" -#: lib/rpmdb.c:1556 +#: lib/rpmdb.c:1558 #, fuzzy, c-format msgid "removing %d entries in %s index:\n" msgstr "tar bort namnindex\n" -#: lib/rpmdb.c:1560 +#: lib/rpmdb.c:1562 #, c-format msgid "\t%6d %s\n" msgstr "" -#: lib/rpmdb.c:1710 +#: lib/rpmdb.c:1712 #, fuzzy msgid "cannot allocate new instance in database" msgstr "kan inte allokera plats för databas" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1761 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1775 +#: lib/rpmdb.c:1777 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "byter namn på %s till %s\n" -#: lib/rpmdb.c:1782 +#: lib/rpmdb.c:1784 #, c-format msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1786 +#: lib/rpmdb.c:1788 #, c-format msgid "%6d %s\n" msgstr "" -#: lib/rpmdb.c:2098 +#: lib/rpmdb.c:2105 #, c-format msgid "rebuilding database %s into %s\n" msgstr "bygger om databas %s till %s\n" -#: lib/rpmdb.c:2102 +#: lib/rpmdb.c:2109 #, c-format msgid "temporary database %s already exists" msgstr "tillfällig databas %s existerar redan" -#: lib/rpmdb.c:2108 +#: lib/rpmdb.c:2115 #, c-format msgid "creating directory: %s\n" msgstr "skapar katalog: %s\n" -#: lib/rpmdb.c:2110 +#: lib/rpmdb.c:2117 #, c-format msgid "error creating directory %s: %s" msgstr "fel när katalog skapades %s: %s" -#: lib/rpmdb.c:2117 +#: lib/rpmdb.c:2123 #, fuzzy, c-format -msgid "opening old database with dbi_major %d\n" +msgid "opening old database with dbapi %d\n" msgstr "öppnar gammal databas\n" -#: lib/rpmdb.c:2126 +#: lib/rpmdb.c:2133 #, fuzzy, c-format -msgid "opening new database with dbi_major %d\n" +msgid "opening new database with dbapi %d\n" msgstr "öppnar ny databas\n" -#: lib/rpmdb.c:2148 +#: lib/rpmdb.c:2157 #, 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:2180 +#: lib/rpmdb.c:2189 #, c-format msgid "cannot add record originally at %d" msgstr "kan inte lägga till post ursprungligen vid %d" -#: lib/rpmdb.c:2198 +#: lib/rpmdb.c:2207 msgid "failed to rebuild database; original database remains in place\n" msgstr "kunde inte bygga om databasen; orginaldatabasen finns kvar\n" -#: lib/rpmdb.c:2206 +#: lib/rpmdb.c:2215 msgid "failed to replace old database with new database!\n" msgstr "kunde inte ersätta gammal databas med ny databas!\n" -#: lib/rpmdb.c:2208 +#: lib/rpmdb.c:2217 #, 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:2214 +#: lib/rpmdb.c:2223 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunde inte ta bort katalogen %s: %s\n" diff --git a/po/tr.po b/po/tr.po index 511af59..a8adc68 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-05-01 13:41-0400\n" +"POT-Creation-Date: 2000-05-02 04:23-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2166,152 +2166,152 @@ msgstr "%s dosyas msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:885 +#: 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:899 +#: lib/depends.c:904 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:927 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:945 +#: lib/depends.c:950 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:963 +#: lib/depends.c:968 #, fuzzy, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "%s dosyasý, hiç bir pakete ait deðil\n" -#: lib/depends.c:976 +#: lib/depends.c:981 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:991 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1010 #, fuzzy, c-format msgid "%s: (%s, %d) added to Depends cache.\n" msgstr "%s dosyasý, hiç bir pakete ait deðil\n" #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1059 #, 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:1106 +#: lib/depends.c:1121 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "%s paketi %s altýnda gözükmüyor" -#: lib/depends.c:1236 +#: lib/depends.c:1251 #, c-format msgid "loop in prerequisite chain: %s" msgstr "gerekenler zincirinde döngü: %s" -#: lib/db1.c:380 +#: lib/db1.c:386 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:383 +#: lib/db1.c:389 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:413 +#: lib/db1.c:419 #, fuzzy, c-format msgid "bad db file %s" msgstr "%s açýlamadý: %s" -#: lib/db1.c:418 +#: lib/db1.c:424 #, 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:426 lib/url.c:445 +#: lib/db1.c:432 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "%s açýlamadý: %s" -#: lib/db1.c:442 +#: lib/db1.c:448 #, c-format msgid "cannot get %s lock on database" msgstr "Veritabaný için %s kilit (lock) alýnamadý" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "exclusive" msgstr "özel" -#: lib/db1.c:443 lib/db3.c:1044 +#: lib/db1.c:449 lib/db3.c:1059 msgid "shared" msgstr "paylaþýlan (shared)" -#: lib/db2.c:133 lib/db3.c:460 +#: lib/db2.c:133 lib/db3.c:456 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:145 lib/db3.c:472 +#: lib/db2.c:145 lib/db3.c:468 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:182 lib/db3.c:509 +#: lib/db2.c:182 lib/db3.c:505 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:557 lib/db3.c:880 +#: lib/db2.c:557 lib/db3.c:876 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:635 lib/db3.c:957 +#: lib/db2.c:635 lib/db3.c:965 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:253 +#: lib/db3.c:249 #, c-format msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:281 +#: lib/db3.c:277 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:289 +#: lib/db3.c:285 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:297 +#: lib/db3.c:293 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:1042 +#: lib/db3.c:1057 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s(%s)\n" msgstr "Veritabaný için %s kilit (lock) alýnamadý" -#: lib/db3.c:1049 +#: lib/db3.c:1064 #, c-format msgid "locked db index %s/%s(%s)\n" msgstr "" @@ -3015,12 +3015,12 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmdb.c:94 +#: lib/rpmdb.c:93 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:197 +#: lib/rpmdb.c:196 msgid "" "\n" "--> This version of rpm was not compiled with support for db%d. Please " @@ -3036,27 +3036,28 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:238 +#. 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:292 +#: lib/rpmdb.c:293 #, fuzzy, c-format msgid "error getting \"%s\" records from %s index" msgstr "%s kaydýna %s dosyasýnda eriþilemiyor:" -#: lib/rpmdb.c:409 +#: lib/rpmdb.c:410 #, c-format msgid "error storing record %s into %s" msgstr "%s kaydý %s dosyasýna yazýlamýyor" -#: lib/rpmdb.c:418 +#: lib/rpmdb.c:419 #, 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:2073 +#: lib/rpmdb.c:619 lib/rpmdb.c:2080 msgid "no dbpath has been set" msgstr "dbpath deðeri girilmemiþ" @@ -3067,126 +3068,126 @@ msgid "" msgstr "" #. error -#: lib/rpmdb.c:910 +#: lib/rpmdb.c:912 #, fuzzy, c-format msgid "cannot retrieve package \"%s\" from db" msgstr "hata: %s%s/packages.rpm açýlamýyor\n" -#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90 +#: lib/rpmdb.c:978 lib/rpmdb.c:1496 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:1449 +#: lib/rpmdb.c:1451 #, fuzzy, c-format msgid "key \"%s\" not found in %s" msgstr "%s pakedi %s içerisinde bulunamadý" -#: lib/rpmdb.c:1457 +#: lib/rpmdb.c:1459 #, fuzzy, c-format msgid "key \"%s\" not removed from %s" msgstr "%s pakedi %s içerisinde bulunamadý" -#: lib/rpmdb.c:1539 +#: lib/rpmdb.c:1541 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1548 +#: lib/rpmdb.c:1550 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata" -#: lib/rpmdb.c:1556 +#: lib/rpmdb.c:1558 #, fuzzy, c-format msgid "removing %d entries in %s index:\n" msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata" -#: lib/rpmdb.c:1560 +#: lib/rpmdb.c:1562 #, c-format msgid "\t%6d %s\n" msgstr "" # reservieren??? -#: lib/rpmdb.c:1710 +#: lib/rpmdb.c:1712 #, fuzzy msgid "cannot allocate new instance in database" msgstr "Veritabaný için yer bulunamadý" -#: lib/rpmdb.c:1759 +#: lib/rpmdb.c:1761 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1775 +#: lib/rpmdb.c:1777 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1782 +#: lib/rpmdb.c:1784 #, c-format msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1786 +#: lib/rpmdb.c:1788 #, c-format msgid "%6d %s\n" msgstr "" -#: lib/rpmdb.c:2098 +#: lib/rpmdb.c:2105 #, 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:2102 +#: lib/rpmdb.c:2109 #, c-format msgid "temporary database %s already exists" msgstr "geçici veritabaný %s mevcut" -#: lib/rpmdb.c:2108 +#: lib/rpmdb.c:2115 #, fuzzy, c-format msgid "creating directory: %s\n" msgstr "%s dizinin oluþturulmasýnda hata: %s" -#: lib/rpmdb.c:2110 +#: lib/rpmdb.c:2117 #, c-format msgid "error creating directory %s: %s" msgstr "%s dizinin oluþturulmasýnda hata: %s" -#: lib/rpmdb.c:2117 +#: lib/rpmdb.c:2123 #, fuzzy, c-format -msgid "opening old database with dbi_major %d\n" +msgid "opening old database with dbapi %d\n" msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur" -#: lib/rpmdb.c:2126 +#: lib/rpmdb.c:2133 #, fuzzy, c-format -msgid "opening new database with dbi_major %d\n" +msgid "opening new database with dbapi %d\n" msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur" -#: lib/rpmdb.c:2148 +#: lib/rpmdb.c:2157 #, 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:2180 +#: lib/rpmdb.c:2189 #, c-format msgid "cannot add record originally at %d" msgstr "%d de yer alan kayýt saklayamýyor" -#: lib/rpmdb.c:2198 +#: lib/rpmdb.c:2207 msgid "failed to rebuild database; original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2206 +#: lib/rpmdb.c:2215 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2208 +#: lib/rpmdb.c:2217 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2214 +#: lib/rpmdb.c:2223 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s açýlamadý: %s" diff --git a/rpm.spec b/rpm.spec index 38503c0..784ea87 100644 --- a/rpm.spec +++ b/rpm.spec @@ -9,8 +9,9 @@ Copyright: GPL Conflicts: patch < 2.5 %ifos linux Prereq: gawk fileutils textutils sh-utils mktemp -BuildRequires: bzip2 >= 0.9.0c-2 Requires: popt, bzip2 >= 0.9.0c-2 +BuildRequires: db1-devel, db3-devel +BuildRequires: bzip2 >= 0.9.0c-2 BuildRequires: python-devel >= 1.5.2 %endif BuildRoot: %{_tmppath}/%{name}-root @@ -234,6 +235,9 @@ fi /usr/include/popt.h %changelog +* Tue May 2 2000 Jeff Johnson +- first try at db1 -> db3 stability. + * Mon May 1 2000 Jeff Johnson - Rename db0.c to db1.c, resurrect db2.c (from db3.c). - Add ia64 and sparc64 changes.