diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | lib/db1.c | 102 | ||||
| -rw-r--r-- | lib/db3.c | 13 | ||||
| -rw-r--r-- | lib/depends.c | 10 | ||||
| -rw-r--r-- | lib/rpmdb.c | 68 | ||||
| -rw-r--r-- | macros.in | 9 | ||||
| -rw-r--r-- | po/cs.po | 93 | ||||
| -rw-r--r-- | po/de.po | 95 | ||||
| -rw-r--r-- | po/fi.po | 93 | ||||
| -rw-r--r-- | po/fr.po | 85 | ||||
| -rw-r--r-- | po/ja.po | 95 | ||||
| -rw-r--r-- | po/pl.po | 93 | ||||
| -rw-r--r-- | po/pt_BR.po | 88 | ||||
| -rw-r--r-- | po/rpm.pot | 75 | ||||
| -rw-r--r-- | po/ru.po | 93 | ||||
| -rw-r--r-- | po/sk.po | 93 | ||||
| -rw-r--r-- | po/sl.po | 95 | ||||
| -rw-r--r-- | po/sr.po | 93 | ||||
| -rw-r--r-- | po/sv.po | 95 | ||||
| -rw-r--r-- | po/tr.po | 95 | ||||
| -rw-r--r-- | rpm.spec | 6 |
22 files changed, 849 insertions, 643 deletions
@@ -53,6 +53,7 @@ - change %configure, add %makeinstall macros to handle FHS changes. - add optflags for i486 and i586. - fix: segfault with legacy packages missing RPMTAG_FILEINODES. + - require db3 in default configuration. 3.0.3 -> 3.0.4 - use compressed filenames on install side. diff --git a/autogen.sh b/autogen.sh index 0fdeb610d..853cc9619 100755 --- a/autogen.sh +++ b/autogen.sh @@ -8,7 +8,7 @@ ACV="Autoconf version 2.13" AMV="automake (GNU automake) 1.4" USAGE=" You need to install: - libtool-1.3.4 + libtool-1.3.5 autoconf-2.13 automake-1.4 " @@ -56,19 +56,46 @@ char * db1basename (int rpmtag) { return xstrdup(base); } +static /*@observer@*/ const char * db_strerror(int error) +{ + if (error == 0) + return ("Successful return: 0"); + if (error > 0) + return (strerror(error)); + + switch (error) { + default: + { + /* + * !!! + * Room for a 64-bit number + slop. This buffer is only used + * if we're given an unknown error, which should never happen. + * Note, however, we're no longer thread-safe if it does. + */ + static char ebuf[40]; + + (void)snprintf(ebuf, sizeof(ebuf), "Unknown error: %d", error); + return(ebuf); + } + } + /*@notreached@*/ +} + static int cvtdberr(dbiIndex dbi, const char * msg, int error, int printit) { int rc = 0; if (error == 0) rc = 0; else if (error < 0) - rc = -1; + rc = errno; else if (error > 0) - rc = 1; + rc = -1; if (printit && rc) { - fprintf(stderr, "*** db%d %s rc %d error %d\n", dbi->dbi_api, msg, - rc, error); + fprintf(stderr, _("db%d error(%d)"), dbi->dbi_api, rc); + if (msg) + fprintf(stderr, _(" performing %s"), msg); + fprintf(stderr, ": %s\n", db_strerror(error)); } return rc; @@ -81,27 +108,15 @@ static int db1sync(dbiIndex dbi, unsigned int flags) { if (dbi->dbi_rpmtag == RPMDBI_PACKAGES) { FD_t pkgs = dbi->dbi_db; int fdno = Fileno(pkgs); - if (fdno >= 0) - rc = fsync(fdno); + if (fdno >= 0 && (rc = fsync(fdno)) != 0) + rc = errno; } else { DB * db = dbi->dbi_db; rc = db->sync(db, flags); + rc = cvtdberr(dbi, "db->sync", rc, _debug); } } - switch (rc) { - default: - case RET_ERROR: /* -1 */ - rc = -1; - break; - case RET_SPECIAL: /* 1 */ - rc = 1; - break; - case RET_SUCCESS: /* 0 */ - rc = 0; - break; - } - return rc; } @@ -113,11 +128,14 @@ static int db1byteswapped(dbiIndex dbi) static void * doGetRecord(FD_t pkgs, unsigned int offset) { void * uh = NULL; - Header h; + Header h = NULL; const char ** fileNames; int fileCount = 0; int i; + if (offset >= fadGetFileSize(pkgs)) + goto exit; + (void)Fseek(pkgs, offset, SEEK_SET); h = headerRead(pkgs, HEADER_MAGIC_NO); @@ -194,7 +212,7 @@ static int db1cget(dbiIndex dbi, void ** keyp, size_t * keylen, int rc = 0; if (dbi == NULL) - return 1; + return EFAULT; memset(&key, 0, sizeof(key)); memset(&data, 0, sizeof(data)); @@ -225,7 +243,7 @@ static int db1cget(dbiIndex dbi, void ** keyp, size_t * keylen, if (offset == 0) { /* XXX simulated offset 0 record */ offset = fadAlloc(pkgs, newSize); if (offset == 0) - return -1; + return ENOMEM; offset--; /* XXX hack: caller will increment */ /* XXX hack: return offset as data, free in db1cput */ data.data = xmalloc(sizeof(offset)); @@ -235,14 +253,14 @@ static int db1cget(dbiIndex dbi, void ** keyp, size_t * keylen, data.data = doGetRecord(pkgs, offset); data.size = 0; /* XXX WRONG */ if (data.data == NULL) - rc = 1; + rc = EFAULT; } } else { DB * db; int _printit; if ((db = dbi->dbi_db) == NULL) - return 1; + return EFAULT; if (key.data == NULL) { rc = db->seq(db, &key, &data, (dbi->dbi_lastoffset++ ? R_NEXT : R_FIRST)); @@ -255,21 +273,11 @@ static int db1cget(dbiIndex dbi, void ** keyp, size_t * keylen, } } - switch (rc) { - default: - case RET_ERROR: /* -1 */ - rc = -1; - break; - case RET_SPECIAL: /* 1 */ - rc = 1; - break; - case RET_SUCCESS: /* 0 */ - rc = 0; + if (rc == 0) { if (keyp) *keyp = key.data; if (keylen) *keylen = key.size; if (datap) *datap = data.data; if (datalen) *datalen = data.size; - break; } return rc; @@ -334,7 +342,7 @@ static int db1cput(dbiIndex dbi, const void * keyp, size_t keylen, rc = headerWrite(pkgs, h, HEADER_MAGIC_NO); fdSetContentLength(pkgs, -1); if (rc) - rc = -1; + rc = EIO; headerFree(h); } } else { @@ -363,6 +371,7 @@ static int db1close(dbiIndex dbi, unsigned int flags) { } else { DB * db = dbi->dbi_db; rc = db->close(db); + rc = cvtdberr(dbi, "db->close", rc, _debug); } dbi->dbi_db = NULL; } @@ -370,19 +379,6 @@ static int db1close(dbiIndex dbi, unsigned int flags) { if (dbi->dbi_debug) fprintf(stderr, "db1close: rc %d db %p\n", rc, dbi->dbi_db); - switch (rc) { - default: - case RET_ERROR: /* -1 */ - rc = -1; - break; - case RET_SPECIAL: /* 1 */ - rc = 1; - break; - case RET_SUCCESS: /* 0 */ - rc = 0; - break; - } - rpmMessage(RPMMESS_DEBUG, _("closed db file %s\n"), urlfn); /* Remove temporary databases */ if (dbi->dbi_temporary) { @@ -410,7 +406,7 @@ static int db1open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip) if (dbip) *dbip = NULL; if ((dbi = db3New(rpmdb, rpmtag)) == NULL) - return -1; + return EFAULT; dbi->dbi_api = DB_VERSION_MAJOR; base = db1basename(rpmtag); @@ -418,7 +414,7 @@ static int db1open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip) (void) urlPath(urlfn, &fn); if (!(fn && *fn != '\0')) { rpmError(RPMERR_DBOPEN, _("bad db file %s"), urlfn); - rc = -1; + rc = EFAULT; goto exit; } @@ -430,7 +426,7 @@ static int db1open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip) pkgs = fadOpen(fn, dbi->dbi_mode, dbi->dbi_perms); if (Ferror(pkgs)) { - rc = errno; + rc = EFAULT; rpmError(RPMERR_DBOPEN, _("failed to open %s: %s\n"), urlfn, Fstrerror(pkgs)); goto exit; @@ -446,7 +442,7 @@ 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)) { - rc = errno; + rc = EFAULT; rpmError(RPMERR_FLOCK, _("cannot get %s lock on database"), ((dbi->dbi_mode & O_RDWR) ? _("exclusive") : _("shared"))); goto exit; @@ -427,16 +427,13 @@ static int db_env_create(DB_ENV **dbenvp, int foo) static int cvtdberr(dbiIndex dbi, const char * msg, int error, int printit) { int rc = 0; - if (error == 0) - rc = 0; - else if (error < 0) - rc = 1; - else if (error > 0) - rc = -1; + rc = error; if (printit && rc) { - fprintf(stderr, "*** db%d %s rc %d %s\n", dbi->dbi_api, msg, - rc, db_strerror(error)); + fprintf(stderr, _("db%d error(%d)"), dbi->dbi_api, rc); + if (msg) + fprintf(stderr, _(" performing %s"), msg); + fprintf(stderr, ": %s\n", db_strerror(error)); } return rc; diff --git a/lib/depends.c b/lib/depends.c index 480f03574..6e24b6d73 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -1451,10 +1451,11 @@ int rpmdepCheck(rpmTransactionSet rpmdep, } /* now look at the removed packages and make sure they aren't critical */ - mi = rpmdbInitIterator(rpmdep->db, RPMDBI_PACKAGES, NULL, 0); - rpmdbAppendIterator(mi, rpmdep->removedPackages, + if (rpmdep->numRemovedPackages > 0) { + mi = rpmdbInitIterator(rpmdep->db, RPMDBI_PACKAGES, NULL, 0); + rpmdbAppendIterator(mi, rpmdep->removedPackages, rpmdep->numRemovedPackages); - while ((h = rpmdbNextIterator(mi)) != NULL) { + while ((h = rpmdbNextIterator(mi)) != NULL) { { const char * name; headerNVR(h, &name, NULL, NULL); @@ -1521,8 +1522,9 @@ int rpmdepCheck(rpmTransactionSet rpmdep, } } + } + rpmdbFreeIterator(mi); } - rpmdbFreeIterator(mi); if (!ps.num) { free(ps.problems); diff --git a/lib/rpmdb.c b/lib/rpmdb.c index dc230eec1..4c2e59ebb 100644 --- a/lib/rpmdb.c +++ b/lib/rpmdb.c @@ -156,7 +156,7 @@ fprintf(stderr, "--- RMW %s (%s:%u)\n", tagName(dbi->dbi_rpmtag), f, l); inline int dbiDel(dbiIndex dbi, const void * keyp, size_t keylen, unsigned int flags) { if (_debug < 0 || dbi->dbi_debug) -fprintf(stderr, " %s Del key (%p,%ld) %s\n", tagName(dbi->dbi_rpmtag), keyp, (long)keylen, (dbi->dbi_rpmtag != RPMDBI_PACKAGES ? (char *)keyp : "")); +fprintf(stderr, " Del %s key (%p,%ld) %s\n", tagName(dbi->dbi_rpmtag), keyp, (long)keylen, (dbi->dbi_rpmtag != RPMDBI_PACKAGES ? (char *)keyp : "")); return (*dbi->dbi_vec->cdel) (dbi, keyp, keylen, flags); } @@ -165,10 +165,18 @@ inline int dbiGet(dbiIndex dbi, void ** keypp, size_t * keylenp, int rc; rc = (*dbi->dbi_vec->cget) (dbi, keypp, keylenp, datapp, datalenp, flags); if (_debug < 0 || dbi->dbi_debug) { +char keyval[32]; int dataval = 0xdeadbeef; -if (rc == 0 && datapp && *datapp) memcpy(&dataval, *datapp, sizeof(dataval)); -fprintf(stderr, " %s Get key (%p,%ld) data (%p,%ld) %s %x\n", tagName(dbi->dbi_rpmtag), *keypp, (long)*keylenp, *datapp, (long)*datalenp, -(dbi->dbi_rpmtag != RPMDBI_PACKAGES ? (char *)*keypp : ""), dataval); +if (dbi->dbi_rpmtag == RPMDBI_PACKAGES && keypp && *keypp && keylenp && *keylenp >= sizeof(keyval)) { + int keyint; + memcpy(&keyint, *keypp, sizeof(keyint)); + sprintf(keyval, "%d", keyint); +} else keyval[0] = '\0'; +if (rc == 0 && datapp && *datapp && datalenp && *datalenp >= sizeof(dataval)) + memcpy(&dataval, *datapp, sizeof(dataval)); +fprintf(stderr, " Get %s key (%p,%ld) data (%p,%ld) \"%s\" %x rc %d\n", + tagName(dbi->dbi_rpmtag), *keypp, (long)*keylenp, *datapp, (long)*datalenp, + (dbi->dbi_rpmtag != RPMDBI_PACKAGES ? (char *)*keypp : keyval), dataval, rc); } return rc; } @@ -178,7 +186,7 @@ inline int dbiPut(dbiIndex dbi, const void * keyp, size_t keylen, if (_debug < 0 || dbi->dbi_debug) { int dataval = 0xdeadbeef; if (datap) memcpy(&dataval, datap, sizeof(dataval)); -fprintf(stderr, " %s Put key (%p,%ld) data (%p,%ld) %s %x\n", tagName(dbi->dbi_rpmtag), keyp, (long)keylen, datap, (long)datalen, (dbi->dbi_rpmtag != RPMDBI_PACKAGES ? (char *)keyp : ""), dataval); +fprintf(stderr, " Put %s key (%p,%ld) data (%p,%ld) \"%s\" %x\n", tagName(dbi->dbi_rpmtag), keyp, (long)keylen, datap, (long)datalen, (dbi->dbi_rpmtag != RPMDBI_PACKAGES ? (char *)keyp : ""), dataval); } return (*dbi->dbi_vec->cput) (dbi, keyp, keylen, datap, datalen, flags); } @@ -328,19 +336,16 @@ static int dbiSearch(dbiIndex dbi, const char * keyp, size_t keylen, size_t datalen; int rc; - if (setp) { - if (*setp) - dbiFreeIndexSet(*setp); - *setp = NULL; - } + if (setp) *setp = NULL; if (keylen == 0) keylen = strlen(keyp); rc = dbiGet(dbi, (void **)&keyp, &keylen, &datap, &datalen, 0); - if (rc < 0) { - rpmError(RPMERR_DBGETINDEX, _("error getting \"%s\" records from %s index"), - keyp, tagName(dbi->dbi_rpmtag)); - } else if (rc == 0 && setp) { + if (rc > 0) { + rpmError(RPMERR_DBGETINDEX, _("error(%d) getting \"%s\" records from %s index"), + rc, keyp, tagName(dbi->dbi_rpmtag)); + } else + if (rc == 0 && setp) { int _dbbyteswapped = dbiByteSwapped(dbi); const char * sdbir = datap; dbiIndexSet set; @@ -455,8 +460,8 @@ static int dbiUpdateIndex(dbiIndex dbi, const char * keyp, dbiIndexSet set) rc = dbiPut(dbi, keyp, keylen, datap, datalen, 0); if (rc) { - rpmError(RPMERR_DBPUTINDEX, _("error storing record %s into %s"), - keyp, tagName(dbi->dbi_rpmtag)); + rpmError(RPMERR_DBPUTINDEX, _("error(%d) storing record %s into %s"), + rc, keyp, tagName(dbi->dbi_rpmtag)); } } else { @@ -464,8 +469,8 @@ static int dbiUpdateIndex(dbiIndex dbi, const char * keyp, dbiIndexSet set) rc = dbiDel(dbi, keyp, keylen, 0); if (rc) { - rpmError(RPMERR_DBPUTINDEX, _("error removing record %s from %s"), - keyp, tagName(dbi->dbi_rpmtag)); + rpmError(RPMERR_DBPUTINDEX, _("error(%d) removing record %s from %s"), + rc, keyp, tagName(dbi->dbi_rpmtag)); } } @@ -651,9 +656,10 @@ int rpmdbSync(rpmdb rpmdb) int dbix; for (dbix = 0; dbix < rpmdb->db_ndbi; dbix++) { + int xx; if (rpmdb->_dbi[dbix] == NULL) continue; - dbiSync(rpmdb->_dbi[dbix], 0); + xx = dbiSync(rpmdb->_dbi[dbix], 0); } return 0; } @@ -984,20 +990,12 @@ int rpmdbCountPackages(rpmdb rpmdb, const char * name) xx = dbiCclose(dbi, NULL, 0); } - switch (rc) { - default: - case -1: /* error */ - rpmError(RPMERR_DBCORRUPT, _("cannot retrieve package \"%s\" from db"), - name); - rc = -1; - break; - case 1: /* not found */ - rc = 0; - break; - case 0: /* success */ + if (rc == 0) /* success */ rc = dbiIndexSetCount(matches); - break; - } + else if (rc > 0) /* error */ + rpmError(RPMERR_DBCORRUPT, _("error(%d) counting packages"), rc); + else /* not found */ + rc = 0; if (matches) dbiFreeIndexSet(matches); @@ -1104,6 +1102,7 @@ static int dbiFindByLabel(dbiIndex dbi, const char * arg, dbiIndexSet * matches) /* did they give us just a name? */ rc = dbiFindMatches(dbi, arg, NULL, NULL, matches); if (rc != 1) return rc; + if (*matches) dbiFreeIndexSet(*matches); /* maybe a name and a release */ localarg = alloca(strlen(arg) + 1); @@ -1116,6 +1115,7 @@ static int dbiFindByLabel(dbiIndex dbi, const char * arg, dbiIndexSet * matches) *chptr = '\0'; rc = dbiFindMatches(dbi, localarg, chptr + 1, NULL, matches); if (rc != 1) return rc; + if (*matches) dbiFreeIndexSet(*matches); /* how about name-version-release? */ @@ -1785,7 +1785,7 @@ int rpmdbAdd(rpmdb rpmdb, Header h) } if (rc) { - rpmError(RPMERR_DBCORRUPT, _("cannot allocate new instance in database")); + rpmError(RPMERR_DBCORRUPT, _("error(%d) allocating new package instance"), rc); goto exit; } @@ -2342,7 +2342,7 @@ int rpmdbRebuild(const char * rootdir) rc = 0; exit: - if (removedir) { + if (removedir && !(rc == 0 && nocleanup)) { rpmMessage(RPMMESS_DEBUG, _("removing directory %s\n"), newrootdbpath); if (Rmdir(newrootdbpath)) rpmMessage(RPMMESS_ERROR, _("failed to remove directory %s: %s\n"), @@ -1,4 +1,4 @@ -# $Id: macros.in,v 1.62 2000/06/05 16:40:04 jbj Exp $ +# $Id: macros.in,v 1.63 2000/06/06 20:06:09 jbj Exp $ #============================================================================== # Macro naming conventions (preliminary): # @@ -208,12 +208,13 @@ # Choose db interface: # 0 same as 1 # 1 native db1 interface (e.g. linux glibc libdb1 routines). -# 2 native db2 interface. +# 2 native db2 interface (not currently implemented, may never be). # 3 native db3 interface. # -1 db3 -> db2 -> db1 (as available). # -# There are two macros so that --rebuilddb can convert db1 -> db3 -%_dbapi -1 +# There are two macros so that --rebuilddb can convert db1 -> db3. +# +%_dbapi 3 %_dbapi_rebuild 3 # @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-06 04:54-0400\n" +"POT-Creation-Date: 2000-06-06 15:54-0400\n" "PO-Revision-Date: 1998-10-10 10:10+0200\n" "Last-Translator: Pavel Makovec <pavelm@terminal.cz>\n" "Language-Team: Czech <pavelm@terminal.cz>\n" @@ -2535,41 +2535,51 @@ msgstr "balíèek %s koliduje: %s\n" msgid "loop in prerequisite chain: %s" msgstr "smyèka v øetìzu podmínek: %s" -#: lib/db1.c:386 +#: lib/db1.c:95 lib/db3.c:433 +#, c-format +msgid "db%d error(%d)" +msgstr "" + +#: lib/db1.c:97 lib/db3.c:435 +#, c-format +msgid " performing %s" +msgstr "" + +#: lib/db1.c:382 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:389 +#: lib/db1.c:385 #, fuzzy, c-format msgid "removed db file %s\n" msgstr "odstraòuje se rejstøík souborù pro %s\n" -#: lib/db1.c:420 +#: lib/db1.c:416 #, fuzzy, c-format msgid "bad db file %s" msgstr "nelze provést statistiku %s: %s" -#: lib/db1.c:425 +#: lib/db1.c:421 #, 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:434 lib/url.c:445 +#: lib/db1.c:430 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "nelze otevøít %s: %s" -#: lib/db1.c:450 +#: lib/db1.c:446 #, c-format msgid "cannot get %s lock on database" msgstr "nelze získat %s zámek k databázi" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "exclusive" msgstr "výhradní" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "shared" msgstr "sdílený" @@ -2618,37 +2628,37 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:464 +#: lib/db3.c:461 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "odstraòuje se rejstøík souborù pro %s\n" -#: lib/db3.c:476 +#: lib/db3.c:473 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "odstraòuje se rejstøík souborù pro %s\n" -#: lib/db3.c:513 +#: lib/db3.c:510 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "otevírá se databáze v %s\n" -#: lib/db3.c:884 +#: lib/db3.c:881 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "odstraòuje se rejstøík souborù pro %s\n" -#: lib/db3.c:974 +#: lib/db3.c:971 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "probíhá otevírání databázového re¾imu: 0%o\n" -#: lib/db3.c:1079 +#: lib/db3.c:1076 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "nelze získat %s zámek k databázi" -#: lib/db3.c:1086 +#: lib/db3.c:1083 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "odstraòuje se rejstøík souborù pro %s\n" @@ -3474,7 +3484,7 @@ msgstr "OK" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:218 +#: lib/rpmdb.c:226 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3484,12 +3494,12 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:251 +#: lib/rpmdb.c:259 #, fuzzy, c-format msgid "dbiOpen: cannot open %s index" msgstr "chyba: nelze otevøít %s\n" -#: lib/rpmdb.c:259 +#: lib/rpmdb.c:267 msgid "" "\n" "--> The database is in db%d format, not the suggested db%d format.\n" @@ -3500,7 +3510,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:272 +#: lib/rpmdb.c:280 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the database is db%d format.\n" @@ -3510,38 +3520,38 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:341 +#: lib/rpmdb.c:345 #, fuzzy, c-format -msgid "error getting \"%s\" records from %s index" +msgid "error(%d) getting \"%s\" records from %s index" msgstr "chyba pøi získávání záznamu %s z %s" -#: lib/rpmdb.c:458 -#, c-format -msgid "error storing record %s into %s" +#: lib/rpmdb.c:463 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s" msgstr "chyba pøi ukládání záznamu %s do %s" -#: lib/rpmdb.c:467 +#: lib/rpmdb.c:472 #, fuzzy, c-format -msgid "error removing record %s from %s" +msgid "error(%d) removing record %s from %s" msgstr "chyba pøi odstraòování záznamu %s do %s" -#: lib/rpmdb.c:689 lib/rpmdb.c:2200 +#: lib/rpmdb.c:695 lib/rpmdb.c:2200 msgid "no dbpath has been set" msgstr "nebyla nastavena dbpath" -#: lib/rpmdb.c:786 +#: lib/rpmdb.c:792 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:990 +#: lib/rpmdb.c:996 #, fuzzy, c-format -msgid "cannot retrieve package \"%s\" from db" -msgstr "chyba: nelze otevøít %s%s/packages.rpm\n" +msgid "error(%d) counting packages" +msgstr "chyba pøi hledání balíèku %s\n" -#: lib/rpmdb.c:1056 lib/rpmdb.c:1574 lib/uninstall.c:90 +#: lib/rpmdb.c:1054 lib/rpmdb.c:1574 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í" @@ -3567,9 +3577,9 @@ msgid "%6d %s\n" msgstr "" #: lib/rpmdb.c:1788 -#, fuzzy -msgid "cannot allocate new instance in database" -msgstr "nelze alokovat prostor pro databázi" +#, fuzzy, c-format +msgid "error(%d) allocating new package instance" +msgstr "chyba pøi hledání balíèku %s\n" #: lib/rpmdb.c:1843 #, c-format @@ -4165,6 +4175,14 @@ msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: " #, fuzzy +#~ msgid "cannot retrieve package \"%s\" from db" +#~ msgstr "chyba: nelze otevøít %s%s/packages.rpm\n" + +#, fuzzy +#~ msgid "cannot allocate new instance in database" +#~ msgstr "nelze alokovat prostor pro databázi" + +#, fuzzy #~ msgid "override build architecture" #~ msgstr "neovìøovat architekturu balíèku" @@ -4246,9 +4264,6 @@ msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: " #~ msgid "error: could not read database record\n" #~ msgstr "chyba: nelze naèíst databázový záznam\n" -#~ msgid "error looking for package %s\n" -#~ msgstr "chyba pøi hledání balíèku %s\n" - #~ msgid "cannot read header at %d for lookup" #~ msgstr "nelze èíst hlavièku u %d pro vyhledání" @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 2.5.2\n" -"POT-Creation-Date: 2000-06-06 04:54-0400\n" +"POT-Creation-Date: 2000-06-06 15:54-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n" "Language-Team: German <de@li.org>\n" @@ -2627,43 +2627,53 @@ msgstr "Paket %s wird nicht in %s aufgeführt" msgid "loop in prerequisite chain: %s" msgstr "" -#: lib/db1.c:386 +#: lib/db1.c:95 lib/db3.c:433 +#, c-format +msgid "db%d error(%d)" +msgstr "" + +#: lib/db1.c:97 lib/db3.c:435 +#, c-format +msgid " performing %s" +msgstr "" + +#: lib/db1.c:382 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:389 +#: lib/db1.c:385 #, c-format msgid "removed db file %s\n" msgstr "" # , c-format -#: lib/db1.c:420 +#: lib/db1.c:416 #, fuzzy, c-format msgid "bad db file %s" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/db1.c:425 +#: lib/db1.c:421 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "Datenbank aus der vorhandenen neu erstellen" # , c-format -#: lib/db1.c:434 lib/url.c:445 +#: lib/db1.c:430 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/db1.c:450 +#: lib/db1.c:446 #, c-format msgid "cannot get %s lock on database" msgstr "kann %s lock für die Datenbank nicht bekommen" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "exclusive" msgstr "exklusiv" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "shared" msgstr "geteilt" @@ -2712,37 +2722,37 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:464 +#: lib/db3.c:461 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:476 +#: lib/db3.c:473 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:513 +#: lib/db3.c:510 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:884 +#: lib/db3.c:881 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:974 +#: lib/db3.c:971 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: lib/db3.c:1079 +#: lib/db3.c:1076 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "kann %s lock für die Datenbank nicht bekommen" -#: lib/db3.c:1086 +#: lib/db3.c:1083 #, c-format msgid "locked db index %s/%s\n" msgstr "" @@ -3582,7 +3592,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:218 +#: lib/rpmdb.c:226 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3592,12 +3602,12 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:251 +#: lib/rpmdb.c:259 #, fuzzy, c-format msgid "dbiOpen: cannot open %s index" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/rpmdb.c:259 +#: lib/rpmdb.c:267 msgid "" "\n" "--> The database is in db%d format, not the suggested db%d format.\n" @@ -3608,7 +3618,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:272 +#: lib/rpmdb.c:280 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the database is db%d format.\n" @@ -3618,39 +3628,39 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:341 +#: lib/rpmdb.c:345 #, fuzzy, c-format -msgid "error getting \"%s\" records from %s index" +msgid "error(%d) getting \"%s\" records from %s index" msgstr "Fehler beim Eintrag %s von %s" -#: lib/rpmdb.c:458 -#, c-format -msgid "error storing record %s into %s" +#: lib/rpmdb.c:463 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s" msgstr "Fehler bei Schreiben des Eintrags %s nach %s" # FIXME -#: lib/rpmdb.c:467 +#: lib/rpmdb.c:472 #, fuzzy, c-format -msgid "error removing record %s from %s" +msgid "error(%d) removing record %s from %s" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: lib/rpmdb.c:689 lib/rpmdb.c:2200 +#: lib/rpmdb.c:695 lib/rpmdb.c:2200 msgid "no dbpath has been set" msgstr "»dbpath« ist nicht gesetzt" -#: lib/rpmdb.c:786 +#: lib/rpmdb.c:792 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:990 +#: lib/rpmdb.c:996 #, fuzzy, c-format -msgid "cannot retrieve package \"%s\" from db" -msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" +msgid "error(%d) counting packages" +msgstr "Fehler beim Suchen nach Paket %s\n" -#: lib/rpmdb.c:1056 lib/rpmdb.c:1574 lib/uninstall.c:90 +#: lib/rpmdb.c:1054 lib/rpmdb.c:1574 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" @@ -3677,11 +3687,10 @@ msgstr "Fehler beim Löschen des Eintrags %s nach %s" msgid "%6d %s\n" msgstr "" -# reservieren??? #: lib/rpmdb.c:1788 -#, fuzzy -msgid "cannot allocate new instance in database" -msgstr "kann keinen Platz für die Datenbank bekommen" +#, fuzzy, c-format +msgid "error(%d) allocating new package instance" +msgstr "Fehler beim Suchen nach Paket %s\n" #: lib/rpmdb.c:1843 #, c-format @@ -4292,6 +4301,15 @@ msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: " #, fuzzy +#~ msgid "cannot retrieve package \"%s\" from db" +#~ msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" + +# reservieren??? +#, fuzzy +#~ msgid "cannot allocate new instance in database" +#~ msgstr "kann keinen Platz für die Datenbank bekommen" + +#, fuzzy #~ msgid "override build architecture" #~ msgstr "Paket-Architektur nicht überprüfen" @@ -4370,9 +4388,6 @@ msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: " #~ msgid "error: could not read database record\n" #~ msgstr "Fehler: konnte Datenbank-Eintrag nicht lesen\n" -#~ msgid "error looking for package %s\n" -#~ msgstr "Fehler beim Suchen nach Paket %s\n" - #~ msgid "cannot read header at %d for lookup" #~ msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen" @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-06-06 04:54-0400\n" +"POT-Creation-Date: 2000-06-06 15:54-0400\n" "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n" "Language-Team: Finnish <linux@sot.com>\n" "Content-Type: text/plain; charset=\n" @@ -2570,41 +2570,51 @@ msgstr "paketti %s ei ole %s:ssä" msgid "loop in prerequisite chain: %s" msgstr "silmukka edellytysten ketjussa: %s" -#: lib/db1.c:386 +#: lib/db1.c:95 lib/db3.c:433 +#, c-format +msgid "db%d error(%d)" +msgstr "" + +#: lib/db1.c:97 lib/db3.c:435 +#, c-format +msgid " performing %s" +msgstr "" + +#: lib/db1.c:382 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:389 +#: lib/db1.c:385 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:420 +#: lib/db1.c:416 #, fuzzy, c-format msgid "bad db file %s" msgstr "en voinut avata %s: %s" -#: lib/db1.c:425 +#: lib/db1.c:421 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: lib/db1.c:434 lib/url.c:445 +#: lib/db1.c:430 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/db1.c:450 +#: lib/db1.c:446 #, c-format msgid "cannot get %s lock on database" msgstr "en voi saada %s lukitusta tietokantaan" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "exclusive" msgstr "poissulkevaa" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "shared" msgstr "jaettua" @@ -2653,37 +2663,37 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:464 +#: lib/db3.c:461 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:476 +#: lib/db3.c:473 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:513 +#: lib/db3.c:510 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:884 +#: lib/db3.c:881 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:974 +#: lib/db3.c:971 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: lib/db3.c:1079 +#: lib/db3.c:1076 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "en voi saada %s lukitusta tietokantaan" -#: lib/db3.c:1086 +#: lib/db3.c:1083 #, c-format msgid "locked db index %s/%s\n" msgstr "" @@ -3509,7 +3519,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:218 +#: lib/rpmdb.c:226 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3519,12 +3529,12 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:251 +#: lib/rpmdb.c:259 #, fuzzy, c-format msgid "dbiOpen: cannot open %s index" msgstr "virhe: en voi avata %s\n" -#: lib/rpmdb.c:259 +#: lib/rpmdb.c:267 msgid "" "\n" "--> The database is in db%d format, not the suggested db%d format.\n" @@ -3535,7 +3545,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:272 +#: lib/rpmdb.c:280 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the database is db%d format.\n" @@ -3545,38 +3555,38 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:341 +#: lib/rpmdb.c:345 #, fuzzy, c-format -msgid "error getting \"%s\" records from %s index" +msgid "error(%d) getting \"%s\" records from %s index" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: lib/rpmdb.c:458 -#, c-format -msgid "error storing record %s into %s" +#: lib/rpmdb.c:463 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: lib/rpmdb.c:467 +#: lib/rpmdb.c:472 #, fuzzy, c-format -msgid "error removing record %s from %s" +msgid "error(%d) removing record %s from %s" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: lib/rpmdb.c:689 lib/rpmdb.c:2200 +#: lib/rpmdb.c:695 lib/rpmdb.c:2200 msgid "no dbpath has been set" msgstr "dbpath ei ole asetettu" -#: lib/rpmdb.c:786 +#: lib/rpmdb.c:792 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:990 +#: lib/rpmdb.c:996 #, fuzzy, c-format -msgid "cannot retrieve package \"%s\" from db" -msgstr "virhe: en voi avata %s%s/packages.rpm\n" +msgid "error(%d) counting packages" +msgstr "virhe etsittäessä pakettia %s\n" -#: lib/rpmdb.c:1056 lib/rpmdb.c:1574 lib/uninstall.c:90 +#: lib/rpmdb.c:1054 lib/rpmdb.c:1574 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ä" @@ -3602,9 +3612,9 @@ msgid "%6d %s\n" msgstr "" #: lib/rpmdb.c:1788 -#, fuzzy -msgid "cannot allocate new instance in database" -msgstr "en voi varata tilaa tietokannalle" +#, fuzzy, c-format +msgid "error(%d) allocating new package instance" +msgstr "virhe etsittäessä pakettia %s\n" #: lib/rpmdb.c:1843 #, c-format @@ -4206,6 +4216,14 @@ msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:" #, fuzzy +#~ msgid "cannot retrieve package \"%s\" from db" +#~ msgstr "virhe: en voi avata %s%s/packages.rpm\n" + +#, fuzzy +#~ msgid "cannot allocate new instance in database" +#~ msgstr "en voi varata tilaa tietokannalle" + +#, fuzzy #~ msgid "override build architecture" #~ msgstr "älä tarkista paketin arkkitehtuuria" @@ -4283,9 +4301,6 @@ msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:" #~ msgid "error: could not read database record\n" #~ msgstr "virhe: tietokannan tietuetta ei voinut lukea\n" -#~ msgid "error looking for package %s\n" -#~ msgstr "virhe etsittäessä pakettia %s\n" - #, fuzzy #~ msgid "searching for package %s\n" #~ msgstr "virhe etsittäessä pakettia %s\n" @@ -1,5 +1,5 @@ msgid "" -msgstr "POT-Creation-Date: 2000-06-06 04:54-0400\n" +msgstr "POT-Creation-Date: 2000-06-06 15:54-0400\n" #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422 #, c-format @@ -2553,41 +2553,51 @@ msgstr "aucun package n'a été spécifié pour la désinstallation" msgid "loop in prerequisite chain: %s" msgstr "" -#: lib/db1.c:386 +#: lib/db1.c:95 lib/db3.c:433 +#, c-format +msgid "db%d error(%d)" +msgstr "" + +#: lib/db1.c:97 lib/db3.c:435 +#, c-format +msgid " performing %s" +msgstr "" + +#: lib/db1.c:382 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:389 +#: lib/db1.c:385 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:420 +#: lib/db1.c:416 #, fuzzy, c-format msgid "bad db file %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/db1.c:425 +#: lib/db1.c:421 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/db1.c:434 lib/url.c:445 +#: lib/db1.c:430 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/db1.c:450 +#: lib/db1.c:446 #, 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:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "shared" msgstr "" @@ -2636,37 +2646,37 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:464 +#: lib/db3.c:461 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:476 +#: lib/db3.c:473 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:513 +#: lib/db3.c:510 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:884 +#: lib/db3.c:881 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:974 +#: lib/db3.c:971 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/db3.c:1079 +#: lib/db3.c:1076 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: lib/db3.c:1086 +#: lib/db3.c:1083 #, c-format msgid "locked db index %s/%s\n" msgstr "" @@ -3494,7 +3504,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:218 +#: lib/rpmdb.c:226 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3504,12 +3514,12 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:251 +#: lib/rpmdb.c:259 #, fuzzy, c-format msgid "dbiOpen: cannot open %s index" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:259 +#: lib/rpmdb.c:267 msgid "" "\n" "--> The database is in db%d format, not the suggested db%d format.\n" @@ -3520,7 +3530,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:272 +#: lib/rpmdb.c:280 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the database is db%d format.\n" @@ -3530,38 +3540,38 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:341 +#: lib/rpmdb.c:345 #, fuzzy, c-format -msgid "error getting \"%s\" records from %s index" +msgid "error(%d) getting \"%s\" records from %s index" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:458 -#, c-format -msgid "error storing record %s into %s" -msgstr "" +#: lib/rpmdb.c:463 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s" +msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:467 +#: lib/rpmdb.c:472 #, fuzzy, c-format -msgid "error removing record %s from %s" +msgid "error(%d) removing record %s from %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:689 lib/rpmdb.c:2200 +#: lib/rpmdb.c:695 lib/rpmdb.c:2200 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:786 +#: lib/rpmdb.c:792 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:990 +#: lib/rpmdb.c:996 #, fuzzy, c-format -msgid "cannot retrieve package \"%s\" from db" -msgstr "impossible d'ouvrir: %s\n" +msgid "error(%d) counting packages" +msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/rpmdb.c:1056 lib/rpmdb.c:1574 lib/uninstall.c:90 +#: lib/rpmdb.c:1054 lib/rpmdb.c:1574 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" @@ -3587,7 +3597,8 @@ msgid "%6d %s\n" msgstr "" #: lib/rpmdb.c:1788 -msgid "cannot allocate new instance in database" +#, c-format +msgid "error(%d) allocating new package instance" msgstr "" #: lib/rpmdb.c:1843 @@ -4172,6 +4183,10 @@ msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" #, fuzzy +#~ msgid "cannot retrieve package \"%s\" from db" +#~ msgstr "impossible d'ouvrir: %s\n" + +#, fuzzy #~ msgid "override build architecture" #~ msgstr "%s ne peut être construit sur cette architecture\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm-3.0.4\n" -"POT-Creation-Date: 2000-06-06 04:54-0400\n" +"POT-Creation-Date: 2000-06-06 15:54-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n" "Language-Team: JRPM <jrpm@linux.or.jp>\n" @@ -127,7 +127,7 @@ msgstr "copyright ¤¬¤¢¤ê¤Þ¤»¤ó!\n" # build root [BuildRoot] # net share [¥Í¥Ã¥È¶¦Í] # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë] -# $Id: ja.po,v 1.67 2000/06/06 09:01:06 jbj Exp $ +# $Id: ja.po,v 1.68 2000/06/06 20:06:09 jbj Exp $ #: rpm.c:179 rpmqv.c:257 #, c-format msgid "rpm: %s\n" @@ -2500,41 +2500,51 @@ msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹: %s\n" msgid "loop in prerequisite chain: %s" msgstr "prerequisite ¥Á¥§¡¼¥ó¤Î¥ë¡¼¥×: %s" -#: lib/db1.c:386 +#: lib/db1.c:95 lib/db3.c:433 +#, c-format +msgid "db%d error(%d)" +msgstr "" + +#: lib/db1.c:97 lib/db3.c:435 +#, c-format +msgid " performing %s" +msgstr "" + +#: lib/db1.c:382 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:389 +#: lib/db1.c:385 #, fuzzy, c-format msgid "removed db file %s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: lib/db1.c:420 +#: lib/db1.c:416 #, fuzzy, c-format msgid "bad db file %s" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/db1.c:425 +#: lib/db1.c:421 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n" -#: lib/db1.c:434 lib/url.c:445 +#: lib/db1.c:430 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" -#: lib/db1.c:450 +#: lib/db1.c:446 #, c-format msgid "cannot get %s lock on database" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤¤Þ¤»¤ó" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "exclusive" msgstr "½ü³°" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "shared" msgstr "¶¦Í" @@ -2583,37 +2593,37 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:464 +#: lib/db3.c:461 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: lib/db3.c:476 +#: lib/db3.c:473 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: lib/db3.c:513 +#: lib/db3.c:510 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:884 +#: lib/db3.c:881 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: lib/db3.c:974 +#: lib/db3.c:971 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n" -#: lib/db3.c:1079 +#: lib/db3.c:1076 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤¤Þ¤»¤ó" -#: lib/db3.c:1086 +#: lib/db3.c:1083 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" @@ -3451,7 +3461,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:218 +#: lib/rpmdb.c:226 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3461,12 +3471,12 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:251 +#: lib/rpmdb.c:259 #, fuzzy, c-format msgid "dbiOpen: cannot open %s index" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n" -#: lib/rpmdb.c:259 +#: lib/rpmdb.c:267 msgid "" "\n" "--> The database is in db%d format, not the suggested db%d format.\n" @@ -3477,7 +3487,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:272 +#: lib/rpmdb.c:280 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the database is db%d format.\n" @@ -3487,38 +3497,38 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:341 +#: lib/rpmdb.c:345 #, fuzzy, c-format -msgid "error getting \"%s\" records from %s index" +msgid "error(%d) getting \"%s\" records from %s index" msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" -#: lib/rpmdb.c:458 -#, c-format -msgid "error storing record %s into %s" +#: lib/rpmdb.c:463 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: lib/rpmdb.c:467 +#: lib/rpmdb.c:472 #, fuzzy, c-format -msgid "error removing record %s from %s" +msgid "error(%d) removing record %s from %s" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼" -#: lib/rpmdb.c:689 lib/rpmdb.c:2200 +#: lib/rpmdb.c:695 lib/rpmdb.c:2200 msgid "no dbpath has been set" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: lib/rpmdb.c:786 +#: lib/rpmdb.c:792 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:990 +#: lib/rpmdb.c:996 #, fuzzy, c-format -msgid "cannot retrieve package \"%s\" from db" -msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n" +msgid "error(%d) counting packages" +msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" -#: lib/rpmdb.c:1056 lib/rpmdb.c:1574 lib/uninstall.c:90 +#: lib/rpmdb.c:1054 lib/rpmdb.c:1574 lib/uninstall.c:90 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤¤Þ¤»¤ó" @@ -3544,9 +3554,9 @@ msgid "%6d %s\n" msgstr "" #: lib/rpmdb.c:1788 -#, fuzzy -msgid "cannot allocate new instance in database" -msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹ÍѤζõ¤ÍÆÎ̤¬Â¤ê¤Þ¤»¤ó" +#, fuzzy, c-format +msgid "error(%d) allocating new package instance" +msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" #: lib/rpmdb.c:1843 #, c-format @@ -4151,6 +4161,14 @@ msgstr "%s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À¤òËþ¤¿¤·¤Æ¤¤¤Þ¤»¤ó:" +#, fuzzy +#~ msgid "cannot retrieve package \"%s\" from db" +#~ msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n" + +#, fuzzy +#~ msgid "cannot allocate new instance in database" +#~ msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹ÍѤζõ¤ÍÆÎ̤¬Â¤ê¤Þ¤»¤ó" + #~ msgid "--buildarch has been obsoleted. Use the --target option instead.\n" #~ msgstr "" #~ "--buildarch ¤Ïµì¼°¤Ë¤Ê¤ê¤Þ¤·¤¿¡£Âå¤ê¤Ë --target " @@ -4245,9 +4263,6 @@ msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À¤òËþ¤¿¤·¤Æ¤¤¤Þ¤»¤ó:" #~ msgid "error: could not read database record\n" #~ msgstr "¥¨¥é¡¼: ¥Ç¡¼¥¿¥Ù¡¼¥¹¥ì¥³¡¼¥É¤òÆɤळ¤È¤¬¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿\n" -#~ msgid "error looking for package %s\n" -#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" - #~ msgid "cannot read header at %d for lookup" #~ msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤¤Þ¤»¤ó" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm-3.0.2\n" -"POT-Creation-Date: 2000-06-06 04:54-0400\n" +"POT-Creation-Date: 2000-06-06 15:54-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n" "Language-Team: Polish <pl@li.org>\n" @@ -2507,41 +2507,51 @@ msgstr "pakiet %s jest w konflikcie: %s\n" msgid "loop in prerequisite chain: %s" msgstr "" -#: lib/db1.c:386 +#: lib/db1.c:95 lib/db3.c:433 +#, c-format +msgid "db%d error(%d)" +msgstr "" + +#: lib/db1.c:97 lib/db3.c:435 +#, c-format +msgid " performing %s" +msgstr "" + +#: lib/db1.c:382 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:389 +#: lib/db1.c:385 #, fuzzy, c-format msgid "removed db file %s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: lib/db1.c:420 +#: lib/db1.c:416 #, fuzzy, c-format msgid "bad db file %s" msgstr "b³êdny status pliku: %s" -#: lib/db1.c:425 +#: lib/db1.c:421 #, 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:434 lib/url.c:445 +#: lib/db1.c:430 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s" -#: lib/db1.c:450 +#: lib/db1.c:446 #, c-format msgid "cannot get %s lock on database" msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "shared" msgstr "" @@ -2590,37 +2600,37 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:464 +#: lib/db3.c:461 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: lib/db3.c:476 +#: lib/db3.c:473 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: lib/db3.c:513 +#: lib/db3.c:510 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:884 +#: lib/db3.c:881 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: lib/db3.c:974 +#: lib/db3.c:971 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "otwiernie bazê danych w trybie 0x%x w %s\n" -#: lib/db3.c:1079 +#: lib/db3.c:1076 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe" -#: lib/db3.c:1086 +#: lib/db3.c:1083 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" @@ -3425,7 +3435,7 @@ msgstr "OK" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:218 +#: lib/rpmdb.c:226 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3435,12 +3445,12 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:251 +#: lib/rpmdb.c:259 #, fuzzy, c-format msgid "dbiOpen: cannot open %s index" msgstr "nie mo¿na otworzyæ %s\n" -#: lib/rpmdb.c:259 +#: lib/rpmdb.c:267 msgid "" "\n" "--> The database is in db%d format, not the suggested db%d format.\n" @@ -3451,7 +3461,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:272 +#: lib/rpmdb.c:280 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the database is db%d format.\n" @@ -3461,26 +3471,26 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:341 +#: lib/rpmdb.c:345 #, fuzzy, c-format -msgid "error getting \"%s\" records from %s index" +msgid "error(%d) getting \"%s\" records from %s index" msgstr "b³±d pobierania rekordu %s z %s" -#: lib/rpmdb.c:458 -#, c-format -msgid "error storing record %s into %s" +#: lib/rpmdb.c:463 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s" msgstr "b³±d zapisywania rekordu %s do %s" -#: lib/rpmdb.c:467 +#: lib/rpmdb.c:472 #, fuzzy, c-format -msgid "error removing record %s from %s" +msgid "error(%d) removing record %s from %s" msgstr "b³±d usuwania rekordu %s z %s" -#: lib/rpmdb.c:689 lib/rpmdb.c:2200 +#: lib/rpmdb.c:695 lib/rpmdb.c:2200 msgid "no dbpath has been set" msgstr "¶cie¿ka bazy danych nie zosta³a podana" -#: lib/rpmdb.c:786 +#: lib/rpmdb.c:792 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" @@ -3489,12 +3499,12 @@ msgstr "" "nowym formacie" #. error -#: lib/rpmdb.c:990 +#: lib/rpmdb.c:996 #, fuzzy, c-format -msgid "cannot retrieve package \"%s\" from db" -msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" +msgid "error(%d) counting packages" +msgstr "b³±d szukania pakietu %s\n" -#: lib/rpmdb.c:1056 lib/rpmdb.c:1574 lib/uninstall.c:90 +#: lib/rpmdb.c:1054 lib/rpmdb.c:1574 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" @@ -3520,9 +3530,9 @@ msgid "%6d %s\n" msgstr "" #: lib/rpmdb.c:1788 -#, fuzzy -msgid "cannot allocate new instance in database" -msgstr "nie mo¿na alokowaæ przestrzeni dla bazy danych" +#, fuzzy, c-format +msgid "error(%d) allocating new package instance" +msgstr "b³±d szukania pakietu %s\n" #: lib/rpmdb.c:1843 #, c-format @@ -4105,6 +4115,14 @@ msgstr "brak %s\n" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: " +#, fuzzy +#~ msgid "cannot retrieve package \"%s\" from db" +#~ msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" + +#, fuzzy +#~ msgid "cannot allocate new instance in database" +#~ msgstr "nie mo¿na alokowaæ przestrzeni dla bazy danych" + #~ msgid "--buildarch has been obsoleted. Use the --target option instead.\n" #~ msgstr "--buildarch wysz³o z u¿ycia. U¿yj opcji --target.\n" @@ -4185,9 +4203,6 @@ msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: " #~ msgid "error: could not read database record\n" #~ msgstr "b³±d: nie mo¿na odczytaæ rekordu bazy\n" -#~ msgid "error looking for package %s\n" -#~ msgstr "b³±d szukania pakietu %s\n" - #~ msgid "cannot read header at %d for lookup" #~ msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla poszukiwania" diff --git a/po/pt_BR.po b/po/pt_BR.po index 436910635..ec0baf40d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,7 +2,7 @@ # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998. # msgid "" -msgstr "POT-Creation-Date: 2000-06-06 04:54-0400\n" +msgstr "POT-Creation-Date: 2000-06-06 15:54-0400\n" #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422 #, c-format @@ -2630,43 +2630,53 @@ msgstr "não foi passado pacote para desinstalação" msgid "loop in prerequisite chain: %s" msgstr "" -#: lib/db1.c:386 +#: lib/db1.c:95 lib/db3.c:433 +#, c-format +msgid "db%d error(%d)" +msgstr "" + +#: lib/db1.c:97 lib/db3.c:435 +#, c-format +msgid " performing %s" +msgstr "" + +#: lib/db1.c:382 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:389 +#: lib/db1.c:385 #, c-format msgid "removed db file %s\n" msgstr "" # , c-format -#: lib/db1.c:420 +#: lib/db1.c:416 #, fuzzy, c-format msgid "bad db file %s" msgstr "Não consegui abrir: %s\n" -#: lib/db1.c:425 +#: lib/db1.c:421 #, 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:434 lib/url.c:445 +#: lib/db1.c:430 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "Não consegui abrir: %s\n" -#: lib/db1.c:450 +#: lib/db1.c:446 #, fuzzy, c-format msgid "cannot get %s lock on database" msgstr "não foi passado pacote para desinstalação" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "shared" msgstr "" @@ -2715,37 +2725,37 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:464 +#: lib/db3.c:461 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:476 +#: lib/db3.c:473 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:513 +#: lib/db3.c:510 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:884 +#: lib/db3.c:881 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:974 +#: lib/db3.c:971 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: lib/db3.c:1079 +#: lib/db3.c:1076 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "não foi passado pacote para desinstalação" -#: lib/db3.c:1086 +#: lib/db3.c:1083 #, c-format msgid "locked db index %s/%s\n" msgstr "" @@ -3579,7 +3589,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:218 +#: lib/rpmdb.c:226 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3590,12 +3600,12 @@ msgid "" msgstr "" # , c-format -#: lib/rpmdb.c:251 +#: lib/rpmdb.c:259 #, fuzzy, c-format msgid "dbiOpen: cannot open %s index" msgstr "Não consegui abrir: %s\n" -#: lib/rpmdb.c:259 +#: lib/rpmdb.c:267 msgid "" "\n" "--> The database is in db%d format, not the suggested db%d format.\n" @@ -3606,7 +3616,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:272 +#: lib/rpmdb.c:280 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the database is db%d format.\n" @@ -3617,40 +3627,40 @@ msgid "" msgstr "" # , c-format -#: lib/rpmdb.c:341 +#: lib/rpmdb.c:345 #, fuzzy, c-format -msgid "error getting \"%s\" records from %s index" +msgid "error(%d) getting \"%s\" records from %s index" msgstr "Não consegui abrir: %s\n" -#: lib/rpmdb.c:458 -#, c-format -msgid "error storing record %s into %s" -msgstr "" +# , c-format +#: lib/rpmdb.c:463 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s" +msgstr "Não consegui abrir: %s\n" # , c-format -#: lib/rpmdb.c:467 +#: lib/rpmdb.c:472 #, fuzzy, c-format -msgid "error removing record %s from %s" +msgid "error(%d) removing record %s from %s" msgstr "Não consegui abrir: %s\n" -#: lib/rpmdb.c:689 lib/rpmdb.c:2200 +#: lib/rpmdb.c:695 lib/rpmdb.c:2200 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:786 +#: lib/rpmdb.c:792 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" -# , c-format #. error -#: lib/rpmdb.c:990 +#: lib/rpmdb.c:996 #, fuzzy, c-format -msgid "cannot retrieve package \"%s\" from db" -msgstr "Não consegui abrir: %s\n" +msgid "error(%d) counting packages" +msgstr "não foi passado pacote para instalação" -#: lib/rpmdb.c:1056 lib/rpmdb.c:1574 lib/uninstall.c:90 +#: lib/rpmdb.c:1054 lib/rpmdb.c:1574 lib/uninstall.c:90 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "não foi passado pacote para desinstalação" @@ -3677,7 +3687,8 @@ msgid "%6d %s\n" msgstr "" #: lib/rpmdb.c:1788 -msgid "cannot allocate new instance in database" +#, c-format +msgid "error(%d) allocating new package instance" msgstr "" #: lib/rpmdb.c:1843 @@ -4310,6 +4321,11 @@ msgstr "" # , c-format #, fuzzy +#~ msgid "cannot retrieve package \"%s\" from db" +#~ msgstr "Não consegui abrir: %s\n" + +# , c-format +#, fuzzy #~ msgid "override build architecture" #~ msgstr "%s não pode ser construido nesta arquitetura\n" diff --git a/po/rpm.pot b/po/rpm.pot index ad4ee7a85..83d170955 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-06-06 04:54-0400\n" +"POT-Creation-Date: 2000-06-06 15:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -2357,41 +2357,51 @@ msgstr "" msgid "loop in prerequisite chain: %s" msgstr "" -#: lib/db1.c:386 +#: lib/db1.c:95 lib/db3.c:433 +#, c-format +msgid "db%d error(%d)" +msgstr "" + +#: lib/db1.c:97 lib/db3.c:435 +#, c-format +msgid " performing %s" +msgstr "" + +#: lib/db1.c:382 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:389 +#: lib/db1.c:385 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:420 +#: lib/db1.c:416 #, c-format msgid "bad db file %s" msgstr "" -#: lib/db1.c:425 +#: lib/db1.c:421 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" -#: lib/db1.c:434 lib/url.c:445 +#: lib/db1.c:430 lib/url.c:445 #, c-format msgid "failed to open %s: %s\n" msgstr "" -#: lib/db1.c:450 +#: lib/db1.c:446 #, c-format msgid "cannot get %s lock on database" msgstr "" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "shared" msgstr "" @@ -2440,37 +2450,37 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:464 +#: lib/db3.c:461 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:476 +#: lib/db3.c:473 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:513 +#: lib/db3.c:510 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:884 +#: lib/db3.c:881 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:974 +#: lib/db3.c:971 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: lib/db3.c:1079 +#: lib/db3.c:1076 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: lib/db3.c:1086 +#: lib/db3.c:1083 #, c-format msgid "locked db index %s/%s\n" msgstr "" @@ -3258,7 +3268,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:218 +#: lib/rpmdb.c:226 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3268,12 +3278,12 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:251 +#: lib/rpmdb.c:259 #, c-format msgid "dbiOpen: cannot open %s index" msgstr "" -#: lib/rpmdb.c:259 +#: lib/rpmdb.c:267 msgid "" "\n" "--> The database is in db%d format, not the suggested db%d format.\n" @@ -3284,7 +3294,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:272 +#: lib/rpmdb.c:280 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the database is db%d format.\n" @@ -3294,38 +3304,38 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:341 +#: lib/rpmdb.c:345 #, c-format -msgid "error getting \"%s\" records from %s index" +msgid "error(%d) getting \"%s\" records from %s index" msgstr "" -#: lib/rpmdb.c:458 +#: lib/rpmdb.c:463 #, c-format -msgid "error storing record %s into %s" +msgid "error(%d) storing record %s into %s" msgstr "" -#: lib/rpmdb.c:467 +#: lib/rpmdb.c:472 #, c-format -msgid "error removing record %s from %s" +msgid "error(%d) removing record %s from %s" msgstr "" -#: lib/rpmdb.c:689 lib/rpmdb.c:2200 +#: lib/rpmdb.c:695 lib/rpmdb.c:2200 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:786 +#: lib/rpmdb.c:792 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:990 +#: lib/rpmdb.c:996 #, c-format -msgid "cannot retrieve package \"%s\" from db" +msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1056 lib/rpmdb.c:1574 lib/uninstall.c:90 +#: lib/rpmdb.c:1054 lib/rpmdb.c:1574 lib/uninstall.c:90 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" @@ -3351,7 +3361,8 @@ msgid "%6d %s\n" msgstr "" #: lib/rpmdb.c:1788 -msgid "cannot allocate new instance in database" +#, c-format +msgid "error(%d) allocating new package instance" msgstr "" #: lib/rpmdb.c:1843 @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-06-06 04:54-0400\n" +"POT-Creation-Date: 2000-06-06 15:54-0400\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" @@ -2510,41 +2510,51 @@ msgstr "ÐÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n" msgid "loop in prerequisite chain: %s" msgstr "ÚÁÍËÎÕÔÙÊ ÃÉËÌ × ÃÅÐÏÞËÅ ÔÒÅÂÏ×ÁÎÉÊ ÄÌÑ ÕÓÔÁÎÏ×ËÉ: %s" -#: lib/db1.c:386 +#: lib/db1.c:95 lib/db3.c:433 +#, c-format +msgid "db%d error(%d)" +msgstr "" + +#: lib/db1.c:97 lib/db3.c:435 +#, c-format +msgid " performing %s" +msgstr "" + +#: lib/db1.c:382 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:389 +#: lib/db1.c:385 #, fuzzy, c-format msgid "removed db file %s\n" msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n" -#: lib/db1.c:420 +#: lib/db1.c:416 #, fuzzy, c-format msgid "bad db file %s" msgstr "ÎÅ×ÅÒÎÏÅ ÓÏÓÔÏÑÎÉÅ ÆÁÊÌÁ: %s" -#: lib/db1.c:425 +#: lib/db1.c:421 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "ÏÔËÒÙ×ÁÀ ÂÁÚÕ × ÒÅÖÉÍÅ 0x%x × %s\n" -#: lib/db1.c:434 lib/url.c:445 +#: lib/db1.c:430 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s: %s" -#: lib/db1.c:450 +#: lib/db1.c:446 #, c-format msgid "cannot get %s lock on database" msgstr "ÎÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ %s ÄÏÓÔÕÐ Ë ÂÁÚÅ ÄÁÎÎÙÈ" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "exclusive" msgstr "ÉÓËÌÀÞÉÔÅÌØÎÙÊ" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "shared" msgstr "ÒÁÚÄÅÌÑÅÍÙÊ" @@ -2593,37 +2603,37 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:464 +#: lib/db3.c:461 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n" -#: lib/db3.c:476 +#: lib/db3.c:473 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n" -#: lib/db3.c:513 +#: lib/db3.c:510 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:884 +#: lib/db3.c:881 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n" -#: lib/db3.c:974 +#: lib/db3.c:971 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "ÏÔËÒÙ×ÁÀ ÂÁÚÕ × ÒÅÖÉÍÅ 0x%x × %s\n" -#: lib/db3.c:1079 +#: lib/db3.c:1076 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ÎÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ %s ÄÏÓÔÕÐ Ë ÂÁÚÅ ÄÁÎÎÙÈ" -#: lib/db3.c:1086 +#: lib/db3.c:1083 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n" @@ -3425,7 +3435,7 @@ msgstr "Ok" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:218 +#: lib/rpmdb.c:226 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3435,12 +3445,12 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:251 +#: lib/rpmdb.c:259 #, fuzzy, c-format msgid "dbiOpen: cannot open %s index" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s\n" -#: lib/rpmdb.c:259 +#: lib/rpmdb.c:267 msgid "" "\n" "--> The database is in db%d format, not the suggested db%d format.\n" @@ -3451,7 +3461,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:272 +#: lib/rpmdb.c:280 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the database is db%d format.\n" @@ -3461,26 +3471,26 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:341 +#: lib/rpmdb.c:345 #, fuzzy, c-format -msgid "error getting \"%s\" records from %s index" +msgid "error(%d) getting \"%s\" records from %s index" msgstr "ÏÛÉÂËÁ ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s" -#: lib/rpmdb.c:458 -#, c-format -msgid "error storing record %s into %s" +#: lib/rpmdb.c:463 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s" msgstr "ÏÛÉÂËÁ ÓÏÈÒÁÎÅÎÉÑ ÚÁÐÉÓÉ %s × %s" -#: lib/rpmdb.c:467 +#: lib/rpmdb.c:472 #, fuzzy, c-format -msgid "error removing record %s from %s" +msgid "error(%d) removing record %s from %s" msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s" -#: lib/rpmdb.c:689 lib/rpmdb.c:2200 +#: lib/rpmdb.c:695 lib/rpmdb.c:2200 msgid "no dbpath has been set" msgstr "ÎÅ ÕÓÔÁÎÏ×ÌÅÎÁ dbpath" -#: lib/rpmdb.c:786 +#: lib/rpmdb.c:792 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" @@ -3489,12 +3499,12 @@ msgstr "" "ÂÁÚÙ ÎÏ×ÏÇÏ ÆÏÒÍÁÔÁ" #. error -#: lib/rpmdb.c:990 +#: lib/rpmdb.c:996 #, fuzzy, c-format -msgid "cannot retrieve package \"%s\" from db" -msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s/packages.rpm\n" +msgid "error(%d) counting packages" +msgstr "ÏÛÉÂËÁ ÐÒÉ ÐÏÉÓËÅ ÐÁËÅÔÁ %s\n" -#: lib/rpmdb.c:1056 lib/rpmdb.c:1574 lib/uninstall.c:90 +#: lib/rpmdb.c:1054 lib/rpmdb.c:1574 lib/uninstall.c:90 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "ÎÅ ÍÏÇÕ ÐÒÏÞÅÓÔØ ÈÅÄÅÒ × %d ÄÌÑ ÐÏÉÓËÁ" @@ -3520,9 +3530,9 @@ msgid "%6d %s\n" msgstr "" #: lib/rpmdb.c:1788 -#, fuzzy -msgid "cannot allocate new instance in database" -msgstr "ÎÅ ÍÏÇÕ ×ÙÄÅÌÉÔØ ÍÅÓÔÏ ÄÌÑ ÂÁÚÙ ÄÁÎÎÙÈ" +#, fuzzy, c-format +msgid "error(%d) allocating new package instance" +msgstr "ÏÛÉÂËÁ ÐÒÉ ÐÏÉÓËÅ ÐÁËÅÔÁ %s\n" #: lib/rpmdb.c:1843 #, c-format @@ -4104,6 +4114,14 @@ msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ %s\n" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: " +#, fuzzy +#~ msgid "cannot retrieve package \"%s\" from db" +#~ msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s/packages.rpm\n" + +#, fuzzy +#~ msgid "cannot allocate new instance in database" +#~ msgstr "ÎÅ ÍÏÇÕ ×ÙÄÅÌÉÔØ ÍÅÓÔÏ ÄÌÑ ÂÁÚÙ ÄÁÎÎÙÈ" + #~ msgid "--buildarch has been obsoleted. Use the --target option instead.\n" #~ msgstr "--buildarch ÕÖÅ ÎÅ × ÍÏÄÅ :) éÓÐÏÌØÚÕÊÔÅ ÏÐÃÉÀ --target.\n" @@ -4188,9 +4206,6 @@ msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: " #~ msgid "error: could not read database record\n" #~ msgstr "ÏÛÉÂËÁ: ÎÅ ÍÏÇÕ ÐÒÏÞÅÓÔØ ÚÁÐÉÓØ ÂÁÚÙ ÄÁÎÎÙÈ\n" -#~ msgid "error looking for package %s\n" -#~ msgstr "ÏÛÉÂËÁ ÐÒÉ ÐÏÉÓËÅ ÐÁËÅÔÁ %s\n" - #~ msgid "cannot read header at %d for lookup" #~ msgstr "ÎÅ ÍÏÇÕ ÐÒÏÞÅÓÔØ ÈÅÄÅÒ × %d ÄÌÑ ÐÏÉÓËÁ" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 2.93\n" -"POT-Creation-Date: 2000-06-06 04:54-0400\n" +"POT-Creation-Date: 2000-06-06 15:54-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n" "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n" @@ -2514,41 +2514,51 @@ msgstr "balík %s koliduje: %s\n" msgid "loop in prerequisite chain: %s" msgstr "sluèka v re»azi po¾iadaviek: %s" -#: lib/db1.c:386 +#: lib/db1.c:95 lib/db3.c:433 +#, c-format +msgid "db%d error(%d)" +msgstr "" + +#: lib/db1.c:97 lib/db3.c:435 +#, c-format +msgid " performing %s" +msgstr "" + +#: lib/db1.c:382 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:389 +#: lib/db1.c:385 #, fuzzy, c-format msgid "removed db file %s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: lib/db1.c:420 +#: lib/db1.c:416 #, fuzzy, c-format msgid "bad db file %s" msgstr "chybný stav súboru: %s" -#: lib/db1.c:425 +#: lib/db1.c:421 #, 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:434 lib/url.c:445 +#: lib/db1.c:430 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" -#: lib/db1.c:450 +#: lib/db1.c:446 #, 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:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "exclusive" msgstr "výhradný" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "shared" msgstr "zdieµaný" @@ -2597,37 +2607,37 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:464 +#: lib/db3.c:461 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: lib/db3.c:476 +#: lib/db3.c:473 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: lib/db3.c:513 +#: lib/db3.c:510 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:884 +#: lib/db3.c:881 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: lib/db3.c:974 +#: lib/db3.c:971 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "otvára sa databáza s právami 0x%x v %s\n" -#: lib/db3.c:1079 +#: lib/db3.c:1076 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "nie je mo¾né získa» %s zámok pre databázu" -#: lib/db3.c:1086 +#: lib/db3.c:1083 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" @@ -3432,7 +3442,7 @@ msgstr "V PORIADKU" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:218 +#: lib/rpmdb.c:226 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3442,12 +3452,12 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:251 +#: lib/rpmdb.c:259 #, fuzzy, c-format msgid "dbiOpen: cannot open %s index" msgstr "nie je mo¾né otvori» %s\n" -#: lib/rpmdb.c:259 +#: lib/rpmdb.c:267 msgid "" "\n" "--> The database is in db%d format, not the suggested db%d format.\n" @@ -3458,7 +3468,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:272 +#: lib/rpmdb.c:280 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the database is db%d format.\n" @@ -3468,26 +3478,26 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:341 +#: lib/rpmdb.c:345 #, fuzzy, c-format -msgid "error getting \"%s\" records from %s index" +msgid "error(%d) getting \"%s\" records from %s index" msgstr "chyba pri naèítaní záznamu %s z %s" -#: lib/rpmdb.c:458 -#, c-format -msgid "error storing record %s into %s" +#: lib/rpmdb.c:463 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s" msgstr "chyba pri zápise záznamu %s do %s" -#: lib/rpmdb.c:467 +#: lib/rpmdb.c:472 #, fuzzy, c-format -msgid "error removing record %s from %s" +msgid "error(%d) removing record %s from %s" msgstr "chyba pri odstraòovaní záznamu %s z %s" -#: lib/rpmdb.c:689 lib/rpmdb.c:2200 +#: lib/rpmdb.c:695 lib/rpmdb.c:2200 msgid "no dbpath has been set" msgstr "nebola nastavená ¾iadna dbpath" -#: lib/rpmdb.c:786 +#: lib/rpmdb.c:792 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" @@ -3496,12 +3506,12 @@ msgstr "" "databázy v novom formáte" #. error -#: lib/rpmdb.c:990 +#: lib/rpmdb.c:996 #, fuzzy, c-format -msgid "cannot retrieve package \"%s\" from db" -msgstr "nie je mo¾né otvori» %s/packages.rpm\n" +msgid "error(%d) counting packages" +msgstr "chyba pri hµadaní balíka %s\n" -#: lib/rpmdb.c:1056 lib/rpmdb.c:1574 lib/uninstall.c:90 +#: lib/rpmdb.c:1054 lib/rpmdb.c:1574 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" @@ -3527,9 +3537,9 @@ msgid "%6d %s\n" msgstr "" #: lib/rpmdb.c:1788 -#, fuzzy -msgid "cannot allocate new instance in database" -msgstr "nie je mo¾né prideli» miesto pre databázu" +#, fuzzy, c-format +msgid "error(%d) allocating new package instance" +msgstr "chyba pri hµadaní balíka %s\n" #: lib/rpmdb.c:1843 #, c-format @@ -4113,6 +4123,14 @@ msgstr "chýbajúce %s\n" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: " +#, fuzzy +#~ msgid "cannot retrieve package \"%s\" from db" +#~ msgstr "nie je mo¾né otvori» %s/packages.rpm\n" + +#, fuzzy +#~ msgid "cannot allocate new instance in database" +#~ msgstr "nie je mo¾né prideli» miesto pre databázu" + #~ msgid "--buildarch has been obsoleted. Use the --target option instead.\n" #~ msgstr "Voµba --buildarch je zastaralá. Pou¾ite namiesto nej --target.\n" @@ -4194,9 +4212,6 @@ msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: " #~ msgid "error: could not read database record\n" #~ msgstr "chyba: nie je mo¾né preèíta» záznam v databáze\n" -#~ msgid "error looking for package %s\n" -#~ msgstr "chyba pri hµadaní balíka %s\n" - #~ msgid "cannot read header at %d for lookup" #~ msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie" @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000. -# $Id: sl.po,v 1.52 2000/06/06 09:01:07 jbj Exp $ +# $Id: sl.po,v 1.53 2000/06/06 20:06:10 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 3.0.4\n" -"POT-Creation-Date: 2000-06-06 04:54-0400\n" +"POT-Creation-Date: 2000-06-06 15:54-0400\n" "PO-Revision-Date: 2000-02-17 22:25+01:00\n" "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -2499,41 +2499,51 @@ msgstr "paket %s v sporu: %s\n" msgid "loop in prerequisite chain: %s" msgstr "zanka v predpogojevani verigi: %s" -#: lib/db1.c:386 +#: lib/db1.c:95 lib/db3.c:433 +#, c-format +msgid "db%d error(%d)" +msgstr "" + +#: lib/db1.c:97 lib/db3.c:435 +#, c-format +msgid " performing %s" +msgstr "" + +#: lib/db1.c:382 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:389 +#: lib/db1.c:385 #, fuzzy, c-format msgid "removed db file %s\n" msgstr "odstranjujemo seznam datotek za %s\n" -#: lib/db1.c:420 +#: lib/db1.c:416 #, fuzzy, c-format msgid "bad db file %s" msgstr "okvarjeno stanje datoteke: %s" -#: lib/db1.c:425 +#: lib/db1.c:421 #, 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:434 lib/url.c:445 +#: lib/db1.c:430 lib/url.c:445 #, c-format msgid "failed to open %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" -#: lib/db1.c:450 +#: lib/db1.c:446 #, c-format msgid "cannot get %s lock on database" msgstr "datoteke ni mo¾no %s zakleniti" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "exclusive" msgstr "izkljuèujoèe" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "shared" msgstr "deljeno" @@ -2582,37 +2592,37 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:464 +#: lib/db3.c:461 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "odstranjujemo seznam datotek za %s\n" -#: lib/db3.c:476 +#: lib/db3.c:473 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "odstranjujemo seznam datotek za %s\n" -#: lib/db3.c:513 +#: lib/db3.c:510 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:884 +#: lib/db3.c:881 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "odstranjujemo seznam datotek za %s\n" -#: lib/db3.c:974 +#: lib/db3.c:971 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "odpiramo datoteko z naèinom 0x%x v %s\n" -#: lib/db3.c:1079 +#: lib/db3.c:1076 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "datoteke ni mo¾no %s zakleniti" -#: lib/db3.c:1086 +#: lib/db3.c:1083 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "odstranjujemo seznam datotek za %s\n" @@ -3417,7 +3427,7 @@ msgstr "V REDU" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:218 +#: lib/rpmdb.c:226 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3427,12 +3437,12 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:251 +#: lib/rpmdb.c:259 #, fuzzy, c-format msgid "dbiOpen: cannot open %s index" msgstr "ni mo¾no odpreti %s: %s\n" -#: lib/rpmdb.c:259 +#: lib/rpmdb.c:267 msgid "" "\n" "--> The database is in db%d format, not the suggested db%d format.\n" @@ -3443,7 +3453,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:272 +#: lib/rpmdb.c:280 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the database is db%d format.\n" @@ -3453,38 +3463,38 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:341 +#: lib/rpmdb.c:345 #, fuzzy, c-format -msgid "error getting \"%s\" records from %s index" +msgid "error(%d) getting \"%s\" records from %s index" msgstr "napaka pri branju zapisa %s iz %s" -#: lib/rpmdb.c:458 -#, c-format -msgid "error storing record %s into %s" +#: lib/rpmdb.c:463 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s" msgstr "napaka pri pisanju zapisa %s v %s" -#: lib/rpmdb.c:467 +#: lib/rpmdb.c:472 #, fuzzy, c-format -msgid "error removing record %s from %s" +msgid "error(%d) removing record %s from %s" msgstr "napaka pri brisanju zapisa %s iz %s" -#: lib/rpmdb.c:689 lib/rpmdb.c:2200 +#: lib/rpmdb.c:695 lib/rpmdb.c:2200 msgid "no dbpath has been set" msgstr "dbpath ni nastavljena" -#: lib/rpmdb.c:786 +#: lib/rpmdb.c:792 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "staro obliko podatkove zbirke pretvorite v novo z --rebuilddb" #. error -#: lib/rpmdb.c:990 +#: lib/rpmdb.c:996 #, fuzzy, c-format -msgid "cannot retrieve package \"%s\" from db" -msgstr "paketa ni mo¾no odpreti: %s\n" +msgid "error(%d) counting packages" +msgstr "napaka pri iskanju paketa %s\n" -#: lib/rpmdb.c:1056 lib/rpmdb.c:1574 lib/uninstall.c:90 +#: lib/rpmdb.c:1054 lib/rpmdb.c:1574 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" @@ -3510,9 +3520,9 @@ msgid "%6d %s\n" msgstr "" #: lib/rpmdb.c:1788 -#, fuzzy -msgid "cannot allocate new instance in database" -msgstr "ni mo¾no zagotoviti prostora za podatkovno zbirko" +#, fuzzy, c-format +msgid "error(%d) allocating new package instance" +msgstr "napaka pri iskanju paketa %s\n" #: lib/rpmdb.c:1843 #, c-format @@ -4092,6 +4102,14 @@ msgstr "manjka %s\n" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: " +#, fuzzy +#~ msgid "cannot retrieve package \"%s\" from db" +#~ msgstr "paketa ni mo¾no odpreti: %s\n" + +#, fuzzy +#~ msgid "cannot allocate new instance in database" +#~ msgstr "ni mo¾no zagotoviti prostora za podatkovno zbirko" + #~ msgid "--buildarch has been obsoleted. Use the --target option instead.\n" #~ msgstr "--buildarch je opu¹èena izbira. Uporabite namesto nje --target.\n" @@ -4179,9 +4197,6 @@ msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: " #~ msgid "error: could not read database record\n" #~ msgstr "napaka: zapisa podatkove zbirke ni mo¾no prebrati\n" -#~ msgid "error looking for package %s\n" -#~ msgstr "napaka pri iskanju paketa %s\n" - #~ msgid "cannot read header at %d for lookup" #~ msgstr "ni mo¾no prebrati glave pri %d za vpogled" @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-06-06 04:54-0400\n" +"POT-Creation-Date: 2000-06-06 15:54-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" "From: Erik Troan <ewt@lacrosse.redhat.com>\n" @@ -2518,41 +2518,51 @@ msgstr "paket %s nije naveden u %s" msgid "loop in prerequisite chain: %s" msgstr "petlja u lancu: %s" -#: lib/db1.c:386 +#: lib/db1.c:95 lib/db3.c:433 +#, c-format +msgid "db%d error(%d)" +msgstr "" + +#: lib/db1.c:97 lib/db3.c:435 +#, c-format +msgid " performing %s" +msgstr "" + +#: lib/db1.c:382 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:389 +#: lib/db1.c:385 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:420 +#: lib/db1.c:416 #, fuzzy, c-format msgid "bad db file %s" msgstr "neuspelo otvaranje %s: %s" -#: lib/db1.c:425 +#: lib/db1.c:421 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: lib/db1.c:434 lib/url.c:445 +#: lib/db1.c:430 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/db1.c:450 +#: lib/db1.c:446 #, c-format msgid "cannot get %s lock on database" msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "exclusive" msgstr "ekskluzivno" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "shared" msgstr "deljeno" @@ -2601,37 +2611,37 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:464 +#: lib/db3.c:461 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:476 +#: lib/db3.c:473 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:513 +#: lib/db3.c:510 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:884 +#: lib/db3.c:881 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:974 +#: lib/db3.c:971 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: lib/db3.c:1079 +#: lib/db3.c:1076 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka" -#: lib/db3.c:1086 +#: lib/db3.c:1083 #, c-format msgid "locked db index %s/%s\n" msgstr "" @@ -3456,7 +3466,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:218 +#: lib/rpmdb.c:226 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3466,12 +3476,12 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:251 +#: lib/rpmdb.c:259 #, fuzzy, c-format msgid "dbiOpen: cannot open %s index" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/rpmdb.c:259 +#: lib/rpmdb.c:267 msgid "" "\n" "--> The database is in db%d format, not the suggested db%d format.\n" @@ -3482,7 +3492,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:272 +#: lib/rpmdb.c:280 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the database is db%d format.\n" @@ -3492,38 +3502,38 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:341 +#: lib/rpmdb.c:345 #, fuzzy, c-format -msgid "error getting \"%s\" records from %s index" +msgid "error(%d) getting \"%s\" records from %s index" msgstr "gre¹ka kod uzimanja sloga %s iz %s" -#: lib/rpmdb.c:458 -#, c-format -msgid "error storing record %s into %s" +#: lib/rpmdb.c:463 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: lib/rpmdb.c:467 +#: lib/rpmdb.c:472 #, fuzzy, c-format -msgid "error removing record %s from %s" +msgid "error(%d) removing record %s from %s" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: lib/rpmdb.c:689 lib/rpmdb.c:2200 +#: lib/rpmdb.c:695 lib/rpmdb.c:2200 msgid "no dbpath has been set" msgstr "dbpath nije odreðen" -#: lib/rpmdb.c:786 +#: lib/rpmdb.c:792 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:990 +#: lib/rpmdb.c:996 #, fuzzy, c-format -msgid "cannot retrieve package \"%s\" from db" -msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" +msgid "error(%d) counting packages" +msgstr "gre¹ka kod potrage za paketom %s\n" -#: lib/rpmdb.c:1056 lib/rpmdb.c:1574 lib/uninstall.c:90 +#: lib/rpmdb.c:1054 lib/rpmdb.c:1574 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" @@ -3549,9 +3559,9 @@ msgid "%6d %s\n" msgstr "" #: lib/rpmdb.c:1788 -#, fuzzy -msgid "cannot allocate new instance in database" -msgstr "ne mogu da zauzmem prostor za bazu podataka" +#, fuzzy, c-format +msgid "error(%d) allocating new package instance" +msgstr "gre¹ka kod potrage za paketom %s\n" #: lib/rpmdb.c:1843 #, c-format @@ -4153,6 +4163,14 @@ msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nezadovoljene meðuzavisnosti za %s-%s-%s: " #, fuzzy +#~ msgid "cannot retrieve package \"%s\" from db" +#~ msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" + +#, fuzzy +#~ msgid "cannot allocate new instance in database" +#~ msgstr "ne mogu da zauzmem prostor za bazu podataka" + +#, fuzzy #~ msgid "override build architecture" #~ msgstr "nemoj proveravati arhitekturu paketa" @@ -4230,9 +4248,6 @@ msgstr "Nezadovoljene meðuzavisnosti za %s-%s-%s: " #~ msgid "error: could not read database record\n" #~ msgstr "gre¹ka: neuspelo èitanje sloga baze podataka\n" -#~ msgid "error looking for package %s\n" -#~ msgstr "gre¹ka kod potrage za paketom %s\n" - #~ msgid "cannot read header at %d for lookup" #~ msgstr "ne mogu da proèitam zaglavlje na %d za proveru" @@ -1,12 +1,12 @@ # Swedish messages for RPM # Copyright © 1999 Free Software Foundation, Inc. # Göran Uddeborg <göran@uddeborg.pp.se>, 1999, 2000. -# $Revision: 1.112 $ +# $Revision: 1.113 $ # msgid "" msgstr "" "Project-Id-Version: rpm 3.0.4\n" -"POT-Creation-Date: 2000-06-06 04:54-0400\n" +"POT-Creation-Date: 2000-06-06 15:54-0400\n" "PO-Revision-Date: 2000-02-21 12:20+0100\n" "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -2483,41 +2483,51 @@ msgstr "paket %s står i konflikt: %s\n" msgid "loop in prerequisite chain: %s" msgstr "cirkularitet i kedja av förutsättningar: %s" -#: lib/db1.c:386 +#: lib/db1.c:95 lib/db3.c:433 +#, c-format +msgid "db%d error(%d)" +msgstr "" + +#: lib/db1.c:97 lib/db3.c:435 +#, c-format +msgid " performing %s" +msgstr "" + +#: lib/db1.c:382 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:389 +#: lib/db1.c:385 #, fuzzy, c-format msgid "removed db file %s\n" msgstr "tar bort filindex för %s\n" -#: lib/db1.c:420 +#: lib/db1.c:416 #, fuzzy, c-format msgid "bad db file %s" msgstr "felaktig filstatus: %s" -#: lib/db1.c:425 +#: lib/db1.c:421 #, 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:434 lib/url.c:445 +#: lib/db1.c:430 lib/url.c:445 #, c-format msgid "failed to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" -#: lib/db1.c:450 +#: lib/db1.c:446 #, c-format msgid "cannot get %s lock on database" msgstr "kan inte få %s lås på databas" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "exclusive" msgstr "uteslutande" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "shared" msgstr "delat" @@ -2566,37 +2576,37 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:464 +#: lib/db3.c:461 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "tar bort filindex för %s\n" -#: lib/db3.c:476 +#: lib/db3.c:473 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "tar bort filindex för %s\n" -#: lib/db3.c:513 +#: lib/db3.c:510 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:884 +#: lib/db3.c:881 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "tar bort filindex för %s\n" -#: lib/db3.c:974 +#: lib/db3.c:971 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "öppnar databas med rättighet 0x%x i %s\n" -#: lib/db3.c:1079 +#: lib/db3.c:1076 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "kan inte få %s lås på databas" -#: lib/db3.c:1086 +#: lib/db3.c:1083 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "tar bort filindex för %s\n" @@ -3404,7 +3414,7 @@ msgstr "OK" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:218 +#: lib/rpmdb.c:226 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3414,12 +3424,12 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:251 +#: lib/rpmdb.c:259 #, fuzzy, c-format msgid "dbiOpen: cannot open %s index" msgstr "kan inte öppna %s: %s\n" -#: lib/rpmdb.c:259 +#: lib/rpmdb.c:267 msgid "" "\n" "--> The database is in db%d format, not the suggested db%d format.\n" @@ -3430,7 +3440,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:272 +#: lib/rpmdb.c:280 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the database is db%d format.\n" @@ -3440,26 +3450,26 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:341 +#: lib/rpmdb.c:345 #, fuzzy, c-format -msgid "error getting \"%s\" records from %s index" +msgid "error(%d) getting \"%s\" records from %s index" msgstr "fel när post %s hämtades från %s" -#: lib/rpmdb.c:458 -#, c-format -msgid "error storing record %s into %s" +#: lib/rpmdb.c:463 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s" msgstr "fel när post %s sparades i %s" -#: lib/rpmdb.c:467 +#: lib/rpmdb.c:472 #, fuzzy, c-format -msgid "error removing record %s from %s" +msgid "error(%d) removing record %s from %s" msgstr "fel när post %s togs bort ur %s" -#: lib/rpmdb.c:689 lib/rpmdb.c:2200 +#: lib/rpmdb.c:695 lib/rpmdb.c:2200 msgid "no dbpath has been set" msgstr "ingen dbpath har satts" -#: lib/rpmdb.c:786 +#: lib/rpmdb.c:792 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" @@ -3468,12 +3478,12 @@ msgstr "" "i nytt format" #. error -#: lib/rpmdb.c:990 +#: lib/rpmdb.c:996 #, fuzzy, c-format -msgid "cannot retrieve package \"%s\" from db" -msgstr "kan inte öppna paket: %s\n" +msgid "error(%d) counting packages" +msgstr "fel vid sökning efter paket %s\n" -#: lib/rpmdb.c:1056 lib/rpmdb.c:1574 lib/uninstall.c:90 +#: lib/rpmdb.c:1054 lib/rpmdb.c:1574 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" @@ -3499,9 +3509,9 @@ msgid "%6d %s\n" msgstr "" #: lib/rpmdb.c:1788 -#, fuzzy -msgid "cannot allocate new instance in database" -msgstr "kan inte allokera plats för databas" +#, fuzzy, c-format +msgid "error(%d) allocating new package instance" +msgstr "fel vid sökning efter paket %s\n" #: lib/rpmdb.c:1843 #, c-format @@ -4080,6 +4090,14 @@ msgstr "saknas %s\n" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Ouppfyllda beroenden för %s-%s-%s: " +#, fuzzy +#~ msgid "cannot retrieve package \"%s\" from db" +#~ msgstr "kan inte öppna paket: %s\n" + +#, fuzzy +#~ msgid "cannot allocate new instance in database" +#~ msgstr "kan inte allokera plats för databas" + #~ msgid "--buildarch has been obsoleted. Use the --target option instead.\n" #~ msgstr "--buildarch är föråldrat. Använd flaggan --target istället.\n" @@ -4166,9 +4184,6 @@ msgstr "Ouppfyllda beroenden för %s-%s-%s: " #~ msgid "error: could not read database record\n" #~ msgstr "fel: kunde inte lästa databaspost\n" -#~ msgid "error looking for package %s\n" -#~ msgstr "fel vid sökning efter paket %s\n" - #~ msgid "cannot read header at %d for lookup" #~ msgstr "kan inte läsa huvud vid %d för uppslagning" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-06 04:54-0400\n" +"POT-Creation-Date: 2000-06-06 15:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -2568,41 +2568,51 @@ msgstr "%s paketi %s altýnda gözükmüyor" msgid "loop in prerequisite chain: %s" msgstr "gerekenler zincirinde döngü: %s" -#: lib/db1.c:386 +#: lib/db1.c:95 lib/db3.c:433 +#, c-format +msgid "db%d error(%d)" +msgstr "" + +#: lib/db1.c:97 lib/db3.c:435 +#, c-format +msgid " performing %s" +msgstr "" + +#: lib/db1.c:382 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:389 +#: lib/db1.c:385 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:420 +#: lib/db1.c:416 #, fuzzy, c-format msgid "bad db file %s" msgstr "%s açýlamadý: %s" -#: lib/db1.c:425 +#: lib/db1.c:421 #, 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:434 lib/url.c:445 +#: lib/db1.c:430 lib/url.c:445 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "%s açýlamadý: %s" -#: lib/db1.c:450 +#: lib/db1.c:446 #, c-format msgid "cannot get %s lock on database" msgstr "Veritabaný için %s kilit (lock) alýnamadý" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "exclusive" msgstr "özel" -#: lib/db1.c:451 lib/db3.c:1081 +#: lib/db1.c:447 lib/db3.c:1078 msgid "shared" msgstr "paylaþýlan (shared)" @@ -2651,37 +2661,37 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:464 +#: lib/db3.c:461 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:476 +#: lib/db3.c:473 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:513 +#: lib/db3.c:510 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:884 +#: lib/db3.c:881 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:974 +#: lib/db3.c:971 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur" -#: lib/db3.c:1079 +#: lib/db3.c:1076 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "Veritabaný için %s kilit (lock) alýnamadý" -#: lib/db3.c:1086 +#: lib/db3.c:1083 #, c-format msgid "locked db index %s/%s\n" msgstr "" @@ -3509,7 +3519,7 @@ msgstr "" msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:218 +#: lib/rpmdb.c:226 msgid "" "\n" "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n" @@ -3519,12 +3529,12 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:251 +#: lib/rpmdb.c:259 #, fuzzy, c-format msgid "dbiOpen: cannot open %s index" msgstr "hata: %s eriþilemiyor\n" -#: lib/rpmdb.c:259 +#: lib/rpmdb.c:267 msgid "" "\n" "--> The database is in db%d format, not the suggested db%d format.\n" @@ -3535,7 +3545,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:272 +#: lib/rpmdb.c:280 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the database is db%d format.\n" @@ -3545,38 +3555,38 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:341 +#: lib/rpmdb.c:345 #, fuzzy, c-format -msgid "error getting \"%s\" records from %s index" +msgid "error(%d) getting \"%s\" records from %s index" msgstr "%s kaydýna %s dosyasýnda eriþilemiyor:" -#: lib/rpmdb.c:458 -#, c-format -msgid "error storing record %s into %s" +#: lib/rpmdb.c:463 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s" msgstr "%s kaydý %s dosyasýna yazýlamýyor" -#: lib/rpmdb.c:467 +#: lib/rpmdb.c:472 #, fuzzy, c-format -msgid "error removing record %s from %s" +msgid "error(%d) removing record %s from %s" msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata" -#: lib/rpmdb.c:689 lib/rpmdb.c:2200 +#: lib/rpmdb.c:695 lib/rpmdb.c:2200 msgid "no dbpath has been set" msgstr "dbpath deðeri girilmemiþ" -#: lib/rpmdb.c:786 +#: lib/rpmdb.c:792 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:990 +#: lib/rpmdb.c:996 #, fuzzy, c-format -msgid "cannot retrieve package \"%s\" from db" -msgstr "hata: %s%s/packages.rpm açýlamýyor\n" +msgid "error(%d) counting packages" +msgstr "%s pakedi aranýrken hata oluþtu\n" -#: lib/rpmdb.c:1056 lib/rpmdb.c:1574 lib/uninstall.c:90 +#: lib/rpmdb.c:1054 lib/rpmdb.c:1574 lib/uninstall.c:90 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "%d kaydýndan baþlýk bilgisi okunamadý" @@ -3601,11 +3611,10 @@ msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata" msgid "%6d %s\n" msgstr "" -# reservieren??? #: lib/rpmdb.c:1788 -#, fuzzy -msgid "cannot allocate new instance in database" -msgstr "Veritabaný için yer bulunamadý" +#, fuzzy, c-format +msgid "error(%d) allocating new package instance" +msgstr "%s pakedi aranýrken hata oluþtu\n" #: lib/rpmdb.c:1843 #, c-format @@ -4207,6 +4216,15 @@ msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "%s-%s-%s 'nin baðýmlýlýk sorunlarý: " #, fuzzy +#~ msgid "cannot retrieve package \"%s\" from db" +#~ msgstr "hata: %s%s/packages.rpm açýlamýyor\n" + +# reservieren??? +#, fuzzy +#~ msgid "cannot allocate new instance in database" +#~ msgstr "Veritabaný için yer bulunamadý" + +#, fuzzy #~ msgid "override build architecture" #~ msgstr "paket mimarisini doðrulamaz" @@ -4285,9 +4303,6 @@ msgstr "%s-%s-%s 'nin baðýmlýlýk sorunlarý: " #~ msgid "error: could not read database record\n" #~ msgstr "hata: veritabaný kaydý okunamadý\n" -#~ msgid "error looking for package %s\n" -#~ msgstr "%s pakedi aranýrken hata oluþtu\n" - #~ msgid "cannot read header at %d for lookup" #~ msgstr "%d kaydýndan baþlýk bilgisi okunamadý" @@ -5,7 +5,7 @@ Summary: The Red Hat package management system. Name: rpm %define version 4.0 Version: %{version} -Release: 0.32 +Release: 0.33 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz Copyright: GPL @@ -89,7 +89,6 @@ capabilities. %prep %setup -q - %build %ifos linux CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{__prefix} --sysconfdir=/etc --localstatedir=/var --infodir='${prefix}%{__share}/info' --mandir='${prefix}%{__share}/man' @@ -252,6 +251,9 @@ fi %{__prefix}/include/popt.h %changelog +* Tue Jun 6 2000 Jeff Johnson <jbj@redhat.com> +- require db3 in default configuration. + * Mon Jun 5 2000 Jeff Johnson <jbj@redhat.com> - add optflags for i486 and i586. - fix: segfault with legacy packages missing RPMTAG_FILEINODES. |