diff options
-rw-r--r-- | .lclintrc | 2 | ||||
-rw-r--r-- | CHANGES | 2 | ||||
-rw-r--r-- | build.c | 4 | ||||
-rw-r--r-- | build/.lclintrc | 2 | ||||
-rw-r--r-- | build/build.c | 2 | ||||
-rw-r--r-- | build/buildio.h | 1 | ||||
-rw-r--r-- | build/pack.c | 58 | ||||
-rw-r--r-- | build/parseDescription.c | 9 | ||||
-rw-r--r-- | build/parseFiles.c | 9 | ||||
-rw-r--r-- | build/parsePreamble.c | 10 | ||||
-rw-r--r-- | build/parsePrep.c | 6 | ||||
-rw-r--r-- | build/parseScript.c | 15 | ||||
-rw-r--r-- | build/parseSpec.c | 15 | ||||
-rw-r--r-- | build/rpmspec.h | 2 | ||||
-rw-r--r-- | lib/.lclintrc | 2 | ||||
-rw-r--r-- | lib/Makefile.am | 2 | ||||
-rw-r--r-- | lib/cpio.c | 149 | ||||
-rw-r--r-- | lib/cpio.h | 29 | ||||
-rw-r--r-- | lib/falloc.c | 88 | ||||
-rw-r--r-- | lib/falloc.h | 12 | ||||
-rw-r--r-- | lib/fprint.c | 48 | ||||
-rw-r--r-- | lib/ftp.c | 14 | ||||
-rw-r--r-- | lib/hash.c | 28 | ||||
-rw-r--r-- | lib/header.c | 28 | ||||
-rw-r--r-- | lib/header.h | 3 | ||||
-rw-r--r-- | lib/install.c | 9 | ||||
-rw-r--r-- | lib/macro.c | 10 | ||||
-rw-r--r-- | lib/oldheader.c | 2 | ||||
-rw-r--r-- | lib/package.c | 6 | ||||
-rw-r--r-- | lib/rpmbzio.c | 33 | ||||
-rw-r--r-- | lib/rpmchecksig.c | 10 | ||||
-rw-r--r-- | lib/rpmdb.c | 6 | ||||
-rw-r--r-- | lib/rpminstall.c | 12 | ||||
-rw-r--r-- | lib/rpmio.h | 42 | ||||
-rw-r--r-- | lib/rpmlead.c | 2 | ||||
-rw-r--r-- | lib/rpmlib.h | 8 | ||||
-rw-r--r-- | lib/rpmrc.c | 71 | ||||
-rw-r--r-- | lib/signature.c | 14 | ||||
-rw-r--r-- | lib/tread.c | 4 | ||||
-rw-r--r-- | lib/uninstall.c | 12 | ||||
-rw-r--r-- | lib/url.c | 10 | ||||
-rw-r--r-- | lib/verify.c | 2 | ||||
-rw-r--r-- | po/POTFILES.in | 1 | ||||
-rw-r--r-- | po/cs.po | 542 | ||||
-rw-r--r-- | po/de.po | 544 | ||||
-rw-r--r-- | po/fi.po | 542 | ||||
-rw-r--r-- | po/fr.po | 540 | ||||
-rw-r--r-- | po/pl.po | 544 | ||||
-rw-r--r-- | po/pt_BR.po | 555 | ||||
-rw-r--r-- | po/rpm.pot | 162 | ||||
-rw-r--r-- | po/ru.po | 544 | ||||
-rw-r--r-- | po/sk.po | 544 | ||||
-rw-r--r-- | po/sr.po | 542 | ||||
-rw-r--r-- | po/sv.po | 542 | ||||
-rw-r--r-- | po/tr.po | 542 | ||||
-rw-r--r-- | popt/po/popt.pot | 2 | ||||
-rw-r--r-- | popt/po/ro.po | 2 | ||||
-rw-r--r-- | popt/po/sk.po | 2 | ||||
-rw-r--r-- | popt/popt.3 | 12 | ||||
-rw-r--r-- | popt/popt.c | 12 | ||||
-rw-r--r-- | popt/popt.h | 6 | ||||
-rw-r--r-- | popt/test1.c | 2 | ||||
-rw-r--r-- | popt/test2.c | 2 | ||||
-rw-r--r-- | python/rpmmodule.c | 104 | ||||
-rwxr-xr-x | rpm.c | 4 | ||||
-rw-r--r-- | rpm2cpio.c | 8 | ||||
-rw-r--r-- | rpmio/macro.c | 10 | ||||
-rw-r--r-- | system.h | 17 | ||||
-rw-r--r-- | tools/dump.c | 2 | ||||
-rw-r--r-- | tools/rpmarchive.c | 4 | ||||
-rw-r--r-- | tools/rpmgettext.c | 6 | ||||
-rw-r--r-- | tools/rpminject.c | 4 |
72 files changed, 3622 insertions, 3514 deletions
@@ -1,4 +1,4 @@ --I. -I./build -I./lib -I./popt -DHAVE_CONFIG_H +-I. -I./build -I./lib -I./popt -DHAVE_CONFIG_H -D_GNU_SOURCE +partial @@ -1,4 +1,6 @@ 3.0.3 -> 3.0.4 + - use compressed filenames on install side. + - start unifying FD types, CFD_t now gone. 3.0.2 -> 3.0.3 - add --eval to find result of macro expansion. @@ -61,8 +61,8 @@ static int isSpecFile(const char *specfile) fprintf(stderr, _("Unable to open spec file: %s\n"), specfile); return 0; } - count = fdRead(fd, buf, sizeof(buf)); - fdClose(fd); + count = Fread(buf, sizeof(buf), 1, fd); + Fclose(fd); checking = 1; for (s = buf; count--; s++) { diff --git a/build/.lclintrc b/build/.lclintrc index 51ee0477f..38330a279 100644 --- a/build/.lclintrc +++ b/build/.lclintrc @@ -1,4 +1,4 @@ --I. -I.. -I../build -I../lib -I../popt -DHAVE_CONFIG_H +-I. -I.. -I../build -I../lib -I../popt -DHAVE_CONFIG_H -D_GNU_SOURCE +partial diff --git a/build/build.c b/build/build.c index c0c7764e3..0e4961111 100644 --- a/build/build.c +++ b/build/build.c @@ -78,7 +78,7 @@ int doScript(Spec spec, int what, const char *name, StringBuf sb, int test) } if (makeTempFile(NULL, &scriptName, &fd)) { - fdClose(fd); + Fclose(fd); FREE(scriptName); rpmError(RPMERR_SCRIPT, _("Unable to open temp file")); return RPMERR_SCRIPT; diff --git a/build/buildio.h b/build/buildio.h index c70fce50b..536ca6dfa 100644 --- a/build/buildio.h +++ b/build/buildio.h @@ -6,7 +6,6 @@ #include "cpio.h" typedef struct cpioSourceArchive { - CFD_t cpioCfd; unsigned int cpioArchiveSize; FD_t cpioFdIn; /*@dependent@*/ struct cpioFileMapping *cpioList; diff --git a/build/pack.c b/build/pack.c index 460ff246a..d8db32069 100644 --- a/build/pack.c +++ b/build/pack.c @@ -63,7 +63,7 @@ int packageSources(Spec spec) memset(csa, 0, sizeof(*csa)); csa->cpioArchiveSize = 0; - csa->cpioFdIn = fdNew(); + csa->cpioFdIn = fdNew(&fdio); csa->cpioList = spec->sourceCpioList; csa->cpioCount = spec->sourceCpioCount; @@ -158,7 +158,7 @@ int packageBinaries(Spec spec) memset(csa, 0, sizeof(*csa)); csa->cpioArchiveSize = 0; - csa->cpioFdIn = fdNew(); + csa->cpioFdIn = fdNew(&fdio); csa->cpioList = pkg->cpioList; csa->cpioCount = pkg->cpioCount; @@ -190,12 +190,13 @@ int readRPM(const char *fileName, Spec *specp, struct rpmlead *lead, Header *sig } /* Get copy of lead */ - if ((rc = fdRead(fdi, lead, sizeof(*lead))) != sizeof(*lead)) { + if ((rc = Fread(lead, sizeof(*lead), 1, fdi)) != sizeof(*lead)) { rpmError(RPMERR_BADMAGIC, _("readRPM: read %s: %s\n"), fileName, strerror(errno)); return RPMERR_BADMAGIC; } - (void)fdLseek(fdi, 0, SEEK_SET); /* XXX FIXME: EPIPE */ + + (void)Fseek(fdi, 0, SEEK_SET); /* XXX FIXME: EPIPE */ /* Reallocate build data structures */ spec = newSpec(); @@ -228,7 +229,7 @@ int readRPM(const char *fileName, Spec *specp, struct rpmlead *lead, Header *sig if (csa) { csa->cpioFdIn = fdi; } else { - fdClose(fdi); + Fclose(fdi); } return 0; @@ -279,7 +280,7 @@ int writeRPM(Header h, const char *fileName, int type, } } if (rc != 0) { - fdClose(fd); + Fclose(fd); unlink(sigtarget); xfree(sigtarget); return rc; @@ -290,11 +291,13 @@ int writeRPM(Header h, const char *fileName, int type, headerModifyEntry(h, RPMTAG_ARCHIVESIZE, RPM_INT32_TYPE, &csa->cpioArchiveSize, 1); } - (void)fdLseek(fd, 0, SEEK_SET); + + (void)Fseek(fd, 0, SEEK_SET); + if (headerWrite(fd, h, HEADER_MAGIC_YES)) rc = RPMERR_NOSPACE; - fdClose(fd); + Fclose(fd); unlink(fileName); if (rc) { @@ -339,7 +342,7 @@ int writeRPM(Header h, const char *fileName, int type, if (writeLead(fd, &lead)) { rpmError(RPMERR_NOSPACE, _("Unable to write package: %s"), strerror(errno)); - fdClose(fd); + Fclose(fd); unlink(sigtarget); xfree(sigtarget); unlink(fileName); @@ -356,7 +359,7 @@ int writeRPM(Header h, const char *fileName, int type, rpmAddSignature(sig, sigtarget, sigtype, passPhrase); } if ((rc = rpmWriteSignature(fd, sig))) { - fdClose(fd); + Fclose(fd); unlink(sigtarget); xfree(sigtarget); unlink(fileName); @@ -367,30 +370,30 @@ int writeRPM(Header h, const char *fileName, int type, /* Append the header and archive */ ifd = fdOpen(sigtarget, O_RDONLY, 0); - while ((count = fdRead(ifd, buf, sizeof(buf))) > 0) { + while ((count = Fread(buf, sizeof(buf), 1, ifd)) > 0) { if (count == -1) { rpmError(RPMERR_READERROR, _("Unable to read sigtarget: %s"), strerror(errno)); - fdClose(ifd); - fdClose(fd); + Fclose(ifd); + Fclose(fd); unlink(sigtarget); xfree(sigtarget); unlink(fileName); return RPMERR_READERROR; } - if (fdWrite(fd, buf, count) < 0) { + if (Fwrite(buf, count, 1, fd) < 0) { rpmError(RPMERR_NOSPACE, _("Unable to write package: %s"), strerror(errno)); - fdClose(ifd); - fdClose(fd); + Fclose(ifd); + Fclose(fd); unlink(sigtarget); xfree(sigtarget); unlink(fileName); return RPMERR_NOSPACE; } } - fdClose(ifd); - fdClose(fd); + Fclose(ifd); + Fclose(fd); unlink(sigtarget); xfree(sigtarget); @@ -402,12 +405,11 @@ int writeRPM(Header h, const char *fileName, int type, #if ENABLE_BZIP2_PAYLOAD static int cpio_bzip2(FD_t fdo, CSA_t *csa) { - CFD_t *cfd = &csa->cpioCfd; + FD_t cfd; int rc; const char *failedFile = NULL; - cfd->cpioIoType = cpioIoTypeBzFd; - cfd->cpioBzFd = bzdFdopen(fdDup(fdFileno(fdo)), "w9"); + cfd = bzdFdopen(fdDup(fdFileno(fdo)), "w9"); rc = cpioBuildArchive(cfd, csa->cpioList, csa->cpioCount, NULL, NULL, &csa->cpioArchiveSize, &failedFile); if (rc) { @@ -416,7 +418,7 @@ static int cpio_bzip2(FD_t fdo, CSA_t *csa) rc = 1; } - bzdClose(cfd->cpioBzFd); + Fclose(cfd); if (failedFile) xfree(failedFile); @@ -426,12 +428,11 @@ static int cpio_bzip2(FD_t fdo, CSA_t *csa) static int cpio_gzip(FD_t fdo, CSA_t *csa) { - CFD_t *cfd = &csa->cpioCfd; + FD_t cfd; int rc; const char *failedFile = NULL; - cfd->cpioIoType = cpioIoTypeGzFd; - cfd->cpioGzFd = gzdFdopen(fdDup(fdFileno(fdo)), "w9"); + cfd = gzdFdopen(fdDup(fdFileno(fdo)), "w9"); rc = cpioBuildArchive(cfd, csa->cpioList, csa->cpioCount, NULL, NULL, &csa->cpioArchiveSize, &failedFile); if (rc) { @@ -440,8 +441,7 @@ static int cpio_gzip(FD_t fdo, CSA_t *csa) rc = 1; } - gzdClose(cfd->cpioGzFd); - cfd->cpioGzFd = NULL; + Fclose(cfd); if (failedFile) xfree(failedFile); @@ -453,8 +453,8 @@ static int cpio_copy(FD_t fdo, CSA_t *csa) char buf[BUFSIZ]; ssize_t nb; - while((nb = fdRead(csa->cpioFdIn, buf, sizeof(buf))) > 0) { - if (fdWrite(fdo, buf, nb) != nb) { + while((nb = Fread(buf, sizeof(buf), 1, csa->cpioFdIn)) > 0) { + if (Fwrite(buf, nb, 1, fdo) != nb) { rpmError(RPMERR_CPIO, _("cpio_copy write failed: %s"), strerror(errno)); return 1; diff --git a/build/parseDescription.c b/build/parseDescription.c index 009a8ee29..c336ab3bd 100644 --- a/build/parseDescription.c +++ b/build/parseDescription.c @@ -5,8 +5,8 @@ extern int noLang; /* XXX FIXME: pass as arg */ /* These have to be global scope to make up for *stupid* compilers */ - /*@observer@*/ /*@null@*/ static char *name; - /*@observer@*/ /*@null@*/ static char *lang; + /*@observer@*/ /*@null@*/ static const char *name = NULL; + /*@observer@*/ /*@null@*/ static const char *lang = NULL; static struct poptOption optionsTable[] = { { NULL, 'n', POPT_ARG_STRING, &name, 'n', NULL, NULL}, @@ -22,7 +22,7 @@ int parseDescription(Spec spec) Package pkg; int rc, argc; int arg; - char **argv = NULL; + const char **argv = NULL; poptContext optCon = NULL; struct spectag *t = NULL; @@ -53,9 +53,8 @@ int parseDescription(Spec spec) } if (poptPeekArg(optCon)) { - if (! name) { + if (name == NULL) name = poptGetArg(optCon); - } if (poptPeekArg(optCon)) { rpmError(RPMERR_BADSPEC, _("line %d: Too many names: %s"), spec->lineNum, diff --git a/build/parseFiles.c b/build/parseFiles.c index 9cafb7cbd..87b1892e7 100644 --- a/build/parseFiles.c +++ b/build/parseFiles.c @@ -3,8 +3,8 @@ #include "rpmbuild.h" /* These have to be global scope to make up for *stupid* compilers */ - /*@observer@*/ /*@null@*/ static char *name; - /*@observer@*/ /*@null@*/ static char *file; + /*@observer@*/ /*@null@*/ static const char *name = NULL; + /*@observer@*/ /*@null@*/ static const char *file = NULL; static struct poptOption optionsTable[] = { { NULL, 'n', POPT_ARG_STRING, &name, 'n', NULL, NULL}, { NULL, 'f', POPT_ARG_STRING, &file, 'f', NULL, NULL}, @@ -17,7 +17,7 @@ int parseFiles(Spec spec) Package pkg; int rc, argc; int arg; - char **argv = NULL; + const char **argv = NULL; int flag = PART_SUBNAME; poptContext optCon = NULL; @@ -47,9 +47,8 @@ int parseFiles(Spec spec) } if (poptPeekArg(optCon)) { - if (! name) { + if (name == NULL) name = poptGetArg(optCon); - } if (poptPeekArg(optCon)) { rpmError(RPMERR_BADSPEC, _("line %d: Too many names: %s"), spec->lineNum, diff --git a/build/parsePreamble.c b/build/parsePreamble.c index 8a0d9be68..8cffc5a09 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c @@ -37,7 +37,7 @@ static int requiredTags[] = { static void addOrAppendListEntry(Header h, int_32 tag, char *line) { int argc; - char **argv; + const char **argv; poptParseArgvString(line, &argc, &argv); if (argc) { @@ -105,7 +105,7 @@ static char *findLastChar(char *s) return res; } -static int isMemberInEntry(Header header, char *name, int tag) +static int isMemberInEntry(Header header, const char *name, int tag) { char **names; int count; @@ -131,7 +131,7 @@ static int isMemberInEntry(Header header, char *name, int tag) static int checkForValidArchitectures(Spec spec) { - char *arch, *os; + const char *arch, *os; rpmGetArchInfo(&arch, NULL); rpmGetOsInfo(&os, NULL); @@ -244,8 +244,8 @@ static int readIcon(Header h, const char *file) icon = xmalloc(statbuf.st_size); *icon = '\0'; fd = fdOpen(fn, O_RDONLY, 0); - nb = fdRead(fd, icon, statbuf.st_size); - fdClose(fd); + nb = Fread(icon, statbuf.st_size, 1, fd); + Fclose(fd); if (nb != statbuf.st_size) { rpmError(RPMERR_BADSPEC, _("Unable to read icon: %s"), fn); rc = RPMERR_BADSPEC; diff --git a/build/parsePrep.c b/build/parsePrep.c index 7aa17f54f..83e45ce3e 100644 --- a/build/parsePrep.c +++ b/build/parsePrep.c @@ -5,7 +5,7 @@ /* These have to be global to make up for stupid compilers */ static int leaveDirs, skipDefaultAction; static int createDir, quietly; - /*@observer@*/ /*@null@*/ static char * dirName; + /*@observer@*/ /*@null@*/ static const char * dirName = NULL; static struct poptOption optionsTable[] = { { NULL, 'a', POPT_ARG_STRING, NULL, 'a', NULL, NULL}, { NULL, 'b', POPT_ARG_STRING, NULL, 'b', NULL, NULL}, @@ -176,9 +176,9 @@ static int doSetupMacro(Spec spec, char *line) StringBuf after; poptContext optCon; int argc; - char ** argv; + const char ** argv; int arg; - char * optArg; + const char * optArg; int rc; int num; diff --git a/build/parseScript.c b/build/parseScript.c index 6802b0de6..111aa4bf8 100644 --- a/build/parseScript.c +++ b/build/parseScript.c @@ -2,7 +2,7 @@ #include "rpmbuild.h" -static int addTriggerIndex(Package pkg, char *file, char *script, char *prog) +static int addTriggerIndex(Package pkg, const char *file, const char *script, const char *prog) { struct TriggerFileEntry *new; struct TriggerFileEntry *list = pkg->triggerFiles; @@ -36,9 +36,9 @@ static int addTriggerIndex(Package pkg, char *file, char *script, char *prog) } /* these have to be global because of stupid compilers */ - /*@observer@*/ /*@null@*/ static char *name; - /*@observer@*/ /*@null@*/ static char *prog; - /*@observer@*/ /*@null@*/ static char *file; + /*@observer@*/ /*@null@*/ static const char *name = NULL; + /*@observer@*/ /*@null@*/ static const char *prog = NULL; + /*@observer@*/ /*@null@*/ static const char *file = NULL; static struct poptOption optionsTable[] = { { NULL, 'p', POPT_ARG_STRING, &prog, 'p', NULL, NULL}, { NULL, 'n', POPT_ARG_STRING, &name, 'n', NULL, NULL}, @@ -61,7 +61,7 @@ int parseScript(Spec spec, int parsePart) /* -f <file> */ char *p; - char **progArgv = NULL; + const char **progArgv = NULL; int progArgc; char *partname = NULL; int reqtag = 0; @@ -76,7 +76,7 @@ int parseScript(Spec spec, int parsePart) int rc, argc; int arg; - char **argv = NULL; + const char **argv = NULL; poptContext optCon = NULL; name = NULL; @@ -175,9 +175,8 @@ int parseScript(Spec spec, int parsePart) } if (poptPeekArg(optCon)) { - if (! name) { + if (name == NULL) name = poptGetArg(optCon); - } if (poptPeekArg(optCon)) { rpmError(RPMERR_BADSPEC, _("line %d: Too many names: %s"), spec->lineNum, diff --git a/build/parseSpec.c b/build/parseSpec.c index 3e42535d0..3a7e91987 100644 --- a/build/parseSpec.c +++ b/build/parseSpec.c @@ -159,7 +159,8 @@ static int copyNextLine(Spec spec, OFI_t *ofi, int strip) int readLine(Spec spec, int strip) { - char *s, *arch, *os; + const char *arch, *os; + char *s; int match; struct ReadLevelEntry *rl; OFI_t *ofi = spec->fileStack; @@ -330,7 +331,7 @@ int parseSpec(Spec *specp, const char *specFile, const char *buildRoot, int parsePart = PART_PREAMBLE; int initialPackage = 1; char *name; - char *saveArch; + const char *saveArch; Package pkg; int x, index; Spec spec; @@ -439,7 +440,7 @@ int parseSpec(Spec *specp, const char *specFile, const char *buildRoot, return RPMERR_BADSPEC; } rpmSetMachine(saveArch, NULL); - free(saveArch); + xfree(saveArch); index++; } } @@ -473,7 +474,8 @@ int parseSpec(Spec *specp, const char *specFile, const char *buildRoot, } /* Check for description in each package and add arch and os */ - { char *arch, *os, *myos = NULL; + { const char *arch, *os; + char *myos = NULL; rpmGetArchInfo(&arch, NULL); rpmGetOsInfo(&os, NULL); @@ -484,8 +486,9 @@ int parseSpec(Spec *specp, const char *specFile, const char *buildRoot, * XXX A copy of this string is embedded in headers. */ if (!strcmp(os, "linux")) { - os = myos = xstrdup(os); - *os = 'L'; + myos = xstrdup(os); + *myos = 'L'; + os = myos; } for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) { diff --git a/build/rpmspec.h b/build/rpmspec.h index 3b951be19..70028ece8 100644 --- a/build/rpmspec.h +++ b/build/rpmspec.h @@ -90,7 +90,7 @@ struct SpecStruct { /*@refcounted@*/ Header buildRestrictions; /*@owned@*/ struct SpecStruct **buildArchitectureSpecs; - char ** buildArchitectures; + /*@only@*/ const char ** buildArchitectures; int buildArchitectureCount; int inBuildArchitectures; diff --git a/lib/.lclintrc b/lib/.lclintrc index bf1ea4ab3..5ff453c20 100644 --- a/lib/.lclintrc +++ b/lib/.lclintrc @@ -1,4 +1,4 @@ --I. -I.. -I../build -I../popt -DHAVE_CONFIG_H +-I. -I.. -I../build -I../popt -DHAVE_CONFIG_H -D_GNU_SOURCE +partial diff --git a/lib/Makefile.am b/lib/Makefile.am index fd6104019..4b78b2c6d 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -22,7 +22,7 @@ librpm_la_SOURCES = \ formats.c fprint.c fs.c ftp.c hash.c header.c install.c \ lookup.c macro.c md5.c md5sum.c \ messages.c misc.c oldheader.c package.c problems.c query.c \ - rebuilddb.c rpmbzio.c rpmchecksig.c rpmdb.c rpmerr.c rpminstall.c \ + rebuilddb.c rpmchecksig.c rpmdb.c rpmerr.c rpminstall.c \ rpmio.c rpmlead.c rpmmalloc.c rpmrc.c signature.c stringbuf.c \ tagName.c tagtable.c transaction.c tread.c uninstall.c url.c verify.c diff --git a/lib/cpio.c b/lib/cpio.c index 6ca3b90ec..ccde5cf26 100644 --- a/lib/cpio.c +++ b/lib/cpio.c @@ -2,6 +2,8 @@ #include "cpio.h" +/*@access FD_t@*/ + #define CPIO_NEWC_MAGIC "070701" #define CPIO_CRC_MAGIC "070702" #define TRAILER "TRAILER!!!" @@ -53,41 +55,15 @@ struct cpioHeader { /*@owned@*/char * path; }; -static inline off_t saferead(CFD_t *cfd, /*@out@*/void * vbuf, size_t amount) +static inline off_t saferead(FD_t cfd, /*@out@*/void * vbuf, size_t amount) { off_t rc = 0; char * buf = vbuf; while (amount > 0) { size_t nb; - switch (cfd->cpioIoType) { - default: -#ifdef PARANOID - fprintf(stderr, "\tsaferead(%p,%p,%x)\n", cfd, vbuf, (unsigned)amount); - exit(1); - break; -#endif - case cpioIoTypeDebug: - nb = amount; - fprintf(stderr, "\tsaferead(%p,%p,%x)\n", cfd, vbuf, (unsigned)amount); - break; - case cpioIoTypeFd: - nb = fdRead(cfd->cpioFd, buf, amount); - break; - case cpioIoTypeFp: - nb = fread(buf, amount, 1, cfd->cpioFp); - if (nb) - nb *= amount; - break; - case cpioIoTypeGzFd: - nb = gzdRead(cfd->cpioGzFd, buf, amount); - break; -#if ENABLE_BZIP2_PAYLOAD - case cpioIoTypeBzFd: - nb = bzdRead(cfd->cpioBzFd, buf, amount); - break; -#endif - } + + nb = Fread(buf, amount, 1, cfd); if (nb <= 0) return nb; rc += nb; @@ -99,58 +75,32 @@ static inline off_t saferead(CFD_t *cfd, /*@out@*/void * vbuf, size_t amount) return rc; } -static inline off_t ourread(CFD_t * cfd, /*@out@*/void * buf, size_t size) +static inline off_t ourread(FD_t cfd, /*@out@*/void * buf, size_t size) { off_t i = saferead(cfd, buf, size); if (i > 0) - cfd->cpioPos += i; + cfd->fd_cpioPos += i; return i; } -static inline void padinfd(CFD_t * cfd, int modulo) +static inline void padinfd(FD_t cfd, int modulo) { int buf[10]; int amount; - amount = (modulo - cfd->cpioPos % modulo) % modulo; + amount = (modulo - cfd->fd_cpioPos % modulo) % modulo; (void)ourread(cfd, buf, amount); } -static inline off_t safewrite(CFD_t *cfd, const void * vbuf, size_t amount) +static inline off_t safewrite(FD_t cfd, const void * vbuf, size_t amount) { off_t rc = 0; const char * buf = vbuf; while (amount > 0) { size_t nb; - switch (cfd->cpioIoType) { - default: -#ifdef PARANOID - fprintf(stderr, "\tsafewrite(%p,%p,%x)\n", cfd, vbuf, (unsigned)amount); - exit(1); - break; -#endif - case cpioIoTypeDebug: - nb = amount; - fprintf(stderr, "\tsafewrite(%p,%p,%x)\n", cfd, vbuf, (unsigned)amount); - break; - case cpioIoTypeFd: - nb = fdWrite(cfd->cpioFd, buf, amount); - break; - case cpioIoTypeFp: - nb = fwrite(buf, amount, 1, cfd->cpioFp); - if (nb) - nb *= amount; - break; - case cpioIoTypeGzFd: - nb = gzdWrite(cfd->cpioGzFd, buf, amount); - break; -#if ENABLE_BZIP2_PAYLOAD - case cpioIoTypeBzFd: - nb = bzdWrite(cfd->cpioBzFd, buf, amount); - break; -#endif - } + + nb = Fwrite(buf, amount, 1, cfd); if (nb <= 0) return nb; rc += nb; @@ -163,7 +113,7 @@ static inline off_t safewrite(CFD_t *cfd, const void * vbuf, size_t amount) return rc; } -static inline int padoutfd(CFD_t * cfd, size_t * where, int modulo) +static inline int padoutfd(FD_t cfd, size_t * where, int modulo) { static int buf[10] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; int amount; @@ -201,7 +151,7 @@ static int strntoul(const char *str, /*@out@*/char **endptr, int base, int num) sprintf(space, "%8.8lx", (unsigned long) (val)); \ memcpy(phys, space, 8); -static int getNextHeader(CFD_t * cfd, struct cpioHeader * chPtr) +static int getNextHeader(FD_t cfd, /*@out@*/ struct cpioHeader * chPtr) { struct cpioCrcPhysicalHeader physHeader; int nameSize; @@ -366,15 +316,15 @@ static int checkDirectory(const char * filename) return rc; } -static int expandRegular(CFD_t * cfd, struct cpioHeader * hdr, +static int expandRegular(FD_t cfd, struct cpioHeader * hdr, cpioCallback cb, void * cbData) { - FD_t out; + FD_t ofd; char buf[8192]; int bytesRead; int left = hdr->size; int rc = 0; - struct cpioCallbackInfo cbInfo; + struct cpioCallbackInfo cbInfo = { NULL, 0, 0, 0 }; struct stat sb; /* Rename the old file before attempting unlink to avoid EBUSY errors */ @@ -396,8 +346,8 @@ static int expandRegular(CFD_t * cfd, struct cpioHeader * hdr, } } - out = fdOpen(hdr->path, O_CREAT | O_WRONLY, 0); - if (fdFileno(out) < 0) + ofd = fdOpen(hdr->path, O_CREAT | O_WRONLY, 0); + if (fdFileno(ofd) < 0) return CPIOERR_OPEN_FAILED; cbInfo.file = hdr->path; @@ -410,7 +360,7 @@ static int expandRegular(CFD_t * cfd, struct cpioHeader * hdr, break; } - if (fdWrite(out, buf, bytesRead) != bytesRead) { + if (Fwrite(buf, bytesRead, 1, ofd) != bytesRead) { rc = CPIOERR_COPY_FAILED; break; } @@ -420,17 +370,17 @@ static int expandRegular(CFD_t * cfd, struct cpioHeader * hdr, /* don't call this with fileSize == fileComplete */ if (!rc && cb && left) { cbInfo.fileComplete = hdr->size - left; - cbInfo.bytesProcessed = cfd->cpioPos; + cbInfo.bytesProcessed = cfd->fd_cpioPos; cb(&cbInfo, cbData); } } - fdClose(out); + Fclose(ofd); return rc; } -static int expandSymlink(CFD_t * cfd, struct cpioHeader * hdr) +static int expandSymlink(FD_t cfd, struct cpioHeader * hdr) { char buf[2048], buf2[2048]; struct stat sb; @@ -463,7 +413,7 @@ static int expandSymlink(CFD_t * cfd, struct cpioHeader * hdr) return 0; } -static int expandFifo( /*@unused@*/ CFD_t * cfd, struct cpioHeader * hdr) +static int expandFifo( /*@unused@*/ FD_t cfd, struct cpioHeader * hdr) { struct stat sb; @@ -480,7 +430,7 @@ static int expandFifo( /*@unused@*/ CFD_t * cfd, struct cpioHeader * hdr) return 0; } -static int expandDevice( /*@unused@*/ CFD_t * cfd, struct cpioHeader * hdr) +static int expandDevice( /*@unused@*/ FD_t cfd, struct cpioHeader * hdr) { struct stat sb; @@ -541,7 +491,7 @@ static int createLinks(struct hardLink * li, /*@out@*/const char ** failedFile) return 0; } -static int eatBytes(CFD_t * cfd, int amount) +static int eatBytes(FD_t cfd, int amount) { char buf[4096]; int bite; @@ -556,7 +506,7 @@ static int eatBytes(CFD_t * cfd, int amount) return 0; } -int cpioInstallArchive(CFD_t *cfd, struct cpioFileMapping * mappings, +int cpioInstallArchive(FD_t cfd, struct cpioFileMapping * mappings, int numMappings, cpioCallback cb, void * cbData, const char ** failedFile) { @@ -567,11 +517,11 @@ int cpioInstallArchive(CFD_t *cfd, struct cpioFileMapping * mappings, struct cpioFileMapping needle; mode_t cpioMode; int olderr; - struct cpioCallbackInfo cbInfo; + struct cpioCallbackInfo cbInfo = { NULL, 0, 0, 0 }; struct hardLink * links = NULL; struct hardLink * li = NULL; - cfd->cpioPos = 0; + cfd->fd_cpioPos = 0; if (failedFile) *failedFile = NULL; @@ -585,7 +535,7 @@ int cpioInstallArchive(CFD_t *cfd, struct cpioFileMapping * mappings, } if (!strcmp(ch.path, TRAILER)) { - free(ch.path); + if (ch.path) free(ch.path); break; } @@ -602,7 +552,7 @@ int cpioInstallArchive(CFD_t *cfd, struct cpioFileMapping * mappings, if (map) { if (map->mapFlags & CPIO_MAP_PATH) { - free(ch.path); + if (ch.path) free(ch.path); ch.path = xstrdup(map->fsPath); } @@ -699,11 +649,11 @@ int cpioInstallArchive(CFD_t *cfd, struct cpioFileMapping * mappings, cbInfo.file = ch.path; cbInfo.fileSize = ch.size; cbInfo.fileComplete = ch.size; - cbInfo.bytesProcessed = cfd->cpioPos; + cbInfo.bytesProcessed = cfd->fd_cpioPos; cb(&cbInfo, cbData); } - free(ch.path); + if (ch.path) free(ch.path); ch.path = NULL; } while (1 && !rc); @@ -736,7 +686,7 @@ int cpioInstallArchive(CFD_t *cfd, struct cpioFileMapping * mappings, return rc; } -static int writeFile(CFD_t *cfd, struct stat sb, struct cpioFileMapping * map, +static int writeFile(FD_t cfd, struct stat sb, struct cpioFileMapping * map, /*@out@*/size_t * sizep, int writeData) { struct cpioCrcPhysicalHeader hdr; @@ -825,11 +775,12 @@ static int writeFile(CFD_t *cfd, struct stat sb, struct cpioFileMapping * map, } else #endif { - amount = fdRead(datafd, b, - sb.st_size > sizeof(buf) ? sizeof(buf) : sb.st_size); + amount = Fread(b, + (sb.st_size > sizeof(buf) ? sizeof(buf) : sb.st_size), + 1, datafd); if (amount <= 0) { olderrno = errno; - fdClose(datafd); + Fclose(datafd); errno = olderrno; return CPIOERR_READ_FAILED; } @@ -837,7 +788,7 @@ static int writeFile(CFD_t *cfd, struct stat sb, struct cpioFileMapping * map, if ((rc = safewrite(cfd, b, amount)) != amount) { olderrno = errno; - fdClose(datafd); + Fclose(datafd); errno = olderrno; return rc; } @@ -851,7 +802,7 @@ static int writeFile(CFD_t *cfd, struct stat sb, struct cpioFileMapping * map, } #endif - fdClose(datafd); + Fclose(datafd); } else if (writeData && S_ISLNK(sb.st_mode)) { if ((rc = safewrite(cfd, symbuf, amount)) != amount) return rc; @@ -868,7 +819,7 @@ static int writeFile(CFD_t *cfd, struct stat sb, struct cpioFileMapping * map, return 0; } -static int writeLinkedFile(CFD_t *cfd, struct hardLink * hlink, +static int writeLinkedFile(FD_t cfd, struct hardLink * hlink, struct cpioFileMapping * mappings, cpioCallback cb, void * cbData, /*@out@*/size_t * sizep, @@ -876,7 +827,7 @@ static int writeLinkedFile(CFD_t *cfd, struct hardLink * hlink, { int i, rc; size_t size, total; - struct cpioCallbackInfo cbinfo; + struct cpioCallbackInfo cbInfo = { NULL, 0, 0, 0 }; total = 0; @@ -891,8 +842,8 @@ static int writeLinkedFile(CFD_t *cfd, struct hardLink * hlink, total += size; if (cb) { - cbinfo.file = mappings[i].archivePath; - cb(&cbinfo, cbData); + cbInfo.file = mappings[i].archivePath; + cb(&cbInfo, cbData); } } @@ -911,21 +862,21 @@ static int writeLinkedFile(CFD_t *cfd, struct hardLink * hlink, *sizep = total; if (cb) { - cbinfo.file = mappings[i].archivePath; - cb(&cbinfo, cbData); + cbInfo.file = mappings[i].archivePath; + cb(&cbInfo, cbData); } return 0; } -int cpioBuildArchive(CFD_t *cfd, struct cpioFileMapping * mappings, +int cpioBuildArchive(FD_t cfd, struct cpioFileMapping * mappings, int numMappings, cpioCallback cb, void * cbData, unsigned int * archiveSize, const char ** failedFile) { size_t size, totalsize = 0; int rc; int i; - struct cpioCallbackInfo cbinfo; + struct cpioCallbackInfo cbInfo = { NULL, 0, 0, 0 }; struct cpioCrcPhysicalHeader hdr; struct stat sb; /*@-fullinitblock@*/ @@ -989,8 +940,8 @@ int cpioBuildArchive(CFD_t *cfd, struct cpioFileMapping * mappings, } if (cb) { - cbinfo.file = mappings[i].archivePath; - cb(&cbinfo, cbData); + cbInfo.file = mappings[i].archivePath; + cb(&cbInfo, cbData); } totalsize += size; diff --git a/lib/cpio.h b/lib/cpio.h index 0169ecef3..db9979a47 100644 --- a/lib/cpio.h +++ b/lib/cpio.h @@ -61,31 +61,6 @@ struct cpioCallbackInfo { long bytesProcessed; /* bytes in archive read */ }; -typedef struct CFD { - union { - /*@owned@*/FD_t _cfdu_fd; -#define cpioFd _cfdu._cfdu_fd - /*@owned@*/FILE *_cfdu_fp; -#define cpioFp _cfdu._cfdu_fp - /*@owned@*/FD_t _cfdu_gzfd; -#define cpioGzFd _cfdu._cfdu_gzfd -#if ENABLE_BZIP2_PAYLOAD - /*@owned@*/FD_t _cfdu_bzfd; -#define cpioBzFd _cfdu._cfdu_bzfd -#endif - } _cfdu; - int cpioPos; - enum cpioIoType { - cpioIoTypeDebug, - cpioIoTypeFd, - cpioIoTypeFp, - cpioIoTypeGzFd, -#if ENABLE_BZIP2_PAYLOAD - cpioIoTypeBzFd, -#endif - } cpioIoType; -} CFD_t; - #ifdef __cplusplus extern "C" { #endif @@ -99,10 +74,10 @@ typedef void (*cpioCallback)(struct cpioCallbackInfo * filespec, void * data); directory. The mode mapping is only used for the permission bits, not for the file type. The owner/group mappings are ignored for the nonroot user. If *failedFile is non-NULL on return, it should be free()d. */ -int cpioInstallArchive(CFD_t *cfd, struct cpioFileMapping * mappings, +int cpioInstallArchive(FD_t cfd, struct cpioFileMapping * mappings, int numMappings, cpioCallback cb, void * cbData, /*@out@*/const char ** failedFile); -int cpioBuildArchive(CFD_t *cfd, struct cpioFileMapping * mappings, +int cpioBuildArchive(FD_t cfd, struct cpioFileMapping * mappings, int numMappings, cpioCallback cb, void * cbData, unsigned int * archiveSize, /*@out@*/const char ** failedFile); diff --git a/lib/falloc.c b/lib/falloc.c index 804bf5799..207d48d60 100644 --- a/lib/falloc.c +++ b/lib/falloc.c @@ -35,24 +35,23 @@ struct faFooter { } ; FD_t faFileno(faFile fa) { - return fa->fd; + return fa; } -static inline ssize_t faRead(faFile fa, /*@out@*/void *buf, size_t count) { - return fdRead(faFileno(fa), buf, count); +static inline ssize_t faRead(faFile fa, /*@out@*/ void *buf, size_t count) { + return Fread(buf, count, 1, faFileno(fa)); } static inline ssize_t faWrite(faFile fa, const void *buf, size_t count) { - return fdWrite(faFileno(fa), buf, count); + return Fwrite(buf, count, 1, faFileno(fa)); } -off_t faLseek(faFile fa, off_t off, int op) { - return fdLseek(faFileno(fa), off, op); +int faSeek(faFile fa, off_t pos, int whence) { + return Fseek(faFileno(fa), pos, whence); } -void faClose(faFile fa) { - fdClose(fa->fd); - free(fa); +int faClose(faFile fa) { + return Fclose(faFileno(fa)); } int faFcntl(faFile fa, int op, void *lip) { @@ -60,13 +59,13 @@ int faFcntl(faFile fa, int op, void *lip) { } static inline ssize_t faPRead(faFile fa, /*@out@*/void *buf, size_t count, off_t offset) { - if (faLseek(fa, offset, SEEK_SET) < 0) + if (faSeek(fa, offset, SEEK_SET) < 0) return -1; return faRead(fa, buf, count); } static inline ssize_t faPWrite(faFile fa, const void *buf, size_t count, off_t offset) { - if (faLseek(fa, offset, SEEK_SET) < 0) + if (faSeek(fa, offset, SEEK_SET) < 0) return -1; return faWrite(fa, buf, count); } @@ -75,59 +74,43 @@ static inline ssize_t faPWrite(faFile fa, const void *buf, size_t count, off_t o faFile faOpen(const char * path, int flags, int perms) { struct faFileHeader newHdr; - struct faFile_s fas; faFile fa; - off_t end; - if (flags & O_WRONLY) { + if (flags & O_WRONLY) + return NULL; + + fa = fdOpen(path, flags, perms); + if (fdFileno(faFileno(fa)) < 0) return NULL; - } - if (flags & O_RDWR) { - fas.readOnly = 0; - } else { - fas.readOnly = 1; - } - fas.fd = fdOpen(path, flags, perms); - if (fdFileno(fas.fd) < 0) return NULL; - fas.firstFree = 0; - fas.fileSize = 0; + fa->readOnly = (flags & O_RDWR) ? 0 : 1; + fa->firstFree = 0; /* is this file brand new? */ - end = faLseek(&fas, 0, SEEK_END); - if (!end) { + if ((fa->fileSize = faSeek(fa, 0, SEEK_END)) < 0) { newHdr.magic = FA_MAGIC; newHdr.firstFree = 0; - if (faWrite(&fas, &newHdr, sizeof(newHdr)) != sizeof(newHdr)) { - close(fdFileno(fas.fd)); + if (faWrite(fa, &newHdr, sizeof(newHdr)) != sizeof(newHdr)) { + faClose(fa); return NULL; } - fas.firstFree = 0; - fas.fileSize = sizeof(newHdr); + fa->firstFree = 0; + fa->fileSize = sizeof(newHdr); } else { - if (faPRead(&fas, &newHdr, sizeof(newHdr), 0) != sizeof(newHdr)) { - fdClose(fas.fd); + if (faPRead(fa, &newHdr, sizeof(newHdr), 0) != sizeof(newHdr)) { + faClose(fa); return NULL; } if (newHdr.magic != FA_MAGIC) { - fdClose(fas.fd); + faClose(fa); return NULL; } - fas.firstFree = newHdr.firstFree; + fa->firstFree = newHdr.firstFree; - if (faLseek(&fas, 0, SEEK_END) < 0) { - fdClose(fas.fd); + if ((fa->fileSize = faSeek(fa, 0, SEEK_END)) < 0) { + faClose(fa); return NULL; } - - fas.fileSize = faLseek(&fas, 0, SEEK_CUR); - } - - if ((fa = malloc(sizeof(*fa))) != NULL) { - fa->fd = fas.fd; - fa->readOnly = fas.readOnly; - fa->firstFree = fas.firstFree; - fa->fileSize = fas.fileSize; } return fa; @@ -298,7 +281,8 @@ unsigned int faAlloc(faFile fa, unsigned int size) footerOffset = newBlockOffset + size - sizeof(footer); space = alloca(size); - if (!space) return 0; + if (space == NULL) return 0; + memset(space, 0, size); footer.isFree = header.isFree = 0; footer.size = header.size = size; @@ -410,16 +394,16 @@ int faNextOffset(faFile fa, unsigned int lastOffset) struct faHeader header; int offset; - if (lastOffset) { - offset = lastOffset - sizeof(header); - } else { - offset = sizeof(struct faFileHeader); - } + offset = (lastOffset) + ? (lastOffset - sizeof(header)) + : sizeof(struct faFileHeader); - if (offset >= fa->fileSize) return 0; + if (offset >= fa->fileSize) + return 0; if (faPRead(fa, &header, sizeof(header), offset) != sizeof(header)) return 0; + if (!lastOffset && !header.isFree) return (offset + sizeof(header)); diff --git a/lib/falloc.h b/lib/falloc.h index 40cb94efd..4d5d2fa33 100644 --- a/lib/falloc.h +++ b/lib/falloc.h @@ -5,16 +5,15 @@ are compacted. Minimal fragmentation is more important then speed. This uses 32 bit offsets on all platforms and should be byte order independent */ +#if 0 typedef /*@abstract@*/ struct faFile_s { /*@owned@*/ FD_t fd; int readOnly; unsigned int firstFree; unsigned long fileSize; } * faFile; - -#ifdef UNUSED -struct FaPlace_s; -typedef struct FaPlace * faPlace; +#else +typedef FD_t faFile; #endif #ifdef __cplusplus @@ -25,10 +24,11 @@ extern "C" { /*@only@*/ faFile faOpen(const char * path, int flags, int perms); unsigned int faAlloc(faFile fa, unsigned int size); /* returns 0 on failure */ void faFree(faFile fa, unsigned int offset); -void faClose( /*@only@*/ faFile fa); FD_t faFileno(faFile fa); -off_t faLseek(faFile fa, off_t off, int op); +int faSeek(faFile fa, off_t pos, int whence); +int faClose( /*@only@*/ faFile fa); + int faFcntl(faFile fa, int op, void *lip); int faFirstOffset(faFile fa); diff --git a/lib/fprint.c b/lib/fprint.c index 7e575bf0e..94f597416 100644 --- a/lib/fprint.c +++ b/lib/fprint.c @@ -17,23 +17,23 @@ void fpCacheFree(fingerPrintCache cache) { static const struct fprintCacheEntry_s * cacheContainsDirectory( fingerPrintCache cache, - const char * dirName) { + const char * dirName) +{ const void ** data; - int count; - if (htGetEntry(cache->ht, dirName, &data, &count, NULL)) return NULL; + if (htGetEntry(cache->ht, dirName, &data, NULL, NULL)) + return NULL; return data[0]; } static fingerPrint doLookup(fingerPrintCache cache, const char * dirName, - const char * baseName, int scareMemory) { + const char * baseName, int scareMemory) +{ char dir[PATH_MAX]; - const char * chptr1; - char * end, * bn; + char * end; fingerPrint fp; struct stat sb; char * buf; - int stripCount; const struct fprintCacheEntry_s * cacheHit; struct fprintCacheEntry_s * newEntry; @@ -54,7 +54,7 @@ static fingerPrint doLookup(fingerPrintCache cache, const char * dirName, if ( /*@-unrecog@*/ realpath(".", dir) /*@=unrecog@*/ != NULL) { char *s = alloca(strlen(dir) + strlen(dirName) + 2); sprintf(s, "%s/%s", dir, dirName); - dirName = chptr1 = s; + dirName = s; } } @@ -63,12 +63,9 @@ static fingerPrint doLookup(fingerPrintCache cache, const char * dirName, buf = alloca(strlen(dirName) + 1); strcpy(buf, dirName); - end = bn = strrchr(buf, '/'); - stripCount = 0; + end = buf + strlen(buf); fp.entry = NULL; while (*buf) { - *end = '\0'; - stripCount++; /* as we're stating paths here, we want to follow symlinks */ @@ -87,11 +84,13 @@ static fingerPrint doLookup(fingerPrintCache cache, const char * dirName, } if (fp.entry) { - chptr1 = dirName + (end - buf) + 1; - if (scareMemory) - fp.subdir = chptr1; + fp.subdir = dirName + (end - buf); + if (fp.subdir[0] == '/' && fp.subdir[1] != '\0') + fp.subdir++; else - fp.subdir = xstrdup(chptr1); /* XXX memory leak, but how + fp.subdir = ""; + if (!scareMemory && fp.subdir != NULL) + fp.subdir = xstrdup(fp.subdir); /* XXX memory leak, but how do we know we can free it? Using the (new) cache would work if hash tables allowed @@ -102,6 +101,7 @@ static fingerPrint doLookup(fingerPrintCache cache, const char * dirName, end--; while ((end > buf) && *end != '/') end--; + *end = '\0'; } /* This can't happen, or stat('/') just failed! */ @@ -113,8 +113,15 @@ static fingerPrint doLookup(fingerPrintCache cache, const char * dirName, fingerPrint fpLookup(fingerPrintCache cache, const char * fullName, int scareMemory) { - /* XXX FIXME */ - abort(); + char *dn = strcpy(alloca(strlen(fullName)+1), fullName); + char *bn = strrchr(dn, '/'); + + if (bn) + *bn++ = '\0'; + else + bn = dn; + + return doLookup(cache, dn, bn, scareMemory); } unsigned int fpHashFunction(const void * key) @@ -137,7 +144,10 @@ unsigned int fpHashFunction(const void * key) int fpEqual(const void * key1, const void * key2) { - return FP_EQUAL(*((const fingerPrint *) key1), *((fingerPrint *) key2)); + const fingerPrint *k1 = key1; + const fingerPrint *k2 = key2; + /* XXX negated to preserve strcmp return behavior in ht->eq */ + return (FP_EQUAL(*k1, *k2) ? 0 : 1); } void fpLookupList(fingerPrintCache cache, const char ** dirNames, @@ -456,13 +456,13 @@ static int copyData( /*@only@*/ FD_t sfd, FD_t tfd) { break; } - bytesRead = fdRead(sfd, buf, sizeof(buf)); + bytesRead = Fread(buf, sizeof(buf), 1, sfd); if (bytesRead == 0) { rc = 0; break; } - if (fdWrite(tfd, buf, bytesRead) != bytesRead) { + if (Fwrite(buf, bytesRead, 1, tfd) != bytesRead) { rc = FTPERR_FILE_IO_ERROR; break; } @@ -485,7 +485,7 @@ fprintf(stderr, "++ copied %d bytes: %s\n", bytesCopied, ftpStrerror(rc)); bytesCopied, bytesCopied, NULL, urlNotifyData); } - fdClose(sfd); + Fclose(sfd); return rc; } @@ -519,7 +519,7 @@ fprintf(stderr, "-> ABOR\n"); ftpTimeoutSecs = tosecs; if (fdFileno(fd) >= 0) - fdClose(fd); + Fclose(fd); return 0; } @@ -609,7 +609,7 @@ fprintf(stderr, "-> PASV\n"); sizeof(dataAddress)) < 0) { if (errno == EINTR) continue; - fdClose(fd); + Fclose(fd); return FTPERR_FAILED_DATA_CONNECT; } @@ -620,7 +620,7 @@ fprintf(stderr, "-> %s", retrCommand); } if ((rc = ftpCheckResponse(u, NULL))) { - fdClose(fd); + Fclose(fd); return rc; } @@ -642,7 +642,7 @@ int ftpGetFile(FD_t sfd, FD_t tfd) /* XXX normally sfd = ufdOpen(...) and this code does not execute */ if (fdFileno(sfd) < 0 && (rc = ftpGetFileDesc(sfd)) < 0) { - fdClose(sfd); + Fclose(sfd); return rc; } diff --git a/lib/hash.c b/lib/hash.c index 8dc7339b1..a8dd8695c 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -24,9 +24,9 @@ static /*@shared@*/ struct hashBucket * findEntry(hashTable ht, const void * key struct hashBucket * b; hash = ht->fn(key) % ht->numBuckets; - b = ht->buckets[hash]; + b = ht->buckets[hash]; - while (b && b->key && !ht->eq(b->key, key)) + while (b && b->key && ht->eq(b->key, key)) b = b->next; return b; @@ -74,15 +74,15 @@ hashTable htCreate(int numBuckets, int keySize, hashFunctionType fn, void htAddEntry(hashTable ht, const void * key, const void * data) { unsigned int hash; - struct hashBucket * b, * ob; + struct hashBucket * b; hash = ht->fn(key) % ht->numBuckets; - b = ob = ht->buckets[hash]; + b = ht->buckets[hash]; - while (b && b->key && !ht->eq(b->key, key)) + while (b && b->key && ht->eq(b->key, key)) b = b->next; - - if (!b) { + + if (b == NULL) { b = xmalloc(sizeof(*b)); if (ht->keySize) { char *k = xmalloc(ht->keySize); @@ -128,16 +128,20 @@ int htHasEntry(hashTable ht, const void * key) if (!(b = findEntry(ht, key))) return 0; else return 1; } -int htGetEntry(hashTable ht, const void * key, const void *** data, +int htGetEntry(hashTable ht, const void * key, const void *** data, int * dataCount, const void ** tableKey) { struct hashBucket * b; - if (!(b = findEntry(ht, key))) return 1; + if ((b = findEntry(ht, key)) == NULL) + return 1; - *data = b->data; - *dataCount = b->dataCount; - if (tableKey) *tableKey = b->key; + if (data) + *data = b->data; + if (dataCount) + *dataCount = b->dataCount; + if (tableKey) + *tableKey = b->key; return 0; } diff --git a/lib/header.c b/lib/header.c index 05e640668..f43e943c2 100644 --- a/lib/header.c +++ b/lib/header.c @@ -482,20 +482,20 @@ int headerWrite(FD_t fd, Header h, int magicp) p = doHeaderUnload(h, &length); if (magicp) { - nb = fdWrite(fd, header_magic, sizeof(header_magic)); + nb = Fwrite(header_magic, sizeof(header_magic), 1, fd); if (nb != sizeof(header_magic)) { free(p); return 1; } l = htonl(0); - nb = fdWrite(fd, &l, sizeof(l)); + nb = Fwrite(&l, sizeof(l), 1, fd); if (nb != sizeof(l)) { free(p); return 1; } } - nb = fdWrite(fd, p, length); + nb = Fwrite(p, length, 1, fd); if (nb != length) { free(p); return 1; @@ -571,20 +571,20 @@ int headerGzWrite(FD_t fd, Header h, int magicp) p = doHeaderUnload(h, &length); if (magicp) { - nb = gzdWrite(fd, header_magic, sizeof(header_magic)); + nb = Fwrite(header_magic, sizeof(header_magic), 1, fd); if (nb != sizeof(header_magic)) { free(p); return 1; } l = htonl(0); - nb = gzdWrite(fd, &l, sizeof(l)); + nb = Fwrite(&l, sizeof(l), 1, fd); if (nb != sizeof(l)) { free(p); return 1; } } - nb = gzdWrite(fd, p, length); + nb = Fwrite(p, length, 1, fd); if (nb != length) { free(p); return 1; @@ -605,24 +605,24 @@ Header headerGzRead(FD_t fd, int magicp) int totalSize; if (magicp == HEADER_MAGIC_YES) { - if (gzdRead(fd, &magic, sizeof(magic)) != sizeof(magic)) + if (Fread(&magic, sizeof(magic), 1, fd) != sizeof(magic)) return NULL; if (memcmp(&magic, header_magic, sizeof(magic))) { return NULL; } - if (gzdRead(fd, &reserved, sizeof(reserved)) != sizeof(reserved)) + if (Fread(&reserved, sizeof(reserved), 1, fd) != sizeof(reserved)) return NULL; } /* First read the index length (count of index entries) */ - if (gzdRead(fd, &il, sizeof(il)) != sizeof(il)) + if (Fread(&il, sizeof(il), 1, fd) != sizeof(il)) return NULL; il = ntohl(il); /* Then read the data length (number of bytes) */ - if (gzdRead(fd, &dl, sizeof(dl)) != sizeof(dl)) + if (Fread(&dl, sizeof(dl), 1, fd) != sizeof(dl)) return NULL; dl = ntohl(dl); @@ -635,7 +635,7 @@ Header headerGzRead(FD_t fd, int magicp) *p++ = htonl(dl); totalSize -= sizeof(int_32) + sizeof(int_32); - if (gzdRead(fd, p, totalSize) != totalSize) + if (Fread(p, totalSize, 1, fd) != totalSize) return NULL; h = headerLoad(block); @@ -1163,11 +1163,11 @@ headerGetLangs(Header h) return table; } -int headerAddI18NString(Header h, int_32 tag, char * string, char * lang) +int headerAddI18NString(Header h, int_32 tag, const char * string, const char * lang) { struct indexEntry * table, * entry; char * chptr; - char ** strArray; + const char ** strArray; int length; int ghosts; int i, langNum; @@ -1181,7 +1181,7 @@ int headerAddI18NString(Header h, int_32 tag, char * string, char * lang) } if (!table && !entry) { - char * charArray[2]; + const char * charArray[2]; int count = 0; if (!lang || (lang[0] == 'C' && lang[1] == '\0')) { charArray[count++] = "C"; diff --git a/lib/header.h b/lib/header.h index 03d58d068..e3fdd625c 100644 --- a/lib/header.h +++ b/lib/header.h @@ -124,7 +124,8 @@ char **headerGetLangs(Header h); more fine grained control use headerAddEntry() and headerModifyEntry() but be careful! */ -int headerAddI18NString(Header h, int_32 tag, char * string, char * lang); +int headerAddI18NString(Header h, int_32 tag, const char * string, + const char * lang); /* Appends item p to entry w/ tag and type as passed. Won't work on RPM_STRING_TYPE. Any pointers from headerGetEntry() for this entry diff --git a/lib/install.c b/lib/install.c index 592b41643..aacb1447f 100644 --- a/lib/install.c +++ b/lib/install.c @@ -301,6 +301,7 @@ static int installArchive(FD_t fd, struct fileInfo * files, int mappedFiles = 0; const char * failedFile = NULL; struct callbackInfo info; + FD_t cfd; if (!files) { /* install all files */ @@ -341,15 +342,11 @@ static int installArchive(FD_t fd, struct fileInfo * files, (void)notify(h, RPMCALLBACK_INST_PROGRESS, 0, archiveSize, pkgKey, notifyData); - { CFD_t cfdbuf, *cfd = &cfdbuf; - cfd->cpioPos = 0; - cfd->cpioIoType = cpioIoTypeGzFd; - cfd->cpioGzFd = gzdFdopen(fdDup(fdFileno(fd)), "r"); + cfd = gzdFdopen(fdDup(fdFileno(fd)), "r"); rc = cpioInstallArchive(cfd, map, mappedFiles, ((notify && archiveSize) || specFile) ? callback : NULL, &info, &failedFile); - gzdClose(cfd->cpioGzFd); - } + Fclose(cfd); headerFree(info.h); if (rc) { diff --git a/lib/macro.c b/lib/macro.c index fedf24587..24d4b5d71 100644 --- a/lib/macro.c +++ b/lib/macro.c @@ -3,7 +3,9 @@ #include <assert.h> #include <stdarg.h> +#if !defined(isblank) #define isblank(_c) ((_c) == ' ' || (_c) == '\t') +#endif #define iseol(_c) ((_c) == '\n' || (_c) == '\r') #define STREQ(_t, _f, _fn) ((_fn) == (sizeof(_t)-1) && !strncmp((_t), (_f), (_fn))) @@ -25,8 +27,8 @@ typedef int FD_t; #define fdFileno(_x) (_x) #define fdOpen open -#define fdRead read -#define fdClose close +#define Fread(_b, _s, _n, _fd) read(_fd, _b, _s) +#define Fclose(_fd) close(_fd) #else #include <rpmlib.h> #endif @@ -1343,9 +1345,9 @@ int isCompressed(const char *file, int *compressed) rpmError(RPMERR_BADSPEC, _("File %s: %s"), file, strerror(errno)); return 1; } - nb = fdRead(fd, magic, sizeof(magic)); + nb = Fread(magic, sizeof(magic), 1, fd); rderrno = errno; - fdClose(fd); + Fclose(fd); if (nb < 0) { rpmError(RPMERR_BADSPEC, _("File %s: %s"), file, strerror(rderrno)); diff --git a/lib/oldheader.c b/lib/oldheader.c index 05801d595..9e24d9a6e 100644 --- a/lib/oldheader.c +++ b/lib/oldheader.c @@ -149,7 +149,7 @@ char * oldhdrReadFromFile(char * filename, struct oldrpmHeader * header) { if (fdFileno(fd) < 0) return strerror(errno); rc = oldhdrReadFromStream(fd, header); - fdClose(fd); + Fclose(fd); return rc; } diff --git a/lib/package.c b/lib/package.c index d6cfafce4..44a0b3403 100644 --- a/lib/package.c +++ b/lib/package.c @@ -39,7 +39,8 @@ static int readOldHeader(FD_t fd, /*@out@*/Header * hdr, /*@unused@*/ /*@out@*/i int i, j; char ** unames, ** gnames; - (void)fdLseek(fd, 0, SEEK_SET); + (void)Fseek(fd, 0, SEEK_SET); + if (oldhdrReadFromStream(fd, &oldheader)) { return 1; } @@ -243,7 +244,8 @@ static int readPackageHeaders(FD_t fd, /*@out@*/struct rpmlead * leadPtr, oldLead->archiveOffset = ntohl(oldLead->archiveOffset); rpmMessage(RPMMESS_DEBUG, _("archive offset is %d\n"), oldLead->archiveOffset); - (void)fdLseek(fd, oldLead->archiveOffset, SEEK_SET); + + (void)Fseek(fd, oldLead->archiveOffset, SEEK_SET); /* we can't put togeher a header for old format source packages, there just isn't enough information there. We'll return diff --git a/lib/rpmbzio.c b/lib/rpmbzio.c index 0cbc2249f..72a08a634 100644 --- a/lib/rpmbzio.c +++ b/lib/rpmbzio.c @@ -21,7 +21,7 @@ FD_t bzdOpen(const char *pathname, const char *mode) { BZFILE *bzfile;; if ((bzfile = bzopen(pathname, mode)) == NULL) return NULL; - fd = fdNew(); + fd = fdNew(&bzdio); fd->fd_bzd = bzfile; return fd; } @@ -36,15 +36,6 @@ FD_t bzdFdopen(FD_t fd, const char *mode) { return NULL; } -ssize_t bzdRead(FD_t fd, void * buf, size_t count) { - *((char *)buf) = '\0'; - return bzread(bzdFileno(fd), buf, count); -} - -ssize_t bzdWrite(FD_t fd, const void * buf, size_t count) { - return bzwrite(bzdFileno(fd), (void *)buf, count); -} - int bzdFlush(FD_t fd) { return bzflush(bzdFileno(fd)); } @@ -54,7 +45,24 @@ const char * bzdStrerror(FD_t fd) { return bzerror(bzdFileno(fd), &bzerr); } -int bzdClose(FD_t fd) { +/* =============================================================== */ +static ssize_t bzdRead(void * cookie, char * buf, size_t count) { + FD_t fd = cookie; + *((char *)buf) = '\0'; + return bzread(bzdFileno(fd), buf, count); +} + +static ssize_t bzdWrite(void * cookie, const char * buf, size_t count) { + FD_t fd = cookie; + return bzwrite(bzdFileno(fd), (void *)buf, count); +} + +static int bzdSeek(void * cookie, off_t pos, int whence) { + return -1; +} + +static int bzdClose(void * cookie) { + FD_t fd = cookie; BZFILE *bzfile; if (fd != NULL && (bzfile = bzdFileno(fd)) != NULL) { @@ -67,4 +75,7 @@ int bzdClose(FD_t fd) { } return -2; } + +cookie_io_functions_t bzdio = { bzdRead, bzdWrite, bzdSeek, bzdClose }; + #endif /* HAVE_BZLIB_H */ diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c index 9eb3bc26c..598cbc064 100644 --- a/lib/rpmchecksig.c +++ b/lib/rpmchecksig.c @@ -19,7 +19,7 @@ static int manageFile(FD_t *fdp, const char **fnp, int flags, int rc) /* close and reset *fdp to NULL */ if (*fdp && (fnp == NULL || *fnp == NULL)) { - fdClose(*fdp); + Fclose(*fdp); *fdp = NULL; return 0; } @@ -69,15 +69,15 @@ static int copyFile(FD_t *sfdp, const char **sfnp, if (manageFile(tfdp, tfnp, O_WRONLY|O_CREAT|O_TRUNC, 0)) goto exit; - while ((count = fdRead(*sfdp, buffer, sizeof(buffer))) > 0) { - if (fdWrite(*tfdp, buffer, count) < 0) { - fprintf(stderr, _("%s: fdWrite failed: %s\n"), *tfnp, + while ((count = Fread(buffer, sizeof(buffer), 1, *sfdp)) > 0) { + if (Fwrite(buffer, count, 1, *tfdp) < 0) { + fprintf(stderr, _("%s: Fwrite failed: %s\n"), *tfnp, strerror(errno)); goto exit; } } if (count < 0) { - fprintf(stderr, _("%s: fdRead failed: %s\n"), *sfnp, strerror(errno)); + fprintf(stderr, _("%s: Fread failed: %s\n"), *sfnp, strerror(errno)); goto exit; } diff --git a/lib/rpmdb.c b/lib/rpmdb.c index 47b51c91d..07752df8b 100644 --- a/lib/rpmdb.c +++ b/lib/rpmdb.c @@ -303,7 +303,7 @@ static Header doGetRecord(rpmdb db, unsigned int offset, int pristine) { int fileCount = 0; int i; - (void)faLseek(db->pkgs, offset, SEEK_SET); + (void)faSeek(db->pkgs, offset, SEEK_SET); h = headerRead(faFileno(db->pkgs), HEADER_MAGIC_NO); @@ -659,7 +659,7 @@ int rpmdbAdd(rpmdb db, Header dbentry) if (!dboffset) { rc = 1; } else { - (void)faLseek(db->pkgs, dboffset, SEEK_SET); + (void)faSeek(db->pkgs, dboffset, SEEK_SET); rc = headerWrite(faFileno(db->pkgs), dbentry, HEADER_MAGIC_NO); } @@ -741,7 +741,7 @@ int rpmdbUpdateRecord(rpmdb db, int offset, Header newHeader) } else { blockSignals(); - (void)faLseek(db->pkgs, offset, SEEK_SET); + (void)faSeek(db->pkgs, offset, SEEK_SET); rc = headerWrite(faFileno(db->pkgs), newHeader, HEADER_MAGIC_NO); diff --git a/lib/rpminstall.c b/lib/rpminstall.c index fe8081d9a..9374142df 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -50,7 +50,7 @@ static void * showProgress(const Header h, const rpmCallbackType what, return fd; case RPMCALLBACK_INST_CLOSE_FILE: - fdClose(fd); + Fclose(fd); break; case RPMCALLBACK_INST_START: @@ -198,7 +198,7 @@ int rpmInstall(const char * rootdir, const char ** argv, int transFlags, switch (rc) { case 1: - fdClose(fd); + Fclose(fd); rpmMessage(RPMMESS_ERROR, _("%s does not appear to be a RPM package\n"), *filename); @@ -211,7 +211,7 @@ int rpmInstall(const char * rootdir, const char ** argv, int transFlags, case 0: if (isSource) { sourcePackages[numSourcePackages++] = *filename; - fdClose(fd); + Fclose(fd); } else { if (!dbIsOpen) { if (rpmdbOpen(rootdir, &db, mode, 0644)) { @@ -251,7 +251,7 @@ int rpmInstall(const char * rootdir, const char ** argv, int transFlags, relocations); headerFree(h); /* XXX reference held by transaction set */ - fdClose(fd); + Fclose(fd); switch(rc) { case 0: @@ -338,7 +338,7 @@ int rpmInstall(const char * rootdir, const char ** argv, int transFlags, numFailed += rpmInstallSourcePackage(rootdir, fd, NULL, showProgress, (void *) notifyFlags, NULL); - fdClose(fd); + Fclose(fd); } } @@ -471,7 +471,7 @@ int rpmInstallSource(const char * rootdir, const char * arg, const char ** specF if (cookie && *cookie) free(*cookie); } - fdClose(fd); + Fclose(fd); return rc; } diff --git a/lib/rpmio.h b/lib/rpmio.h index 931a94930..2dfc23a82 100644 --- a/lib/rpmio.h +++ b/lib/rpmio.h @@ -11,8 +11,22 @@ typedef /*@abstract@*/ struct _FD { /*@owned@*/ void * fd_bzd; /*@owned@*/ void * fd_gzd; void * fd_url; + int readOnly; /* falloc.c */ + unsigned int firstFree; /* falloc.c */ + long int fileSize; /* falloc.c */ + long int fd_cpioPos; /* cpio.c */ + /*@observer@*/ const char *fd_errstr; + long int fd_pos; + /*@dependent@*/ cookie_io_functions_t *fd_io; } *FD_t; +/*@observer@*/ const char * Fstrerror(FD_t); + +size_t Fread (/*@out@*/ void *buf, size_t size, size_t nmemb, FD_t fd); +size_t Fwrite (const void *buf, size_t size, size_t nmemb, FD_t fd); +int Fseek (FD_t fd, long int offset, int whence); +int Fclose ( /*@only@*/ FD_t fd); + #endif /* H_RPMIO */ #ifndef H_RPMIO_F @@ -24,20 +38,16 @@ extern "C" { int timedRead(FD_t fd, /*@out@*/void * bufptr, int length); -extern /*@only@*/ /*@null@*/ FD_t fdNew(void); +extern /*@only@*/ /*@null@*/ FD_t fdNew(cookie_io_functions_t * iop); extern int fdValid(FD_t fd); extern int fdFileno(FD_t fd); extern /*@only@*/ /*@null@*/ FD_t fdOpen(const char *pathname, int flags, mode_t mode); extern /*@only@*/ /*@null@*/ FD_t fdDup(int fdno); - -extern off_t fdLseek(FD_t fd, off_t offset, int whence); -extern ssize_t fdRead(FD_t fd, /*@out@*/void * buf, size_t count); -extern ssize_t fdWrite(FD_t fd, const void * buf, size_t count); -extern int fdClose(/*@only@*/ FD_t fd); - extern /*@dependent@*/ /*@null@*/ FILE *fdFdopen( /*@only@*/ FD_t fd, const char *mode); +extern cookie_io_functions_t fdio; + /* * Support for GZIP library. */ @@ -51,17 +61,9 @@ extern /*@only@*/ /*@null@*/ FD_t gzdOpen(const char *pathname, const char *mode extern /*@only@*/ /*@null@*/ FD_t gzdFdopen( /*@only@*/ FD_t fd, const char *mode); -extern ssize_t gzdRead(FD_t fd, /*@out@*/ void * buf, size_t count); - -extern ssize_t gzdWrite(FD_t fd, const void * buf, size_t count); - -extern off_t gzdLseek(FD_t fd, off_t offset, int whence); - extern int gzdFlush(FD_t fd); -extern /*@only@*/ /*@observer@*/ const char * gzdStrerror(FD_t fd); - -extern int gzdClose( /*@only@*/ FD_t fd); +extern cookie_io_functions_t gzdio; #endif /* HAVE_ZLIB_H */ @@ -78,15 +80,9 @@ extern /*@only@*/ /*@null@*/ FD_t bzdOpen(const char *pathname, const char *mode extern /*@only@*/ /*@null@*/ FD_t bzdFdopen( /*@only@*/ FD_t fd, const char *mode); -extern ssize_t bzdRead(FD_t fd, /*@out@*/ void * buf, size_t count); - -extern ssize_t bzdWrite(FD_t fd, const void * buf, size_t count); - extern int bzdFlush(FD_t fd); -extern /*@observer@*/ const char * bzdStrerror(FD_t fd); - -extern int bzdClose( /*@only@*/ FD_t fd); +extern cookie_io_functions_t bzdio; #endif /* HAVE_BZLIB_H */ diff --git a/lib/rpmlead.c b/lib/rpmlead.c index 9eb81179b..574577f6c 100644 --- a/lib/rpmlead.c +++ b/lib/rpmlead.c @@ -35,7 +35,7 @@ int writeLead(FD_t fd, struct rpmlead *lead) l.osnum = htons(l.osnum); l.signature_type = htons(l.signature_type); - if (fdWrite(fd, &l, sizeof(l)) < 0) { + if (Fwrite(&l, sizeof(l), 1, fd) < 0) { return 1; } diff --git a/lib/rpmlib.h b/lib/rpmlib.h index d1f46e6f4..b3cb32215 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -278,15 +278,15 @@ void rpmSetVar(int var, const char *val); int rpmReadConfigFiles(const char * file, const char * target); int rpmReadRC(const char * file); -void rpmGetArchInfo( /*@out@*/ char ** name, /*@out@*/ int * num); -void rpmGetOsInfo( /*@out@*/ char ** name, /*@out@*/ int * num); -int rpmMachineScore(int type, char * name); +void rpmGetArchInfo( /*@out@*/ const char ** name, /*@out@*/ int * num); +void rpmGetOsInfo( /*@out@*/ const char ** name, /*@out@*/ int * num); +int rpmMachineScore(int type, const char * name); int rpmShowRC(FILE *f); void rpmSetTables(int archTable, int osTable); /* only used by build code */ /* if either are NULL, they are set to the default value (munged uname()) pushed through a translation table (if appropriate) */ void rpmSetMachine(const char * arch, const char * os); -void rpmGetMachine( /*@out@*/ char **arch, /*@out@*/ char **os); +void rpmGetMachine( /*@out@*/ const char **arch, /*@out@*/ const char **os); void rpmFreeRpmrc(void); /** **/ diff --git a/lib/rpmrc.c b/lib/rpmrc.c index 92714203d..0f9c30246 100644 --- a/lib/rpmrc.c +++ b/lib/rpmrc.c @@ -104,7 +104,7 @@ static int currTables[2] = { RPM_MACHTABLE_INSTOS, RPM_MACHTABLE_INSTARCH }; static struct rpmvarValue values[RPMVAR_NUM]; /* prototypes */ -static void defaultMachine(/*@out@*/char ** arch, /*@out@*/char ** os); +static void defaultMachine(/*@out@*/ const char ** arch, /*@out@*/ const char ** os); static int doReadRC(FD_t fd, const char * filename); static int optionCompare(const void * a, const void * b); static int addCanon(struct canonEntry **table, int *tableLen, char *line, @@ -124,24 +124,24 @@ static void setVarDefault(int var, const char *macroname, const char *val, const static void setPathDefault(int var, const char *macroname, const char *subdir); static void setDefaults(void); -static void rebuildCompatTables(int type, char *name); +static void rebuildCompatTables(int type, const char *name); /* compatiblity tables */ static int machCompatCacheAdd(char * name, const char * fn, int linenum, struct machCache * cache); static struct machCacheEntry * machCacheFindEntry(struct machCache * cache, - char * key); + const char * key); static struct machEquivInfo * machEquivSearch( - struct machEquivTable * table, char * name); -static void machAddEquiv(struct machEquivTable * table, char * name, + struct machEquivTable * table, const char * name); +static void machAddEquiv(struct machEquivTable * table, const char * name, int distance); static void machCacheEntryVisit(struct machCache * cache, struct machEquivTable * table, - char * name, + const char * name, int distance); static void machFindEquivs(struct machCache * cache, struct machEquivTable * table, - char * key); + const char * key); static int optionCompare(const void * a, const void * b) { return strcasecmp(((struct rpmOption *) a)->name, @@ -151,7 +151,7 @@ static int optionCompare(const void * a, const void * b) { static void rpmRebuildTargetVars(const char **target, const char ** canontarget); static struct machCacheEntry * machCacheFindEntry(struct machCache * cache, - char * key) + const char * key) { int i; @@ -229,7 +229,7 @@ static int machCompatCacheAdd(char * name, const char * fn, int linenum, } static struct machEquivInfo * machEquivSearch( - struct machEquivTable * table, char * name) + struct machEquivTable * table, const char * name) { int i; @@ -248,7 +248,7 @@ static struct machEquivInfo * machEquivSearch( return NULL; } -static void machAddEquiv(struct machEquivTable * table, char * name, +static void machAddEquiv(struct machEquivTable * table, const char * name, int distance) { struct machEquivInfo * equiv; @@ -268,7 +268,7 @@ static void machAddEquiv(struct machEquivTable * table, char * name, static void machCacheEntryVisit(struct machCache * cache, struct machEquivTable * table, - char * name, + const char * name, int distance) { struct machCacheEntry * entry; @@ -290,7 +290,7 @@ static void machCacheEntryVisit(struct machCache * cache, static void machFindEquivs(struct machCache * cache, struct machEquivTable * table, - char * key) + const char * key) { int i; @@ -579,7 +579,7 @@ int rpmReadRC(const char * rcfiles) break; } rc = doReadRC(fd, fn); - fdClose(fd); + Fclose(fd); if (rc) break; } if (myrcfiles) free(myrcfiles); @@ -604,7 +604,7 @@ static int doReadRC(FD_t fd, const char * filename) { struct stat sb; fstat(fdFileno(fd), &sb); next = alloca(sb.st_size + 2); - if (fdRead(fd, next, sb.st_size) != sb.st_size) { + if (Fread(next, sb.st_size, 1, fd) != sb.st_size) { rpmError(RPMERR_RPMRC, _("Failed to read %s: %s."), filename, strerror(errno)); return 1; @@ -683,7 +683,7 @@ static int doReadRC(FD_t fd, const char * filename) rc = 1; } else { rc = doReadRC(fdinc, fn); - fdClose(fdinc); + Fclose(fdinc); } if (fn) xfree(fn); if (rc) return rc; @@ -795,7 +795,7 @@ static int doReadRC(FD_t fd, const char * filename) return 0; } -static void defaultMachine(char ** arch, char ** os) { +static void defaultMachine(const char ** arch, const char ** os) { static struct utsname un; static int gotDefaults = 0; char * chptr; @@ -851,8 +851,8 @@ static void defaultMachine(char ** arch, char ** os) { if (fdFileno(fd) > 0) { chptr = (char *) xcalloc(1, 256); if (chptr != NULL) { - int irelid = fdRead(fd, (void *)chptr, 256); - fdClose(fd); + int irelid = Fread(chptr, 256, 1, fd); + Fclose(fd); /* example: "112393 RELEASE 020200 Version 01 OS" */ if (irelid > 0) { if ((prelid=strstr(chptr, "RELEASE "))){ @@ -1046,7 +1046,7 @@ static void rpmSetVarArch(int var, const char * val, const char * arch) { } void rpmSetTables(int archTable, int osTable) { - char * arch, * os; + const char * arch, * os; defaultMachine(&arch, &os); @@ -1061,12 +1061,12 @@ void rpmSetTables(int archTable, int osTable) { } } -int rpmMachineScore(int type, char * name) { +int rpmMachineScore(int type, const char * name) { struct machEquivInfo * info = machEquivSearch(&tables[type].equiv, name); return (info != NULL ? info->score : 0); } -void rpmGetMachine(char **arch, char **os) +void rpmGetMachine(const char **arch, const char **os) { if (arch) *arch = current[ARCH]; @@ -1076,7 +1076,7 @@ void rpmGetMachine(char **arch, char **os) } void rpmSetMachine(const char * arch, const char * os) { - char * host_cpu, * host_os; + const char * host_cpu, * host_os; defaultMachine(&host_cpu, &host_os); @@ -1119,13 +1119,13 @@ void rpmSetMachine(const char * arch, const char * os) { } } -static void rebuildCompatTables(int type, char * name) { +static void rebuildCompatTables(int type, const char * name) { machFindEquivs(&tables[currTables[type]].cache, &tables[currTables[type]].equiv, name); } -static void getMachineInfo(int type, /*@only@*/ /*@out@*/ char ** name, +static void getMachineInfo(int type, /*@only@*/ /*@out@*/ const char ** name, /*@out@*/int * num) { struct canonEntry * canon; @@ -1152,11 +1152,11 @@ static void getMachineInfo(int type, /*@only@*/ /*@out@*/ char ** name, } } -void rpmGetArchInfo(char ** name, int * num) { +void rpmGetArchInfo(const char ** name, int * num) { getMachineInfo(ARCH, name, num); } -void rpmGetOsInfo(char ** name, int * num) { +void rpmGetOsInfo(const char ** name, int * num) { getMachineInfo(OS, name, num); } @@ -1192,24 +1192,27 @@ void rpmRebuildTargetVars(const char **buildtarget, const char ** canontarget) if (co != NULL) co = xstrdup(co); } } else { + const char *a, *o; /* Set build target from rpm arch and os */ - rpmGetArchInfo(&ca,NULL); - if (ca) ca = xstrdup(ca); - rpmGetOsInfo(&co,NULL); - if (co) co = xstrdup(co); + rpmGetArchInfo(&a,NULL); + ca = (a) ? xstrdup(a) : NULL; + rpmGetOsInfo(&o,NULL); + co = (o) ? xstrdup(o) : NULL; } /* If still not set, Set target arch/os from default uname(2) values */ if (ca == NULL) { - defaultMachine(&ca, NULL); - ca = xstrdup(ca); + const char *a; + defaultMachine(&a, NULL); + ca = (a) ? xstrdup(a) : NULL; } for (x = 0; ca[x]; x++) ca[x] = tolower(ca[x]); if (co == NULL) { - defaultMachine(NULL, &co); - co = xstrdup(co); + const char *o; + defaultMachine(NULL, &o); + co = (o) ? xstrdup(co) : NULL; } for (x = 0; co[x]; x++) co[x] = tolower(co[x]); diff --git a/lib/signature.c b/lib/signature.c index 48d7e5716..8289e2946 100644 --- a/lib/signature.c +++ b/lib/signature.c @@ -202,7 +202,7 @@ int rpmWriteSignature(FD_t fd, Header header) rpmMessage(RPMMESS_DEBUG, _("Signature size: %d\n"), sigSize); rpmMessage(RPMMESS_DEBUG, _("Signature pad : %d\n"), pad); memset(buf, 0, pad); - if (fdWrite(fd, buf, pad) != pad) + if (Fwrite(buf, pad, 1, fd) != pad) rc = 1; } return rc; @@ -294,7 +294,7 @@ static int makePGPSignature(const char *file, /*@out@*/void **sig, /*@out@*/int_ fd = fdOpen(sigfile, O_RDONLY, 0); rc = timedRead(fd, *sig, *size); unlink(sigfile); - fdClose(fd); + Fclose(fd); if (rc != *size) { free(*sig); rpmError(RPMERR_SIGGEN, _("unable to read the signature")); @@ -371,7 +371,7 @@ static int makeGPGSignature(const char *file, /*@out@*/void **sig, /*@out@*/int_ fd = fdOpen(sigfile, O_RDONLY, 0); rc = timedRead(fd, *sig, *size); unlink(sigfile); - fdClose(fd); + Fclose(fd); if (rc != *size) { free(*sig); rpmError(RPMERR_SIGGEN, _("unable to read the signature")); @@ -506,8 +506,8 @@ static int verifyPGPSignature(const char *datafile, void *sig, xfree(tmppath); } sfd = fdOpen(sigfile, O_WRONLY|O_CREAT|O_TRUNC, 0644); - (void)fdWrite(sfd, sig, count); - fdClose(sfd); + (void)Fwrite(sig, count, 1, sfd); + Fclose(sfd); /* Now run PGP */ outpipe[0] = outpipe[1] = 0; @@ -601,8 +601,8 @@ static int verifyGPGSignature(const char *datafile, void *sig, xfree(tmppath); } sfd = fdOpen(sigfile, O_WRONLY|O_CREAT|O_TRUNC, 0644); - (void)fdWrite(sfd, sig, count); - fdClose(sfd); + (void)Fwrite(sig, count, 1, sfd); + Fclose(sfd); /* Now run GPG */ outpipe[0] = outpipe[1] = 0; diff --git a/lib/tread.c b/lib/tread.c index 648b34a08..d3d685287 100644 --- a/lib/tread.c +++ b/lib/tread.c @@ -12,7 +12,7 @@ int timedRead(FD_t fd, void * bufptr, int length) { fstat(fdFileno(fd), &sb); if (S_ISREG(sb.st_mode)) - return fdRead(fd, buf, length); + return Fread(buf, length, 1, fd); while (total < length) { FD_ZERO(&readSet); @@ -24,7 +24,7 @@ int timedRead(FD_t fd, void * bufptr, int length) { if (select(fdFileno(fd) + 1, &readSet, NULL, NULL, &tv) != 1) return total; - bytesRead = fdRead(fd, buf + total, length - total); + bytesRead = Fread(buf + total, length - total, 1, fd); if (bytesRead < 0) return bytesRead; diff --git a/lib/uninstall.c b/lib/uninstall.c index 28b7cb61c..459b412ad 100644 --- a/lib/uninstall.c +++ b/lib/uninstall.c @@ -288,10 +288,10 @@ static int runScript(Header h, const char * root, int progArgc, const char ** pr if (rpmIsDebug() && (!strcmp(argv[0], "/bin/sh") || !strcmp(argv[0], "/bin/bash"))) - (void)fdWrite(fd, "set -x\n", 7); + (void)Fwrite("set -x\n", 7, 1, fd); - (void)fdWrite(fd, script, strlen(script)); - fdClose(fd); + (void)Fwrite(script, strlen(script), 1, fd); + Fclose(fd); argv[argc++] = fn + strlen(root); if (arg1 >= 0) { @@ -337,9 +337,9 @@ static int runScript(Header h, const char * root, int progArgc, const char ** pr dup2(fdFileno(out), STDOUT_FILENO); /* make sure we don't close stdin/stderr/stdout by mistake! */ if (fdFileno(out) > STDERR_FILENO && fdFileno(out) != fdFileno(errfd)) - fdClose (out); + Fclose (out); if (fdFileno(errfd) > STDERR_FILENO) - fdClose (errfd); + Fclose (errfd); } doputenv(SCRIPT_PATH); @@ -370,7 +370,7 @@ static int runScript(Header h, const char * root, int progArgc, const char ** pr if (freePrefixes) free(prefixes); - fdClose(out); /* XXX dup'd STDOUT_FILENO */ + Fclose(out); /* XXX dup'd STDOUT_FILENO */ if (script) { if (!rpmIsDebug()) unlink(fn); @@ -370,7 +370,7 @@ int ufdClose(FD_t fd) u->ftpControl = -1; } } - return fdClose(fd); + return Fclose(fd); } FD_t ufdOpen(const char *url, int flags, mode_t mode) @@ -382,7 +382,7 @@ FD_t ufdOpen(const char *url, int flags, mode_t mode) case URL_IS_FTP: if (urlConnect(url, &u) < 0) break; - if ((fd = fdNew()) == NULL) + if ((fd = fdNew(&fdio)) == NULL) break; fd->fd_url = u; if ((u->openError = ftpGetFileDesc(fd)) < 0) { @@ -393,7 +393,7 @@ FD_t ufdOpen(const char *url, int flags, mode_t mode) case URL_IS_HTTP: if (urlSplit(url, &u)) break; - if ((fd = fdNew()) == NULL) + if ((fd = fdNew(&fdio)) == NULL) break; fd->fd_url = u; fd->fd_fd = httpOpen(u); @@ -444,7 +444,7 @@ int urlGetFile(const char * url, const char * dest) { tfd = fdOpen(dest, O_CREAT|O_WRONLY|O_TRUNC, 0600); if (fdFileno(tfd) < 0) { rpmMessage(RPMMESS_DEBUG, _("failed to create %s\n"), dest); - fdClose(tfd); + Fclose(tfd); ufdClose(sfd); return FTPERR_UNKNOWN; } @@ -472,7 +472,7 @@ int urlGetFile(const char * url, const char * dest) { break; } - fdClose(tfd); + Fclose(tfd); return rc; } diff --git a/lib/verify.c b/lib/verify.c index 4a4e70dbe..13b9514cf 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -357,7 +357,7 @@ int showVerifyPackage(QVA_t *qva, rpmdb db, Header h) if ((qva->qva_flags & VERIFY_SCRIPT) && (rc = rpmVerifyScript(qva->qva_prefix, h, fdo)) != 0) ec = rc; - fdClose(fdo); + Fclose(fdo); return ec; } diff --git a/po/POTFILES.in b/po/POTFILES.in index b29bb568d..857694b9d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -47,7 +47,6 @@ lib/package.c lib/problems.c lib/query.c lib/rebuilddb.c -lib/rpmbzio.c lib/rpmchecksig.c lib/rpmdb.c lib/rpmerr.c @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-10-04 16:05-0400\n" +"POT-Creation-Date: 1999-10-27 12:52-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" @@ -1279,36 +1279,36 @@ msgstr "k podpisu nezadány ¾ádné balíèky" msgid "no packages files given for rebuild" msgstr "k opìtnému sestavení nezadány ¾ádné soubory balíèkù" -#: rpm.c:1230 +#: rpm.c:1234 msgid "no spec files given for build" msgstr "pro sestavení nezadány ¾ádné soubory .spec" -#: rpm.c:1232 +#: rpm.c:1236 msgid "no tar files given for build" msgstr "pro sestavení nezadány ¾ádné soubory tar" -#: rpm.c:1244 +#: rpm.c:1248 msgid "no packages given for uninstall" msgstr "pro deinstalaci nezadány ¾ádné balíèky" -#: rpm.c:1294 +#: rpm.c:1298 msgid "no packages given for install" msgstr "pro instalaci nezadány ¾ádné balíèky" -#: rpm.c:1317 +#: rpm.c:1321 msgid "extra arguments given for query of all packages" msgstr "k dotazu na v¹echny balíèky zadány argumenty navíc" -#: rpm.c:1322 +#: rpm.c:1326 msgid "no arguments given for query" msgstr "k dotazu nezadány ¾ádné argumenty" -#: rpm.c:1339 +#: rpm.c:1343 #, fuzzy msgid "extra arguments given for verify of all packages" msgstr "k dotazu na v¹echny balíèky zadány argumenty navíc" -#: rpm.c:1343 +#: rpm.c:1347 msgid "no arguments given for verify" msgstr "pro verifikaci nezadány ¾ádné argumenty" @@ -1322,7 +1322,7 @@ msgstr "%s není typu RPM\n" msgid "error reading header from package\n" msgstr "chyba pøi vytváøení adresáøe %s: %s" -#: build/build.c:83 build/pack.c:263 +#: build/build.c:83 build/pack.c:267 #, fuzzy msgid "Unable to open temp file" msgstr "Nelze otevøít %s pro ètení: %s." @@ -1342,60 +1342,60 @@ msgstr "nelze otevøít %s: %s\n" msgid "Bad exit status from %s (%s)" msgstr "nelze provést statistiku %s: %s" -#: build/expression.c:208 +#: build/expression.c:207 #, fuzzy msgid "syntax error while parsing ==" msgstr "ve vırazu se oèekával ?" -#: build/expression.c:238 +#: build/expression.c:237 #, fuzzy msgid "syntax error while parsing &&" msgstr "ve vırazu se oèekával ?" -#: build/expression.c:247 +#: build/expression.c:246 #, fuzzy msgid "syntax error while parsing ||" msgstr "ve vırazu se oèekával ?" -#: build/expression.c:289 +#: build/expression.c:288 #, fuzzy msgid "parse error in expression" msgstr "ve vırazu se oèekával ?" -#: build/expression.c:319 +#: build/expression.c:318 msgid "unmatched (" msgstr "" -#: build/expression.c:337 +#: build/expression.c:336 msgid "undefined identifier" msgstr "" -#: build/expression.c:356 +#: build/expression.c:355 msgid "- only on numbers" msgstr "" -#: build/expression.c:372 +#: build/expression.c:371 msgid "! only on numbers" msgstr "" -#: build/expression.c:411 build/expression.c:456 build/expression.c:513 -#: build/expression.c:600 +#: build/expression.c:410 build/expression.c:455 build/expression.c:512 +#: build/expression.c:599 msgid "types must match" msgstr "" -#: build/expression.c:424 +#: build/expression.c:423 msgid "* / not suported for strings" msgstr "" -#: build/expression.c:472 +#: build/expression.c:471 msgid "- not suported for strings" msgstr "" -#: build/expression.c:613 +#: build/expression.c:612 msgid "&& and || not suported for strings" msgstr "" -#: build/expression.c:644 build/expression.c:689 +#: build/expression.c:645 build/expression.c:692 #, fuzzy msgid "syntax error in expression" msgstr "ve vırazu se oèekával ?" @@ -1476,82 +1476,82 @@ msgstr "" msgid "File listed twice: %s" msgstr "Nelze èíst %s: %s." -#: build/files.c:951 +#: build/files.c:953 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s" msgstr "Nelze èíst %s: %s." -#: build/files.c:961 +#: build/files.c:963 #, fuzzy, c-format msgid "File not found: %s" msgstr "Soubor nebyl na serveru nalezen" -#: build/files.c:1004 +#: build/files.c:1006 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1018 +#: build/files.c:1020 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "soubor %s: %s\n" -#: build/files.c:1088 +#: build/files.c:1090 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1132 +#: build/files.c:1134 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Soubor nebyl na serveru nalezen" -#: build/files.c:1174 +#: build/files.c:1176 #, fuzzy msgid "Could not open %%files file: %s" msgstr "chyba: nelze otevøít soubor %s\n" -#: build/files.c:1181 build/pack.c:485 +#: build/files.c:1183 build/pack.c:488 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1508 build/parsePrep.c:29 +#: build/files.c:1510 build/parsePrep.c:29 #, c-format msgid "Bad owner/group: %s" msgstr "" -#: build/files.c:1562 +#: build/files.c:1564 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "Nelze spustit pgp" -#: build/files.c:1567 +#: build/files.c:1569 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Nelze naèíst cílpodpisu" -#: build/files.c:1649 +#: build/files.c:1651 #, fuzzy, c-format msgid "%s failed" msgstr "chyba pgp" -#: build/files.c:1653 +#: build/files.c:1655 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "%s nelze vytvoøit\n" -#: build/files.c:1742 +#: build/files.c:1744 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1772 build/files.c:1781 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "%s nelze vytvoøit\n" -#: build/files.c:1885 +#: build/files.c:1887 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "soubor %s: %s\n" @@ -1569,106 +1569,106 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:131 +#: build/pack.c:132 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:148 +#: build/pack.c:149 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "nelze otevøít soubor %s: " -#: build/pack.c:183 +#: build/pack.c:184 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "nelze otevøít %s: %s" -#: build/pack.c:193 +#: build/pack.c:194 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "Nelze èíst %s: %s." -#: build/pack.c:213 +#: build/pack.c:215 #, fuzzy, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "%s není typu RPM\n" -#: build/pack.c:219 +#: build/pack.c:221 #, fuzzy, c-format msgid "readRPM: reading header from %s\n" msgstr "chyba pøi vytváøení adresáøe %s: %s" -#: build/pack.c:274 +#: build/pack.c:278 msgid "Bad CSA data" msgstr "" -#: build/pack.c:305 +#: build/pack.c:311 #, fuzzy, c-format msgid "Could not open %s\n" msgstr "nelze otevøít %s\n" -#: build/pack.c:337 build/pack.c:379 +#: build/pack.c:343 build/pack.c:385 #, fuzzy, c-format msgid "Unable to write package: %s" msgstr "Nelze zapsat %s" -#: build/pack.c:352 +#: build/pack.c:358 #, c-format msgid "Generating signature: %d\n" msgstr "Probíhá generování podpisu: %d\n" -#: build/pack.c:369 +#: build/pack.c:375 #, fuzzy, c-format msgid "Unable to read sigtarget: %s" msgstr "Nelze zapsat %s" -#: build/pack.c:394 +#: build/pack.c:400 #, fuzzy, c-format msgid "Wrote: %s\n" msgstr "rpm: %s\n" -#: build/pack.c:411 build/pack.c:435 +#: build/pack.c:416 build/pack.c:439 #, fuzzy, c-format msgid "create archive failed on file %s: %s" msgstr "nelze otevøít %s: %s" -#: build/pack.c:455 +#: build/pack.c:458 #, fuzzy, c-format msgid "cpio_copy write failed: %s" msgstr "nelze otevøít %s: %s" -#: build/pack.c:462 +#: build/pack.c:465 #, fuzzy, c-format msgid "cpio_copy read failed: %s" msgstr "nelze èíst: %s (%d)" -#: build/pack.c:541 +#: build/pack.c:544 #, fuzzy, c-format msgid "Could not open PreIn file: %s" msgstr "chyba: nelze otevøít soubor %s\n" -#: build/pack.c:548 +#: build/pack.c:551 #, fuzzy, c-format msgid "Could not open PreUn file: %s" msgstr "chyba: nelze otevøít soubor %s\n" -#: build/pack.c:555 +#: build/pack.c:558 #, fuzzy, c-format msgid "Could not open PostIn file: %s" msgstr "chyba: nelze otevøít soubor %s\n" -#: build/pack.c:562 +#: build/pack.c:565 #, fuzzy, c-format msgid "Could not open PostUn file: %s" msgstr "chyba: nelze otevøít soubor %s\n" -#: build/pack.c:570 +#: build/pack.c:573 #, c-format msgid "Could not open VerifyScript file: %s" msgstr "" -#: build/pack.c:586 +#: build/pack.c:589 #, c-format msgid "Could not open Trigger script file: %s" msgstr "" @@ -1711,17 +1711,17 @@ msgstr "" msgid "line %d: Bad option %s: %s" msgstr "nelze otevøít %s: %s" -#: build/parseDescription.c:60 build/parseFiles.c:54 build/parseScript.c:182 +#: build/parseDescription.c:59 build/parseFiles.c:53 build/parseScript.c:181 #, c-format msgid "line %d: Too many names: %s" msgstr "" -#: build/parseDescription.c:70 build/parseFiles.c:64 build/parseScript.c:192 +#: build/parseDescription.c:69 build/parseFiles.c:63 build/parseScript.c:191 #, fuzzy, c-format msgid "line %d: Package does not exist: %s" msgstr "balíèek %s není uveden v %s" -#: build/parseDescription.c:82 +#: build/parseDescription.c:81 #, c-format msgid "line %d: Second description" msgstr "" @@ -1730,7 +1730,7 @@ msgstr "" msgid "line %d: Error parsing %%files: %s" msgstr "" -#: build/parseFiles.c:72 +#: build/parseFiles.c:71 msgid "line %d: Second %%files list" msgstr "" @@ -1825,22 +1825,22 @@ msgstr "chybí architektura pro %s u %s:%d" msgid "Internal error: Bogus tag %d" msgstr "interní chyba (chyba rpm?): " -#: build/parsePreamble.c:657 +#: build/parsePreamble.c:656 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Volby pro specifikaci balíèku:" -#: build/parsePreamble.c:663 +#: build/parsePreamble.c:662 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:690 +#: build/parsePreamble.c:689 #, fuzzy, c-format msgid "line %d: Unknown tag: %s" msgstr "Neznámı systém: %s\n" -#: build/parsePreamble.c:715 +#: build/parsePreamble.c:714 msgid "Spec file can't use BuildRoot" msgstr "" @@ -1864,43 +1864,43 @@ msgstr "" msgid "Couldn't download nosource %s: %s" msgstr "Nelze èíst %s: %s." -#: build/parsePrep.c:191 +#: build/parsePrep.c:190 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:206 +#: build/parsePrep.c:205 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:227 +#: build/parsePrep.c:223 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:351 +#: build/parsePrep.c:346 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:359 +#: build/parsePrep.c:354 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:371 +#: build/parsePrep.c:366 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:377 +#: build/parsePrep.c:372 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:384 +#: build/parsePrep.c:379 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:388 +#: build/parsePrep.c:383 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:424 +#: build/parsePrep.c:419 msgid "line %d: second %%prep" msgstr "" @@ -1935,7 +1935,7 @@ msgstr "nelze otevøít %s: %s" msgid "line %d: triggers must have --: %s" msgstr "" -#: build/parseScript.c:146 build/parseScript.c:210 +#: build/parseScript.c:146 build/parseScript.c:209 #, c-format msgid "line %d: Error parsing %s: %s" msgstr "" @@ -1945,7 +1945,7 @@ msgstr "" msgid "line %d: script program must begin with '/': %s" msgstr "" -#: build/parseScript.c:201 +#: build/parseScript.c:200 #, c-format msgid "line %d: Second %s" msgstr "" @@ -1955,45 +1955,45 @@ msgstr "" msgid "line %d: %s" msgstr "soubor %s: %s\n" -#: build/parseSpec.c:172 +#: build/parseSpec.c:173 #, fuzzy, c-format msgid "Unable to open: %s\n" msgstr "nelze otevøít %s\n" -#: build/parseSpec.c:184 +#: build/parseSpec.c:185 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:243 +#: build/parseSpec.c:244 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:251 +#: build/parseSpec.c:252 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:262 +#: build/parseSpec.c:263 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:276 build/parseSpec.c:285 +#: build/parseSpec.c:277 build/parseSpec.c:286 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:366 +#: build/parseSpec.c:367 #, c-format msgid "Timecheck value must be an integer: %s" msgstr "" -#: build/parseSpec.c:449 +#: build/parseSpec.c:450 #, fuzzy msgid "No buildable architectures" msgstr "neovìøovat architekturu balíèku" -#: build/parseSpec.c:494 +#: build/parseSpec.c:497 #, fuzzy msgid "Package has no %%description: %s" msgstr "balíèek %s není uveden v %s" @@ -2018,53 +2018,53 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "neplatné èíslo balíèku: %s\n" -#: lib/cpio.c:385 +#: lib/cpio.c:335 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "nelze odstranit %s: %s\n" -#: lib/cpio.c:391 +#: lib/cpio.c:341 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:582 +#: lib/cpio.c:532 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1044 +#: lib/cpio.c:995 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "chyba: " -#: lib/cpio.c:1047 +#: lib/cpio.c:998 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1048 +#: lib/cpio.c:999 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1066 +#: lib/cpio.c:1017 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1067 +#: lib/cpio.c:1018 #, fuzzy msgid "Unknown file type" msgstr "Neznámı systém: %s\n" -#: lib/cpio.c:1068 +#: lib/cpio.c:1019 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1069 +#: lib/cpio.c:1020 #, fuzzy msgid "Internal error" msgstr "interní chyba (chyba rpm?): " -#: lib/cpio.c:1078 +#: lib/cpio.c:1029 #, fuzzy msgid " failed - " msgstr "chyba pgp" @@ -2090,90 +2090,90 @@ msgid "error removing record %s into %s" msgstr "chyba pøi odstraòování záznamu %s do %s" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:339 +#: lib/depends.c:404 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:368 +#: lib/depends.c:433 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:460 +#: lib/depends.c:525 msgid "dbrecMatchesDepFlags() failed to read header" msgstr "dbrecMatchesDepFlags() nemù¾e pøeèíst hlavièku" -#: lib/depends.c:695 +#: lib/depends.c:760 +#, c-format +msgid "%s: %s satisfied by added file list.\n" +msgstr "" + +#: lib/depends.c:799 #, fuzzy, c-format msgid "%s: %s satisfied by added package.\n" msgstr "¾ádnı balíèek nevlastní soubor %s\n" -#: lib/depends.c:712 +#: lib/depends.c:816 #, c-format msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:717 -#, c-format -msgid "%s: %s satisfied by added file list.\n" -msgstr "" - -#: lib/depends.c:747 +#: lib/depends.c:847 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:775 +#: lib/depends.c:875 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:797 +#: lib/depends.c:897 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:819 +#: lib/depends.c:919 #, fuzzy, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "¾ádnı balíèek nevlastní soubor %s\n" -#: lib/depends.c:832 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:942 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:890 +#: lib/depends.c:990 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "polo¾ka 'vy¾aduje' balíèku %s není splnìna: %s\n" #. conflicts exist. -#: lib/depends.c:952 +#: lib/depends.c:1052 #, c-format msgid "package %s conflicts: %s\n" msgstr "balíèek %s koliduje: %s\n" -#: lib/depends.c:1007 lib/depends.c:1311 +#: lib/depends.c:1107 lib/depends.c:1415 #, c-format msgid "cannot read header at %d for dependency check" msgstr "nelze èíst hlavièku u %d pro kontrolu závislostí" -#: lib/depends.c:1102 +#: lib/depends.c:1202 #, c-format msgid "loop in prerequisite chain: %s" msgstr "smyèka v øetìzu podmínek: %s" -#: lib/falloc.c:160 +#: lib/falloc.c:157 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2183,8 +2183,8 @@ msgid "" "if \"rpm --rebuilddb\" fails to correct the problem.\n" msgstr "" -#: lib/formats.c:66 lib/formats.c:84 lib/formats.c:105 lib/formats.c:138 -#: lib/header.c:2122 lib/header.c:2139 lib/header.c:2159 +#: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141 +#: lib/header.c:2138 lib/header.c:2155 lib/header.c:2175 msgid "(not a number)" msgstr "(není èíslo)" @@ -2287,73 +2287,73 @@ msgstr "Datovı typ %d není podporován\n" msgid "Data type %d not supprted\n" msgstr "Datovı typ %d není podporován\n" -#: lib/header.c:1119 +#: lib/header.c:1120 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "Chybnı poèet pro headerAddEntry(): %d\n" -#: lib/header.c:1520 +#: lib/header.c:1529 #, c-format msgid "missing { after %" msgstr "po % chybí {" -#: lib/header.c:1548 +#: lib/header.c:1557 msgid "missing } after %{" msgstr "po %{ chybí }" -#: lib/header.c:1560 +#: lib/header.c:1569 msgid "empty tag format" msgstr "prázdnı formát pøíznaku" -#: lib/header.c:1570 +#: lib/header.c:1579 msgid "empty tag name" msgstr "prázdnı název pøíznaku" -#: lib/header.c:1585 +#: lib/header.c:1594 msgid "unknown tag" msgstr "neznámı pøíznak" -#: lib/header.c:1611 +#: lib/header.c:1620 msgid "] expected at end of array" msgstr "na konci øady se oèekávala ]" -#: lib/header.c:1627 +#: lib/header.c:1636 msgid "unexpected ]" msgstr "neoèekávaná ]" -#: lib/header.c:1629 +#: lib/header.c:1638 msgid "unexpected }" msgstr "neoèekávaná }" -#: lib/header.c:1682 +#: lib/header.c:1692 msgid "? expected in expression" msgstr "ve vırazu se oèekával ?" -#: lib/header.c:1689 +#: lib/header.c:1699 msgid "{ expected after ? in expression" msgstr "ve vırazu se po ? oèekávala {" -#: lib/header.c:1699 lib/header.c:1731 +#: lib/header.c:1709 lib/header.c:1744 msgid "} expected in expression" msgstr "ve vırazu se oèekávala }" -#: lib/header.c:1706 +#: lib/header.c:1717 msgid ": expected following ? subexpression" msgstr "v podvırazu se po ? oèekávala :" -#: lib/header.c:1719 +#: lib/header.c:1731 msgid "{ expected after : in expression" msgstr "ve vırazu se po : oèekávala {" -#: lib/header.c:1738 +#: lib/header.c:1752 msgid "| expected at end of expression" msgstr "na konci vırazu se oèekávala |" -#: lib/header.c:1905 +#: lib/header.c:1921 msgid "(unknown type)" msgstr "(neznámı typ)" -#: lib/install.c:141 lib/uninstall.c:179 +#: lib/install.c:141 lib/uninstall.c:193 #, fuzzy, c-format msgid " file: %s action: %s\n" msgstr "soubor %s: %s\n" @@ -2374,90 +2374,90 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:358 +#: lib/install.c:355 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:359 +#: lib/install.c:356 msgid " on file " msgstr "" -#: lib/install.c:402 +#: lib/install.c:399 #, fuzzy msgid "installing a source package\n" msgstr "probíhá instalace binárních balíèkù\n" -#: lib/install.c:413 +#: lib/install.c:410 #, fuzzy, c-format msgid "cannot create %s: %s" msgstr "nelze otevøít soubor %s: " -#: lib/install.c:421 lib/install.c:443 +#: lib/install.c:418 lib/install.c:440 #, fuzzy, c-format msgid "cannot write to %s" msgstr "nelze otevøít soubor %s: " -#: lib/install.c:425 +#: lib/install.c:422 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:436 +#: lib/install.c:433 #, fuzzy, c-format msgid "cannot create %s" msgstr "nelze otevøít soubor %s: " -#: lib/install.c:447 +#: lib/install.c:444 #, fuzzy, c-format msgid "spec file in: %s\n" msgstr "soubor %s: %s\n" -#: lib/install.c:481 lib/install.c:509 +#: lib/install.c:478 lib/install.c:506 #, fuzzy msgid "source package contains no .spec file" msgstr "balíèek %s neobsahuje soubory" -#: lib/install.c:530 +#: lib/install.c:527 #, fuzzy, c-format msgid "renaming %s to %s\n" msgstr "Probíhá získávání %s jako %s\n" -#: lib/install.c:532 lib/install.c:810 lib/uninstall.c:26 +#: lib/install.c:529 lib/install.c:807 lib/uninstall.c:26 #, c-format msgid "rename of %s to %s failed: %s" msgstr "%s nelze pøejmenovat na %s: %s" -#: lib/install.c:622 +#: lib/install.c:619 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:679 +#: lib/install.c:676 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "balíèek %s-%s-%s obsahuje sdílení soubory\n" -#: lib/install.c:740 +#: lib/install.c:737 #, fuzzy msgid "stopping install as we're running --test\n" msgstr "probíhá zastavení zdrojové instalace, nebo» jde jen o testování\n" -#: lib/install.c:745 +#: lib/install.c:742 #, fuzzy msgid "running preinstall script (if any)\n" msgstr "spou¹tí se pøípadnı poinstalaèní skript\n" -#: lib/install.c:770 +#: lib/install.c:767 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:806 +#: lib/install.c:803 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:880 +#: lib/install.c:877 #, fuzzy msgid "running postinstall scripts (if any)\n" msgstr "spou¹tí se pøípadnı poinstalaèní skript\n" @@ -2467,84 +2467,84 @@ msgstr "spou¹tí se pøípadnı poinstalaèní skript\n" msgid "cannot read header at %d for lookup" msgstr "nelze èíst hlavièku u %d pro vyhledání" -#: lib/macro.c:149 +#: lib/macro.c:151 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: lib/macro.c:243 +#: lib/macro.c:245 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: lib/macro.c:278 +#: lib/macro.c:280 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: lib/macro.c:457 +#: lib/macro.c:459 msgid "Macro %%%s has unterminated body" msgstr "" -#: lib/macro.c:483 +#: lib/macro.c:485 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: lib/macro.c:489 +#: lib/macro.c:491 msgid "Macro %%%s has unterminated opts" msgstr "" -#: lib/macro.c:494 +#: lib/macro.c:496 msgid "Macro %%%s has empty body" msgstr "" -#: lib/macro.c:499 +#: lib/macro.c:501 msgid "Macro %%%s failed to expand" msgstr "" -#: lib/macro.c:524 +#: lib/macro.c:526 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: lib/macro.c:601 +#: lib/macro.c:603 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: lib/macro.c:698 +#: lib/macro.c:700 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)" msgstr "Neznámı systém: %s\n" -#: lib/macro.c:870 +#: lib/macro.c:872 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: lib/macro.c:936 lib/macro.c:952 +#: lib/macro.c:938 lib/macro.c:954 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: lib/macro.c:992 +#: lib/macro.c:994 msgid "A %% is followed by an unparseable macro" msgstr "" -#: lib/macro.c:1115 +#: lib/macro.c:1117 #, fuzzy msgid "Macro %%%.*s not found, skipping" msgstr "balíèek %s nenalezen v %s" -#: lib/macro.c:1196 +#: lib/macro.c:1198 msgid "Target buffer overflow" msgstr "" -#: lib/macro.c:1343 lib/macro.c:1351 +#: lib/macro.c:1345 lib/macro.c:1353 #, fuzzy, c-format msgid "File %s: %s" msgstr "soubor %s: %s\n" -#: lib/macro.c:1354 +#: lib/macro.c:1356 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -2575,24 +2575,24 @@ msgstr "chyba pøi vytváøení adresáøe %s: %s" msgid "bad file state: %s" msgstr "nelze provést statistiku %s: %s" -#: lib/package.c:234 +#: lib/package.c:237 msgid "package is a version one package!\n" msgstr "balíèek je balíèkem verze jedna!\n" -#: lib/package.c:239 +#: lib/package.c:242 msgid "old style source package -- I'll do my best\n" msgstr "zdrojovı balíèek starého typu -- snaha bude\n" -#: lib/package.c:242 +#: lib/package.c:245 #, c-format msgid "archive offset is %d\n" msgstr "offset archivu je %d\n" -#: lib/package.c:252 +#: lib/package.c:256 msgid "old style binary package\n" msgstr "binární balíèek starého typu\n" -#: lib/package.c:298 +#: lib/package.c:316 msgid "" "only packages with major numbers <= 3 are supported by this version of RPM" msgstr "" @@ -2659,204 +2659,204 @@ msgstr "" msgid "error in format: %s\n" msgstr "chyba v formátu: %s\n" -#: lib/query.c:180 +#: lib/query.c:181 msgid "(contains no files)" msgstr "(neobsahuje soubory)" -#: lib/query.c:233 +#: lib/query.c:238 msgid "normal " msgstr "normální " -#: lib/query.c:235 +#: lib/query.c:240 msgid "replaced " msgstr "nahrazen " -#: lib/query.c:237 +#: lib/query.c:242 msgid "not installed " msgstr "neinstalován " -#: lib/query.c:239 +#: lib/query.c:244 msgid "net shared " msgstr "sdílen v síti " -#: lib/query.c:241 +#: lib/query.c:246 #, c-format msgid "(unknown %3d) " msgstr "(neznámı %3d) " -#: lib/query.c:245 +#: lib/query.c:250 msgid "(no state) " msgstr "(chybí stav) " -#: lib/query.c:261 lib/query.c:291 +#: lib/query.c:267 lib/query.c:308 msgid "package has neither file owner or id lists" msgstr "balíèek nemá vlastníka souboru ani id-seznamy" -#: lib/query.c:400 +#: lib/query.c:421 #, fuzzy, c-format msgid "record number %u\n" msgstr "probíhá ovìøování záznamu èíslo %d\n" -#: lib/query.c:404 +#: lib/query.c:425 msgid "error: could not read database record\n" msgstr "chyba: nelze naèíst databázovı záznam\n" -#: lib/query.c:442 +#: lib/query.c:463 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "nelze otevøít %s: %s\n" -#: lib/query.c:455 +#: lib/query.c:476 msgid "old format source packages cannot be queried\n" msgstr "na zdrojové balíèky starého formátu se nelze dotazovat\n" -#: lib/query.c:464 lib/rpminstall.c:203 +#: lib/query.c:485 lib/rpminstall.c:203 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "nezdá se, ¾e by %s byl balíèek typu RPM\n" -#: lib/query.c:467 +#: lib/query.c:488 #, c-format msgid "query of %s failed\n" msgstr "dotaz na %s se nezdaøil\n" -#: lib/query.c:494 +#: lib/query.c:515 #, fuzzy, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "dotaz na %s se nezdaøil\n" -#: lib/query.c:519 +#: lib/query.c:540 msgid "could not read database record!\n" msgstr "nelze naèíst databázovı záznam!\n" -#: lib/query.c:530 +#: lib/query.c:551 #, c-format msgid "group %s does not contain any packages\n" msgstr "skupina %s neobsahuje ¾ádné balíèky\n" -#: lib/query.c:540 +#: lib/query.c:561 #, c-format msgid "no package provides %s\n" msgstr "¾ádnı balíèek neposkytuje %s\n" -#: lib/query.c:550 +#: lib/query.c:571 #, c-format msgid "no package triggers %s\n" msgstr "¾ádnı balíèek neaktivuje %s\n" -#: lib/query.c:560 +#: lib/query.c:581 #, c-format msgid "no package requires %s\n" msgstr "¾ádnı balíèek nevy¾aduje %s\n" -#: lib/query.c:575 +#: lib/query.c:596 #, c-format msgid "file %s: %s\n" msgstr "soubor %s: %s\n" -#: lib/query.c:578 +#: lib/query.c:599 #, c-format msgid "file %s is not owned by any package\n" msgstr "¾ádnı balíèek nevlastní soubor %s\n" -#: lib/query.c:591 +#: lib/query.c:612 #, c-format msgid "invalid package number: %s\n" msgstr "neplatné èíslo balíèku: %s\n" -#: lib/query.c:594 +#: lib/query.c:615 #, fuzzy, c-format msgid "package record number: %d\n" msgstr "probíhá dotaz na záznam èíslo %d\n" -#: lib/query.c:597 +#: lib/query.c:618 #, c-format msgid "record %d could not be read\n" msgstr "záznam %d nelze naèíst\n" -#: lib/query.c:609 lib/rpminstall.c:393 +#: lib/query.c:630 lib/rpminstall.c:393 #, c-format msgid "package %s is not installed\n" msgstr "balíèek %s není nainstalován\n" -#: lib/query.c:612 +#: lib/query.c:633 #, c-format msgid "error looking for package %s\n" msgstr "chyba pøi hledání balíèku %s\n" -#: lib/query.c:634 +#: lib/query.c:655 #, fuzzy msgid "rpmQuery: rpmdbOpen() failed\n" msgstr "%s: Chybné otevøení\n" -#: lib/query.c:693 +#: lib/query.c:714 #, fuzzy msgid "query package owning file" msgstr "dotazy na balíèek vlastnící <soubor>" -#: lib/query.c:695 +#: lib/query.c:716 #, fuzzy msgid "query packages in group" msgstr "balíèek nemá skupinu\n" -#: lib/query.c:697 +#: lib/query.c:718 #, fuzzy msgid "query a package file" msgstr "dotazovat v¹echny balíèky" -#: lib/query.c:701 +#: lib/query.c:722 #, fuzzy msgid "query a spec file" msgstr "dotaz na %s se nezdaøil\n" -#: lib/query.c:703 +#: lib/query.c:724 #, fuzzy msgid "query the pacakges triggered by the package" msgstr "dotazy na balíèky aktivované <balíkem>" -#: lib/query.c:705 +#: lib/query.c:726 #, fuzzy msgid "query the packages which require a capability" msgstr "dotazovat balíèky vy¾adující schopnost <sch>" -#: lib/query.c:707 +#: lib/query.c:728 #, fuzzy msgid "query the packages which provide a capability" msgstr "dotazovat balíèky poskytující schopnost <sch>" -#: lib/query.c:746 +#: lib/query.c:767 #, fuzzy msgid "list all configuration files" msgstr "uvést pouze konfiguraèní soubory (implikuje -l)" -#: lib/query.c:748 +#: lib/query.c:769 #, fuzzy msgid "list all documentation files" msgstr "nainstalovat dokumentaci" -#: lib/query.c:750 +#: lib/query.c:771 #, fuzzy msgid "dump basic file information" msgstr "zobrazit informace o balíèku" -#: lib/query.c:752 +#: lib/query.c:773 #, fuzzy msgid "list files in package" msgstr "binární balíèek starého typu\n" -#: lib/query.c:756 +#: lib/query.c:777 msgid "use the following query format" msgstr "" -#: lib/query.c:758 +#: lib/query.c:779 msgid "substitute i18n sections from the following catalogue" msgstr "" -#: lib/query.c:761 +#: lib/query.c:782 msgid "display the states of the listed files" msgstr "" -#: lib/query.c:763 +#: lib/query.c:784 #, fuzzy msgid "display a verbose file listing" msgstr "zobrazit seznam souborù balíèkù" @@ -2933,12 +2933,12 @@ msgstr "nelze spustit\n" #: lib/rpmchecksig.c:74 #, fuzzy, c-format -msgid "%s: fdWrite failed: %s\n" -msgstr "%s: Chybné otevøení\n" +msgid "%s: Fwrite failed: %s\n" +msgstr "%s: Chybné readLead\n" #: lib/rpmchecksig.c:80 #, fuzzy, c-format -msgid "%s: fdRead failed: %s\n" +msgid "%s: Fread failed: %s\n" msgstr "%s: Chybné readLead\n" #: lib/rpmchecksig.c:113 lib/rpmchecksig.c:242 @@ -3035,76 +3035,76 @@ msgid "" "database" msgstr "" -#: lib/rpmdb.c:439 +#: lib/rpmdb.c:468 #, c-format msgid "package %s not listed in %s" msgstr "balíèek %s není uveden v %s" -#: lib/rpmdb.c:450 +#: lib/rpmdb.c:479 #, c-format msgid "package %s not found in %s" msgstr "balíèek %s nenalezen v %s" -#: lib/rpmdb.c:475 lib/uninstall.c:85 +#: lib/rpmdb.c:503 lib/uninstall.c:85 #, c-format msgid "cannot read header at %d for uninstall" msgstr "nelze èíst hlavièku u %d pro deinstalaci" -#: lib/rpmdb.c:483 +#: lib/rpmdb.c:511 msgid "package has no name" msgstr "balíèek nemá název" -#: lib/rpmdb.c:485 +#: lib/rpmdb.c:513 msgid "removing name index\n" msgstr "odstraòuje se rejstøík názvù\n" -#: lib/rpmdb.c:490 +#: lib/rpmdb.c:518 msgid "package has no group\n" msgstr "balíèek nemá skupinu\n" -#: lib/rpmdb.c:492 +#: lib/rpmdb.c:520 msgid "removing group index\n" msgstr "odstraòuje se rejstøík skupin\n" -#: lib/rpmdb.c:499 +#: lib/rpmdb.c:527 #, c-format msgid "removing provides index for %s\n" msgstr "odstraòuje se rejstøík 'poskytuje' pro %s\n" -#: lib/rpmdb.c:514 +#: lib/rpmdb.c:542 #, c-format msgid "removing requiredby index for %s\n" msgstr "odstraòuje se rejstøík 'vy¾aduje' pro %s\n" -#: lib/rpmdb.c:526 +#: lib/rpmdb.c:554 #, c-format msgid "removing trigger index for %s\n" msgstr "odstraòuje se rejstøík aktivací pro %s\n" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:565 #, c-format msgid "removing conflict index for %s\n" msgstr "odstraòuje se rejstøík konfliktù pro %s\n" -#: lib/rpmdb.c:554 +#: lib/rpmdb.c:576 #, c-format msgid "removing file index for %s\n" msgstr "odstraòuje se rejstøík souborù pro %s\n" -#: lib/rpmdb.c:563 +#: lib/rpmdb.c:585 msgid "package has no files\n" msgstr "balíèek neobsahuje soubory\n" -#: lib/rpmdb.c:645 +#: lib/rpmdb.c:667 msgid "cannot allocate space for database" msgstr "nelze alokovat prostor pro databázi" -#: lib/rpmdb.c:711 +#: lib/rpmdb.c:726 #, c-format msgid "cannot read header at %d for update" msgstr "nelze èíst hlavièku u %d pro inovaci" -#: lib/rpmdb.c:720 +#: lib/rpmdb.c:735 msgid "header changed size!" msgstr "hlavièka zmìnila velikost!" @@ -3263,37 +3263,37 @@ msgstr "Nelze èíst %s: %s." msgid "missing ':' at %s:%d" msgstr "chybí ':' u %s:%d" -#: lib/rpmrc.c:655 lib/rpmrc.c:729 +#: lib/rpmrc.c:655 lib/rpmrc.c:730 #, c-format msgid "missing argument for %s at %s:%d" msgstr "chybí argument pro %s u %s:%d" -#: lib/rpmrc.c:672 lib/rpmrc.c:694 +#: lib/rpmrc.c:672 lib/rpmrc.c:695 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "nelze otevøít %s: %s" -#: lib/rpmrc.c:680 +#: lib/rpmrc.c:681 #, fuzzy, c-format msgid "cannot open %s at %s:%d" msgstr "nelze otevøít soubor %s: " -#: lib/rpmrc.c:721 +#: lib/rpmrc.c:722 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "chybí architektura pro %s u %s:%d" -#: lib/rpmrc.c:788 +#: lib/rpmrc.c:789 #, c-format msgid "bad option '%s' at %s:%d" msgstr "chybná volba '%s' u %s:%d" -#: lib/rpmrc.c:1147 +#: lib/rpmrc.c:1149 #, c-format msgid "Unknown system: %s\n" msgstr "Neznámı systém: %s\n" -#: lib/rpmrc.c:1148 +#: lib/rpmrc.c:1150 msgid "Please contact rpm-list@redhat.com\n" msgstr "Zkontaktujte rpm-list@redhat.com\n" @@ -3442,17 +3442,27 @@ msgstr "V souboru rpmrc se musí nastavit \"pgp_name:\"" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "V souboru rpmrc se musí nastavit \"pgp_name:\"" -#: lib/transaction.c:363 +#: lib/transaction.c:386 +#, fuzzy, c-format +msgid "excluding file %s%s\n" +msgstr "Probíhá naèítání %s\n" + +#: lib/transaction.c:412 lib/transaction.c:496 +#, fuzzy, c-format +msgid "excluding directory %s\n" +msgstr "vytváøí se adresáø: %s\n" + +#: lib/transaction.c:417 #, fuzzy, c-format msgid "relocating %s to %s\n" msgstr "Probíhá získávání %s jako %s\n" -#: lib/transaction.c:370 +#: lib/transaction.c:489 #, fuzzy, c-format -msgid "excluding %s\n" -msgstr "Probíhá naèítání %s\n" +msgid "relocating directory %s to %s\n" +msgstr "Probíhá získávání %s jako %s\n" -#: lib/transaction.c:489 +#: lib/transaction.c:637 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3482,15 +3492,15 @@ msgstr "nelze èíst balíèky nazvané %d pro deinstalaci" msgid "will remove files test = %d\n" msgstr "odstraní se soubory test = %d\n" -#: lib/uninstall.c:191 +#: lib/uninstall.c:207 msgid "running postuninstall script (if any)\n" msgstr "spou¹tí se pøípadnı poinstalaèní skript\n" -#: lib/uninstall.c:204 +#: lib/uninstall.c:220 msgid "removing database entry\n" msgstr "odstraòuje se polo¾ka databáze\n" -#: lib/uninstall.c:365 +#: lib/uninstall.c:381 msgid "execution of script failed" msgstr "skript nelze spustit" @@ -3525,30 +3535,34 @@ msgstr "%s nelze vytvoøit\n" msgid "don't verify files in package" msgstr "binární balíèek starého typu\n" -#: lib/verify.c:208 +#: lib/verify.c:213 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:226 +#: lib/verify.c:231 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:259 +#: lib/verify.c:266 #, c-format msgid "missing %s\n" msgstr "chybí %s\n" -#: lib/verify.c:321 +#: lib/verify.c:328 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: " -#: lib/verify.c:369 +#: lib/verify.c:376 #, fuzzy msgid "rpmVerify: rpmdbOpen() failed\n" msgstr "%s: Chybné otevøení\n" #, fuzzy +#~ msgid "%s: fdWrite failed: %s\n" +#~ msgstr "%s: Chybné otevøení\n" + +#, fuzzy #~ msgid "failed build prerequisites:\n" #~ msgstr "chybné závislosti:\n" @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 2.5.2\n" -"POT-Creation-Date: 1999-10-04 16:05-0400\n" +"POT-Creation-Date: 1999-10-27 12:52-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" @@ -1351,36 +1351,36 @@ msgstr "Es wurden keine Pakete für die Signatur angeben" msgid "no packages files given for rebuild" msgstr "Es wurden keine Paketdateien für die Neuerstellung angegeben" -#: rpm.c:1230 +#: rpm.c:1234 msgid "no spec files given for build" msgstr "Es wurde kein spec-Datei für die Erstellung angegeben" -#: rpm.c:1232 +#: rpm.c:1236 msgid "no tar files given for build" msgstr "Es wurde keine tar-Datei für die Erstellung angegeben" -#: rpm.c:1244 +#: rpm.c:1248 msgid "no packages given for uninstall" msgstr "Es wurden keine Pakete für die Deinstallation angegeben" -#: rpm.c:1294 +#: rpm.c:1298 msgid "no packages given for install" msgstr "Es wurden keine Pakete für die Installation angegeben" -#: rpm.c:1317 +#: rpm.c:1321 msgid "extra arguments given for query of all packages" msgstr "Zusätzliche Argumente für die Anfrage an alle Pakete angegeben" -#: rpm.c:1322 +#: rpm.c:1326 msgid "no arguments given for query" msgstr "Es wurden keine Argumente für die Anfrage angegeben" -#: rpm.c:1339 +#: rpm.c:1343 #, fuzzy msgid "extra arguments given for verify of all packages" msgstr "Zusätzliche Argumente für die Anfrage an alle Pakete angegeben" -#: rpm.c:1343 +#: rpm.c:1347 msgid "no arguments given for verify" msgstr "Es wurden keine Argumente für die Überprüfung angegeben" @@ -1394,7 +1394,7 @@ msgid "error reading header from package\n" msgstr "Fehler beim Suchen nach Paket %s\n" # , c-format -#: build/build.c:83 build/pack.c:263 +#: build/build.c:83 build/pack.c:267 #, fuzzy msgid "Unable to open temp file" msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s." @@ -1415,60 +1415,60 @@ msgstr "öffnen von %s fehlgeschlagen: %s\n" msgid "Bad exit status from %s (%s)" msgstr "" -#: build/expression.c:208 +#: build/expression.c:207 #, fuzzy msgid "syntax error while parsing ==" msgstr "? im Ausdruck erwartet" -#: build/expression.c:238 +#: build/expression.c:237 #, fuzzy msgid "syntax error while parsing &&" msgstr "? im Ausdruck erwartet" -#: build/expression.c:247 +#: build/expression.c:246 #, fuzzy msgid "syntax error while parsing ||" msgstr "? im Ausdruck erwartet" -#: build/expression.c:289 +#: build/expression.c:288 #, fuzzy msgid "parse error in expression" msgstr "? im Ausdruck erwartet" -#: build/expression.c:319 +#: build/expression.c:318 msgid "unmatched (" msgstr "" -#: build/expression.c:337 +#: build/expression.c:336 msgid "undefined identifier" msgstr "" -#: build/expression.c:356 +#: build/expression.c:355 msgid "- only on numbers" msgstr "" -#: build/expression.c:372 +#: build/expression.c:371 msgid "! only on numbers" msgstr "" -#: build/expression.c:411 build/expression.c:456 build/expression.c:513 -#: build/expression.c:600 +#: build/expression.c:410 build/expression.c:455 build/expression.c:512 +#: build/expression.c:599 msgid "types must match" msgstr "" -#: build/expression.c:424 +#: build/expression.c:423 msgid "* / not suported for strings" msgstr "" -#: build/expression.c:472 +#: build/expression.c:471 msgid "- not suported for strings" msgstr "" -#: build/expression.c:613 +#: build/expression.c:612 msgid "&& and || not suported for strings" msgstr "" -#: build/expression.c:644 build/expression.c:689 +#: build/expression.c:645 build/expression.c:692 #, fuzzy msgid "syntax error in expression" msgstr "? im Ausdruck erwartet" @@ -1554,86 +1554,86 @@ msgid "File listed twice: %s" msgstr "Lesen von %s fehlgeschlagen: %s." # , c-format -#: build/files.c:951 +#: build/files.c:953 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s" msgstr "Lesen von %s fehlgeschlagen: %s." -#: build/files.c:961 +#: build/files.c:963 #, fuzzy, c-format msgid "File not found: %s" msgstr "Datei auf dem Server nicht gefunden" -#: build/files.c:1004 +#: build/files.c:1006 #, c-format msgid "Bad owner/group: %s\n" msgstr "" # , c-format -#: build/files.c:1018 +#: build/files.c:1020 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/files.c:1088 +#: build/files.c:1090 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1132 +#: build/files.c:1134 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Datei auf dem Server nicht gefunden" -#: build/files.c:1174 +#: build/files.c:1176 #, fuzzy msgid "Could not open %%files file: %s" msgstr "Fehler: kann Datei %s nicht öffnen\n" -#: build/files.c:1181 build/pack.c:485 +#: build/files.c:1183 build/pack.c:488 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1508 build/parsePrep.c:29 +#: build/files.c:1510 build/parsePrep.c:29 #, c-format msgid "Bad owner/group: %s" msgstr "" -#: build/files.c:1562 +#: build/files.c:1564 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "Konnte pgp nicht durchführen" -#: build/files.c:1567 +#: build/files.c:1569 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Konnte Signatur-Ziel (»sigtarget«) nicht lesen" -#: build/files.c:1649 +#: build/files.c:1651 #, fuzzy, c-format msgid "%s failed" msgstr "pgp fehlgeschlagen" # , c-format -#: build/files.c:1653 +#: build/files.c:1655 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "anlegen von %s fehlgeschlagen\n" -#: build/files.c:1742 +#: build/files.c:1744 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" # , c-format -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1772 build/files.c:1781 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "anlegen von %s fehlgeschlagen\n" # , c-format -#: build/files.c:1885 +#: build/files.c:1887 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -1651,112 +1651,112 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:131 +#: build/pack.c:132 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:148 +#: build/pack.c:149 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "kann Datei %s nicht öffnen: " # , c-format -#: build/pack.c:183 +#: build/pack.c:184 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: build/pack.c:193 +#: build/pack.c:194 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "Lesen von %s fehlgeschlagen: %s." -#: build/pack.c:213 +#: build/pack.c:215 #, fuzzy, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "Fehler: %s scheint zu keinem RPM-Paket zu gehören\n" -#: build/pack.c:219 +#: build/pack.c:221 #, fuzzy, c-format msgid "readRPM: reading header from %s\n" msgstr "Fehler beim Eintrag %s von %s" -#: build/pack.c:274 +#: build/pack.c:278 msgid "Bad CSA data" msgstr "" # , c-format -#: build/pack.c:305 +#: build/pack.c:311 #, fuzzy, c-format msgid "Could not open %s\n" msgstr "Öffnen von %s fehlgeschlagen\n" # , c-format -#: build/pack.c:337 build/pack.c:379 +#: build/pack.c:343 build/pack.c:385 #, fuzzy, c-format msgid "Unable to write package: %s" msgstr "Nicht möglich %s zu schreiben" -#: build/pack.c:352 +#: build/pack.c:358 #, fuzzy, c-format msgid "Generating signature: %d\n" msgstr "PGP-Signatur generieren" # , c-format -#: build/pack.c:369 +#: build/pack.c:375 #, fuzzy, c-format msgid "Unable to read sigtarget: %s" msgstr "Nicht möglich %s zu schreiben" -#: build/pack.c:394 +#: build/pack.c:400 #, c-format msgid "Wrote: %s\n" msgstr "" # , c-format -#: build/pack.c:411 build/pack.c:435 +#: build/pack.c:416 build/pack.c:439 #, fuzzy, c-format msgid "create archive failed on file %s: %s" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/pack.c:455 +#: build/pack.c:458 #, c-format msgid "cpio_copy write failed: %s" msgstr "" -#: build/pack.c:462 +#: build/pack.c:465 #, fuzzy, c-format msgid "cpio_copy read failed: %s" msgstr "lesen fehlgeschlagen: %s (%d)" -#: build/pack.c:541 +#: build/pack.c:544 #, fuzzy, c-format msgid "Could not open PreIn file: %s" msgstr "Fehler: kann Datei %s nicht öffnen\n" -#: build/pack.c:548 +#: build/pack.c:551 #, fuzzy, c-format msgid "Could not open PreUn file: %s" msgstr "Fehler: kann Datei %s nicht öffnen\n" -#: build/pack.c:555 +#: build/pack.c:558 #, fuzzy, c-format msgid "Could not open PostIn file: %s" msgstr "Fehler: kann Datei %s nicht öffnen\n" -#: build/pack.c:562 +#: build/pack.c:565 #, fuzzy, c-format msgid "Could not open PostUn file: %s" msgstr "Fehler: kann Datei %s nicht öffnen\n" -#: build/pack.c:570 +#: build/pack.c:573 #, c-format msgid "Could not open VerifyScript file: %s" msgstr "" -#: build/pack.c:586 +#: build/pack.c:589 #, c-format msgid "Could not open Trigger script file: %s" msgstr "" @@ -1800,17 +1800,17 @@ msgstr "" msgid "line %d: Bad option %s: %s" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/parseDescription.c:60 build/parseFiles.c:54 build/parseScript.c:182 +#: build/parseDescription.c:59 build/parseFiles.c:53 build/parseScript.c:181 #, c-format msgid "line %d: Too many names: %s" msgstr "" -#: build/parseDescription.c:70 build/parseFiles.c:64 build/parseScript.c:192 +#: build/parseDescription.c:69 build/parseFiles.c:63 build/parseScript.c:191 #, fuzzy, c-format msgid "line %d: Package does not exist: %s" msgstr "Paket %s wird nicht in %s aufgeführt" -#: build/parseDescription.c:82 +#: build/parseDescription.c:81 #, c-format msgid "line %d: Second description" msgstr "" @@ -1819,7 +1819,7 @@ msgstr "" msgid "line %d: Error parsing %%files: %s" msgstr "" -#: build/parseFiles.c:72 +#: build/parseFiles.c:71 msgid "line %d: Second %%files list" msgstr "" @@ -1917,22 +1917,22 @@ msgstr "fehlende Architektur für %s bei %s:%d" msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:657 +#: build/parsePreamble.c:656 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Optionen der Paketauswahl:" -#: build/parsePreamble.c:663 +#: build/parsePreamble.c:662 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:690 +#: build/parsePreamble.c:689 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:715 +#: build/parsePreamble.c:714 msgid "Spec file can't use BuildRoot" msgstr "" @@ -1958,43 +1958,43 @@ msgstr "" msgid "Couldn't download nosource %s: %s" msgstr "Lesen von %s fehlgeschlagen: %s." -#: build/parsePrep.c:191 +#: build/parsePrep.c:190 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:206 +#: build/parsePrep.c:205 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:227 +#: build/parsePrep.c:223 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:351 +#: build/parsePrep.c:346 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:359 +#: build/parsePrep.c:354 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:371 +#: build/parsePrep.c:366 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:377 +#: build/parsePrep.c:372 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:384 +#: build/parsePrep.c:379 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:388 +#: build/parsePrep.c:383 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:424 +#: build/parsePrep.c:419 msgid "line %d: second %%prep" msgstr "" @@ -2030,7 +2030,7 @@ msgstr "Öffnen von %s fehlgeschlagen: %s" msgid "line %d: triggers must have --: %s" msgstr "" -#: build/parseScript.c:146 build/parseScript.c:210 +#: build/parseScript.c:146 build/parseScript.c:209 #, c-format msgid "line %d: Error parsing %s: %s" msgstr "" @@ -2040,7 +2040,7 @@ msgstr "" msgid "line %d: script program must begin with '/': %s" msgstr "" -#: build/parseScript.c:201 +#: build/parseScript.c:200 #, c-format msgid "line %d: Second %s" msgstr "" @@ -2052,45 +2052,45 @@ msgid "line %d: %s" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: build/parseSpec.c:172 +#: build/parseSpec.c:173 #, fuzzy, c-format msgid "Unable to open: %s\n" msgstr "Öffnen von %s fehlgeschlagen\n" -#: build/parseSpec.c:184 +#: build/parseSpec.c:185 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:243 +#: build/parseSpec.c:244 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:251 +#: build/parseSpec.c:252 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:262 +#: build/parseSpec.c:263 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:276 build/parseSpec.c:285 +#: build/parseSpec.c:277 build/parseSpec.c:286 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:366 +#: build/parseSpec.c:367 #, c-format msgid "Timecheck value must be an integer: %s" msgstr "" -#: build/parseSpec.c:449 +#: build/parseSpec.c:450 #, fuzzy msgid "No buildable architectures" msgstr "Paket-Architektur nicht überprüfen" -#: build/parseSpec.c:494 +#: build/parseSpec.c:497 #, fuzzy msgid "Package has no %%description: %s" msgstr "Paket %s wird nicht in %s aufgeführt" @@ -2116,53 +2116,53 @@ msgid "line %d: Bad %s number: %s\n" msgstr "ungültige Paket-Nummer: %s\n" # , c-format -#: lib/cpio.c:385 +#: lib/cpio.c:335 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "Lesen von %s fehlgeschlagen: %s." -#: lib/cpio.c:391 +#: lib/cpio.c:341 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:582 +#: lib/cpio.c:532 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1044 +#: lib/cpio.c:995 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "Fehler: " -#: lib/cpio.c:1047 +#: lib/cpio.c:998 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1048 +#: lib/cpio.c:999 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1066 +#: lib/cpio.c:1017 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1067 +#: lib/cpio.c:1018 #, fuzzy msgid "Unknown file type" msgstr "(unbekannter Typ)" -#: lib/cpio.c:1068 +#: lib/cpio.c:1019 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1069 +#: lib/cpio.c:1020 #, fuzzy msgid "Internal error" msgstr "Fataler Fehler: " -#: lib/cpio.c:1078 +#: lib/cpio.c:1029 #, fuzzy msgid " failed - " msgstr "pgp fehlgeschlagen" @@ -2189,90 +2189,90 @@ msgid "error removing record %s into %s" msgstr "Fehler beim Löschen des Eintrags %s nach %s" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:339 +#: lib/depends.c:404 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:368 +#: lib/depends.c:433 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:460 +#: lib/depends.c:525 msgid "dbrecMatchesDepFlags() failed to read header" msgstr "" -#: lib/depends.c:695 +#: lib/depends.c:760 +#, c-format +msgid "%s: %s satisfied by added file list.\n" +msgstr "" + +#: lib/depends.c:799 #, fuzzy, c-format msgid "%s: %s satisfied by added package.\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:712 +#: lib/depends.c:816 #, c-format msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:717 -#, c-format -msgid "%s: %s satisfied by added file list.\n" -msgstr "" - -#: lib/depends.c:747 +#: lib/depends.c:847 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:775 +#: lib/depends.c:875 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:797 +#: lib/depends.c:897 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:819 +#: lib/depends.c:919 #, fuzzy, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:832 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:942 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:890 +#: lib/depends.c:990 #, fuzzy, c-format msgid "package %s require not satisfied: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" #. conflicts exist. -#: lib/depends.c:952 +#: lib/depends.c:1052 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" -#: lib/depends.c:1007 lib/depends.c:1311 +#: lib/depends.c:1107 lib/depends.c:1415 #, c-format msgid "cannot read header at %d for dependency check" msgstr "kann Kopfzeilen bei %d nicht lesen, um Abhängigkeiten zu prüfen" -#: lib/depends.c:1102 +#: lib/depends.c:1202 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" -#: lib/falloc.c:160 +#: lib/falloc.c:157 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2282,8 +2282,8 @@ msgid "" "if \"rpm --rebuilddb\" fails to correct the problem.\n" msgstr "" -#: lib/formats.c:66 lib/formats.c:84 lib/formats.c:105 lib/formats.c:138 -#: lib/header.c:2122 lib/header.c:2139 lib/header.c:2159 +#: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141 +#: lib/header.c:2138 lib/header.c:2155 lib/header.c:2175 msgid "(not a number)" msgstr "(keine Zahl)" @@ -2388,77 +2388,77 @@ msgstr "" msgid "Data type %d not supprted\n" msgstr "" -#: lib/header.c:1119 +#: lib/header.c:1120 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" -#: lib/header.c:1520 +#: lib/header.c:1529 #, c-format msgid "missing { after %" msgstr "fehlende { nach %{" -#: lib/header.c:1548 +#: lib/header.c:1557 msgid "missing } after %{" msgstr "fehlende } nach %{" # »Tag« übersetzen??? -ke- -#: lib/header.c:1560 +#: lib/header.c:1569 msgid "empty tag format" msgstr "leeres »Tag«-Format" -#: lib/header.c:1570 +#: lib/header.c:1579 msgid "empty tag name" msgstr "leerer »Tag«-Name" -#: lib/header.c:1585 +#: lib/header.c:1594 msgid "unknown tag" msgstr "unbekannter »Tag«" -#: lib/header.c:1611 +#: lib/header.c:1620 msgid "] expected at end of array" msgstr "] am Ende des Arrays erwartet" -#: lib/header.c:1627 +#: lib/header.c:1636 msgid "unexpected ]" msgstr "unerwartete ]" -#: lib/header.c:1629 +#: lib/header.c:1638 msgid "unexpected }" msgstr "unerwartete }" -#: lib/header.c:1682 +#: lib/header.c:1692 msgid "? expected in expression" msgstr "? im Ausdruck erwartet" -#: lib/header.c:1689 +#: lib/header.c:1699 #, fuzzy msgid "{ expected after ? in expression" msgstr "{ nach ? im Ausdruck erwartet" -#: lib/header.c:1699 lib/header.c:1731 +#: lib/header.c:1709 lib/header.c:1744 msgid "} expected in expression" msgstr "} im Ausdruck erwartet" -#: lib/header.c:1706 +#: lib/header.c:1717 msgid ": expected following ? subexpression" msgstr ": nach ? Unterausdruck erwartet" -#: lib/header.c:1719 +#: lib/header.c:1731 #, fuzzy msgid "{ expected after : in expression" msgstr "{ nach : im Ausdruck erwartet" -#: lib/header.c:1738 +#: lib/header.c:1752 msgid "| expected at end of expression" msgstr "| am Ende des Ausdrucks erwartet" -#: lib/header.c:1905 +#: lib/header.c:1921 msgid "(unknown type)" msgstr "(unbekannter Typ)" # , c-format -#: lib/install.c:141 lib/uninstall.c:179 +#: lib/install.c:141 lib/uninstall.c:193 #, fuzzy, c-format msgid " file: %s action: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -2479,90 +2479,90 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:358 +#: lib/install.c:355 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:359 +#: lib/install.c:356 msgid " on file " msgstr "" -#: lib/install.c:402 +#: lib/install.c:399 #, fuzzy msgid "installing a source package\n" msgstr "Paket installieren" -#: lib/install.c:413 +#: lib/install.c:410 #, fuzzy, c-format msgid "cannot create %s: %s" msgstr "kann Datei %s nicht öffnen: " -#: lib/install.c:421 lib/install.c:443 +#: lib/install.c:418 lib/install.c:440 #, fuzzy, c-format msgid "cannot write to %s" msgstr "kann Datei %s nicht öffnen: " -#: lib/install.c:425 +#: lib/install.c:422 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:436 +#: lib/install.c:433 #, fuzzy, c-format msgid "cannot create %s" msgstr "kann Datei %s nicht öffnen: " # , c-format -#: lib/install.c:447 +#: lib/install.c:444 #, fuzzy, c-format msgid "spec file in: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/install.c:481 lib/install.c:509 +#: lib/install.c:478 lib/install.c:506 #, fuzzy msgid "source package contains no .spec file" msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt" -#: lib/install.c:530 +#: lib/install.c:527 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:532 lib/install.c:810 lib/uninstall.c:26 +#: lib/install.c:529 lib/install.c:807 lib/uninstall.c:26 #, c-format msgid "rename of %s to %s failed: %s" msgstr "umbennen von %s nach %s fehlgeschlagen: %s" -#: lib/install.c:622 +#: lib/install.c:619 msgid "source package expected, binary found" msgstr "" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/install.c:679 +#: lib/install.c:676 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/install.c:740 +#: lib/install.c:737 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:745 +#: lib/install.c:742 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:770 +#: lib/install.c:767 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:806 +#: lib/install.c:803 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:880 +#: lib/install.c:877 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2571,85 +2571,85 @@ msgstr "" msgid "cannot read header at %d for lookup" msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen" -#: lib/macro.c:149 +#: lib/macro.c:151 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: lib/macro.c:243 +#: lib/macro.c:245 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: lib/macro.c:278 +#: lib/macro.c:280 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: lib/macro.c:457 +#: lib/macro.c:459 msgid "Macro %%%s has unterminated body" msgstr "" -#: lib/macro.c:483 +#: lib/macro.c:485 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: lib/macro.c:489 +#: lib/macro.c:491 msgid "Macro %%%s has unterminated opts" msgstr "" -#: lib/macro.c:494 +#: lib/macro.c:496 msgid "Macro %%%s has empty body" msgstr "" -#: lib/macro.c:499 +#: lib/macro.c:501 msgid "Macro %%%s failed to expand" msgstr "" -#: lib/macro.c:524 +#: lib/macro.c:526 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: lib/macro.c:601 +#: lib/macro.c:603 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: lib/macro.c:698 +#: lib/macro.c:700 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: lib/macro.c:870 +#: lib/macro.c:872 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: lib/macro.c:936 lib/macro.c:952 +#: lib/macro.c:938 lib/macro.c:954 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: lib/macro.c:992 +#: lib/macro.c:994 msgid "A %% is followed by an unparseable macro" msgstr "" -#: lib/macro.c:1115 +#: lib/macro.c:1117 #, fuzzy msgid "Macro %%%.*s not found, skipping" msgstr "Paket %s in %s nicht gefunden" -#: lib/macro.c:1196 +#: lib/macro.c:1198 msgid "Target buffer overflow" msgstr "" # , c-format -#: lib/macro.c:1343 lib/macro.c:1351 +#: lib/macro.c:1345 lib/macro.c:1353 #, fuzzy, c-format msgid "File %s: %s" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/macro.c:1354 +#: lib/macro.c:1356 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -2681,24 +2681,24 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" msgid "bad file state: %s" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/package.c:234 +#: lib/package.c:237 msgid "package is a version one package!\n" msgstr "" -#: lib/package.c:239 +#: lib/package.c:242 msgid "old style source package -- I'll do my best\n" msgstr "" -#: lib/package.c:242 +#: lib/package.c:245 #, c-format msgid "archive offset is %d\n" msgstr "" -#: lib/package.c:252 +#: lib/package.c:256 msgid "old style binary package\n" msgstr "" -#: lib/package.c:298 +#: lib/package.c:316 msgid "" "only packages with major numbers <= 3 are supported by this version of RPM" msgstr "" @@ -2768,207 +2768,207 @@ msgstr "" msgid "error in format: %s\n" msgstr "Fehler beim Format %s\n" -#: lib/query.c:180 +#: lib/query.c:181 msgid "(contains no files)" msgstr "(beinhaltet keine Dateien)" -#: lib/query.c:233 +#: lib/query.c:238 msgid "normal " msgstr "" -#: lib/query.c:235 +#: lib/query.c:240 msgid "replaced " msgstr "" -#: lib/query.c:237 +#: lib/query.c:242 #, fuzzy msgid "not installed " msgstr "Paket %s ist nicht installiert\n" -#: lib/query.c:239 +#: lib/query.c:244 msgid "net shared " msgstr "" -#: lib/query.c:241 +#: lib/query.c:246 #, fuzzy, c-format msgid "(unknown %3d) " msgstr "(unbekannter Typ)" -#: lib/query.c:245 +#: lib/query.c:250 msgid "(no state) " msgstr "" -#: lib/query.c:261 lib/query.c:291 +#: lib/query.c:267 lib/query.c:308 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:400 +#: lib/query.c:421 #, c-format msgid "record number %u\n" msgstr "" -#: lib/query.c:404 +#: lib/query.c:425 msgid "error: could not read database record\n" msgstr "Fehler: konnte Datenbank-Eintrag nicht lesen\n" -#: lib/query.c:442 +#: lib/query.c:463 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/query.c:455 +#: lib/query.c:476 msgid "old format source packages cannot be queried\n" msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n" -#: lib/query.c:464 lib/rpminstall.c:203 +#: lib/query.c:485 lib/rpminstall.c:203 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s scheint kein RPM-Paket zu sein\n" -#: lib/query.c:467 +#: lib/query.c:488 #, c-format msgid "query of %s failed\n" msgstr "Anfrage von %s fehlgeschlagen\n" -#: lib/query.c:494 +#: lib/query.c:515 #, fuzzy, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "Anfrage von %s fehlgeschlagen\n" -#: lib/query.c:519 +#: lib/query.c:540 msgid "could not read database record!\n" msgstr "kann Datenbank-Eintrag nicht lesen!\n" -#: lib/query.c:530 +#: lib/query.c:551 #, c-format msgid "group %s does not contain any packages\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" # oder besser: ... listet %s auf? -ke- -#: lib/query.c:540 +#: lib/query.c:561 #, c-format msgid "no package provides %s\n" msgstr "kein Paket stellt %s bereit\n" -#: lib/query.c:550 +#: lib/query.c:571 #, c-format msgid "no package triggers %s\n" msgstr "kein Paket triggert %s\n" -#: lib/query.c:560 +#: lib/query.c:581 #, c-format msgid "no package requires %s\n" msgstr "kein Paket verlangt %s\n" # , c-format -#: lib/query.c:575 +#: lib/query.c:596 #, fuzzy, c-format msgid "file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/query.c:578 +#: lib/query.c:599 #, c-format msgid "file %s is not owned by any package\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/query.c:591 +#: lib/query.c:612 #, c-format msgid "invalid package number: %s\n" msgstr "ungültige Paket-Nummer: %s\n" -#: lib/query.c:594 +#: lib/query.c:615 #, fuzzy, c-format msgid "package record number: %d\n" msgstr "ungültige Paket-Nummer: %s\n" -#: lib/query.c:597 +#: lib/query.c:618 #, c-format msgid "record %d could not be read\n" msgstr "Eintrag %d konnte nicht gelesen werden\n" -#: lib/query.c:609 lib/rpminstall.c:393 +#: lib/query.c:630 lib/rpminstall.c:393 #, c-format msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/query.c:612 +#: lib/query.c:633 #, c-format msgid "error looking for package %s\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: lib/query.c:634 +#: lib/query.c:655 #, fuzzy msgid "rpmQuery: rpmdbOpen() failed\n" msgstr "%s: Öffnen fehlgeschlagen\n" -#: lib/query.c:693 +#: lib/query.c:714 #, fuzzy msgid "query package owning file" msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt" -#: lib/query.c:695 +#: lib/query.c:716 #, fuzzy msgid "query packages in group" msgstr "Paket hat keinen Namen" -#: lib/query.c:697 +#: lib/query.c:718 #, fuzzy msgid "query a package file" msgstr "Anfrage an alle Pakete" -#: lib/query.c:701 +#: lib/query.c:722 #, fuzzy msgid "query a spec file" msgstr "Anfrage von %s fehlgeschlagen\n" -#: lib/query.c:703 +#: lib/query.c:724 #, fuzzy msgid "query the pacakges triggered by the package" msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt" -#: lib/query.c:705 +#: lib/query.c:726 #, fuzzy msgid "query the packages which require a capability" msgstr "Anfrage nach Paketen, die die Fähigkeit <i> benötigen" -#: lib/query.c:707 +#: lib/query.c:728 #, fuzzy msgid "query the packages which provide a capability" msgstr "Anfrage nach Paketen, die die Fähigkeit <i> bereitstellen" -#: lib/query.c:746 +#: lib/query.c:767 #, fuzzy msgid "list all configuration files" msgstr "Nur Konfigurationsdateien auflisten (impliziert -l)" -#: lib/query.c:748 +#: lib/query.c:769 #, fuzzy msgid "list all documentation files" msgstr "Dokumentation installieren" -#: lib/query.c:750 +#: lib/query.c:771 #, fuzzy msgid "dump basic file information" msgstr "Paketinformationen anzeigen" -#: lib/query.c:752 +#: lib/query.c:773 #, fuzzy msgid "list files in package" msgstr "Paket installieren" -#: lib/query.c:756 +#: lib/query.c:777 msgid "use the following query format" msgstr "" -#: lib/query.c:758 +#: lib/query.c:779 msgid "substitute i18n sections from the following catalogue" msgstr "" -#: lib/query.c:761 +#: lib/query.c:782 msgid "display the states of the listed files" msgstr "" -#: lib/query.c:763 +#: lib/query.c:784 #, fuzzy msgid "display a verbose file listing" msgstr "Dateiliste des Pakets anzeigen" @@ -3047,12 +3047,12 @@ msgstr "%s: Öffnen fehlgeschlagen\n" #: lib/rpmchecksig.c:74 #, fuzzy, c-format -msgid "%s: fdWrite failed: %s\n" -msgstr "%s: Öffnen fehlgeschlagen\n" +msgid "%s: Fwrite failed: %s\n" +msgstr "%s: »readLead« fehlgeschlagen\n" #: lib/rpmchecksig.c:80 #, fuzzy, c-format -msgid "%s: fdRead failed: %s\n" +msgid "%s: Fread failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" #: lib/rpmchecksig.c:113 lib/rpmchecksig.c:242 @@ -3150,82 +3150,82 @@ msgid "" "database" msgstr "" -#: lib/rpmdb.c:439 +#: lib/rpmdb.c:468 #, c-format msgid "package %s not listed in %s" msgstr "Paket %s wird nicht in %s aufgeführt" -#: lib/rpmdb.c:450 +#: lib/rpmdb.c:479 #, c-format msgid "package %s not found in %s" msgstr "Paket %s in %s nicht gefunden" -#: lib/rpmdb.c:475 lib/uninstall.c:85 +#: lib/rpmdb.c:503 lib/uninstall.c:85 #, c-format msgid "cannot read header at %d for uninstall" msgstr "kann Kopfzeilen bei %d nicht lesen, um Deinstallation durchzuführen" -#: lib/rpmdb.c:483 +#: lib/rpmdb.c:511 msgid "package has no name" msgstr "Paket hat keinen Namen" -#: lib/rpmdb.c:485 +#: lib/rpmdb.c:513 msgid "removing name index\n" msgstr "" -#: lib/rpmdb.c:490 +#: lib/rpmdb.c:518 #, fuzzy msgid "package has no group\n" msgstr "Paket hat keinen Namen" -#: lib/rpmdb.c:492 +#: lib/rpmdb.c:520 msgid "removing group index\n" msgstr "" # FIXME -#: lib/rpmdb.c:499 +#: lib/rpmdb.c:527 #, fuzzy, c-format msgid "removing provides index for %s\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" # FIXME -#: lib/rpmdb.c:514 +#: lib/rpmdb.c:542 #, fuzzy, c-format msgid "removing requiredby index for %s\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" # FIXME -#: lib/rpmdb.c:526 +#: lib/rpmdb.c:554 #, fuzzy, c-format msgid "removing trigger index for %s\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:565 #, c-format msgid "removing conflict index for %s\n" msgstr "" -#: lib/rpmdb.c:554 +#: lib/rpmdb.c:576 #, c-format msgid "removing file index for %s\n" msgstr "" -#: lib/rpmdb.c:563 +#: lib/rpmdb.c:585 #, fuzzy msgid "package has no files\n" msgstr "Paket hat keinen Namen" # reservieren??? -#: lib/rpmdb.c:645 +#: lib/rpmdb.c:667 msgid "cannot allocate space for database" msgstr "kann keinen Platz für die Datenbank bekommen" -#: lib/rpmdb.c:711 +#: lib/rpmdb.c:726 #, c-format msgid "cannot read header at %d for update" msgstr "kann Kopfzeilen bei %d nicht lesen, um Update durchzuführen" -#: lib/rpmdb.c:720 +#: lib/rpmdb.c:735 msgid "header changed size!" msgstr "" @@ -3391,38 +3391,38 @@ msgstr "Lesen von %s fehlgeschlagen: %s." msgid "missing ':' at %s:%d" msgstr "fehlender ':' bei %s:%d" -#: lib/rpmrc.c:655 lib/rpmrc.c:729 +#: lib/rpmrc.c:655 lib/rpmrc.c:730 #, c-format msgid "missing argument for %s at %s:%d" msgstr "fehlendes Argument für %s bei %s:%d" # , c-format -#: lib/rpmrc.c:672 lib/rpmrc.c:694 +#: lib/rpmrc.c:672 lib/rpmrc.c:695 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/rpmrc.c:680 +#: lib/rpmrc.c:681 #, fuzzy, c-format msgid "cannot open %s at %s:%d" msgstr "kann Datei %s nicht öffnen: " -#: lib/rpmrc.c:721 +#: lib/rpmrc.c:722 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "fehlende Architektur für %s bei %s:%d" -#: lib/rpmrc.c:788 +#: lib/rpmrc.c:789 #, c-format msgid "bad option '%s' at %s:%d" msgstr "unzureichende Option '%s' bei %s:%d" -#: lib/rpmrc.c:1147 +#: lib/rpmrc.c:1149 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1148 +#: lib/rpmrc.c:1150 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3575,18 +3575,28 @@ msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein" -#: lib/transaction.c:363 +# , c-format +#: lib/transaction.c:386 +#, fuzzy, c-format +msgid "excluding file %s%s\n" +msgstr "Hole %s heraus\n" + +#: lib/transaction.c:412 lib/transaction.c:496 +#, fuzzy, c-format +msgid "excluding directory %s\n" +msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" + +#: lib/transaction.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -# , c-format -#: lib/transaction.c:370 +#: lib/transaction.c:489 #, fuzzy, c-format -msgid "excluding %s\n" -msgstr "Hole %s heraus\n" +msgid "relocating directory %s to %s\n" +msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/transaction.c:489 +#: lib/transaction.c:637 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3616,15 +3626,15 @@ msgstr "kann Kopfzeilen bei %d nicht lesen, um Deinstallation durchzuführen" msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:191 +#: lib/uninstall.c:207 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:204 +#: lib/uninstall.c:220 msgid "removing database entry\n" msgstr "" -#: lib/uninstall.c:365 +#: lib/uninstall.c:381 msgid "execution of script failed" msgstr "Ausführung des Skripts fehlgeschlagen" @@ -3660,30 +3670,34 @@ msgstr "anlegen von %s fehlgeschlagen\n" msgid "don't verify files in package" msgstr "Paket installieren" -#: lib/verify.c:208 +#: lib/verify.c:213 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:226 +#: lib/verify.c:231 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:259 +#: lib/verify.c:266 #, fuzzy, c-format msgid "missing %s\n" msgstr "fehlende { nach %{" -#: lib/verify.c:321 +#: lib/verify.c:328 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: " -#: lib/verify.c:369 +#: lib/verify.c:376 #, fuzzy msgid "rpmVerify: rpmdbOpen() failed\n" msgstr "%s: Öffnen fehlgeschlagen\n" #, fuzzy +#~ msgid "%s: fdWrite failed: %s\n" +#~ msgstr "%s: Öffnen fehlgeschlagen\n" + +#, fuzzy #~ msgid "failed build prerequisites:\n" #~ msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 1999-10-04 16:05-0400\n" +"POT-Creation-Date: 1999-10-27 12:52-0400\n" "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n" "Language-Team: Finnish <linux@sot.com>\n" "Content-Type: text/plain; charset=\n" @@ -1318,36 +1318,36 @@ msgstr "allekirjoitukselle ei määritelty paketteja" msgid "no packages files given for rebuild" msgstr "uudelleenkäännolle ei määritelty paketteja" -#: rpm.c:1230 +#: rpm.c:1234 msgid "no spec files given for build" msgstr "käännökselle ei annettu määrittelytiedostoja" -#: rpm.c:1232 +#: rpm.c:1236 msgid "no tar files given for build" msgstr "käännökselle ei määritelty tar-tiedostoja" -#: rpm.c:1244 +#: rpm.c:1248 msgid "no packages given for uninstall" msgstr "poistolle ei määritelty paketteja" -#: rpm.c:1294 +#: rpm.c:1298 msgid "no packages given for install" msgstr "asennukselle ei määritelty paketteja" -#: rpm.c:1317 +#: rpm.c:1321 msgid "extra arguments given for query of all packages" msgstr "pakettien kyselylle annettiin ylimääräisiä parametrejä" -#: rpm.c:1322 +#: rpm.c:1326 msgid "no arguments given for query" msgstr "kyselylle ei annettu parametrejä" -#: rpm.c:1339 +#: rpm.c:1343 #, fuzzy msgid "extra arguments given for verify of all packages" msgstr "pakettien kyselylle annettiin ylimääräisiä parametrejä" -#: rpm.c:1343 +#: rpm.c:1347 msgid "no arguments given for verify" msgstr "tarkistukselle ei annettu parametrejä" @@ -1360,7 +1360,7 @@ msgstr "" msgid "error reading header from package\n" msgstr "virhe etsittäessä pakettia %s\n" -#: build/build.c:83 build/pack.c:263 +#: build/build.c:83 build/pack.c:267 #, fuzzy msgid "Unable to open temp file" msgstr "En voi avata %s luettavaksi: %s." @@ -1380,60 +1380,60 @@ msgstr "%s:n avaus ei onnistunut: %s\n" msgid "Bad exit status from %s (%s)" msgstr "" -#: build/expression.c:208 +#: build/expression.c:207 #, fuzzy msgid "syntax error while parsing ==" msgstr "odotin '?'-merkkiä ilmauksessa" -#: build/expression.c:238 +#: build/expression.c:237 #, fuzzy msgid "syntax error while parsing &&" msgstr "odotin '?'-merkkiä ilmauksessa" -#: build/expression.c:247 +#: build/expression.c:246 #, fuzzy msgid "syntax error while parsing ||" msgstr "odotin '?'-merkkiä ilmauksessa" -#: build/expression.c:289 +#: build/expression.c:288 #, fuzzy msgid "parse error in expression" msgstr "odotin '?'-merkkiä ilmauksessa" -#: build/expression.c:319 +#: build/expression.c:318 msgid "unmatched (" msgstr "" -#: build/expression.c:337 +#: build/expression.c:336 msgid "undefined identifier" msgstr "" -#: build/expression.c:356 +#: build/expression.c:355 msgid "- only on numbers" msgstr "" -#: build/expression.c:372 +#: build/expression.c:371 msgid "! only on numbers" msgstr "" -#: build/expression.c:411 build/expression.c:456 build/expression.c:513 -#: build/expression.c:600 +#: build/expression.c:410 build/expression.c:455 build/expression.c:512 +#: build/expression.c:599 msgid "types must match" msgstr "" -#: build/expression.c:424 +#: build/expression.c:423 msgid "* / not suported for strings" msgstr "" -#: build/expression.c:472 +#: build/expression.c:471 msgid "- not suported for strings" msgstr "" -#: build/expression.c:613 +#: build/expression.c:612 msgid "&& and || not suported for strings" msgstr "" -#: build/expression.c:644 build/expression.c:689 +#: build/expression.c:645 build/expression.c:692 #, fuzzy msgid "syntax error in expression" msgstr "odotin '?'-merkkiä ilmauksessa" @@ -1514,82 +1514,82 @@ msgstr "" msgid "File listed twice: %s" msgstr "En voi lukea %s: %s." -#: build/files.c:951 +#: build/files.c:953 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s" msgstr "En voi lukea %s: %s." -#: build/files.c:961 +#: build/files.c:963 #, fuzzy, c-format msgid "File not found: %s" msgstr "Tiedostoa ei löytynyt palvelimelta" -#: build/files.c:1004 +#: build/files.c:1006 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1018 +#: build/files.c:1020 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "en voinut avata %s: %s" -#: build/files.c:1088 +#: build/files.c:1090 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1132 +#: build/files.c:1134 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Tiedostoa ei löytynyt palvelimelta" -#: build/files.c:1174 +#: build/files.c:1176 #, fuzzy msgid "Could not open %%files file: %s" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/files.c:1181 build/pack.c:485 +#: build/files.c:1183 build/pack.c:488 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1508 build/parsePrep.c:29 +#: build/files.c:1510 build/parsePrep.c:29 #, c-format msgid "Bad owner/group: %s" msgstr "" -#: build/files.c:1562 +#: build/files.c:1564 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "En voinut ajaa pgp:tä" -#: build/files.c:1567 +#: build/files.c:1569 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "En voinut ajaa pgp:tä" -#: build/files.c:1649 +#: build/files.c:1651 #, fuzzy, c-format msgid "%s failed" msgstr "pgp epäonnistui" -#: build/files.c:1653 +#: build/files.c:1655 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "%s:n luonti epäonnistui\n" -#: build/files.c:1742 +#: build/files.c:1744 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1772 build/files.c:1781 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "%s:n luonti epäonnistui\n" -#: build/files.c:1885 +#: build/files.c:1887 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "en voinut avata %s: %s" @@ -1607,106 +1607,106 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:131 +#: build/pack.c:132 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:148 +#: build/pack.c:149 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "en voinut avata tiedostoa %s: " -#: build/pack.c:183 +#: build/pack.c:184 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "en voinut avata %s: %s" -#: build/pack.c:193 +#: build/pack.c:194 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "En voi lukea %s: %s." -#: build/pack.c:213 +#: build/pack.c:215 #, fuzzy, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "virhe: %s ei vaikuta RPM paketilta\n" -#: build/pack.c:219 +#: build/pack.c:221 #, fuzzy, c-format msgid "readRPM: reading header from %s\n" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: build/pack.c:274 +#: build/pack.c:278 msgid "Bad CSA data" msgstr "" -#: build/pack.c:305 +#: build/pack.c:311 #, fuzzy, c-format msgid "Could not open %s\n" msgstr "%s:n avaus epäonnistui\n" -#: build/pack.c:337 build/pack.c:379 +#: build/pack.c:343 build/pack.c:385 #, fuzzy, c-format msgid "Unable to write package: %s" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:352 +#: build/pack.c:358 #, fuzzy, c-format msgid "Generating signature: %d\n" msgstr "generoi PGP-allekirjoitus" -#: build/pack.c:369 +#: build/pack.c:375 #, fuzzy, c-format msgid "Unable to read sigtarget: %s" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:394 +#: build/pack.c:400 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:411 build/pack.c:435 +#: build/pack.c:416 build/pack.c:439 #, fuzzy, c-format msgid "create archive failed on file %s: %s" msgstr "en voinut avata %s: %s" -#: build/pack.c:455 +#: build/pack.c:458 #, c-format msgid "cpio_copy write failed: %s" msgstr "" -#: build/pack.c:462 +#: build/pack.c:465 #, fuzzy, c-format msgid "cpio_copy read failed: %s" msgstr "luku epäonnistui: %s (%d)" -#: build/pack.c:541 +#: build/pack.c:544 #, fuzzy, c-format msgid "Could not open PreIn file: %s" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/pack.c:548 +#: build/pack.c:551 #, fuzzy, c-format msgid "Could not open PreUn file: %s" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/pack.c:555 +#: build/pack.c:558 #, fuzzy, c-format msgid "Could not open PostIn file: %s" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/pack.c:562 +#: build/pack.c:565 #, fuzzy, c-format msgid "Could not open PostUn file: %s" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/pack.c:570 +#: build/pack.c:573 #, c-format msgid "Could not open VerifyScript file: %s" msgstr "" -#: build/pack.c:586 +#: build/pack.c:589 #, c-format msgid "Could not open Trigger script file: %s" msgstr "" @@ -1749,17 +1749,17 @@ msgstr "" msgid "line %d: Bad option %s: %s" msgstr "en voinut avata %s: %s" -#: build/parseDescription.c:60 build/parseFiles.c:54 build/parseScript.c:182 +#: build/parseDescription.c:59 build/parseFiles.c:53 build/parseScript.c:181 #, c-format msgid "line %d: Too many names: %s" msgstr "" -#: build/parseDescription.c:70 build/parseFiles.c:64 build/parseScript.c:192 +#: build/parseDescription.c:69 build/parseFiles.c:63 build/parseScript.c:191 #, fuzzy, c-format msgid "line %d: Package does not exist: %s" msgstr "paketti %s ei ole %s:ssä" -#: build/parseDescription.c:82 +#: build/parseDescription.c:81 #, c-format msgid "line %d: Second description" msgstr "" @@ -1768,7 +1768,7 @@ msgstr "" msgid "line %d: Error parsing %%files: %s" msgstr "" -#: build/parseFiles.c:72 +#: build/parseFiles.c:71 msgid "line %d: Second %%files list" msgstr "" @@ -1863,22 +1863,22 @@ msgstr "%s:n puuttuva arkkitehtuuri %s:%d" msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:657 +#: build/parsePreamble.c:656 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Paketin määrittelyparametrit:" -#: build/parsePreamble.c:663 +#: build/parsePreamble.c:662 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:690 +#: build/parsePreamble.c:689 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:715 +#: build/parsePreamble.c:714 msgid "Spec file can't use BuildRoot" msgstr "" @@ -1902,43 +1902,43 @@ msgstr "" msgid "Couldn't download nosource %s: %s" msgstr "En voi lukea %s: %s." -#: build/parsePrep.c:191 +#: build/parsePrep.c:190 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:206 +#: build/parsePrep.c:205 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:227 +#: build/parsePrep.c:223 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:351 +#: build/parsePrep.c:346 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:359 +#: build/parsePrep.c:354 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:371 +#: build/parsePrep.c:366 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:377 +#: build/parsePrep.c:372 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:384 +#: build/parsePrep.c:379 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:388 +#: build/parsePrep.c:383 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:424 +#: build/parsePrep.c:419 msgid "line %d: second %%prep" msgstr "" @@ -1973,7 +1973,7 @@ msgstr "en voinut avata %s: %s" msgid "line %d: triggers must have --: %s" msgstr "" -#: build/parseScript.c:146 build/parseScript.c:210 +#: build/parseScript.c:146 build/parseScript.c:209 #, c-format msgid "line %d: Error parsing %s: %s" msgstr "" @@ -1983,7 +1983,7 @@ msgstr "" msgid "line %d: script program must begin with '/': %s" msgstr "" -#: build/parseScript.c:201 +#: build/parseScript.c:200 #, c-format msgid "line %d: Second %s" msgstr "" @@ -1993,45 +1993,45 @@ msgstr "" msgid "line %d: %s" msgstr "en voinut avata %s: %s" -#: build/parseSpec.c:172 +#: build/parseSpec.c:173 #, fuzzy, c-format msgid "Unable to open: %s\n" msgstr "%s:n avaus epäonnistui\n" -#: build/parseSpec.c:184 +#: build/parseSpec.c:185 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:243 +#: build/parseSpec.c:244 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:251 +#: build/parseSpec.c:252 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:262 +#: build/parseSpec.c:263 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:276 build/parseSpec.c:285 +#: build/parseSpec.c:277 build/parseSpec.c:286 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:366 +#: build/parseSpec.c:367 #, c-format msgid "Timecheck value must be an integer: %s" msgstr "" -#: build/parseSpec.c:449 +#: build/parseSpec.c:450 #, fuzzy msgid "No buildable architectures" msgstr "älä tarkista paketin arkkitehtuuria" -#: build/parseSpec.c:494 +#: build/parseSpec.c:497 #, fuzzy msgid "Package has no %%description: %s" msgstr "paketti %s ei ole %s:ssä" @@ -2056,53 +2056,53 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "virheellinen paketin numero: %s\n" -#: lib/cpio.c:385 +#: lib/cpio.c:335 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "En voi lukea %s: %s." -#: lib/cpio.c:391 +#: lib/cpio.c:341 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:582 +#: lib/cpio.c:532 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1044 +#: lib/cpio.c:995 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "virhe: " -#: lib/cpio.c:1047 +#: lib/cpio.c:998 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1048 +#: lib/cpio.c:999 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1066 +#: lib/cpio.c:1017 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1067 +#: lib/cpio.c:1018 #, fuzzy msgid "Unknown file type" msgstr "(tuntematon tyyppi)" -#: lib/cpio.c:1068 +#: lib/cpio.c:1019 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1069 +#: lib/cpio.c:1020 #, fuzzy msgid "Internal error" msgstr "vakava virhe: " -#: lib/cpio.c:1078 +#: lib/cpio.c:1029 #, fuzzy msgid " failed - " msgstr "pgp epäonnistui" @@ -2128,90 +2128,90 @@ msgid "error removing record %s into %s" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:339 +#: lib/depends.c:404 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:368 +#: lib/depends.c:433 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:460 +#: lib/depends.c:525 msgid "dbrecMatchesDepFlags() failed to read header" msgstr "" -#: lib/depends.c:695 +#: lib/depends.c:760 +#, c-format +msgid "%s: %s satisfied by added file list.\n" +msgstr "" + +#: lib/depends.c:799 #, fuzzy, c-format msgid "%s: %s satisfied by added package.\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:712 +#: lib/depends.c:816 #, c-format msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:717 -#, c-format -msgid "%s: %s satisfied by added file list.\n" -msgstr "" - -#: lib/depends.c:747 +#: lib/depends.c:847 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:775 +#: lib/depends.c:875 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:797 +#: lib/depends.c:897 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:819 +#: lib/depends.c:919 #, fuzzy, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:832 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:942 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:890 +#: lib/depends.c:990 #, fuzzy, c-format msgid "package %s require not satisfied: %s\n" msgstr "paketti %s ei ole %s:ssä" #. conflicts exist. -#: lib/depends.c:952 +#: lib/depends.c:1052 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: lib/depends.c:1007 lib/depends.c:1311 +#: lib/depends.c:1107 lib/depends.c:1415 #, c-format msgid "cannot read header at %d for dependency check" msgstr "en voi lukea headeria %d:ssä riippuvuutta tarkistaessa" -#: lib/depends.c:1102 +#: lib/depends.c:1202 #, c-format msgid "loop in prerequisite chain: %s" msgstr "silmukka edellytysten ketjussa: %s" -#: lib/falloc.c:160 +#: lib/falloc.c:157 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2221,8 +2221,8 @@ msgid "" "if \"rpm --rebuilddb\" fails to correct the problem.\n" msgstr "" -#: lib/formats.c:66 lib/formats.c:84 lib/formats.c:105 lib/formats.c:138 -#: lib/header.c:2122 lib/header.c:2139 lib/header.c:2159 +#: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141 +#: lib/header.c:2138 lib/header.c:2155 lib/header.c:2175 msgid "(not a number)" msgstr "(ei ole luku)" @@ -2325,75 +2325,75 @@ msgstr "" msgid "Data type %d not supprted\n" msgstr "" -#: lib/header.c:1119 +#: lib/header.c:1120 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" -#: lib/header.c:1520 +#: lib/header.c:1529 #, c-format msgid "missing { after %" msgstr "puuttuva '{' '%':n jälkeen" -#: lib/header.c:1548 +#: lib/header.c:1557 msgid "missing } after %{" msgstr "puuttuva '{' '%{':n jälkeen" -#: lib/header.c:1560 +#: lib/header.c:1569 msgid "empty tag format" msgstr "tyhjä nimiön formaatti" -#: lib/header.c:1570 +#: lib/header.c:1579 msgid "empty tag name" msgstr "tyhjä nimiön nimi" -#: lib/header.c:1585 +#: lib/header.c:1594 msgid "unknown tag" msgstr "tuntematon nimiö" -#: lib/header.c:1611 +#: lib/header.c:1620 msgid "] expected at end of array" msgstr "']' puuttuu taulukkomäärittelyn lopusta" -#: lib/header.c:1627 +#: lib/header.c:1636 msgid "unexpected ]" msgstr "odottamaton ']'" -#: lib/header.c:1629 +#: lib/header.c:1638 msgid "unexpected }" msgstr "odottamaton '}'" -#: lib/header.c:1682 +#: lib/header.c:1692 msgid "? expected in expression" msgstr "odotin '?'-merkkiä ilmauksessa" -#: lib/header.c:1689 +#: lib/header.c:1699 #, fuzzy msgid "{ expected after ? in expression" msgstr "odotin '{' '?'-merkin jälkeen ilmauksessa " -#: lib/header.c:1699 lib/header.c:1731 +#: lib/header.c:1709 lib/header.c:1744 msgid "} expected in expression" msgstr "odotin '}'-merkkiä ilmauksessa" -#: lib/header.c:1706 +#: lib/header.c:1717 msgid ": expected following ? subexpression" msgstr "odotin ':' '?'-merkin jälkeen ali-ilmauksessa " -#: lib/header.c:1719 +#: lib/header.c:1731 #, fuzzy msgid "{ expected after : in expression" msgstr "odotin '{' ':'-merkin jälkeen ilmauksessa " -#: lib/header.c:1738 +#: lib/header.c:1752 msgid "| expected at end of expression" msgstr "odotin '}'-merkkiä ilmauksen lopussa" -#: lib/header.c:1905 +#: lib/header.c:1921 msgid "(unknown type)" msgstr "(tuntematon tyyppi)" -#: lib/install.c:141 lib/uninstall.c:179 +#: lib/install.c:141 lib/uninstall.c:193 #, fuzzy, c-format msgid " file: %s action: %s\n" msgstr "en voinut avata %s: %s" @@ -2414,88 +2414,88 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:358 +#: lib/install.c:355 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:359 +#: lib/install.c:356 msgid " on file " msgstr "" -#: lib/install.c:402 +#: lib/install.c:399 #, fuzzy msgid "installing a source package\n" msgstr "asenna paketti" -#: lib/install.c:413 +#: lib/install.c:410 #, fuzzy, c-format msgid "cannot create %s: %s" msgstr "en voinut avata tiedostoa %s: " -#: lib/install.c:421 lib/install.c:443 +#: lib/install.c:418 lib/install.c:440 #, fuzzy, c-format msgid "cannot write to %s" msgstr "en voinut avata tiedostoa %s: " -#: lib/install.c:425 +#: lib/install.c:422 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:436 +#: lib/install.c:433 #, fuzzy, c-format msgid "cannot create %s" msgstr "en voinut avata tiedostoa %s: " -#: lib/install.c:447 +#: lib/install.c:444 #, fuzzy, c-format msgid "spec file in: %s\n" msgstr "en voinut avata %s: %s" -#: lib/install.c:481 lib/install.c:509 +#: lib/install.c:478 lib/install.c:506 #, fuzzy msgid "source package contains no .spec file" msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on" -#: lib/install.c:530 +#: lib/install.c:527 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:532 lib/install.c:810 lib/uninstall.c:26 +#: lib/install.c:529 lib/install.c:807 lib/uninstall.c:26 #, c-format msgid "rename of %s to %s failed: %s" msgstr "%s:n nimeäminen %s:ksi epäonnistui: %s" -#: lib/install.c:622 +#: lib/install.c:619 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:679 +#: lib/install.c:676 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/install.c:740 +#: lib/install.c:737 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:745 +#: lib/install.c:742 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:770 +#: lib/install.c:767 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:806 +#: lib/install.c:803 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:880 +#: lib/install.c:877 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2504,84 +2504,84 @@ msgstr "" msgid "cannot read header at %d for lookup" msgstr "" -#: lib/macro.c:149 +#: lib/macro.c:151 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: lib/macro.c:243 +#: lib/macro.c:245 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: lib/macro.c:278 +#: lib/macro.c:280 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: lib/macro.c:457 +#: lib/macro.c:459 msgid "Macro %%%s has unterminated body" msgstr "" -#: lib/macro.c:483 +#: lib/macro.c:485 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: lib/macro.c:489 +#: lib/macro.c:491 msgid "Macro %%%s has unterminated opts" msgstr "" -#: lib/macro.c:494 +#: lib/macro.c:496 msgid "Macro %%%s has empty body" msgstr "" -#: lib/macro.c:499 +#: lib/macro.c:501 msgid "Macro %%%s failed to expand" msgstr "" -#: lib/macro.c:524 +#: lib/macro.c:526 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: lib/macro.c:601 +#: lib/macro.c:603 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: lib/macro.c:698 +#: lib/macro.c:700 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: lib/macro.c:870 +#: lib/macro.c:872 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: lib/macro.c:936 lib/macro.c:952 +#: lib/macro.c:938 lib/macro.c:954 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: lib/macro.c:992 +#: lib/macro.c:994 msgid "A %% is followed by an unparseable macro" msgstr "" -#: lib/macro.c:1115 +#: lib/macro.c:1117 #, fuzzy msgid "Macro %%%.*s not found, skipping" msgstr "paketti %s ei ole %s:ssä" -#: lib/macro.c:1196 +#: lib/macro.c:1198 msgid "Target buffer overflow" msgstr "" -#: lib/macro.c:1343 lib/macro.c:1351 +#: lib/macro.c:1345 lib/macro.c:1353 #, fuzzy, c-format msgid "File %s: %s" msgstr "en voinut avata %s: %s" -#: lib/macro.c:1354 +#: lib/macro.c:1356 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -2612,24 +2612,24 @@ msgstr "virhe luotaessa hakemistoa %s: %s" msgid "bad file state: %s" msgstr "en voinut avata %s: %s" -#: lib/package.c:234 +#: lib/package.c:237 msgid "package is a version one package!\n" msgstr "" -#: lib/package.c:239 +#: lib/package.c:242 msgid "old style source package -- I'll do my best\n" msgstr "" -#: lib/package.c:242 +#: lib/package.c:245 #, c-format msgid "archive offset is %d\n" msgstr "" -#: lib/package.c:252 +#: lib/package.c:256 msgid "old style binary package\n" msgstr "" -#: lib/package.c:298 +#: lib/package.c:316 msgid "" "only packages with major numbers <= 3 are supported by this version of RPM" msgstr "" @@ -2696,205 +2696,205 @@ msgstr "" msgid "error in format: %s\n" msgstr "virhe formaatissa: %s\n" -#: lib/query.c:180 +#: lib/query.c:181 msgid "(contains no files)" msgstr "(ei tiedostoja)" -#: lib/query.c:233 +#: lib/query.c:238 msgid "normal " msgstr "" -#: lib/query.c:235 +#: lib/query.c:240 msgid "replaced " msgstr "" -#: lib/query.c:237 +#: lib/query.c:242 #, fuzzy msgid "not installed " msgstr "paketti %s ei ole asennettu\n" -#: lib/query.c:239 +#: lib/query.c:244 msgid "net shared " msgstr "" -#: lib/query.c:241 +#: lib/query.c:246 #, fuzzy, c-format msgid "(unknown %3d) " msgstr "(tuntematon tyyppi)" -#: lib/query.c:245 +#: lib/query.c:250 msgid "(no state) " msgstr "" -#: lib/query.c:261 lib/query.c:291 +#: lib/query.c:267 lib/query.c:308 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:400 +#: lib/query.c:421 #, c-format msgid "record number %u\n" msgstr "" -#: lib/query.c:404 +#: lib/query.c:425 msgid "error: could not read database record\n" msgstr "virhe: tietokannan tietuetta ei voinut lukea\n" -#: lib/query.c:442 +#: lib/query.c:463 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/query.c:455 +#: lib/query.c:476 msgid "old format source packages cannot be queried\n" msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n" -#: lib/query.c:464 lib/rpminstall.c:203 +#: lib/query.c:485 lib/rpminstall.c:203 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s ei vaikuta RPM-paketilta\n" -#: lib/query.c:467 +#: lib/query.c:488 #, c-format msgid "query of %s failed\n" msgstr "%s:n kysely ei onnistunut\n" -#: lib/query.c:494 +#: lib/query.c:515 #, fuzzy, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "%s:n kysely ei onnistunut\n" -#: lib/query.c:519 +#: lib/query.c:540 msgid "could not read database record!\n" msgstr "en voinut lukea tietokannan tietuetta!\n" -#: lib/query.c:530 +#: lib/query.c:551 #, c-format msgid "group %s does not contain any packages\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/query.c:540 +#: lib/query.c:561 #, c-format msgid "no package provides %s\n" msgstr "mikään paketti ei tarjoa %s:a\n" -#: lib/query.c:550 +#: lib/query.c:571 #, c-format msgid "no package triggers %s\n" msgstr "mikään paketti ei laukaise %s:a\n" -#: lib/query.c:560 +#: lib/query.c:581 #, c-format msgid "no package requires %s\n" msgstr "mikään pakettie ei tarvitse %s:a\n" -#: lib/query.c:575 +#: lib/query.c:596 #, fuzzy, c-format msgid "file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/query.c:578 +#: lib/query.c:599 #, c-format msgid "file %s is not owned by any package\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/query.c:591 +#: lib/query.c:612 #, c-format msgid "invalid package number: %s\n" msgstr "virheellinen paketin numero: %s\n" -#: lib/query.c:594 +#: lib/query.c:615 #, fuzzy, c-format msgid "package record number: %d\n" msgstr "virheellinen paketin numero: %s\n" -#: lib/query.c:597 +#: lib/query.c:618 #, c-format msgid "record %d could not be read\n" msgstr "tietuetta %d ei voitu lukea\n" -#: lib/query.c:609 lib/rpminstall.c:393 +#: lib/query.c:630 lib/rpminstall.c:393 #, c-format msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/query.c:612 +#: lib/query.c:633 #, c-format msgid "error looking for package %s\n" msgstr "virhe etsittäessä pakettia %s\n" -#: lib/query.c:634 +#: lib/query.c:655 #, fuzzy msgid "rpmQuery: rpmdbOpen() failed\n" msgstr "%s: avaus ei onnistunut\n" -#: lib/query.c:693 +#: lib/query.c:714 #, fuzzy msgid "query package owning file" msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on" -#: lib/query.c:695 +#: lib/query.c:716 #, fuzzy msgid "query packages in group" msgstr "paketilla ei ole nimeä" -#: lib/query.c:697 +#: lib/query.c:718 #, fuzzy msgid "query a package file" msgstr "kysele kaikki paketit" -#: lib/query.c:701 +#: lib/query.c:722 #, fuzzy msgid "query a spec file" msgstr "%s:n kysely ei onnistunut\n" -#: lib/query.c:703 +#: lib/query.c:724 #, fuzzy msgid "query the pacakges triggered by the package" msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on" -#: lib/query.c:705 +#: lib/query.c:726 #, fuzzy msgid "query the packages which require a capability" msgstr "kysele paketteja, jotka vaativat <i> ominaisuutta" -#: lib/query.c:707 +#: lib/query.c:728 #, fuzzy msgid "query the packages which provide a capability" msgstr "kysele paketteja, jotka tarjoavat <i> ominaisuuden" -#: lib/query.c:746 +#: lib/query.c:767 #, fuzzy msgid "list all configuration files" msgstr "listaa vain konfigurointiedostot (josta seuraa -l)" -#: lib/query.c:748 +#: lib/query.c:769 #, fuzzy msgid "list all documentation files" msgstr "asenna dokumentaatio" -#: lib/query.c:750 +#: lib/query.c:771 #, fuzzy msgid "dump basic file information" msgstr "näytä paketin tiedot" -#: lib/query.c:752 +#: lib/query.c:773 #, fuzzy msgid "list files in package" msgstr "asenna paketti" -#: lib/query.c:756 +#: lib/query.c:777 msgid "use the following query format" msgstr "" -#: lib/query.c:758 +#: lib/query.c:779 msgid "substitute i18n sections from the following catalogue" msgstr "" -#: lib/query.c:761 +#: lib/query.c:782 msgid "display the states of the listed files" msgstr "" -#: lib/query.c:763 +#: lib/query.c:784 #, fuzzy msgid "display a verbose file listing" msgstr "näytä paketin tiedostolistaus" @@ -2971,12 +2971,12 @@ msgstr "%s: avaus ei onnistunut\n" #: lib/rpmchecksig.c:74 #, fuzzy, c-format -msgid "%s: fdWrite failed: %s\n" -msgstr "%s: avaus ei onnistunut\n" +msgid "%s: Fwrite failed: %s\n" +msgstr "%s: readLead epäonnistui\n" #: lib/rpmchecksig.c:80 #, fuzzy, c-format -msgid "%s: fdRead failed: %s\n" +msgid "%s: Fread failed: %s\n" msgstr "%s: readLead epäonnistui\n" #: lib/rpmchecksig.c:113 lib/rpmchecksig.c:242 @@ -3073,78 +3073,78 @@ msgid "" "database" msgstr "" -#: lib/rpmdb.c:439 +#: lib/rpmdb.c:468 #, c-format msgid "package %s not listed in %s" msgstr "paketti %s ei ole %s:ssä" -#: lib/rpmdb.c:450 +#: lib/rpmdb.c:479 #, c-format msgid "package %s not found in %s" msgstr "paketti %s ei ole %s:ssä" -#: lib/rpmdb.c:475 lib/uninstall.c:85 +#: lib/rpmdb.c:503 lib/uninstall.c:85 #, c-format msgid "cannot read header at %d for uninstall" msgstr "en voi lukea headeria %d:stä poistamiseen" -#: lib/rpmdb.c:483 +#: lib/rpmdb.c:511 msgid "package has no name" msgstr "paketilla ei ole nimeä" -#: lib/rpmdb.c:485 +#: lib/rpmdb.c:513 msgid "removing name index\n" msgstr "" -#: lib/rpmdb.c:490 +#: lib/rpmdb.c:518 #, fuzzy msgid "package has no group\n" msgstr "paketilla ei ole nimeä" -#: lib/rpmdb.c:492 +#: lib/rpmdb.c:520 msgid "removing group index\n" msgstr "" -#: lib/rpmdb.c:499 +#: lib/rpmdb.c:527 #, fuzzy, c-format msgid "removing provides index for %s\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: lib/rpmdb.c:514 +#: lib/rpmdb.c:542 #, fuzzy, c-format msgid "removing requiredby index for %s\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: lib/rpmdb.c:526 +#: lib/rpmdb.c:554 #, fuzzy, c-format msgid "removing trigger index for %s\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:565 #, c-format msgid "removing conflict index for %s\n" msgstr "" -#: lib/rpmdb.c:554 +#: lib/rpmdb.c:576 #, c-format msgid "removing file index for %s\n" msgstr "" -#: lib/rpmdb.c:563 +#: lib/rpmdb.c:585 #, fuzzy msgid "package has no files\n" msgstr "paketilla ei ole nimeä" -#: lib/rpmdb.c:645 +#: lib/rpmdb.c:667 msgid "cannot allocate space for database" msgstr "en voi varata tilaa tietokannalle" -#: lib/rpmdb.c:711 +#: lib/rpmdb.c:726 #, c-format msgid "cannot read header at %d for update" msgstr "en voi lukea headeria %d:stä päivittäessä" -#: lib/rpmdb.c:720 +#: lib/rpmdb.c:735 msgid "header changed size!" msgstr "" @@ -3306,37 +3306,37 @@ msgstr "En voi lukea %s: %s." msgid "missing ':' at %s:%d" msgstr "puuttuva ':', %s:%d" -#: lib/rpmrc.c:655 lib/rpmrc.c:729 +#: lib/rpmrc.c:655 lib/rpmrc.c:730 #, c-format msgid "missing argument for %s at %s:%d" msgstr "%s:n puuttuva parametri %s:%d" -#: lib/rpmrc.c:672 lib/rpmrc.c:694 +#: lib/rpmrc.c:672 lib/rpmrc.c:695 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "en voinut avata %s: %s" -#: lib/rpmrc.c:680 +#: lib/rpmrc.c:681 #, fuzzy, c-format msgid "cannot open %s at %s:%d" msgstr "en voinut avata tiedostoa %s: " -#: lib/rpmrc.c:721 +#: lib/rpmrc.c:722 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "%s:n puuttuva arkkitehtuuri %s:%d" -#: lib/rpmrc.c:788 +#: lib/rpmrc.c:789 #, c-format msgid "bad option '%s' at %s:%d" msgstr "huono parametri '%s', %s:%d" -#: lib/rpmrc.c:1147 +#: lib/rpmrc.c:1149 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1148 +#: lib/rpmrc.c:1150 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3489,17 +3489,27 @@ msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa" -#: lib/transaction.c:363 +#: lib/transaction.c:386 +#, fuzzy, c-format +msgid "excluding file %s%s\n" +msgstr "Haen: %s\n" + +#: lib/transaction.c:412 lib/transaction.c:496 +#, fuzzy, c-format +msgid "excluding directory %s\n" +msgstr "virhe luotaessa hakemistoa %s: %s" + +#: lib/transaction.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:370 +#: lib/transaction.c:489 #, fuzzy, c-format -msgid "excluding %s\n" -msgstr "Haen: %s\n" +msgid "relocating directory %s to %s\n" +msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/transaction.c:489 +#: lib/transaction.c:637 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3529,15 +3539,15 @@ msgstr "en voi lukea headeria %d:stä poistamiseen" msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:191 +#: lib/uninstall.c:207 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:204 +#: lib/uninstall.c:220 msgid "removing database entry\n" msgstr "" -#: lib/uninstall.c:365 +#: lib/uninstall.c:381 msgid "execution of script failed" msgstr "skriptin ajo epäonnistui" @@ -3572,30 +3582,34 @@ msgstr "%s:n luonti epäonnistui\n" msgid "don't verify files in package" msgstr "asenna paketti" -#: lib/verify.c:208 +#: lib/verify.c:213 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:226 +#: lib/verify.c:231 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:259 +#: lib/verify.c:266 #, fuzzy, c-format msgid "missing %s\n" msgstr "puuttuva '{' '%':n jälkeen" -#: lib/verify.c:321 +#: lib/verify.c:328 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:" -#: lib/verify.c:369 +#: lib/verify.c:376 #, fuzzy msgid "rpmVerify: rpmdbOpen() failed\n" msgstr "%s: avaus ei onnistunut\n" #, fuzzy +#~ msgid "%s: fdWrite failed: %s\n" +#~ msgstr "%s: avaus ei onnistunut\n" + +#, fuzzy #~ msgid "failed build prerequisites:\n" #~ msgstr "puuttuvat riippuvuudet:\n" @@ -1,5 +1,5 @@ msgid "" -msgstr "POT-Creation-Date: 1999-10-04 16:05-0400\n" +msgstr "POT-Creation-Date: 1999-10-27 12:52-0400\n" #: build.c:23 lib/rpminstall.c:222 lib/rpminstall.c:382 #, c-format @@ -1325,38 +1325,38 @@ msgstr "aucun package n'a été spécifié pour la désinstallation" msgid "no packages files given for rebuild" msgstr "aucun package n'a été spécifié pour la reconstruction" -#: rpm.c:1230 +#: rpm.c:1234 msgid "no spec files given for build" msgstr "aucun package n'a été spécifié pour la construction" -#: rpm.c:1232 +#: rpm.c:1236 #, fuzzy msgid "no tar files given for build" msgstr "aucun package n'a été spécifié pour la construction" -#: rpm.c:1244 +#: rpm.c:1248 msgid "no packages given for uninstall" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: rpm.c:1294 +#: rpm.c:1298 msgid "no packages given for install" msgstr "aucun package n'a été spécifié pour l'installation" -#: rpm.c:1317 +#: rpm.c:1321 #, fuzzy msgid "extra arguments given for query of all packages" msgstr "aucun argument n'a été fourni pour la requête" -#: rpm.c:1322 +#: rpm.c:1326 msgid "no arguments given for query" msgstr "aucun argument n'a été fourni pour la requête" -#: rpm.c:1339 +#: rpm.c:1343 #, fuzzy msgid "extra arguments given for verify of all packages" msgstr "aucun argument n'a été fourni pour la requête" -#: rpm.c:1343 +#: rpm.c:1347 msgid "no arguments given for verify" msgstr "aucun argument n'a été fourni pour la vérification" @@ -1368,7 +1368,7 @@ msgstr "" msgid "error reading header from package\n" msgstr "" -#: build/build.c:83 build/pack.c:263 +#: build/build.c:83 build/pack.c:267 #, fuzzy msgid "Unable to open temp file" msgstr "impossible d'ouvrir: %s\n" @@ -1388,56 +1388,56 @@ msgstr "" msgid "Bad exit status from %s (%s)" msgstr "" -#: build/expression.c:208 +#: build/expression.c:207 msgid "syntax error while parsing ==" msgstr "" -#: build/expression.c:238 +#: build/expression.c:237 msgid "syntax error while parsing &&" msgstr "" -#: build/expression.c:247 +#: build/expression.c:246 msgid "syntax error while parsing ||" msgstr "" -#: build/expression.c:289 +#: build/expression.c:288 msgid "parse error in expression" msgstr "" -#: build/expression.c:319 +#: build/expression.c:318 msgid "unmatched (" msgstr "" -#: build/expression.c:337 +#: build/expression.c:336 msgid "undefined identifier" msgstr "" -#: build/expression.c:356 +#: build/expression.c:355 msgid "- only on numbers" msgstr "" -#: build/expression.c:372 +#: build/expression.c:371 msgid "! only on numbers" msgstr "" -#: build/expression.c:411 build/expression.c:456 build/expression.c:513 -#: build/expression.c:600 +#: build/expression.c:410 build/expression.c:455 build/expression.c:512 +#: build/expression.c:599 msgid "types must match" msgstr "" -#: build/expression.c:424 +#: build/expression.c:423 msgid "* / not suported for strings" msgstr "" -#: build/expression.c:472 +#: build/expression.c:471 msgid "- not suported for strings" msgstr "" -#: build/expression.c:613 +#: build/expression.c:612 msgid "&& and || not suported for strings" msgstr "" -#: build/expression.c:644 build/expression.c:689 +#: build/expression.c:645 build/expression.c:692 msgid "syntax error in expression" msgstr "" @@ -1517,82 +1517,82 @@ msgstr "" msgid "File listed twice: %s" msgstr "" -#: build/files.c:951 +#: build/files.c:953 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "" -#: build/files.c:961 +#: build/files.c:963 #, fuzzy, c-format msgid "File not found: %s" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: build/files.c:1004 +#: build/files.c:1006 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1018 +#: build/files.c:1020 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1088 +#: build/files.c:1090 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1132 +#: build/files.c:1134 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: build/files.c:1174 +#: build/files.c:1176 #, fuzzy msgid "Could not open %%files file: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1181 build/pack.c:485 +#: build/files.c:1183 build/pack.c:488 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1508 build/parsePrep.c:29 +#: build/files.c:1510 build/parsePrep.c:29 #, c-format msgid "Bad owner/group: %s" msgstr "" -#: build/files.c:1562 +#: build/files.c:1564 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1567 +#: build/files.c:1569 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1649 +#: build/files.c:1651 #, fuzzy, c-format msgid "%s failed" msgstr "La construction a échoué.\n" -#: build/files.c:1653 +#: build/files.c:1655 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1742 +#: build/files.c:1744 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1772 build/files.c:1781 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1885 +#: build/files.c:1887 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1610,106 +1610,106 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:131 +#: build/pack.c:132 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:148 +#: build/pack.c:149 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:183 +#: build/pack.c:184 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:193 +#: build/pack.c:194 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:213 +#: build/pack.c:215 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:219 +#: build/pack.c:221 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:274 +#: build/pack.c:278 msgid "Bad CSA data" msgstr "" -#: build/pack.c:305 +#: build/pack.c:311 #, fuzzy, c-format msgid "Could not open %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:337 build/pack.c:379 +#: build/pack.c:343 build/pack.c:385 #, fuzzy, c-format msgid "Unable to write package: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:352 +#: build/pack.c:358 #, fuzzy, c-format msgid "Generating signature: %d\n" msgstr " --sign - genère une signature PGP" -#: build/pack.c:369 +#: build/pack.c:375 #, fuzzy, c-format msgid "Unable to read sigtarget: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:394 +#: build/pack.c:400 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:411 build/pack.c:435 +#: build/pack.c:416 build/pack.c:439 #, fuzzy, c-format msgid "create archive failed on file %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:455 +#: build/pack.c:458 #, c-format msgid "cpio_copy write failed: %s" msgstr "" -#: build/pack.c:462 +#: build/pack.c:465 #, c-format msgid "cpio_copy read failed: %s" msgstr "" -#: build/pack.c:541 +#: build/pack.c:544 #, c-format msgid "Could not open PreIn file: %s" msgstr "" -#: build/pack.c:548 +#: build/pack.c:551 #, c-format msgid "Could not open PreUn file: %s" msgstr "" -#: build/pack.c:555 +#: build/pack.c:558 #, c-format msgid "Could not open PostIn file: %s" msgstr "" -#: build/pack.c:562 +#: build/pack.c:565 #, c-format msgid "Could not open PostUn file: %s" msgstr "" -#: build/pack.c:570 +#: build/pack.c:573 #, c-format msgid "Could not open VerifyScript file: %s" msgstr "" -#: build/pack.c:586 +#: build/pack.c:589 #, c-format msgid "Could not open Trigger script file: %s" msgstr "" @@ -1752,17 +1752,17 @@ msgstr "" msgid "line %d: Bad option %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/parseDescription.c:60 build/parseFiles.c:54 build/parseScript.c:182 +#: build/parseDescription.c:59 build/parseFiles.c:53 build/parseScript.c:181 #, c-format msgid "line %d: Too many names: %s" msgstr "" -#: build/parseDescription.c:70 build/parseFiles.c:64 build/parseScript.c:192 +#: build/parseDescription.c:69 build/parseFiles.c:63 build/parseScript.c:191 #, c-format msgid "line %d: Package does not exist: %s" msgstr "" -#: build/parseDescription.c:82 +#: build/parseDescription.c:81 #, c-format msgid "line %d: Second description" msgstr "" @@ -1771,7 +1771,7 @@ msgstr "" msgid "line %d: Error parsing %%files: %s" msgstr "" -#: build/parseFiles.c:72 +#: build/parseFiles.c:71 msgid "line %d: Second %%files list" msgstr "" @@ -1866,22 +1866,22 @@ msgstr "" msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:657 +#: build/parsePreamble.c:656 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Options de spécification de package:" -#: build/parsePreamble.c:663 +#: build/parsePreamble.c:662 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:690 +#: build/parsePreamble.c:689 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:715 +#: build/parsePreamble.c:714 msgid "Spec file can't use BuildRoot" msgstr "" @@ -1905,43 +1905,43 @@ msgstr "" msgid "Couldn't download nosource %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/parsePrep.c:191 +#: build/parsePrep.c:190 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:206 +#: build/parsePrep.c:205 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:227 +#: build/parsePrep.c:223 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:351 +#: build/parsePrep.c:346 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:359 +#: build/parsePrep.c:354 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:371 +#: build/parsePrep.c:366 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:377 +#: build/parsePrep.c:372 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:384 +#: build/parsePrep.c:379 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:388 +#: build/parsePrep.c:383 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:424 +#: build/parsePrep.c:419 msgid "line %d: second %%prep" msgstr "" @@ -1976,7 +1976,7 @@ msgstr "impossible d'ouvrir: %s\n" msgid "line %d: triggers must have --: %s" msgstr "" -#: build/parseScript.c:146 build/parseScript.c:210 +#: build/parseScript.c:146 build/parseScript.c:209 #, c-format msgid "line %d: Error parsing %s: %s" msgstr "" @@ -1986,7 +1986,7 @@ msgstr "" msgid "line %d: script program must begin with '/': %s" msgstr "" -#: build/parseScript.c:201 +#: build/parseScript.c:200 #, c-format msgid "line %d: Second %s" msgstr "" @@ -1996,45 +1996,45 @@ msgstr "" msgid "line %d: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/parseSpec.c:172 +#: build/parseSpec.c:173 #, fuzzy, c-format msgid "Unable to open: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/parseSpec.c:184 +#: build/parseSpec.c:185 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:243 +#: build/parseSpec.c:244 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:251 +#: build/parseSpec.c:252 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:262 +#: build/parseSpec.c:263 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:276 build/parseSpec.c:285 +#: build/parseSpec.c:277 build/parseSpec.c:286 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:366 +#: build/parseSpec.c:367 #, c-format msgid "Timecheck value must be an integer: %s" msgstr "" -#: build/parseSpec.c:449 +#: build/parseSpec.c:450 #, fuzzy msgid "No buildable architectures" msgstr "%s ne peut être construit sur cette architecture\n" -#: build/parseSpec.c:494 +#: build/parseSpec.c:497 #, fuzzy msgid "Package has no %%description: %s" msgstr "aucun package n'a été spécifié pour la désinstallation" @@ -2059,51 +2059,51 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:385 +#: lib/cpio.c:335 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/cpio.c:391 +#: lib/cpio.c:341 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:582 +#: lib/cpio.c:532 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1044 +#: lib/cpio.c:995 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1047 +#: lib/cpio.c:998 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1048 +#: lib/cpio.c:999 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1066 +#: lib/cpio.c:1017 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1067 +#: lib/cpio.c:1018 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1068 +#: lib/cpio.c:1019 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1069 +#: lib/cpio.c:1020 msgid "Internal error" msgstr "" -#: lib/cpio.c:1078 +#: lib/cpio.c:1029 #, fuzzy msgid " failed - " msgstr "La construction a échoué.\n" @@ -2129,90 +2129,90 @@ msgid "error removing record %s into %s" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:339 +#: lib/depends.c:404 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:368 +#: lib/depends.c:433 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:460 +#: lib/depends.c:525 msgid "dbrecMatchesDepFlags() failed to read header" msgstr "" -#: lib/depends.c:695 +#: lib/depends.c:760 #, c-format -msgid "%s: %s satisfied by added package.\n" +msgid "%s: %s satisfied by added file list.\n" msgstr "" -#: lib/depends.c:712 +#: lib/depends.c:799 #, c-format -msgid "%s: %s satisfied by added provide.\n" +msgid "%s: %s satisfied by added package.\n" msgstr "" -#: lib/depends.c:717 +#: lib/depends.c:816 #, c-format -msgid "%s: %s satisfied by added file list.\n" +msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:747 +#: lib/depends.c:847 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:775 +#: lib/depends.c:875 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:797 +#: lib/depends.c:897 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:819 +#: lib/depends.c:919 #, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:942 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:890 +#: lib/depends.c:990 #, fuzzy, c-format msgid "package %s require not satisfied: %s\n" msgstr "aucun package n'a été spécifié pour l'installation" #. conflicts exist. -#: lib/depends.c:952 +#: lib/depends.c:1052 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: lib/depends.c:1007 lib/depends.c:1311 +#: lib/depends.c:1107 lib/depends.c:1415 #, c-format msgid "cannot read header at %d for dependency check" msgstr "" -#: lib/depends.c:1102 +#: lib/depends.c:1202 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" -#: lib/falloc.c:160 +#: lib/falloc.c:157 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2222,8 +2222,8 @@ msgid "" "if \"rpm --rebuilddb\" fails to correct the problem.\n" msgstr "" -#: lib/formats.c:66 lib/formats.c:84 lib/formats.c:105 lib/formats.c:138 -#: lib/header.c:2122 lib/header.c:2139 lib/header.c:2159 +#: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141 +#: lib/header.c:2138 lib/header.c:2155 lib/header.c:2175 msgid "(not a number)" msgstr "" @@ -2318,75 +2318,75 @@ msgstr "" msgid "Data type %d not supprted\n" msgstr "" -#: lib/header.c:1119 +#: lib/header.c:1120 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" -#: lib/header.c:1520 +#: lib/header.c:1529 #, c-format msgid "missing { after %" msgstr "" -#: lib/header.c:1548 +#: lib/header.c:1557 msgid "missing } after %{" msgstr "" -#: lib/header.c:1560 +#: lib/header.c:1569 msgid "empty tag format" msgstr "" -#: lib/header.c:1570 +#: lib/header.c:1579 msgid "empty tag name" msgstr "" -#: lib/header.c:1585 +#: lib/header.c:1594 msgid "unknown tag" msgstr "" -#: lib/header.c:1611 +#: lib/header.c:1620 msgid "] expected at end of array" msgstr "" -#: lib/header.c:1627 +#: lib/header.c:1636 #, fuzzy msgid "unexpected ]" msgstr "source de requête inattendue" -#: lib/header.c:1629 +#: lib/header.c:1638 #, fuzzy msgid "unexpected }" msgstr "source de requête inattendue" -#: lib/header.c:1682 +#: lib/header.c:1692 msgid "? expected in expression" msgstr "" -#: lib/header.c:1689 +#: lib/header.c:1699 msgid "{ expected after ? in expression" msgstr "" -#: lib/header.c:1699 lib/header.c:1731 +#: lib/header.c:1709 lib/header.c:1744 msgid "} expected in expression" msgstr "" -#: lib/header.c:1706 +#: lib/header.c:1717 msgid ": expected following ? subexpression" msgstr "" -#: lib/header.c:1719 +#: lib/header.c:1731 msgid "{ expected after : in expression" msgstr "" -#: lib/header.c:1738 +#: lib/header.c:1752 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:1905 +#: lib/header.c:1921 msgid "(unknown type)" msgstr "" -#: lib/install.c:141 lib/uninstall.c:179 +#: lib/install.c:141 lib/uninstall.c:193 #, c-format msgid " file: %s action: %s\n" msgstr "" @@ -2407,88 +2407,88 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:358 +#: lib/install.c:355 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:359 +#: lib/install.c:356 msgid " on file " msgstr "" -#: lib/install.c:402 +#: lib/install.c:399 msgid "installing a source package\n" msgstr "" -#: lib/install.c:413 +#: lib/install.c:410 #, fuzzy, c-format msgid "cannot create %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/install.c:421 lib/install.c:443 +#: lib/install.c:418 lib/install.c:440 #, fuzzy, c-format msgid "cannot write to %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/install.c:425 +#: lib/install.c:422 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:436 +#: lib/install.c:433 #, fuzzy, c-format msgid "cannot create %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/install.c:447 +#: lib/install.c:444 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:481 lib/install.c:509 +#: lib/install.c:478 lib/install.c:506 #, fuzzy msgid "source package contains no .spec file" msgstr "" " -f <file>+ - interroge le package à qui appartient <file>" -#: lib/install.c:530 +#: lib/install.c:527 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:532 lib/install.c:810 lib/uninstall.c:26 +#: lib/install.c:529 lib/install.c:807 lib/uninstall.c:26 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:622 +#: lib/install.c:619 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:679 +#: lib/install.c:676 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/install.c:740 +#: lib/install.c:737 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:745 +#: lib/install.c:742 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:770 +#: lib/install.c:767 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:806 +#: lib/install.c:803 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:880 +#: lib/install.c:877 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2497,84 +2497,84 @@ msgstr "" msgid "cannot read header at %d for lookup" msgstr "" -#: lib/macro.c:149 +#: lib/macro.c:151 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: lib/macro.c:243 +#: lib/macro.c:245 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: lib/macro.c:278 +#: lib/macro.c:280 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: lib/macro.c:457 +#: lib/macro.c:459 msgid "Macro %%%s has unterminated body" msgstr "" -#: lib/macro.c:483 +#: lib/macro.c:485 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: lib/macro.c:489 +#: lib/macro.c:491 msgid "Macro %%%s has unterminated opts" msgstr "" -#: lib/macro.c:494 +#: lib/macro.c:496 msgid "Macro %%%s has empty body" msgstr "" -#: lib/macro.c:499 +#: lib/macro.c:501 msgid "Macro %%%s failed to expand" msgstr "" -#: lib/macro.c:524 +#: lib/macro.c:526 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: lib/macro.c:601 +#: lib/macro.c:603 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: lib/macro.c:698 +#: lib/macro.c:700 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: lib/macro.c:870 +#: lib/macro.c:872 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: lib/macro.c:936 lib/macro.c:952 +#: lib/macro.c:938 lib/macro.c:954 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: lib/macro.c:992 +#: lib/macro.c:994 msgid "A %% is followed by an unparseable macro" msgstr "" -#: lib/macro.c:1115 +#: lib/macro.c:1117 #, fuzzy msgid "Macro %%%.*s not found, skipping" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: lib/macro.c:1196 +#: lib/macro.c:1198 msgid "Target buffer overflow" msgstr "" -#: lib/macro.c:1343 lib/macro.c:1351 +#: lib/macro.c:1345 lib/macro.c:1353 #, fuzzy, c-format msgid "File %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/macro.c:1354 +#: lib/macro.c:1356 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -2605,24 +2605,24 @@ msgstr "" msgid "bad file state: %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/package.c:234 +#: lib/package.c:237 msgid "package is a version one package!\n" msgstr "" -#: lib/package.c:239 +#: lib/package.c:242 msgid "old style source package -- I'll do my best\n" msgstr "" -#: lib/package.c:242 +#: lib/package.c:245 #, c-format msgid "archive offset is %d\n" msgstr "" -#: lib/package.c:252 +#: lib/package.c:256 msgid "old style binary package\n" msgstr "" -#: lib/package.c:298 +#: lib/package.c:316 msgid "" "only packages with major numbers <= 3 are supported by this version of RPM" msgstr "" @@ -2688,208 +2688,208 @@ msgstr "" msgid "error in format: %s\n" msgstr "" -#: lib/query.c:180 +#: lib/query.c:181 msgid "(contains no files)" msgstr "" -#: lib/query.c:233 +#: lib/query.c:238 msgid "normal " msgstr "" -#: lib/query.c:235 +#: lib/query.c:240 msgid "replaced " msgstr "" -#: lib/query.c:237 +#: lib/query.c:242 #, fuzzy msgid "not installed " msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/query.c:239 +#: lib/query.c:244 msgid "net shared " msgstr "" -#: lib/query.c:241 +#: lib/query.c:246 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:245 +#: lib/query.c:250 msgid "(no state) " msgstr "" -#: lib/query.c:261 lib/query.c:291 +#: lib/query.c:267 lib/query.c:308 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:400 +#: lib/query.c:421 #, c-format msgid "record number %u\n" msgstr "" -#: lib/query.c:404 +#: lib/query.c:425 msgid "error: could not read database record\n" msgstr "" -#: lib/query.c:442 +#: lib/query.c:463 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "La construction a échoué.\n" -#: lib/query.c:455 +#: lib/query.c:476 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:464 lib/rpminstall.c:203 +#: lib/query.c:485 lib/rpminstall.c:203 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:467 +#: lib/query.c:488 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:494 +#: lib/query.c:515 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:519 +#: lib/query.c:540 msgid "could not read database record!\n" msgstr "" -#: lib/query.c:530 +#: lib/query.c:551 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:540 +#: lib/query.c:561 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:550 +#: lib/query.c:571 #, fuzzy, c-format msgid "no package triggers %s\n" msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/query.c:560 +#: lib/query.c:581 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:575 +#: lib/query.c:596 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:578 +#: lib/query.c:599 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:612 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:594 +#: lib/query.c:615 #, c-format msgid "package record number: %d\n" msgstr "" -#: lib/query.c:597 +#: lib/query.c:618 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:393 +#: lib/query.c:630 lib/rpminstall.c:393 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/query.c:612 +#: lib/query.c:633 #, c-format msgid "error looking for package %s\n" msgstr "" -#: lib/query.c:634 +#: lib/query.c:655 msgid "rpmQuery: rpmdbOpen() failed\n" msgstr "" -#: lib/query.c:693 +#: lib/query.c:714 #, fuzzy msgid "query package owning file" msgstr "" " -f <file>+ - interroge le package à qui appartient <file>" -#: lib/query.c:695 +#: lib/query.c:716 #, fuzzy msgid "query packages in group" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: lib/query.c:697 +#: lib/query.c:718 #, fuzzy msgid "query a package file" msgstr "" " -f <file>+ - interroge le package à qui appartient <file>" -#: lib/query.c:701 +#: lib/query.c:722 msgid "query a spec file" msgstr "" -#: lib/query.c:703 +#: lib/query.c:724 #, fuzzy msgid "query the pacakges triggered by the package" msgstr "" " -f <file>+ - interroge le package à qui appartient <file>" -#: lib/query.c:705 +#: lib/query.c:726 msgid "query the packages which require a capability" msgstr "" -#: lib/query.c:707 +#: lib/query.c:728 msgid "query the packages which provide a capability" msgstr "" -#: lib/query.c:746 +#: lib/query.c:767 #, fuzzy msgid "list all configuration files" msgstr "" " -c - donne uniquement la liste des fichiers de " "configuration (implique -l)" -#: lib/query.c:748 +#: lib/query.c:769 #, fuzzy msgid "list all documentation files" msgstr "" " -d - donne uniquement la liste des fichiers de " "documentation (implique -l)" -#: lib/query.c:750 +#: lib/query.c:771 #, fuzzy msgid "dump basic file information" msgstr "" " -i - affiche les informations relatives à un package" -#: lib/query.c:752 +#: lib/query.c:773 msgid "list files in package" msgstr "" -#: lib/query.c:756 +#: lib/query.c:777 msgid "use the following query format" msgstr "" -#: lib/query.c:758 +#: lib/query.c:779 msgid "substitute i18n sections from the following catalogue" msgstr "" -#: lib/query.c:761 +#: lib/query.c:782 msgid "display the states of the listed files" msgstr "" -#: lib/query.c:763 +#: lib/query.c:784 #, fuzzy msgid "display a verbose file listing" msgstr " -l - affiche la liste des packages" @@ -2965,14 +2965,14 @@ msgid "makeTempFile failed\n" msgstr "La construction a échoué.\n" #: lib/rpmchecksig.c:74 -#, c-format -msgid "%s: fdWrite failed: %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%s: Fwrite failed: %s\n" +msgstr "impossible d'ouvrir: %s\n" #: lib/rpmchecksig.c:80 -#, c-format -msgid "%s: fdRead failed: %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%s: Fread failed: %s\n" +msgstr "impossible d'ouvrir: %s\n" #: lib/rpmchecksig.c:113 lib/rpmchecksig.c:242 #, c-format @@ -3067,78 +3067,78 @@ msgid "" "database" msgstr "" -#: lib/rpmdb.c:439 +#: lib/rpmdb.c:468 #, c-format msgid "package %s not listed in %s" msgstr "" -#: lib/rpmdb.c:450 +#: lib/rpmdb.c:479 #, fuzzy, c-format msgid "package %s not found in %s" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: lib/rpmdb.c:475 lib/uninstall.c:85 +#: lib/rpmdb.c:503 lib/uninstall.c:85 #, fuzzy, c-format msgid "cannot read header at %d for uninstall" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: lib/rpmdb.c:483 +#: lib/rpmdb.c:511 msgid "package has no name" msgstr "" -#: lib/rpmdb.c:485 +#: lib/rpmdb.c:513 msgid "removing name index\n" msgstr "" -#: lib/rpmdb.c:490 +#: lib/rpmdb.c:518 #, fuzzy msgid "package has no group\n" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: lib/rpmdb.c:492 +#: lib/rpmdb.c:520 msgid "removing group index\n" msgstr "" -#: lib/rpmdb.c:499 +#: lib/rpmdb.c:527 #, c-format msgid "removing provides index for %s\n" msgstr "" -#: lib/rpmdb.c:514 +#: lib/rpmdb.c:542 #, c-format msgid "removing requiredby index for %s\n" msgstr "" -#: lib/rpmdb.c:526 +#: lib/rpmdb.c:554 #, c-format msgid "removing trigger index for %s\n" msgstr "" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:565 #, c-format msgid "removing conflict index for %s\n" msgstr "" -#: lib/rpmdb.c:554 +#: lib/rpmdb.c:576 #, c-format msgid "removing file index for %s\n" msgstr "" -#: lib/rpmdb.c:563 +#: lib/rpmdb.c:585 #, fuzzy msgid "package has no files\n" msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/rpmdb.c:645 +#: lib/rpmdb.c:667 msgid "cannot allocate space for database" msgstr "" -#: lib/rpmdb.c:711 +#: lib/rpmdb.c:726 #, c-format msgid "cannot read header at %d for update" msgstr "" -#: lib/rpmdb.c:720 +#: lib/rpmdb.c:735 msgid "header changed size!" msgstr "" @@ -3298,37 +3298,37 @@ msgstr "" msgid "missing ':' at %s:%d" msgstr "" -#: lib/rpmrc.c:655 lib/rpmrc.c:729 +#: lib/rpmrc.c:655 lib/rpmrc.c:730 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:672 lib/rpmrc.c:694 +#: lib/rpmrc.c:672 lib/rpmrc.c:695 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmrc.c:680 +#: lib/rpmrc.c:681 #, c-format msgid "cannot open %s at %s:%d" msgstr "" -#: lib/rpmrc.c:721 +#: lib/rpmrc.c:722 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:788 +#: lib/rpmrc.c:789 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1147 +#: lib/rpmrc.c:1149 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1148 +#: lib/rpmrc.c:1150 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3475,17 +3475,27 @@ msgstr "" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "" -#: lib/transaction.c:363 +#: lib/transaction.c:386 #, c-format -msgid "relocating %s to %s\n" +msgid "excluding file %s%s\n" +msgstr "" + +#: lib/transaction.c:412 lib/transaction.c:496 +#, c-format +msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:370 +#: lib/transaction.c:417 #, c-format -msgid "excluding %s\n" +msgid "relocating %s to %s\n" msgstr "" #: lib/transaction.c:489 +#, fuzzy, c-format +msgid "relocating directory %s to %s\n" +msgstr "impossible d'ouvrir: %s\n" + +#: lib/transaction.c:637 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3515,15 +3525,15 @@ msgstr "aucun package n'a été spécifié pour la désinstallation" msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:191 +#: lib/uninstall.c:207 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:204 +#: lib/uninstall.c:220 msgid "removing database entry\n" msgstr "" -#: lib/uninstall.c:365 +#: lib/uninstall.c:381 msgid "execution of script failed" msgstr "" @@ -3556,25 +3566,25 @@ msgstr "impossible d'ouvrir: %s\n" msgid "don't verify files in package" msgstr "" -#: lib/verify.c:208 +#: lib/verify.c:213 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:226 +#: lib/verify.c:231 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:259 +#: lib/verify.c:266 #, c-format msgid "missing %s\n" msgstr "" -#: lib/verify.c:321 +#: lib/verify.c:328 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: lib/verify.c:369 +#: lib/verify.c:376 msgid "rpmVerify: rpmdbOpen() failed\n" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm-3.0.2\n" -"POT-Creation-Date: 1999-10-04 16:05-0400\n" +"POT-Creation-Date: 1999-10-27 12:52-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" @@ -1245,35 +1245,35 @@ msgstr "nie podano nazwy pakietu do podpisania" msgid "no packages files given for rebuild" msgstr "nie podano nazw pakietów do przebudowania" -#: rpm.c:1230 +#: rpm.c:1234 msgid "no spec files given for build" msgstr "nie podano nazw plików spec do budowania" -#: rpm.c:1232 +#: rpm.c:1236 msgid "no tar files given for build" msgstr "nie podano nazw plików tar do budowania" -#: rpm.c:1244 +#: rpm.c:1248 msgid "no packages given for uninstall" msgstr "nie podano nazw plików do usuniêcia" -#: rpm.c:1294 +#: rpm.c:1298 msgid "no packages given for install" msgstr "nie podano nazw plików do zainstalowania" -#: rpm.c:1317 +#: rpm.c:1321 msgid "extra arguments given for query of all packages" msgstr "zbyt wiele argumentów dla odpytywania wszystkich pakietów" -#: rpm.c:1322 +#: rpm.c:1326 msgid "no arguments given for query" msgstr "nie podano argumentów dla trybu zapytañ" -#: rpm.c:1339 +#: rpm.c:1343 msgid "extra arguments given for verify of all packages" msgstr "zbyt wiele argumentów dla weryfikacji wszystkich pakietów" -#: rpm.c:1343 +#: rpm.c:1347 msgid "no arguments given for verify" msgstr "nie podano argumentów dla sprawdzania" @@ -1285,7 +1285,7 @@ msgstr "argument nie jest pakietem RPM\n" msgid "error reading header from package\n" msgstr "b³±d odczytu nag³ówka z pakietu\n" -#: build/build.c:83 build/pack.c:263 +#: build/build.c:83 build/pack.c:267 msgid "Unable to open temp file" msgstr "Nie mo¿na otworzyæ pliku tymczasowego" @@ -1304,59 +1304,59 @@ msgstr "Wykonanie %s nie powiod³o siê (%s)" msgid "Bad exit status from %s (%s)" msgstr "B³êdny status wyj¶cia z %s (%s)" -#: build/expression.c:208 +#: build/expression.c:207 #, fuzzy msgid "syntax error while parsing ==" msgstr "b³±d sk³adni w wyra¿eniu" -#: build/expression.c:238 +#: build/expression.c:237 #, fuzzy msgid "syntax error while parsing &&" msgstr "b³±d sk³adni w wyra¿eniu" -#: build/expression.c:247 +#: build/expression.c:246 #, fuzzy msgid "syntax error while parsing ||" msgstr "b³±d sk³adni w wyra¿eniu" -#: build/expression.c:289 +#: build/expression.c:288 msgid "parse error in expression" msgstr "b³±d interpretacji wyra¿enia" -#: build/expression.c:319 +#: build/expression.c:318 msgid "unmatched (" msgstr "niesparowane (" -#: build/expression.c:337 +#: build/expression.c:336 msgid "undefined identifier" msgstr "nieznany identyfikator" -#: build/expression.c:356 +#: build/expression.c:355 msgid "- only on numbers" msgstr "- tylko na liczbach" -#: build/expression.c:372 +#: build/expression.c:371 msgid "! only on numbers" msgstr "! tylko na liczbach" -#: build/expression.c:411 build/expression.c:456 build/expression.c:513 -#: build/expression.c:600 +#: build/expression.c:410 build/expression.c:455 build/expression.c:512 +#: build/expression.c:599 msgid "types must match" msgstr "typy musz± siê zgadzaæ" -#: build/expression.c:424 +#: build/expression.c:423 msgid "* / not suported for strings" msgstr "* / nie jest wspierane dla ³añcuchów znakowych" -#: build/expression.c:472 +#: build/expression.c:471 msgid "- not suported for strings" msgstr "- nie jest wspierane dla ³añcuchów znakowych" -#: build/expression.c:613 +#: build/expression.c:612 msgid "&& and || not suported for strings" msgstr "&& i || nie jest wspierane dla ³añcuchów znakowych" -#: build/expression.c:644 build/expression.c:689 +#: build/expression.c:645 build/expression.c:692 msgid "syntax error in expression" msgstr "b³±d sk³adni w wyra¿eniu" @@ -1436,81 +1436,81 @@ msgstr "Nie mo¿na mieszaæ specjalnej %%doc z innymi formami: %s" msgid "File listed twice: %s" msgstr "Plik podany dwukrotnie: %s" -#: build/files.c:951 +#: build/files.c:953 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "Plik nie zgadza siê z prefiksem (%s): %s" -#: build/files.c:961 +#: build/files.c:963 #, c-format msgid "File not found: %s" msgstr "Nie znaleziono pliku: %s" -#: build/files.c:1004 +#: build/files.c:1006 #, c-format msgid "Bad owner/group: %s\n" msgstr "B³êdny u¿ytkownik/grupa: %s\n" -#: build/files.c:1018 +#: build/files.c:1020 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Plik %4d: 0%o %s.%s\t %s\n" -#: build/files.c:1088 +#: build/files.c:1090 #, c-format msgid "File needs leading \"/\": %s" msgstr "Plik musi siê zaczynaæ od \"/\": %s" -#: build/files.c:1132 +#: build/files.c:1134 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Nie znaleziono pliku: %s" -#: build/files.c:1174 +#: build/files.c:1176 msgid "Could not open %%files file: %s" msgstr "Nie mo¿na otworzyæ %%files pliku: %s" -#: build/files.c:1181 build/pack.c:485 +#: build/files.c:1183 build/pack.c:488 #, c-format msgid "line: %s" msgstr "linia: %s" -#: build/files.c:1508 build/parsePrep.c:29 +#: build/files.c:1510 build/parsePrep.c:29 #, c-format msgid "Bad owner/group: %s" msgstr "B³êdny u¿ytkownik/grupa: %s" -#: build/files.c:1562 +#: build/files.c:1564 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "Nie mo¿na uruchomiæ %s" -#: build/files.c:1567 +#: build/files.c:1569 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Nie mo¿na wykonaæ fork na %s" -#: build/files.c:1649 +#: build/files.c:1651 #, c-format msgid "%s failed" msgstr "%s nie powiod³o siê" -#: build/files.c:1653 +#: build/files.c:1655 #, c-format msgid "failed to write all data to %s" msgstr "zapisanie wszystkich danych do %s nie powiod³o siê" -#: build/files.c:1742 +#: build/files.c:1744 #, fuzzy, c-format msgid "Finding %s: (using %s)...\n" msgstr "Wyszukiwanie wymaganych zasobów...\n" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1772 build/files.c:1781 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "Wyszukiwanie nie powiod³o siê" -#: build/files.c:1885 +#: build/files.c:1887 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Przetwarzanie plików: %s\n" @@ -1528,106 +1528,106 @@ msgstr "RPMERR_INTERNAL: Limit trafieñ w getGname()\n" msgid "Could not canonicalize hostname: %s\n" msgstr "Nie mo¿na rozwi±zaæ nazwy systemu: %s\n" -#: build/pack.c:131 +#: build/pack.c:132 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "Nie mo¿na wygenerowaæ wyj¶ciowej nazwy dla pakietu %s: %s\n" -#: build/pack.c:148 +#: build/pack.c:149 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "nie mo¿na utworzyæ %s" -#: build/pack.c:183 +#: build/pack.c:184 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: otwieranie %s: %s\n" -#: build/pack.c:193 +#: build/pack.c:194 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: czytanie %s: %s\n" -#: build/pack.c:213 +#: build/pack.c:215 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s nie jest pakietem RPM\n" -#: build/pack.c:219 +#: build/pack.c:221 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: czytanie nag³ówka z %s\n" -#: build/pack.c:274 +#: build/pack.c:278 msgid "Bad CSA data" msgstr "B³êdne dane CSA" -#: build/pack.c:305 +#: build/pack.c:311 #, c-format msgid "Could not open %s\n" msgstr "Nie mo¿na otworzyæ %s\n" -#: build/pack.c:337 build/pack.c:379 +#: build/pack.c:343 build/pack.c:385 #, c-format msgid "Unable to write package: %s" msgstr "Nie mo¿na zapisaæ pakietu: %s" -#: build/pack.c:352 +#: build/pack.c:358 #, c-format msgid "Generating signature: %d\n" msgstr "Generowanie sygnatury: %d\n" -#: build/pack.c:369 +#: build/pack.c:375 #, c-format msgid "Unable to read sigtarget: %s" msgstr "Nie mo¿na odczytaæ sigtarget: %s" -#: build/pack.c:394 +#: build/pack.c:400 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" -#: build/pack.c:411 build/pack.c:435 +#: build/pack.c:416 build/pack.c:439 #, c-format msgid "create archive failed on file %s: %s" msgstr "utworzenie archiwum pliku %s nie powiod³o siê: %s" -#: build/pack.c:455 +#: build/pack.c:458 #, c-format msgid "cpio_copy write failed: %s" msgstr "zapis w trybie cpio_copy nie powiód³ siê: %s" -#: build/pack.c:462 +#: build/pack.c:465 #, c-format msgid "cpio_copy read failed: %s" msgstr "odczyt w trybie cpio_copy nie powiód³ siê: %s" -#: build/pack.c:541 +#: build/pack.c:544 #, c-format msgid "Could not open PreIn file: %s" msgstr "Nie mo¿na otworzyæ pliku PreIn: %s" -#: build/pack.c:548 +#: build/pack.c:551 #, c-format msgid "Could not open PreUn file: %s" msgstr "Nie mo¿na otworzyæ pliku PreUn: %s" -#: build/pack.c:555 +#: build/pack.c:558 #, c-format msgid "Could not open PostIn file: %s" msgstr "Nie mo¿na otworzyæ pliku PostIn: %s" -#: build/pack.c:562 +#: build/pack.c:565 #, c-format msgid "Could not open PostUn file: %s" msgstr "Nie mo¿na otworzyæ pliku PostUn: %s" -#: build/pack.c:570 +#: build/pack.c:573 #, c-format msgid "Could not open VerifyScript file: %s" msgstr "Nie mo¿na otworzyæ pliku VerifyScript: %s" -#: build/pack.c:586 +#: build/pack.c:589 #, c-format msgid "Could not open Trigger script file: %s" msgstr "Nie mo¿na otworzyæ skryptu Trigger: %s" @@ -1670,17 +1670,17 @@ msgstr "linia %d: b³±d w interpretacji wpisu %%description: %s" msgid "line %d: Bad option %s: %s" msgstr "linia %d: B³edna opcja %s: %s" -#: build/parseDescription.c:60 build/parseFiles.c:54 build/parseScript.c:182 +#: build/parseDescription.c:59 build/parseFiles.c:53 build/parseScript.c:181 #, c-format msgid "line %d: Too many names: %s" msgstr "linia %d: Zbyt du¿o nazw: %s" -#: build/parseDescription.c:70 build/parseFiles.c:64 build/parseScript.c:192 +#: build/parseDescription.c:69 build/parseFiles.c:63 build/parseScript.c:191 #, c-format msgid "line %d: Package does not exist: %s" msgstr "linia %d: Pakiet nie istnieje: %s" -#: build/parseDescription.c:82 +#: build/parseDescription.c:81 #, c-format msgid "line %d: Second description" msgstr "linia %d: Drugi opis" @@ -1689,7 +1689,7 @@ msgstr "linia %d: Drugi opis" msgid "line %d: Error parsing %%files: %s" msgstr "linia %d: B³±d w interpretacji wpisu %%files: %s" -#: build/parseFiles.c:72 +#: build/parseFiles.c:71 msgid "line %d: Second %%files list" msgstr "linia %d: Druga lista %%files" @@ -1784,22 +1784,22 @@ msgstr "linia %d: B³êdny format wpisu BuildArchitecture: %s" msgid "Internal error: Bogus tag %d" msgstr "B³±d wewnêtrzny: Fa³szywa etykieta %d" -#: build/parsePreamble.c:657 +#: build/parsePreamble.c:656 #, c-format msgid "Bad package specification: %s" msgstr "B³êdna specyfikacja pakietu: $s" -#: build/parsePreamble.c:663 +#: build/parsePreamble.c:662 #, c-format msgid "Package already exists: %s" msgstr "Pakiet ju¿ istnieje: %s" -#: build/parsePreamble.c:690 +#: build/parsePreamble.c:689 #, c-format msgid "line %d: Unknown tag: %s" msgstr "linia %d: Nieznana etykieta: %s" -#: build/parsePreamble.c:715 +#: build/parsePreamble.c:714 msgid "Spec file can't use BuildRoot" msgstr "W pliku spec nie mo¿na u¿ywaæ wpisów BuildRoot" @@ -1823,43 +1823,43 @@ msgstr "Brak ¼ród³a numer %d" msgid "Couldn't download nosource %s: %s" msgstr "" -#: build/parsePrep.c:191 +#: build/parsePrep.c:190 msgid "Error parsing %%setup: %s" msgstr "B³±d przetwarzania %%setup: %s" -#: build/parsePrep.c:206 +#: build/parsePrep.c:205 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "linia %d: B³êdny argument dla %%setup %c: %s" -#: build/parsePrep.c:227 +#: build/parsePrep.c:223 msgid "line %d: Bad %%setup option %s: %s" msgstr "linia %d: B³êdna opcja %%setup %s: %s" -#: build/parsePrep.c:351 +#: build/parsePrep.c:346 msgid "line %d: Need arg to %%patch -b: %s" msgstr "linia %d: Wymagany argument dla %%patch -b: %s" -#: build/parsePrep.c:359 +#: build/parsePrep.c:354 msgid "line %d: Need arg to %%patch -z: %s" msgstr "linia %d: Wymagany argument dla %%patch -z: %s" -#: build/parsePrep.c:371 +#: build/parsePrep.c:366 msgid "line %d: Need arg to %%patch -p: %s" msgstr "linia %d: Wymagany argument dla %%patch -p: %s" -#: build/parsePrep.c:377 +#: build/parsePrep.c:372 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "linia %d: B³êdny argument dla %%patch -p: %s" -#: build/parsePrep.c:384 +#: build/parsePrep.c:379 msgid "Too many patches!" msgstr "Zbyt wiele ³at!" -#: build/parsePrep.c:388 +#: build/parsePrep.c:383 msgid "line %d: Bad arg to %%patch: %s" msgstr "linia %d: B³êdny argument dla %%patch: %s" -#: build/parsePrep.c:424 +#: build/parsePrep.c:419 msgid "line %d: second %%prep" msgstr "linia %d: druga sekcja %%prep" @@ -1895,7 +1895,7 @@ msgstr "linia %d: Wymagana wersja: %s" msgid "line %d: triggers must have --: %s" msgstr "linia %d: triggery musz± mieæ --: %s" -#: build/parseScript.c:146 build/parseScript.c:210 +#: build/parseScript.c:146 build/parseScript.c:209 #, c-format msgid "line %d: Error parsing %s: %s" msgstr "linia %d: B³±d przetwarzania %s: %s" @@ -1905,7 +1905,7 @@ msgstr "linia %d: B³±d przetwarzania %s: %s" msgid "line %d: script program must begin with '/': %s" msgstr "linia %d: skrypt (tu jako program) musi siê zaczynaæ od '/': %s" -#: build/parseScript.c:201 +#: build/parseScript.c:200 #, c-format msgid "line %d: Second %s" msgstr "linia %d: Drugi %s" @@ -1915,44 +1915,44 @@ msgstr "linia %d: Drugi %s" msgid "line %d: %s" msgstr "linia %d: %s" -#: build/parseSpec.c:172 +#: build/parseSpec.c:173 #, c-format msgid "Unable to open: %s\n" msgstr "Nie mo¿na otworzyæ: %s\n" -#: build/parseSpec.c:184 +#: build/parseSpec.c:185 msgid "Unclosed %%if" msgstr "Niedomkniête %%if" -#: build/parseSpec.c:243 +#: build/parseSpec.c:244 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:251 +#: build/parseSpec.c:252 msgid "%s:%d: Got a %%else with no if" msgstr "%s:%d: Napotkano %%else bez if" #. Got an end with no %if ! -#: build/parseSpec.c:262 +#: build/parseSpec.c:263 msgid "%s:%d: Got a %%endif with no if" msgstr "%s:%d: Napotkano %%endif bez if" -#: build/parseSpec.c:276 build/parseSpec.c:285 +#: build/parseSpec.c:277 build/parseSpec.c:286 msgid "malformed %%include statement" msgstr "b³ednie sformatowany wpis %%include" -#: build/parseSpec.c:366 +#: build/parseSpec.c:367 #, c-format msgid "Timecheck value must be an integer: %s" msgstr "Warto¶æ timecheck musi byæ liczb± ca³kowit±: %s" -#: build/parseSpec.c:449 +#: build/parseSpec.c:450 msgid "No buildable architectures" msgstr "Nie mo¿na budowaæ na takie architektury" -#: build/parseSpec.c:494 +#: build/parseSpec.c:497 msgid "Package has no %%description: %s" msgstr "Pakiet nie ma %%description: %s" @@ -1976,51 +1976,51 @@ msgstr "linia %d: b³êdny numer no%s: %d" msgid "line %d: Bad %s number: %s\n" msgstr "linia %d: B³êdny numer %s: %s\n" -#: lib/cpio.c:385 +#: lib/cpio.c:335 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "nie mo¿na zmieniæ nazwy %s na %s: %s\n" -#: lib/cpio.c:391 +#: lib/cpio.c:341 #, c-format msgid "can't unlink %s: %s\n" msgstr "nie mo¿na odwi±zaæ %s: %s\n" -#: lib/cpio.c:582 +#: lib/cpio.c:532 #, c-format msgid "getNextHeader: %s\n" msgstr "getNextHeader: %s\n" -#: lib/cpio.c:1044 +#: lib/cpio.c:995 #, c-format msgid "(error 0x%x)" msgstr "(b³±d 0x%x)" -#: lib/cpio.c:1047 +#: lib/cpio.c:998 msgid "Bad magic" msgstr "B³êdny magic" -#: lib/cpio.c:1048 +#: lib/cpio.c:999 msgid "Bad/unreadable header" msgstr "B³êdny/nieczytelny nag³ówek" -#: lib/cpio.c:1066 +#: lib/cpio.c:1017 msgid "Header size too big" msgstr "Rozmiar nag³ówka jest zbyt du¿y" -#: lib/cpio.c:1067 +#: lib/cpio.c:1018 msgid "Unknown file type" msgstr "Nieznany typ pliku" -#: lib/cpio.c:1068 +#: lib/cpio.c:1019 msgid "Missing hard link" msgstr "Brak twardego dowi±zania" -#: lib/cpio.c:1069 +#: lib/cpio.c:1020 msgid "Internal error" msgstr "B³±d wewnêtrzny" -#: lib/cpio.c:1078 +#: lib/cpio.c:1029 msgid " failed - " msgstr " nie powiod³o siê -" @@ -2045,90 +2045,90 @@ msgid "error removing record %s into %s" msgstr "b³±d usuwania rekordu %s z %s" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:339 +#: lib/depends.c:404 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:368 +#: lib/depends.c:433 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:460 +#: lib/depends.c:525 msgid "dbrecMatchesDepFlags() failed to read header" msgstr "dbrecMatchesDepFlags() odczyt nag³ówka nie powiód³ siê" -#: lib/depends.c:695 +#: lib/depends.c:760 +#, c-format +msgid "%s: %s satisfied by added file list.\n" +msgstr "" + +#: lib/depends.c:799 #, fuzzy, c-format msgid "%s: %s satisfied by added package.\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:712 +#: lib/depends.c:816 #, c-format msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:717 -#, c-format -msgid "%s: %s satisfied by added file list.\n" -msgstr "" - -#: lib/depends.c:747 +#: lib/depends.c:847 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:775 +#: lib/depends.c:875 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:797 +#: lib/depends.c:897 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:819 +#: lib/depends.c:919 #, fuzzy, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:832 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:942 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:890 +#: lib/depends.c:990 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" #. conflicts exist. -#: lib/depends.c:952 +#: lib/depends.c:1052 #, c-format msgid "package %s conflicts: %s\n" msgstr "pakiet %s jest w konflikcie: %s\n" -#: lib/depends.c:1007 lib/depends.c:1311 +#: lib/depends.c:1107 lib/depends.c:1415 #, c-format msgid "cannot read header at %d for dependency check" msgstr "nie mo¿na odczytaæ nag³ówka %d dla sprawdzenia zale¿no¶ci" -#: lib/depends.c:1102 +#: lib/depends.c:1202 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" -#: lib/falloc.c:160 +#: lib/falloc.c:157 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2138,8 +2138,8 @@ msgid "" "if \"rpm --rebuilddb\" fails to correct the problem.\n" msgstr "" -#: lib/formats.c:66 lib/formats.c:84 lib/formats.c:105 lib/formats.c:138 -#: lib/header.c:2122 lib/header.c:2139 lib/header.c:2159 +#: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141 +#: lib/header.c:2138 lib/header.c:2155 lib/header.c:2175 msgid "(not a number)" msgstr "(nie jest liczb±)" @@ -2234,73 +2234,73 @@ msgstr "Typ danych %d nie jest obs³ugiwany\n" msgid "Data type %d not supprted\n" msgstr "Typ danych %d nie jest obs³ugiwany\n" -#: lib/header.c:1119 +#: lib/header.c:1120 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "B³edny licznik dla headerAddEntry(): %d\n" -#: lib/header.c:1520 +#: lib/header.c:1529 #, c-format msgid "missing { after %" msgstr "brak { po %" -#: lib/header.c:1548 +#: lib/header.c:1557 msgid "missing } after %{" msgstr "brak } po %{" -#: lib/header.c:1560 +#: lib/header.c:1569 msgid "empty tag format" msgstr "pusty format etykiety" -#: lib/header.c:1570 +#: lib/header.c:1579 msgid "empty tag name" msgstr "pusta nazwa etykiety" -#: lib/header.c:1585 +#: lib/header.c:1594 msgid "unknown tag" msgstr "nieznana etykieta" -#: lib/header.c:1611 +#: lib/header.c:1620 msgid "] expected at end of array" msgstr "spodziewany ] na koñcu tablicy" -#: lib/header.c:1627 +#: lib/header.c:1636 msgid "unexpected ]" msgstr "nie spodziewany ]" -#: lib/header.c:1629 +#: lib/header.c:1638 msgid "unexpected }" msgstr "nie spodziewany }" -#: lib/header.c:1682 +#: lib/header.c:1692 msgid "? expected in expression" msgstr "spodziewany ? w wyra¿eniu" -#: lib/header.c:1689 +#: lib/header.c:1699 msgid "{ expected after ? in expression" msgstr "spodziewany { po ? w wyra¿eniu" -#: lib/header.c:1699 lib/header.c:1731 +#: lib/header.c:1709 lib/header.c:1744 msgid "} expected in expression" msgstr "spodziewany } w wyra¿eniu" -#: lib/header.c:1706 +#: lib/header.c:1717 msgid ": expected following ? subexpression" msgstr "spodziewany : po podwyra¿eniu ?" -#: lib/header.c:1719 +#: lib/header.c:1731 msgid "{ expected after : in expression" msgstr "spodziewany { po : w wyra¿eniu" -#: lib/header.c:1738 +#: lib/header.c:1752 msgid "| expected at end of expression" msgstr "spodziewany | na koñcu wyra¿enia" -#: lib/header.c:1905 +#: lib/header.c:1921 msgid "(unknown type)" msgstr "(nieznany typ)" -#: lib/install.c:141 lib/uninstall.c:179 +#: lib/install.c:141 lib/uninstall.c:193 #, c-format msgid " file: %s action: %s\n" msgstr " plik: %s akcja: %s\n" @@ -2321,86 +2321,86 @@ msgstr "warto¶æ %%instchangelog w pliku makra powinna byæ liczb±, a nie jest" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:358 +#: lib/install.c:355 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "rozpakowanie archiwum nie powiod³o siê %s%s: %s" -#: lib/install.c:359 +#: lib/install.c:356 msgid " on file " msgstr " na pliku " -#: lib/install.c:402 +#: lib/install.c:399 msgid "installing a source package\n" msgstr "instacja pakietu ¼ród³owego\n" -#: lib/install.c:413 +#: lib/install.c:410 #, fuzzy, c-format msgid "cannot create %s: %s" msgstr "nie mo¿na utworzyæ %s" -#: lib/install.c:421 lib/install.c:443 +#: lib/install.c:418 lib/install.c:440 #, c-format msgid "cannot write to %s" msgstr "nie mo¿na zapisaæ do %s" -#: lib/install.c:425 +#: lib/install.c:422 #, c-format msgid "sources in: %s\n" msgstr "¼ród³a w: %s\n" -#: lib/install.c:436 +#: lib/install.c:433 #, c-format msgid "cannot create %s" msgstr "nie mo¿na utworzyæ %s" -#: lib/install.c:447 +#: lib/install.c:444 #, c-format msgid "spec file in: %s\n" msgstr "plik spec w: %s\n" -#: lib/install.c:481 lib/install.c:509 +#: lib/install.c:478 lib/install.c:506 msgid "source package contains no .spec file" msgstr "pakiet ¼ród³owy nie zawiera pliku .spec" -#: lib/install.c:530 +#: lib/install.c:527 #, c-format msgid "renaming %s to %s\n" msgstr "zmiana nazwy %s na %s\n" -#: lib/install.c:532 lib/install.c:810 lib/uninstall.c:26 +#: lib/install.c:529 lib/install.c:807 lib/uninstall.c:26 #, c-format msgid "rename of %s to %s failed: %s" msgstr "zmiana nazwy z %s na %s nie powiod³a sie: %s" -#: lib/install.c:622 +#: lib/install.c:619 msgid "source package expected, binary found" msgstr "spodziewany pakiet ¼ród³owy a nie binarny" -#: lib/install.c:679 +#: lib/install.c:676 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "pakiet: %s-%s-%s test plików = %d\n" -#: lib/install.c:740 +#: lib/install.c:737 msgid "stopping install as we're running --test\n" msgstr "przebieg testowy - instalacja zatrzymana\n" -#: lib/install.c:745 +#: lib/install.c:742 msgid "running preinstall script (if any)\n" msgstr "uruchamianie skryptu preinstall (je¶li istnieje)\n" -#: lib/install.c:770 +#: lib/install.c:767 #, c-format msgid "warning: %s created as %s" msgstr "ostrze¿enie: %s utworzony jako %s" -#: lib/install.c:806 +#: lib/install.c:803 #, c-format msgid "warning: %s saved as %s" msgstr "ostrze¿enie: %s zapisany jako %s" -#: lib/install.c:880 +#: lib/install.c:877 #, fuzzy msgid "running postinstall scripts (if any)\n" msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n" @@ -2410,83 +2410,83 @@ msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n" msgid "cannot read header at %d for lookup" msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla poszukiwania" -#: lib/macro.c:149 +#: lib/macro.c:151 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== aktywny %d pusty %d\n" #. XXX just in case -#: lib/macro.c:243 +#: lib/macro.c:245 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(pusty)" -#: lib/macro.c:278 +#: lib/macro.c:280 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(pusty)\n" -#: lib/macro.c:457 +#: lib/macro.c:459 msgid "Macro %%%s has unterminated body" msgstr "Makro %%%s ma niezakoñczon± strukturê" -#: lib/macro.c:483 +#: lib/macro.c:485 msgid "Macro %%%s has illegal name (%%define)" msgstr "Makro %%%s ma niedozwolon± nazwê (%%define)" -#: lib/macro.c:489 +#: lib/macro.c:491 msgid "Macro %%%s has unterminated opts" msgstr "Makro %%%s ma niezakoñczone opcje" -#: lib/macro.c:494 +#: lib/macro.c:496 msgid "Macro %%%s has empty body" msgstr "Makro %%%s nie zawiera ¿adnych poleceñ" -#: lib/macro.c:499 +#: lib/macro.c:501 msgid "Macro %%%s failed to expand" msgstr "Rozwiniêcie makra %%%s nie powiod³o siê" -#: lib/macro.c:524 +#: lib/macro.c:526 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "Makro %%%s ma niedozwolon± nazwê (%%undefine)" -#: lib/macro.c:601 +#: lib/macro.c:603 msgid "Macro %%%s (%s) was not used below level %d" msgstr "Makro %%%s (%s) nie by³o u¿yte poni¿ej poziomu %d" -#: lib/macro.c:698 +#: lib/macro.c:700 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "Nieznana opcja %c in %s(%s)" -#: lib/macro.c:870 +#: lib/macro.c:872 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "G³êboko¶æ(%d) rekursji wiêksza mi¿ maks(%d)" -#: lib/macro.c:936 lib/macro.c:952 +#: lib/macro.c:938 lib/macro.c:954 #, c-format msgid "Unterminated %c: %s" msgstr "Niezakoñczone %c: %s" -#: lib/macro.c:992 +#: lib/macro.c:994 msgid "A %% is followed by an unparseable macro" msgstr "Napotkano nieprzetwarzalne makro po %%" -#: lib/macro.c:1115 +#: lib/macro.c:1117 msgid "Macro %%%.*s not found, skipping" msgstr "Nie znaleziono makra %%%.*s, makro pominiête" -#: lib/macro.c:1196 +#: lib/macro.c:1198 msgid "Target buffer overflow" msgstr "Przepe³nienie bufora docelowego" -#: lib/macro.c:1343 lib/macro.c:1351 +#: lib/macro.c:1345 lib/macro.c:1353 #, c-format msgid "File %s: %s" msgstr "Plik %s: %s" -#: lib/macro.c:1354 +#: lib/macro.c:1356 #, c-format msgid "File %s is smaller than %d bytes" msgstr "Plik %s jest mniejszy ni¿ %d bajtów" @@ -2517,24 +2517,24 @@ msgstr "b³±d w tworzeniu pliku tymczasowego %s" msgid "bad file state: %s" msgstr "b³êdny status pliku: %s" -#: lib/package.c:234 +#: lib/package.c:237 msgid "package is a version one package!\n" msgstr "ten pakiet jest pakietem w wersji jeden!\n" -#: lib/package.c:239 +#: lib/package.c:242 msgid "old style source package -- I'll do my best\n" msgstr "stary styl pakietu ¼ród³owego -- Zrobiê co w mojej mocy\n" -#: lib/package.c:242 +#: lib/package.c:245 #, c-format msgid "archive offset is %d\n" msgstr "ofsetem archiwum jest %d\n" -#: lib/package.c:252 +#: lib/package.c:256 msgid "old style binary package\n" msgstr "stary styl pakietu binarnego\n" -#: lib/package.c:298 +#: lib/package.c:316 msgid "" "only packages with major numbers <= 3 are supported by this version of RPM" msgstr "" @@ -2603,192 +2603,192 @@ msgstr "wyst±pi³ nieznany b³±d %d w trakcie manipulowania pakietem %s-%s-%s" msgid "error in format: %s\n" msgstr "b³±d w formacie: %s\n" -#: lib/query.c:180 +#: lib/query.c:181 msgid "(contains no files)" msgstr "(nie zawiera plików)" -#: lib/query.c:233 +#: lib/query.c:238 msgid "normal " msgstr "normalny " -#: lib/query.c:235 +#: lib/query.c:240 msgid "replaced " msgstr "zast±piony " -#: lib/query.c:237 +#: lib/query.c:242 msgid "not installed " msgstr "niezainstalowany" -#: lib/query.c:239 +#: lib/query.c:244 msgid "net shared " msgstr "udostêpniony w sieci" -#: lib/query.c:241 +#: lib/query.c:246 #, c-format msgid "(unknown %3d) " msgstr "(nieznany %3d)" -#: lib/query.c:245 +#: lib/query.c:250 msgid "(no state) " msgstr "(brak statusu)" -#: lib/query.c:261 lib/query.c:291 +#: lib/query.c:267 lib/query.c:308 msgid "package has neither file owner or id lists" msgstr "pakiet nie ma ani w³a¶ciciela pliku ani list id" -#: lib/query.c:400 +#: lib/query.c:421 #, c-format msgid "record number %u\n" msgstr "rekord numer %u\n" -#: lib/query.c:404 +#: lib/query.c:425 msgid "error: could not read database record\n" msgstr "b³±d: nie mo¿na odczytaæ rekordu bazy\n" -#: lib/query.c:442 +#: lib/query.c:463 #, c-format msgid "open of %s failed: %s\n" msgstr "otwarcie %s nie powiod³o siê\n" -#: lib/query.c:455 +#: lib/query.c:476 msgid "old format source packages cannot be queried\n" msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n" -#: lib/query.c:464 lib/rpminstall.c:203 +#: lib/query.c:485 lib/rpminstall.c:203 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s nie wygl±da na pakiet RPM\n" -#: lib/query.c:467 +#: lib/query.c:488 #, c-format msgid "query of %s failed\n" msgstr "odpytywanie %s nie powiod³o siê\n" -#: lib/query.c:494 +#: lib/query.c:515 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "odpytywanie pliku spec %s nie powiod³o siê, nie mo¿na interpretowaæ\n" -#: lib/query.c:519 +#: lib/query.c:540 msgid "could not read database record!\n" msgstr "nie mo¿na odczytaæ rekordu bazy!\n" -#: lib/query.c:530 +#: lib/query.c:551 #, c-format msgid "group %s does not contain any packages\n" msgstr "grupa %s nie zawiera ¿adnych pakietów\n" -#: lib/query.c:540 +#: lib/query.c:561 #, c-format msgid "no package provides %s\n" msgstr "¿aden pakiet nie udostêpnia %s\n" -#: lib/query.c:550 +#: lib/query.c:571 #, c-format msgid "no package triggers %s\n" msgstr "¿aden pakiet nie zahacza %s\n" -#: lib/query.c:560 +#: lib/query.c:581 #, c-format msgid "no package requires %s\n" msgstr "¿aden pakiet nie wymaga %s\n" -#: lib/query.c:575 +#: lib/query.c:596 #, c-format msgid "file %s: %s\n" msgstr "plik %s: %s\n" -#: lib/query.c:578 +#: lib/query.c:599 #, c-format msgid "file %s is not owned by any package\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/query.c:591 +#: lib/query.c:612 #, c-format msgid "invalid package number: %s\n" msgstr "b³êdny numer pakietu: %s\n" -#: lib/query.c:594 +#: lib/query.c:615 #, c-format msgid "package record number: %d\n" msgstr "numer rekordu pakietu: %d\n" -#: lib/query.c:597 +#: lib/query.c:618 #, c-format msgid "record %d could not be read\n" msgstr "nie mo¿na odczytaæ rekordu %d\n" -#: lib/query.c:609 lib/rpminstall.c:393 +#: lib/query.c:630 lib/rpminstall.c:393 #, c-format msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" -#: lib/query.c:612 +#: lib/query.c:633 #, c-format msgid "error looking for package %s\n" msgstr "b³±d szukania pakietu %s\n" -#: lib/query.c:634 +#: lib/query.c:655 msgid "rpmQuery: rpmdbOpen() failed\n" msgstr "rpmQuery: rpmdbOpen() nie powiod³o siê\n" -#: lib/query.c:693 +#: lib/query.c:714 msgid "query package owning file" msgstr "sprawdzanie do jakiego pakietu nale¿y plik" -#: lib/query.c:695 +#: lib/query.c:716 msgid "query packages in group" msgstr "odpytywanie pakietów w grupie" -#: lib/query.c:697 +#: lib/query.c:718 msgid "query a package file" msgstr "odpytywanie pakietu" -#: lib/query.c:701 +#: lib/query.c:722 msgid "query a spec file" msgstr "odpytywanie pliku spec" -#: lib/query.c:703 +#: lib/query.c:724 msgid "query the pacakges triggered by the package" msgstr "odpytywanie pakietów zahaczanych przez pakiet" -#: lib/query.c:705 +#: lib/query.c:726 msgid "query the packages which require a capability" msgstr "odpytywanie pakietów wymagaj±cych zasobu" -#: lib/query.c:707 +#: lib/query.c:728 msgid "query the packages which provide a capability" msgstr "odpytywanie pakietów udostêpniaj±cych zasób" -#: lib/query.c:746 +#: lib/query.c:767 msgid "list all configuration files" msgstr "wy¶wietl wszystkie pliki konfiguracyjne" -#: lib/query.c:748 +#: lib/query.c:769 msgid "list all documentation files" msgstr "wy¶wietl wszystkie pliki dokumentacji" -#: lib/query.c:750 +#: lib/query.c:771 msgid "dump basic file information" msgstr "podaj postawowe informacje o pliku" -#: lib/query.c:752 +#: lib/query.c:773 msgid "list files in package" msgstr "wy¶wietl pliki zawarte w pakiecie" -#: lib/query.c:756 +#: lib/query.c:777 msgid "use the following query format" msgstr "u¿yj nastêpuj±cego formatu zapytania" -#: lib/query.c:758 +#: lib/query.c:779 msgid "substitute i18n sections from the following catalogue" msgstr "" -#: lib/query.c:761 +#: lib/query.c:782 msgid "display the states of the listed files" msgstr "wy¶wietl status pokazywanych plików" -#: lib/query.c:763 +#: lib/query.c:784 msgid "display a verbose file listing" msgstr "wy¶wietl wiêcej informacji o plikach z listy" @@ -2864,12 +2864,12 @@ msgstr "wykonanie nie powiod³o siê\n" #: lib/rpmchecksig.c:74 #, fuzzy, c-format -msgid "%s: fdWrite failed: %s\n" -msgstr "%s: Open nie powiod³o siê\n" +msgid "%s: Fwrite failed: %s\n" +msgstr "%s: readLead nie powiod³o siê\n" #: lib/rpmchecksig.c:80 #, fuzzy, c-format -msgid "%s: fdRead failed: %s\n" +msgid "%s: Fread failed: %s\n" msgstr "%s: readLead nie powiod³o siê\n" #: lib/rpmchecksig.c:113 lib/rpmchecksig.c:242 @@ -2967,76 +2967,76 @@ msgstr "" "baza danych jest w starym formacie; u¿yj --rebuilddb aby wygenerowaæ bazê w " "nowym formacie" -#: lib/rpmdb.c:439 +#: lib/rpmdb.c:468 #, c-format msgid "package %s not listed in %s" msgstr "pakiet %s nie jest wymieniony w %s" -#: lib/rpmdb.c:450 +#: lib/rpmdb.c:479 #, c-format msgid "package %s not found in %s" msgstr "pakiet %s nie znaleziony w %s" -#: lib/rpmdb.c:475 lib/uninstall.c:85 +#: lib/rpmdb.c:503 lib/uninstall.c:85 #, c-format msgid "cannot read header at %d for uninstall" msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla deinstalacji" -#: lib/rpmdb.c:483 +#: lib/rpmdb.c:511 msgid "package has no name" msgstr "pakiet nie ma nazwy" -#: lib/rpmdb.c:485 +#: lib/rpmdb.c:513 msgid "removing name index\n" msgstr "usuwanie indeksu nazw\n" -#: lib/rpmdb.c:490 +#: lib/rpmdb.c:518 msgid "package has no group\n" msgstr "pakiet nie ma grupy\n" -#: lib/rpmdb.c:492 +#: lib/rpmdb.c:520 msgid "removing group index\n" msgstr "usuwanie indeksu grupy\n" -#: lib/rpmdb.c:499 +#: lib/rpmdb.c:527 #, c-format msgid "removing provides index for %s\n" msgstr "usuwanie indeksu udostêpnianych zasobów dla %s\n" -#: lib/rpmdb.c:514 +#: lib/rpmdb.c:542 #, c-format msgid "removing requiredby index for %s\n" msgstr "usuwanie indeksu zale¿no¶ci dla %s\n" -#: lib/rpmdb.c:526 +#: lib/rpmdb.c:554 #, c-format msgid "removing trigger index for %s\n" msgstr "usuwanie indeksu trigger dla %s\n" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:565 #, c-format msgid "removing conflict index for %s\n" msgstr "usuwanie indeksu konfliktów dla %s\n" -#: lib/rpmdb.c:554 +#: lib/rpmdb.c:576 #, c-format msgid "removing file index for %s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: lib/rpmdb.c:563 +#: lib/rpmdb.c:585 msgid "package has no files\n" msgstr "pakiet nie ma plików\n" -#: lib/rpmdb.c:645 +#: lib/rpmdb.c:667 msgid "cannot allocate space for database" msgstr "nie mo¿na alokowaæ przestrzeni dla bazy danych" -#: lib/rpmdb.c:711 +#: lib/rpmdb.c:726 #, c-format msgid "cannot read header at %d for update" msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla uaktualnienia" -#: lib/rpmdb.c:720 +#: lib/rpmdb.c:735 msgid "header changed size!" msgstr "nag³ówek zmieni³ swój rozmiar!" @@ -3195,37 +3195,37 @@ msgstr "Odczytanie %s nie powiod³o siê: %s." msgid "missing ':' at %s:%d" msgstr "brak ':' przy %s:%d" -#: lib/rpmrc.c:655 lib/rpmrc.c:729 +#: lib/rpmrc.c:655 lib/rpmrc.c:730 #, c-format msgid "missing argument for %s at %s:%d" msgstr "brak argumentu dla %s przy %s:%d" -#: lib/rpmrc.c:672 lib/rpmrc.c:694 +#: lib/rpmrc.c:672 lib/rpmrc.c:695 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "" -#: lib/rpmrc.c:680 +#: lib/rpmrc.c:681 #, c-format msgid "cannot open %s at %s:%d" msgstr "nie mo¿na otworzyæ %s przy %s:%d" -#: lib/rpmrc.c:721 +#: lib/rpmrc.c:722 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "brak architektury dla %s przy %s:%d" -#: lib/rpmrc.c:788 +#: lib/rpmrc.c:789 #, c-format msgid "bad option '%s' at %s:%d" msgstr "b³êdna opcja '%s' przy %s:%d" -#: lib/rpmrc.c:1147 +#: lib/rpmrc.c:1149 #, c-format msgid "Unknown system: %s\n" msgstr "Nieznany system: %s\n" -#: lib/rpmrc.c:1148 +#: lib/rpmrc.c:1150 msgid "Please contact rpm-list@redhat.com\n" msgstr "Skontaktuj siê, proszê, z rpm-list@redhat.com\n" @@ -3368,17 +3368,27 @@ msgstr "Musisz ustawiæ \"%%_gpg_name\" w pliku swego makra" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "Musisz ustawiæ \"%%_pgp_name\" w pliku swego makra" -#: lib/transaction.c:363 +#: lib/transaction.c:386 +#, fuzzy, c-format +msgid "excluding file %s%s\n" +msgstr "wy³±czanie %s\n" + +#: lib/transaction.c:412 lib/transaction.c:496 +#, fuzzy, c-format +msgid "excluding directory %s\n" +msgstr "tworzenie katalogu: %s\n" + +#: lib/transaction.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "przesuwanie %s do %s\n" -#: lib/transaction.c:370 -#, c-format -msgid "excluding %s\n" -msgstr "wy³±czanie %s\n" - #: lib/transaction.c:489 +#, fuzzy, c-format +msgid "relocating directory %s to %s\n" +msgstr "przesuwanie %s do %s\n" + +#: lib/transaction.c:637 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s pominiêty z powodu flagi missingok\n" @@ -3408,15 +3418,15 @@ msgstr "nie mo¿na odczytaæ pakietów nazwanych %s dla zdeinstalowania" msgid "will remove files test = %d\n" msgstr "usunie pliki test = %d\n" -#: lib/uninstall.c:191 +#: lib/uninstall.c:207 msgid "running postuninstall script (if any)\n" msgstr "uruchamianie skryptu postinstalacyjnego (je¦li istnieje)\n" -#: lib/uninstall.c:204 +#: lib/uninstall.c:220 msgid "removing database entry\n" msgstr "usuwanie wpisu w bazie\n" -#: lib/uninstall.c:365 +#: lib/uninstall.c:381 msgid "execution of script failed" msgstr "wykonanie skryptu nie powiod³o siê" @@ -3449,32 +3459,36 @@ msgstr "utworzenie %s nie powiod³o siê\n" msgid "don't verify files in package" msgstr "nie sprawdzaj plików pakietu" -#: lib/verify.c:208 +#: lib/verify.c:213 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" "pakiet nie specyfikuje ani nazwy u¿ytkownika ani list id (to nie powinno siê " "zdarzyæ)" -#: lib/verify.c:226 +#: lib/verify.c:231 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" "pakiet nie specyfikuje ani nazwy grupy ani list id (to nie powinno siê " "zdarzyæ)" -#: lib/verify.c:259 +#: lib/verify.c:266 #, c-format msgid "missing %s\n" msgstr "brak %s\n" -#: lib/verify.c:321 +#: lib/verify.c:328 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: " -#: lib/verify.c:369 +#: lib/verify.c:376 msgid "rpmVerify: rpmdbOpen() failed\n" msgstr "rpmVerify: rpmdbOpen() nie powiod³o siê\n" +#, fuzzy +#~ msgid "%s: fdWrite failed: %s\n" +#~ msgstr "%s: Open nie powiod³o siê\n" + #~ msgid "File contains non-printable characters(%c): %s\n" #~ msgstr "Plik zawiera niedrukowalne znaki (%c): %s\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index a94f3d5fb..86cbabd1b 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: 1999-10-04 16:05-0400\n" +msgstr "POT-Creation-Date: 1999-10-27 12:52-0400\n" #: build.c:23 lib/rpminstall.c:222 lib/rpminstall.c:382 #, c-format @@ -1346,36 +1346,36 @@ msgstr "não foram passados pacotes para assinatura" msgid "no packages files given for rebuild" msgstr "não foram passados pacotes para reconstrução" -#: rpm.c:1230 +#: rpm.c:1234 msgid "no spec files given for build" msgstr "não foi passado arquivo spec para construção" -#: rpm.c:1232 +#: rpm.c:1236 msgid "no tar files given for build" msgstr "não foram passados arquivos tar para construção" -#: rpm.c:1244 +#: rpm.c:1248 msgid "no packages given for uninstall" msgstr "não foi passado pacote para desinstalação" -#: rpm.c:1294 +#: rpm.c:1298 msgid "no packages given for install" msgstr "não foi passado pacote para instalação" -#: rpm.c:1317 +#: rpm.c:1321 msgid "extra arguments given for query of all packages" msgstr "foram passados argumentos em excesso para pesquisa em todos os pacotes" -#: rpm.c:1322 +#: rpm.c:1326 msgid "no arguments given for query" msgstr "não foi passado argumento para pesquisa" -#: rpm.c:1339 +#: rpm.c:1343 #, fuzzy msgid "extra arguments given for verify of all packages" msgstr "foram passados argumentos em excesso para pesquisa em todos os pacotes" -#: rpm.c:1343 +#: rpm.c:1347 msgid "no arguments given for verify" msgstr "não foi passado argumento para verificação" @@ -1388,7 +1388,7 @@ msgid "error reading header from package\n" msgstr "" # , c-format -#: build/build.c:83 build/pack.c:263 +#: build/build.c:83 build/pack.c:267 #, fuzzy msgid "Unable to open temp file" msgstr "Não consegui abrir: %s\n" @@ -1416,56 +1416,56 @@ msgstr "" msgid "Bad exit status from %s (%s)" msgstr "" -#: build/expression.c:208 +#: build/expression.c:207 msgid "syntax error while parsing ==" msgstr "" -#: build/expression.c:238 +#: build/expression.c:237 msgid "syntax error while parsing &&" msgstr "" -#: build/expression.c:247 +#: build/expression.c:246 msgid "syntax error while parsing ||" msgstr "" -#: build/expression.c:289 +#: build/expression.c:288 msgid "parse error in expression" msgstr "" -#: build/expression.c:319 +#: build/expression.c:318 msgid "unmatched (" msgstr "" -#: build/expression.c:337 +#: build/expression.c:336 msgid "undefined identifier" msgstr "" -#: build/expression.c:356 +#: build/expression.c:355 msgid "- only on numbers" msgstr "" -#: build/expression.c:372 +#: build/expression.c:371 msgid "! only on numbers" msgstr "" -#: build/expression.c:411 build/expression.c:456 build/expression.c:513 -#: build/expression.c:600 +#: build/expression.c:410 build/expression.c:455 build/expression.c:512 +#: build/expression.c:599 msgid "types must match" msgstr "" -#: build/expression.c:424 +#: build/expression.c:423 msgid "* / not suported for strings" msgstr "" -#: build/expression.c:472 +#: build/expression.c:471 msgid "- not suported for strings" msgstr "" -#: build/expression.c:613 +#: build/expression.c:612 msgid "&& and || not suported for strings" msgstr "" -#: build/expression.c:644 build/expression.c:689 +#: build/expression.c:645 build/expression.c:692 msgid "syntax error in expression" msgstr "" @@ -1550,87 +1550,87 @@ msgid "File listed twice: %s" msgstr "Não consegui ler o arquivo spec de %s\n" # , c-format -#: build/files.c:951 +#: build/files.c:953 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s" msgstr "Não consegui ler o arquivo spec de %s\n" -#: build/files.c:961 +#: build/files.c:963 #, fuzzy, c-format msgid "File not found: %s" msgstr "não foi passado pacote para desinstalação" -#: build/files.c:1004 +#: build/files.c:1006 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1018 +#: build/files.c:1020 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1088 +#: build/files.c:1090 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1132 +#: build/files.c:1134 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "não foi passado pacote para desinstalação" # , c-format -#: build/files.c:1174 +#: build/files.c:1176 #, fuzzy msgid "Could not open %%files file: %s" msgstr "Não consegui abrir: %s\n" -#: build/files.c:1181 build/pack.c:485 +#: build/files.c:1183 build/pack.c:488 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1508 build/parsePrep.c:29 +#: build/files.c:1510 build/parsePrep.c:29 #, c-format msgid "Bad owner/group: %s" msgstr "" # , c-format -#: build/files.c:1562 +#: build/files.c:1564 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "Não consegui ler o arquivo spec de %s\n" # , c-format -#: build/files.c:1567 +#: build/files.c:1569 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Não consegui ler o arquivo spec de %s\n" -#: build/files.c:1649 +#: build/files.c:1651 #, fuzzy, c-format msgid "%s failed" msgstr "Construção falhou.\n" # , c-format -#: build/files.c:1653 +#: build/files.c:1655 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "Não consegui abrir o pipe tar: %s\n" -#: build/files.c:1742 +#: build/files.c:1744 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" # , c-format -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1772 build/files.c:1781 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "Não consegui abrir o pipe tar: %s\n" -#: build/files.c:1885 +#: build/files.c:1887 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1648,113 +1648,113 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:131 +#: build/pack.c:132 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" # , c-format -#: build/pack.c:148 +#: build/pack.c:149 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "Não consegui abrir: %s\n" # , c-format -#: build/pack.c:183 +#: build/pack.c:184 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "Não consegui abrir: %s\n" # , c-format -#: build/pack.c:193 +#: build/pack.c:194 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "Não consegui ler o arquivo spec de %s\n" -#: build/pack.c:213 +#: build/pack.c:215 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:219 +#: build/pack.c:221 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:274 +#: build/pack.c:278 msgid "Bad CSA data" msgstr "" # , c-format -#: build/pack.c:305 +#: build/pack.c:311 #, fuzzy, c-format msgid "Could not open %s\n" msgstr "Não consegui abrir: %s\n" # , c-format -#: build/pack.c:337 build/pack.c:379 +#: build/pack.c:343 build/pack.c:385 #, fuzzy, c-format msgid "Unable to write package: %s" msgstr "Não consegui abrir: %s\n" -#: build/pack.c:352 +#: build/pack.c:358 #, fuzzy, c-format msgid "Generating signature: %d\n" msgstr "gere assinatura PGP" # , c-format -#: build/pack.c:369 +#: build/pack.c:375 #, fuzzy, c-format msgid "Unable to read sigtarget: %s" msgstr "Não consegui abrir: %s\n" -#: build/pack.c:394 +#: build/pack.c:400 #, c-format msgid "Wrote: %s\n" msgstr "" # , c-format -#: build/pack.c:411 build/pack.c:435 +#: build/pack.c:416 build/pack.c:439 #, fuzzy, c-format msgid "create archive failed on file %s: %s" msgstr "Não consegui abrir: %s\n" -#: build/pack.c:455 +#: build/pack.c:458 #, c-format msgid "cpio_copy write failed: %s" msgstr "" -#: build/pack.c:462 +#: build/pack.c:465 #, c-format msgid "cpio_copy read failed: %s" msgstr "" -#: build/pack.c:541 +#: build/pack.c:544 #, c-format msgid "Could not open PreIn file: %s" msgstr "" -#: build/pack.c:548 +#: build/pack.c:551 #, c-format msgid "Could not open PreUn file: %s" msgstr "" -#: build/pack.c:555 +#: build/pack.c:558 #, c-format msgid "Could not open PostIn file: %s" msgstr "" -#: build/pack.c:562 +#: build/pack.c:565 #, c-format msgid "Could not open PostUn file: %s" msgstr "" -#: build/pack.c:570 +#: build/pack.c:573 #, c-format msgid "Could not open VerifyScript file: %s" msgstr "" -#: build/pack.c:586 +#: build/pack.c:589 #, c-format msgid "Could not open Trigger script file: %s" msgstr "" @@ -1798,17 +1798,17 @@ msgstr "" msgid "line %d: Bad option %s: %s" msgstr "Não consegui abrir: %s\n" -#: build/parseDescription.c:60 build/parseFiles.c:54 build/parseScript.c:182 +#: build/parseDescription.c:59 build/parseFiles.c:53 build/parseScript.c:181 #, c-format msgid "line %d: Too many names: %s" msgstr "" -#: build/parseDescription.c:70 build/parseFiles.c:64 build/parseScript.c:192 +#: build/parseDescription.c:69 build/parseFiles.c:63 build/parseScript.c:191 #, c-format msgid "line %d: Package does not exist: %s" msgstr "" -#: build/parseDescription.c:82 +#: build/parseDescription.c:81 #, c-format msgid "line %d: Second description" msgstr "" @@ -1817,7 +1817,7 @@ msgstr "" msgid "line %d: Error parsing %%files: %s" msgstr "" -#: build/parseFiles.c:72 +#: build/parseFiles.c:71 msgid "line %d: Second %%files list" msgstr "" @@ -1915,22 +1915,22 @@ msgstr "" msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:657 +#: build/parsePreamble.c:656 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Opcões para especificação de pacotes:" -#: build/parsePreamble.c:663 +#: build/parsePreamble.c:662 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:690 +#: build/parsePreamble.c:689 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:715 +#: build/parsePreamble.c:714 msgid "Spec file can't use BuildRoot" msgstr "" @@ -1956,43 +1956,43 @@ msgstr "" msgid "Couldn't download nosource %s: %s" msgstr "Não consegui ler o arquivo spec de %s\n" -#: build/parsePrep.c:191 +#: build/parsePrep.c:190 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:206 +#: build/parsePrep.c:205 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:227 +#: build/parsePrep.c:223 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:351 +#: build/parsePrep.c:346 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:359 +#: build/parsePrep.c:354 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:371 +#: build/parsePrep.c:366 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:377 +#: build/parsePrep.c:372 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:384 +#: build/parsePrep.c:379 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:388 +#: build/parsePrep.c:383 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:424 +#: build/parsePrep.c:419 msgid "line %d: second %%prep" msgstr "" @@ -2028,7 +2028,7 @@ msgstr "Não consegui abrir: %s\n" msgid "line %d: triggers must have --: %s" msgstr "" -#: build/parseScript.c:146 build/parseScript.c:210 +#: build/parseScript.c:146 build/parseScript.c:209 #, c-format msgid "line %d: Error parsing %s: %s" msgstr "" @@ -2038,7 +2038,7 @@ msgstr "" msgid "line %d: script program must begin with '/': %s" msgstr "" -#: build/parseScript.c:201 +#: build/parseScript.c:200 #, c-format msgid "line %d: Second %s" msgstr "" @@ -2050,46 +2050,46 @@ msgid "line %d: %s" msgstr "Não consegui ler o arquivo spec de %s\n" # , c-format -#: build/parseSpec.c:172 +#: build/parseSpec.c:173 #, fuzzy, c-format msgid "Unable to open: %s\n" msgstr "Não consegui abrir: %s\n" -#: build/parseSpec.c:184 +#: build/parseSpec.c:185 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:243 +#: build/parseSpec.c:244 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:251 +#: build/parseSpec.c:252 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:262 +#: build/parseSpec.c:263 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:276 build/parseSpec.c:285 +#: build/parseSpec.c:277 build/parseSpec.c:286 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:366 +#: build/parseSpec.c:367 #, c-format msgid "Timecheck value must be an integer: %s" msgstr "" # , c-format -#: build/parseSpec.c:449 +#: build/parseSpec.c:450 #, fuzzy msgid "No buildable architectures" msgstr "%s não pode ser construido nesta arquitetura\n" -#: build/parseSpec.c:494 +#: build/parseSpec.c:497 #, fuzzy msgid "Package has no %%description: %s" msgstr "não foi passado pacote para desinstalação" @@ -2115,51 +2115,51 @@ msgid "line %d: Bad %s number: %s\n" msgstr "" # , c-format -#: lib/cpio.c:385 +#: lib/cpio.c:335 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "Não consegui ler o arquivo spec de %s\n" -#: lib/cpio.c:391 +#: lib/cpio.c:341 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:582 +#: lib/cpio.c:532 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1044 +#: lib/cpio.c:995 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1047 +#: lib/cpio.c:998 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1048 +#: lib/cpio.c:999 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1066 +#: lib/cpio.c:1017 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1067 +#: lib/cpio.c:1018 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1068 +#: lib/cpio.c:1019 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1069 +#: lib/cpio.c:1020 msgid "Internal error" msgstr "" -#: lib/cpio.c:1078 +#: lib/cpio.c:1029 #, fuzzy msgid " failed - " msgstr "Construção falhou.\n" @@ -2186,90 +2186,90 @@ msgid "error removing record %s into %s" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:339 +#: lib/depends.c:404 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:368 +#: lib/depends.c:433 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:460 +#: lib/depends.c:525 msgid "dbrecMatchesDepFlags() failed to read header" msgstr "" -#: lib/depends.c:695 +#: lib/depends.c:760 #, c-format -msgid "%s: %s satisfied by added package.\n" +msgid "%s: %s satisfied by added file list.\n" msgstr "" -#: lib/depends.c:712 +#: lib/depends.c:799 #, c-format -msgid "%s: %s satisfied by added provide.\n" +msgid "%s: %s satisfied by added package.\n" msgstr "" -#: lib/depends.c:717 +#: lib/depends.c:816 #, c-format -msgid "%s: %s satisfied by added file list.\n" +msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:747 +#: lib/depends.c:847 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:775 +#: lib/depends.c:875 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:797 +#: lib/depends.c:897 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:819 +#: lib/depends.c:919 #, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:942 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:890 +#: lib/depends.c:990 #, fuzzy, c-format msgid "package %s require not satisfied: %s\n" msgstr "não foi passado pacote para instalação" #. conflicts exist. -#: lib/depends.c:952 +#: lib/depends.c:1052 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "não foi passado pacote para desinstalação" -#: lib/depends.c:1007 lib/depends.c:1311 +#: lib/depends.c:1107 lib/depends.c:1415 #, c-format msgid "cannot read header at %d for dependency check" msgstr "" -#: lib/depends.c:1102 +#: lib/depends.c:1202 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" -#: lib/falloc.c:160 +#: lib/falloc.c:157 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2279,8 +2279,8 @@ msgid "" "if \"rpm --rebuilddb\" fails to correct the problem.\n" msgstr "" -#: lib/formats.c:66 lib/formats.c:84 lib/formats.c:105 lib/formats.c:138 -#: lib/header.c:2122 lib/header.c:2139 lib/header.c:2159 +#: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141 +#: lib/header.c:2138 lib/header.c:2155 lib/header.c:2175 msgid "(not a number)" msgstr "" @@ -2377,75 +2377,75 @@ msgstr "" msgid "Data type %d not supprted\n" msgstr "" -#: lib/header.c:1119 +#: lib/header.c:1120 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" -#: lib/header.c:1520 +#: lib/header.c:1529 #, c-format msgid "missing { after %" msgstr "" -#: lib/header.c:1548 +#: lib/header.c:1557 msgid "missing } after %{" msgstr "" -#: lib/header.c:1560 +#: lib/header.c:1569 msgid "empty tag format" msgstr "" -#: lib/header.c:1570 +#: lib/header.c:1579 msgid "empty tag name" msgstr "" -#: lib/header.c:1585 +#: lib/header.c:1594 msgid "unknown tag" msgstr "" -#: lib/header.c:1611 +#: lib/header.c:1620 msgid "] expected at end of array" msgstr "" -#: lib/header.c:1627 +#: lib/header.c:1636 #, fuzzy msgid "unexpected ]" msgstr "fonte de pesquisa não esperado" -#: lib/header.c:1629 +#: lib/header.c:1638 #, fuzzy msgid "unexpected }" msgstr "fonte de pesquisa não esperado" -#: lib/header.c:1682 +#: lib/header.c:1692 msgid "? expected in expression" msgstr "" -#: lib/header.c:1689 +#: lib/header.c:1699 msgid "{ expected after ? in expression" msgstr "" -#: lib/header.c:1699 lib/header.c:1731 +#: lib/header.c:1709 lib/header.c:1744 msgid "} expected in expression" msgstr "" -#: lib/header.c:1706 +#: lib/header.c:1717 msgid ": expected following ? subexpression" msgstr "" -#: lib/header.c:1719 +#: lib/header.c:1731 msgid "{ expected after : in expression" msgstr "" -#: lib/header.c:1738 +#: lib/header.c:1752 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:1905 +#: lib/header.c:1921 msgid "(unknown type)" msgstr "" -#: lib/install.c:141 lib/uninstall.c:179 +#: lib/install.c:141 lib/uninstall.c:193 #, c-format msgid " file: %s action: %s\n" msgstr "" @@ -2466,91 +2466,91 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:358 +#: lib/install.c:355 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:359 +#: lib/install.c:356 msgid " on file " msgstr "" -#: lib/install.c:402 +#: lib/install.c:399 #, fuzzy msgid "installing a source package\n" msgstr "instale pacote" # , c-format -#: lib/install.c:413 +#: lib/install.c:410 #, fuzzy, c-format msgid "cannot create %s: %s" msgstr "Não consegui abrir: %s\n" # , c-format -#: lib/install.c:421 lib/install.c:443 +#: lib/install.c:418 lib/install.c:440 #, fuzzy, c-format msgid "cannot write to %s" msgstr "Não consegui abrir: %s\n" -#: lib/install.c:425 +#: lib/install.c:422 #, c-format msgid "sources in: %s\n" msgstr "" # , c-format -#: lib/install.c:436 +#: lib/install.c:433 #, fuzzy, c-format msgid "cannot create %s" msgstr "Não consegui abrir: %s\n" -#: lib/install.c:447 +#: lib/install.c:444 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:481 lib/install.c:509 +#: lib/install.c:478 lib/install.c:506 #, fuzzy msgid "source package contains no .spec file" msgstr "pesquise o pacote ao qual <arquivo> pertence" -#: lib/install.c:530 +#: lib/install.c:527 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:532 lib/install.c:810 lib/uninstall.c:26 +#: lib/install.c:529 lib/install.c:807 lib/uninstall.c:26 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:622 +#: lib/install.c:619 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:679 +#: lib/install.c:676 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "não foi passado pacote para instalação" -#: lib/install.c:740 +#: lib/install.c:737 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:745 +#: lib/install.c:742 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:770 +#: lib/install.c:767 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:806 +#: lib/install.c:803 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:880 +#: lib/install.c:877 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2559,85 +2559,85 @@ msgstr "" msgid "cannot read header at %d for lookup" msgstr "" -#: lib/macro.c:149 +#: lib/macro.c:151 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: lib/macro.c:243 +#: lib/macro.c:245 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: lib/macro.c:278 +#: lib/macro.c:280 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: lib/macro.c:457 +#: lib/macro.c:459 msgid "Macro %%%s has unterminated body" msgstr "" -#: lib/macro.c:483 +#: lib/macro.c:485 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: lib/macro.c:489 +#: lib/macro.c:491 msgid "Macro %%%s has unterminated opts" msgstr "" -#: lib/macro.c:494 +#: lib/macro.c:496 msgid "Macro %%%s has empty body" msgstr "" -#: lib/macro.c:499 +#: lib/macro.c:501 msgid "Macro %%%s failed to expand" msgstr "" -#: lib/macro.c:524 +#: lib/macro.c:526 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: lib/macro.c:601 +#: lib/macro.c:603 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: lib/macro.c:698 +#: lib/macro.c:700 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: lib/macro.c:870 +#: lib/macro.c:872 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: lib/macro.c:936 lib/macro.c:952 +#: lib/macro.c:938 lib/macro.c:954 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: lib/macro.c:992 +#: lib/macro.c:994 msgid "A %% is followed by an unparseable macro" msgstr "" -#: lib/macro.c:1115 +#: lib/macro.c:1117 #, fuzzy msgid "Macro %%%.*s not found, skipping" msgstr "não foi passado pacote para desinstalação" -#: lib/macro.c:1196 +#: lib/macro.c:1198 msgid "Target buffer overflow" msgstr "" # , c-format -#: lib/macro.c:1343 lib/macro.c:1351 +#: lib/macro.c:1345 lib/macro.c:1353 #, fuzzy, c-format msgid "File %s: %s" msgstr "Não consegui ler o arquivo spec de %s\n" -#: lib/macro.c:1354 +#: lib/macro.c:1356 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -2669,24 +2669,24 @@ msgstr "" msgid "bad file state: %s" msgstr "Não consegui abrir: %s\n" -#: lib/package.c:234 +#: lib/package.c:237 msgid "package is a version one package!\n" msgstr "" -#: lib/package.c:239 +#: lib/package.c:242 msgid "old style source package -- I'll do my best\n" msgstr "" -#: lib/package.c:242 +#: lib/package.c:245 #, c-format msgid "archive offset is %d\n" msgstr "" -#: lib/package.c:252 +#: lib/package.c:256 msgid "old style binary package\n" msgstr "" -#: lib/package.c:298 +#: lib/package.c:316 msgid "" "only packages with major numbers <= 3 are supported by this version of RPM" msgstr "" @@ -2752,204 +2752,204 @@ msgstr "" msgid "error in format: %s\n" msgstr "" -#: lib/query.c:180 +#: lib/query.c:181 msgid "(contains no files)" msgstr "" -#: lib/query.c:233 +#: lib/query.c:238 msgid "normal " msgstr "" -#: lib/query.c:235 +#: lib/query.c:240 msgid "replaced " msgstr "" -#: lib/query.c:237 +#: lib/query.c:242 #, fuzzy msgid "not installed " msgstr "não foi passado pacote para instalação" -#: lib/query.c:239 +#: lib/query.c:244 msgid "net shared " msgstr "" -#: lib/query.c:241 +#: lib/query.c:246 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:245 +#: lib/query.c:250 msgid "(no state) " msgstr "" -#: lib/query.c:261 lib/query.c:291 +#: lib/query.c:267 lib/query.c:308 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:400 +#: lib/query.c:421 #, c-format msgid "record number %u\n" msgstr "" -#: lib/query.c:404 +#: lib/query.c:425 msgid "error: could not read database record\n" msgstr "" -#: lib/query.c:442 +#: lib/query.c:463 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "Construção falhou.\n" -#: lib/query.c:455 +#: lib/query.c:476 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:464 lib/rpminstall.c:203 +#: lib/query.c:485 lib/rpminstall.c:203 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:467 +#: lib/query.c:488 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:494 +#: lib/query.c:515 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:519 +#: lib/query.c:540 msgid "could not read database record!\n" msgstr "" -#: lib/query.c:530 +#: lib/query.c:551 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:540 +#: lib/query.c:561 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:550 +#: lib/query.c:571 #, fuzzy, c-format msgid "no package triggers %s\n" msgstr "não foram passados pacotes para assinatura" -#: lib/query.c:560 +#: lib/query.c:581 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:575 +#: lib/query.c:596 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:578 +#: lib/query.c:599 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:612 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:594 +#: lib/query.c:615 #, c-format msgid "package record number: %d\n" msgstr "" -#: lib/query.c:597 +#: lib/query.c:618 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:393 +#: lib/query.c:630 lib/rpminstall.c:393 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "não foi passado pacote para instalação" -#: lib/query.c:612 +#: lib/query.c:633 #, c-format msgid "error looking for package %s\n" msgstr "" -#: lib/query.c:634 +#: lib/query.c:655 msgid "rpmQuery: rpmdbOpen() failed\n" msgstr "" -#: lib/query.c:693 +#: lib/query.c:714 #, fuzzy msgid "query package owning file" msgstr "pesquise o pacote ao qual <arquivo> pertence" -#: lib/query.c:695 +#: lib/query.c:716 #, fuzzy msgid "query packages in group" msgstr "não foi passado pacote para desinstalação" -#: lib/query.c:697 +#: lib/query.c:718 #, fuzzy msgid "query a package file" msgstr "pesquise todos os pacotes" -#: lib/query.c:701 +#: lib/query.c:722 #, fuzzy msgid "query a spec file" msgstr "pesquise todos os pacotes" -#: lib/query.c:703 +#: lib/query.c:724 #, fuzzy msgid "query the pacakges triggered by the package" msgstr "pesquise o pacote ao qual <arquivo> pertence" -#: lib/query.c:705 +#: lib/query.c:726 #, fuzzy msgid "query the packages which require a capability" msgstr "pesquise pacotes que requerem capacidade <i>" -#: lib/query.c:707 +#: lib/query.c:728 #, fuzzy msgid "query the packages which provide a capability" msgstr "pesquise pacotes que fornecem a capacidade <i>" -#: lib/query.c:746 +#: lib/query.c:767 #, fuzzy msgid "list all configuration files" msgstr "liste somente os arquivos de configuração (implica -l)" -#: lib/query.c:748 +#: lib/query.c:769 #, fuzzy msgid "list all documentation files" msgstr "instale documentação" -#: lib/query.c:750 +#: lib/query.c:771 #, fuzzy msgid "dump basic file information" msgstr "mostre informação do pacote" -#: lib/query.c:752 +#: lib/query.c:773 #, fuzzy msgid "list files in package" msgstr "instale pacote" -#: lib/query.c:756 +#: lib/query.c:777 msgid "use the following query format" msgstr "" -#: lib/query.c:758 +#: lib/query.c:779 msgid "substitute i18n sections from the following catalogue" msgstr "" -#: lib/query.c:761 +#: lib/query.c:782 msgid "display the states of the listed files" msgstr "" -#: lib/query.c:763 +#: lib/query.c:784 #, fuzzy msgid "display a verbose file listing" msgstr "mostre a lista de arquivos do pacote" @@ -3026,15 +3026,17 @@ msgstr "Não consegui abrir: %s\n" msgid "makeTempFile failed\n" msgstr "Construção falhou.\n" +# , c-format #: lib/rpmchecksig.c:74 -#, c-format -msgid "%s: fdWrite failed: %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%s: Fwrite failed: %s\n" +msgstr "Não consegui abrir: %s\n" +# , c-format #: lib/rpmchecksig.c:80 -#, c-format -msgid "%s: fdRead failed: %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%s: Fread failed: %s\n" +msgstr "Não consegui abrir: %s\n" #: lib/rpmchecksig.c:113 lib/rpmchecksig.c:242 #, c-format @@ -3130,78 +3132,78 @@ msgid "" "database" msgstr "" -#: lib/rpmdb.c:439 +#: lib/rpmdb.c:468 #, c-format msgid "package %s not listed in %s" msgstr "" -#: lib/rpmdb.c:450 +#: lib/rpmdb.c:479 #, fuzzy, c-format msgid "package %s not found in %s" msgstr "não foi passado pacote para desinstalação" -#: lib/rpmdb.c:475 lib/uninstall.c:85 +#: lib/rpmdb.c:503 lib/uninstall.c:85 #, fuzzy, c-format msgid "cannot read header at %d for uninstall" msgstr "não foi passado pacote para desinstalação" -#: lib/rpmdb.c:483 +#: lib/rpmdb.c:511 msgid "package has no name" msgstr "" -#: lib/rpmdb.c:485 +#: lib/rpmdb.c:513 msgid "removing name index\n" msgstr "" -#: lib/rpmdb.c:490 +#: lib/rpmdb.c:518 #, fuzzy msgid "package has no group\n" msgstr "não foi passado pacote para desinstalação" -#: lib/rpmdb.c:492 +#: lib/rpmdb.c:520 msgid "removing group index\n" msgstr "" -#: lib/rpmdb.c:499 +#: lib/rpmdb.c:527 #, c-format msgid "removing provides index for %s\n" msgstr "" -#: lib/rpmdb.c:514 +#: lib/rpmdb.c:542 #, c-format msgid "removing requiredby index for %s\n" msgstr "" -#: lib/rpmdb.c:526 +#: lib/rpmdb.c:554 #, c-format msgid "removing trigger index for %s\n" msgstr "" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:565 #, c-format msgid "removing conflict index for %s\n" msgstr "" -#: lib/rpmdb.c:554 +#: lib/rpmdb.c:576 #, c-format msgid "removing file index for %s\n" msgstr "" -#: lib/rpmdb.c:563 +#: lib/rpmdb.c:585 #, fuzzy msgid "package has no files\n" msgstr "não foi passado pacote para instalação" -#: lib/rpmdb.c:645 +#: lib/rpmdb.c:667 msgid "cannot allocate space for database" msgstr "" -#: lib/rpmdb.c:711 +#: lib/rpmdb.c:726 #, c-format msgid "cannot read header at %d for update" msgstr "" -#: lib/rpmdb.c:720 +#: lib/rpmdb.c:735 msgid "header changed size!" msgstr "" @@ -3376,38 +3378,38 @@ msgstr "Não consegui ler o arquivo spec de %s\n" msgid "missing ':' at %s:%d" msgstr "" -#: lib/rpmrc.c:655 lib/rpmrc.c:729 +#: lib/rpmrc.c:655 lib/rpmrc.c:730 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" # , c-format -#: lib/rpmrc.c:672 lib/rpmrc.c:694 +#: lib/rpmrc.c:672 lib/rpmrc.c:695 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "Não consegui abrir: %s\n" -#: lib/rpmrc.c:680 +#: lib/rpmrc.c:681 #, c-format msgid "cannot open %s at %s:%d" msgstr "" -#: lib/rpmrc.c:721 +#: lib/rpmrc.c:722 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:788 +#: lib/rpmrc.c:789 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1147 +#: lib/rpmrc.c:1149 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1148 +#: lib/rpmrc.c:1150 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3555,10 +3557,18 @@ msgstr "" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "" -#: lib/transaction.c:363 -#, c-format -msgid "relocating %s to %s\n" -msgstr "" +# "Project-Id-Version: rpm-2.5.3\n" +# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n" +# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n" +# "Language-Team: Portuguese <pt@li.org>\n" +# "MIME-Version: 1.0\n" +# "Content-Type: text/plain; charset=ISO-8859-1\n" +# "Content-Transfer-Encoding: 8-bit\n" +# , c-format +#: lib/transaction.c:386 +#, fuzzy, c-format +msgid "excluding file %s%s\n" +msgstr "RPM versão %s\n" # "Project-Id-Version: rpm-2.5.3\n" # "PO-Revision-Date: 1997-09-11 14:00 MET DST\n" @@ -3568,12 +3578,23 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/transaction.c:370 +#: lib/transaction.c:412 lib/transaction.c:496 #, fuzzy, c-format -msgid "excluding %s\n" +msgid "excluding directory %s\n" msgstr "RPM versão %s\n" +#: lib/transaction.c:417 +#, c-format +msgid "relocating %s to %s\n" +msgstr "" + +# , c-format #: lib/transaction.c:489 +#, fuzzy, c-format +msgid "relocating directory %s to %s\n" +msgstr "Não consegui abrir: %s\n" + +#: lib/transaction.c:637 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3603,15 +3624,15 @@ msgstr "não foi passado pacote para desinstalação" msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:191 +#: lib/uninstall.c:207 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:204 +#: lib/uninstall.c:220 msgid "removing database entry\n" msgstr "" -#: lib/uninstall.c:365 +#: lib/uninstall.c:381 msgid "execution of script failed" msgstr "" @@ -3646,25 +3667,25 @@ msgstr "Não consegui abrir o pipe tar: %s\n" msgid "don't verify files in package" msgstr "instale pacote" -#: lib/verify.c:208 +#: lib/verify.c:213 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:226 +#: lib/verify.c:231 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:259 +#: lib/verify.c:266 #, c-format msgid "missing %s\n" msgstr "" -#: lib/verify.c:321 +#: lib/verify.c:328 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: lib/verify.c:369 +#: lib/verify.c:376 msgid "rpmVerify: rpmdbOpen() failed\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 7bb0b6884..5f7126f03 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-10-21 16:34-0400\n" +"POT-Creation-Date: 1999-10-27 18:55-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" @@ -1224,7 +1224,7 @@ msgstr "" msgid "error reading header from package\n" msgstr "" -#: build/build.c:83 build/pack.c:266 +#: build/build.c:83 build/pack.c:267 msgid "Unable to open temp file" msgstr "" @@ -1484,46 +1484,46 @@ msgstr "" msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:214 +#: build/pack.c:215 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:220 +#: build/pack.c:221 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:277 +#: build/pack.c:278 msgid "Bad CSA data" msgstr "" -#: build/pack.c:308 +#: build/pack.c:311 #, c-format msgid "Could not open %s\n" msgstr "" -#: build/pack.c:340 build/pack.c:382 +#: build/pack.c:343 build/pack.c:385 #, c-format msgid "Unable to write package: %s" msgstr "" -#: build/pack.c:355 +#: build/pack.c:358 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:372 +#: build/pack.c:375 #, c-format msgid "Unable to read sigtarget: %s" msgstr "" -#: build/pack.c:397 +#: build/pack.c:400 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:414 build/pack.c:438 +#: build/pack.c:416 build/pack.c:439 #, c-format msgid "create archive failed on file %s: %s" msgstr "" @@ -1606,17 +1606,17 @@ msgstr "" msgid "line %d: Bad option %s: %s" msgstr "" -#: build/parseDescription.c:60 build/parseFiles.c:54 build/parseScript.c:182 +#: build/parseDescription.c:59 build/parseFiles.c:53 build/parseScript.c:181 #, c-format msgid "line %d: Too many names: %s" msgstr "" -#: build/parseDescription.c:70 build/parseFiles.c:64 build/parseScript.c:192 +#: build/parseDescription.c:69 build/parseFiles.c:63 build/parseScript.c:191 #, c-format msgid "line %d: Package does not exist: %s" msgstr "" -#: build/parseDescription.c:82 +#: build/parseDescription.c:81 #, c-format msgid "line %d: Second description" msgstr "" @@ -1625,7 +1625,7 @@ msgstr "" msgid "line %d: Error parsing %%files: %s" msgstr "" -#: build/parseFiles.c:72 +#: build/parseFiles.c:71 msgid "line %d: Second %%files list" msgstr "" @@ -1830,7 +1830,7 @@ msgstr "" msgid "line %d: triggers must have --: %s" msgstr "" -#: build/parseScript.c:146 build/parseScript.c:210 +#: build/parseScript.c:146 build/parseScript.c:209 #, c-format msgid "line %d: Error parsing %s: %s" msgstr "" @@ -1840,7 +1840,7 @@ msgstr "" msgid "line %d: script program must begin with '/': %s" msgstr "" -#: build/parseScript.c:201 +#: build/parseScript.c:200 #, c-format msgid "line %d: Second %s" msgstr "" @@ -1850,44 +1850,44 @@ msgstr "" msgid "line %d: %s" msgstr "" -#: build/parseSpec.c:172 +#: build/parseSpec.c:173 #, c-format msgid "Unable to open: %s\n" msgstr "" -#: build/parseSpec.c:184 +#: build/parseSpec.c:185 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:243 +#: build/parseSpec.c:244 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:251 +#: build/parseSpec.c:252 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:262 +#: build/parseSpec.c:263 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:276 build/parseSpec.c:285 +#: build/parseSpec.c:277 build/parseSpec.c:286 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:366 +#: build/parseSpec.c:367 #, c-format msgid "Timecheck value must be an integer: %s" msgstr "" -#: build/parseSpec.c:449 +#: build/parseSpec.c:450 msgid "No buildable architectures" msgstr "" -#: build/parseSpec.c:494 +#: build/parseSpec.c:497 msgid "Package has no %%description: %s" msgstr "" @@ -1911,51 +1911,51 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:385 +#: lib/cpio.c:335 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:391 +#: lib/cpio.c:341 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:582 +#: lib/cpio.c:532 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1044 +#: lib/cpio.c:995 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1047 +#: lib/cpio.c:998 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1048 +#: lib/cpio.c:999 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1066 +#: lib/cpio.c:1017 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1067 +#: lib/cpio.c:1018 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1068 +#: lib/cpio.c:1019 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1069 +#: lib/cpio.c:1020 msgid "Internal error" msgstr "" -#: lib/cpio.c:1078 +#: lib/cpio.c:1029 msgid " failed - " msgstr "" @@ -2063,7 +2063,7 @@ msgstr "" msgid "loop in prerequisite chain: %s" msgstr "" -#: lib/falloc.c:174 +#: lib/falloc.c:157 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2256,86 +2256,86 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:358 +#: lib/install.c:355 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:359 +#: lib/install.c:356 msgid " on file " msgstr "" -#: lib/install.c:402 +#: lib/install.c:399 msgid "installing a source package\n" msgstr "" -#: lib/install.c:413 +#: lib/install.c:410 #, c-format msgid "cannot create %s: %s" msgstr "" -#: lib/install.c:421 lib/install.c:443 +#: lib/install.c:418 lib/install.c:440 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:425 +#: lib/install.c:422 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:436 +#: lib/install.c:433 #, c-format msgid "cannot create %s" msgstr "" -#: lib/install.c:447 +#: lib/install.c:444 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:481 lib/install.c:509 +#: lib/install.c:478 lib/install.c:506 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:530 +#: lib/install.c:527 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:532 lib/install.c:810 lib/uninstall.c:26 +#: lib/install.c:529 lib/install.c:807 lib/uninstall.c:26 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:622 +#: lib/install.c:619 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:679 +#: lib/install.c:676 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:740 +#: lib/install.c:737 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:745 +#: lib/install.c:742 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:770 +#: lib/install.c:767 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:806 +#: lib/install.c:803 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:880 +#: lib/install.c:877 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2344,83 +2344,83 @@ msgstr "" msgid "cannot read header at %d for lookup" msgstr "" -#: lib/macro.c:149 +#: lib/macro.c:151 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: lib/macro.c:243 +#: lib/macro.c:245 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: lib/macro.c:278 +#: lib/macro.c:280 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: lib/macro.c:457 +#: lib/macro.c:459 msgid "Macro %%%s has unterminated body" msgstr "" -#: lib/macro.c:483 +#: lib/macro.c:485 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: lib/macro.c:489 +#: lib/macro.c:491 msgid "Macro %%%s has unterminated opts" msgstr "" -#: lib/macro.c:494 +#: lib/macro.c:496 msgid "Macro %%%s has empty body" msgstr "" -#: lib/macro.c:499 +#: lib/macro.c:501 msgid "Macro %%%s failed to expand" msgstr "" -#: lib/macro.c:524 +#: lib/macro.c:526 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: lib/macro.c:601 +#: lib/macro.c:603 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: lib/macro.c:698 +#: lib/macro.c:700 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: lib/macro.c:870 +#: lib/macro.c:872 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: lib/macro.c:936 lib/macro.c:952 +#: lib/macro.c:938 lib/macro.c:954 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: lib/macro.c:992 +#: lib/macro.c:994 msgid "A %% is followed by an unparseable macro" msgstr "" -#: lib/macro.c:1115 +#: lib/macro.c:1117 msgid "Macro %%%.*s not found, skipping" msgstr "" -#: lib/macro.c:1196 +#: lib/macro.c:1198 msgid "Target buffer overflow" msgstr "" -#: lib/macro.c:1343 lib/macro.c:1351 +#: lib/macro.c:1345 lib/macro.c:1353 #, c-format msgid "File %s: %s" msgstr "" -#: lib/macro.c:1354 +#: lib/macro.c:1356 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -2451,24 +2451,24 @@ msgstr "" msgid "bad file state: %s" msgstr "" -#: lib/package.c:236 +#: lib/package.c:237 msgid "package is a version one package!\n" msgstr "" -#: lib/package.c:241 +#: lib/package.c:242 msgid "old style source package -- I'll do my best\n" msgstr "" -#: lib/package.c:244 +#: lib/package.c:245 #, c-format msgid "archive offset is %d\n" msgstr "" -#: lib/package.c:254 +#: lib/package.c:256 msgid "old style binary package\n" msgstr "" -#: lib/package.c:314 +#: lib/package.c:316 msgid "" "only packages with major numbers <= 3 are supported by this version of RPM" msgstr "" @@ -2794,12 +2794,12 @@ msgstr "" #: lib/rpmchecksig.c:74 #, c-format -msgid "%s: fdWrite failed: %s\n" +msgid "%s: Fwrite failed: %s\n" msgstr "" #: lib/rpmchecksig.c:80 #, c-format -msgid "%s: fdRead failed: %s\n" +msgid "%s: Fread failed: %s\n" msgstr "" #: lib/rpmchecksig.c:113 lib/rpmchecksig.c:242 @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 1999-10-04 16:05-0400\n" +"POT-Creation-Date: 1999-10-27 12:52-0400\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" @@ -1253,35 +1253,35 @@ msgstr "ÎÅ ÚÁÄÁÎÙ ĞÁËÅÔÙ ÄÌÑ ĞÏÄĞÉÓÉ" msgid "no packages files given for rebuild" msgstr "ÎÅ ÚÁÄÁÎÙ ĞÁËÅÔÙ ÄÌÑ ĞÅÒÅÓÂÏÒËÉ" -#: rpm.c:1230 +#: rpm.c:1234 msgid "no spec files given for build" msgstr "ÎÅ ÚÁÄÁÎ spec-ÆÁÊÌ ÄÌÑ ÓÂÏÒËÉ ĞÁËÅÔÁ" -#: rpm.c:1232 +#: rpm.c:1236 msgid "no tar files given for build" msgstr "ÎÅ ÚÁÄÁÎÙ tar-ÆÁÊÌÙ ÄÌÑ ÓÂÏÒËÉ ĞÁËÅÔÁ" -#: rpm.c:1244 +#: rpm.c:1248 msgid "no packages given for uninstall" msgstr "ÎÅ ÚÁÄÁÎÙ ĞÁËÅÔÙ ÄÌÑ ÕÄÁÌÅÎÉÑ" -#: rpm.c:1294 +#: rpm.c:1298 msgid "no packages given for install" msgstr "ÎÅ ÚÁÄÁÎÙ ĞÁËÅÔÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ" -#: rpm.c:1317 +#: rpm.c:1321 msgid "extra arguments given for query of all packages" msgstr "× ÚÁĞÒÏÓÅ ËÏ ×ÓÅÍ ĞÁËÅÔÁÍ ÚÁÄÁÎÙ ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ" -#: rpm.c:1322 +#: rpm.c:1326 msgid "no arguments given for query" msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁĞÒÏÓÁ" -#: rpm.c:1339 +#: rpm.c:1343 msgid "extra arguments given for verify of all packages" msgstr "× ÚÁĞÒÏÓÅ ×ÅÒÉÆÉËÁÃÉÉ ×ÓÅÈ ĞÁËÅÔÏ× ÚÁÄÁÎÙ ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ" -#: rpm.c:1343 +#: rpm.c:1347 msgid "no arguments given for verify" msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÄÌÑ ×ÅÒÉÆÉËÁÃÉÉ" @@ -1293,7 +1293,7 @@ msgstr "ÚÁÄÁÎÎÙÊ ÁÒÇÕÍÅÎÔ - ÎÅ ĞÁËÅÔ RPM\n" msgid "error reading header from package\n" msgstr "ÏÛÉÂËÁ ŞÔÅÎÉÑ ÈÅÄÅÒÁ ÉÚ ĞÁËÅÔÁ\n" -#: build/build.c:83 build/pack.c:263 +#: build/build.c:83 build/pack.c:267 msgid "Unable to open temp file" msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ" @@ -1312,59 +1312,59 @@ msgstr "éÓĞÏÌÎÉÔØ %s ÎÅ ÕÄÁÌÏÓØ (%s)" msgid "Bad exit status from %s (%s)" msgstr "îÅ×ÅÒÎÙÊ ËÏÄ ×ÏÚ×ÒÁÔÁ ÉÚ %s (%s)" -#: build/expression.c:208 +#: build/expression.c:207 #, fuzzy msgid "syntax error while parsing ==" msgstr "ÓÉÎÔÁËÓÉŞÅÓËÁÑ ÏÛÉÂËÁ × ×ÙÒÁÖÅÎÉÉ" -#: build/expression.c:238 +#: build/expression.c:237 #, fuzzy msgid "syntax error while parsing &&" msgstr "ÓÉÎÔÁËÓÉŞÅÓËÁÑ ÏÛÉÂËÁ × ×ÙÒÁÖÅÎÉÉ" -#: build/expression.c:247 +#: build/expression.c:246 #, fuzzy msgid "syntax error while parsing ||" msgstr "ÓÉÎÔÁËÓÉŞÅÓËÁÑ ÏÛÉÂËÁ × ×ÙÒÁÖÅÎÉÉ" -#: build/expression.c:289 +#: build/expression.c:288 msgid "parse error in expression" msgstr "ÏÛÉÂËÁ ÒÁÚÂÏÒÁ ×ÙÒÁÖÅÎÉÑ" -#: build/expression.c:319 +#: build/expression.c:318 msgid "unmatched (" msgstr "ÎÅÚÁËÒÙÔÁÑ (" -#: build/expression.c:337 +#: build/expression.c:336 msgid "undefined identifier" msgstr "ÎÅÏĞÒÅÄÅÌÅÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ" -#: build/expression.c:356 +#: build/expression.c:355 msgid "- only on numbers" msgstr "- ÔÏÌØËÏ ÄÌÑ ŞÉÓÅÌ" -#: build/expression.c:372 +#: build/expression.c:371 msgid "! only on numbers" msgstr "! ÔÏÌØËÏ ÄÌÑ ŞÉÓÅÌ" -#: build/expression.c:411 build/expression.c:456 build/expression.c:513 -#: build/expression.c:600 +#: build/expression.c:410 build/expression.c:455 build/expression.c:512 +#: build/expression.c:599 msgid "types must match" msgstr "ÔÉĞÙ ÄÏÌÖÎÙ ÓÏ×ĞÁÄÁÔØ" -#: build/expression.c:424 +#: build/expression.c:423 msgid "* / not suported for strings" msgstr "* / ÎÅ ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÄÌÑ ÓÔÒÏË" -#: build/expression.c:472 +#: build/expression.c:471 msgid "- not suported for strings" msgstr "- ÎÅ ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÄÌÑ ÓÔÒÏË" -#: build/expression.c:613 +#: build/expression.c:612 msgid "&& and || not suported for strings" msgstr "&& É || ÎÅ ĞÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÄÌÑ ÓÔÒÏË" -#: build/expression.c:644 build/expression.c:689 +#: build/expression.c:645 build/expression.c:692 msgid "syntax error in expression" msgstr "ÓÉÎÔÁËÓÉŞÅÓËÁÑ ÏÛÉÂËÁ × ×ÙÒÁÖÅÎÉÉ" @@ -1444,81 +1444,81 @@ msgstr "îÅÌØÚÑ ÓÍÅÛÉ×ÁÔØ ÓĞÅÃ. %%doc Ó ÄÒÕÇÉÍÉ ÆÏÒÍÁÍÉ: %s" msgid "File listed twice: %s" msgstr "æÁÊÌ ÕËÁÚÁÎ Ä×ÁÖÄÙ: %s" -#: build/files.c:951 +#: build/files.c:953 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "æÁÊÌ ÎÅ ÏÔ×ÅŞÁÅÔ ĞÒÅÆÉËÓÕ (%s): %s" -#: build/files.c:961 +#: build/files.c:963 #, c-format msgid "File not found: %s" msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s" -#: build/files.c:1004 +#: build/files.c:1006 #, c-format msgid "Bad owner/group: %s\n" msgstr "îÅ×ÅÒÎÁÑ ĞÁÒÁ ÈÏÚÑÉÎ/ÇÒÕĞĞÁ: %s\n" -#: build/files.c:1018 +#: build/files.c:1020 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "æÁÊÌ %4d: 0%o %s.%s\t %s\n" -#: build/files.c:1088 +#: build/files.c:1090 #, c-format msgid "File needs leading \"/\": %s" msgstr "æÁÊÌ ÄÏÌÖÅÎ ÎÁŞÉÎÁÔØÓÑ Ó \"/\": %s" -#: build/files.c:1132 +#: build/files.c:1134 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s" -#: build/files.c:1174 +#: build/files.c:1176 msgid "Could not open %%files file: %s" msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ %%files: %s" -#: build/files.c:1181 build/pack.c:485 +#: build/files.c:1183 build/pack.c:488 #, c-format msgid "line: %s" msgstr "ÓÔÒÏËÁ: %s" -#: build/files.c:1508 build/parsePrep.c:29 +#: build/files.c:1510 build/parsePrep.c:29 #, c-format msgid "Bad owner/group: %s" msgstr "îÅ×ÅÒÎÁÑ ĞÁÒÁ ÈÏÚÑÉÎ/ÇÒÕĞĞÁ: %s" -#: build/files.c:1562 +#: build/files.c:1564 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "îÅ ÍÏÇÕ ÉÓĞÏÌÎÉÔØ %s" -#: build/files.c:1567 +#: build/files.c:1569 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "îÅ ÍÏÇÕ ÆÏÒËÎÕÔØ %s" -#: build/files.c:1649 +#: build/files.c:1651 #, c-format msgid "%s failed" msgstr "%s ÎÅ ÕÄÁÌÏÓØ" -#: build/files.c:1653 +#: build/files.c:1655 #, c-format msgid "failed to write all data to %s" msgstr "ÚÁĞÉÓØ ×ÓÅÈ ÄÁÎÎÙÈ × %s ÎÅ ÕÄÁÌÁÓØ" -#: build/files.c:1742 +#: build/files.c:1744 #, fuzzy, c-format msgid "Finding %s: (using %s)...\n" msgstr "ïĞÒÅÄÅÌÑÀ ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ...\n" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1772 build/files.c:1781 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "ïÛÉÂËÁ ÏĞÒÅÄÅÌÅÎÉÑ ÓÅÒ×ÉÓÏ×, ĞÒÅÄÏÓÔÁ×ÌÑÅÍÙÈ ĞÁËÅÔÏÍ" -#: build/files.c:1885 +#: build/files.c:1887 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "ïÂÒÁÂÁÔÙ×ÁÀ ÆÁÊÌÙ: %s\n" @@ -1536,106 +1536,106 @@ msgstr "RPMERR_INTERNAL: äÏÓÔÉÇÎÕÔ ĞÒÅÄÅÌ × getGname()\n" msgid "Could not canonicalize hostname: %s\n" msgstr "îÅ ÍÏÇÕ ËÁÎÏÎÉÚÉÒÏ×ÁÔØ ÉÍÑ ÈÏÓÔÁ: %s\n" -#: build/pack.c:131 +#: build/pack.c:132 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "îÅ ÍÏÇÕ ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÉÍÑ ÆÁÊÌÁ ÄÌÑ ĞÁËÅÔÁ %s: %s\n" -#: build/pack.c:148 +#: build/pack.c:149 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s" -#: build/pack.c:183 +#: build/pack.c:184 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: ÏÔËÒÙÔÉÅ %s: %s\n" -#: build/pack.c:193 +#: build/pack.c:194 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: ŞÔÅÎÉÅ %s: %s\n" -#: build/pack.c:213 +#: build/pack.c:215 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s - ÎÅ ĞÁËÅÔ RPM\n" -#: build/pack.c:219 +#: build/pack.c:221 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: ŞÉÔÁÀ ÈÅÄÅÒ ÉÚ %s\n" -#: build/pack.c:274 +#: build/pack.c:278 msgid "Bad CSA data" msgstr "îÅ×ÅÒÎÙÅ ÄÁÎÎÙÅ CSA" -#: build/pack.c:305 +#: build/pack.c:311 #, c-format msgid "Could not open %s\n" msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ %s\n" -#: build/pack.c:337 build/pack.c:379 +#: build/pack.c:343 build/pack.c:385 #, c-format msgid "Unable to write package: %s" msgstr "îÅ ÍÏÇÕ ÚÁĞÉÓÁÔØ ĞÁËÅÔ: %s" -#: build/pack.c:352 +#: build/pack.c:358 #, c-format msgid "Generating signature: %d\n" msgstr "çÅÎÅÒÉÒÕÀ ĞÏÄĞÉÓØ: %d\n" -#: build/pack.c:369 +#: build/pack.c:375 #, c-format msgid "Unable to read sigtarget: %s" msgstr "îÅ ÍÏÇÕ ĞÒÏŞÉÔÁÔØ ÃÅÌØ ĞÏÄĞÉÓÉ: %s" -#: build/pack.c:394 +#: build/pack.c:400 #, c-format msgid "Wrote: %s\n" msgstr "úÁĞÉÓÁÎ: %s\n" -#: build/pack.c:411 build/pack.c:435 +#: build/pack.c:416 build/pack.c:439 #, c-format msgid "create archive failed on file %s: %s" msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÁÒÈÉ×Á ÎÁ ÆÁÊÌÅ %s: %s" -#: build/pack.c:455 +#: build/pack.c:458 #, c-format msgid "cpio_copy write failed: %s" msgstr "ÎÅÕÄÁŞÁ ÚÁĞÉÓÉ cpio_copy: %s" -#: build/pack.c:462 +#: build/pack.c:465 #, c-format msgid "cpio_copy read failed: %s" msgstr "ÎÅÕÄÁŞÁ ŞÔÅÎÉÑ cpio_copy: %s" -#: build/pack.c:541 +#: build/pack.c:544 #, c-format msgid "Could not open PreIn file: %s" msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ PreIn: %s" -#: build/pack.c:548 +#: build/pack.c:551 #, c-format msgid "Could not open PreUn file: %s" msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ PreUn: %s" -#: build/pack.c:555 +#: build/pack.c:558 #, c-format msgid "Could not open PostIn file: %s" msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ PostIn: %s" -#: build/pack.c:562 +#: build/pack.c:565 #, c-format msgid "Could not open PostUn file: %s" msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ PostUn: %s" -#: build/pack.c:570 +#: build/pack.c:573 #, c-format msgid "Could not open VerifyScript file: %s" msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ VerifyScript: %s" -#: build/pack.c:586 +#: build/pack.c:589 #, c-format msgid "Could not open Trigger script file: %s" msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ Trigger script: %s" @@ -1678,17 +1678,17 @@ msgstr "ÓÔÒÏËÁ %d: ïÛÉÂËÁ ÒÁÚÂÏÒÁ %%description: %s" msgid "line %d: Bad option %s: %s" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÁÑ ÏĞÃÉÑ %s: %s" -#: build/parseDescription.c:60 build/parseFiles.c:54 build/parseScript.c:182 +#: build/parseDescription.c:59 build/parseFiles.c:53 build/parseScript.c:181 #, c-format msgid "line %d: Too many names: %s" msgstr "ÓÔÒÏËÁ %d: óÌÉÛËÏÍ ÍÎÏÇÏ ÉÍÅÎ: %s" -#: build/parseDescription.c:70 build/parseFiles.c:64 build/parseScript.c:192 +#: build/parseDescription.c:69 build/parseFiles.c:63 build/parseScript.c:191 #, c-format msgid "line %d: Package does not exist: %s" msgstr "ÓÔÒÏËÁ %d: ğÁËÅÔ ÎÅ ÓÕİÅÓÔ×ÕÅÔ: %s" -#: build/parseDescription.c:82 +#: build/parseDescription.c:81 #, c-format msgid "line %d: Second description" msgstr "ÓÔÒÏËÁ %d: ÷ÔÏÒÏÅ ÏĞÉÓÁÎÉÅ" @@ -1697,7 +1697,7 @@ msgstr "ÓÔÒÏËÁ %d: ÷ÔÏÒÏÅ ÏĞÉÓÁÎÉÅ" msgid "line %d: Error parsing %%files: %s" msgstr "ÓÔÒÏËÁ %d: ïÛÉÂËÁ ÒÁÚÂÏÒÁ %%files: %s" -#: build/parseFiles.c:72 +#: build/parseFiles.c:71 msgid "line %d: Second %%files list" msgstr "ÓÔÒÏËÁ %d: ÷ÔÏÒÏÊ ÓĞÉÓÏË %%files" @@ -1792,22 +1792,22 @@ msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ BuildArchitecture: %s" msgid "Internal error: Bogus tag %d" msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: \"ìÅ×ÙÊ\" ÔÜÇ %d" -#: build/parsePreamble.c:657 +#: build/parsePreamble.c:656 #, c-format msgid "Bad package specification: %s" msgstr "îÅ×ÅÒÎÁÑ ÓĞÅÃÉÆÉËÁÃÉÑ ĞÁËÅÔÁ: %s" -#: build/parsePreamble.c:663 +#: build/parsePreamble.c:662 #, c-format msgid "Package already exists: %s" msgstr "ğÁËÅÔ ÕÖÅ ÓÕİÅÓÔ×ÕÅÔ: %s" -#: build/parsePreamble.c:690 +#: build/parsePreamble.c:689 #, c-format msgid "line %d: Unknown tag: %s" msgstr "ÓÔÒÏËÁ %d: îÅÉÚ×ÅÓÔÎÙÊ ÔÜÇ: %s" -#: build/parsePreamble.c:715 +#: build/parsePreamble.c:714 msgid "Spec file can't use BuildRoot" msgstr "æÁÊÌ spec ÎÅ ÍÏÖÅÔ ÉÓĞÏÌØÚÏ×ÁÔØ BuildRoot" @@ -1831,43 +1831,43 @@ msgstr "îÅÔ ÉÓÈÏÄÎÉËÁ ÎÏÍÅÒ %d" msgid "Couldn't download nosource %s: %s" msgstr "îÅ ÍÏÇÕ ĞÏÌÕŞÉÔØ nosource %s: %s" -#: build/parsePrep.c:191 +#: build/parsePrep.c:190 msgid "Error parsing %%setup: %s" msgstr "ïÛÉÂËÁ ÒÁÚÂÏÒÁ %%setup: %s" -#: build/parsePrep.c:206 +#: build/parsePrep.c:205 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %%setup %c: %s" -#: build/parsePrep.c:227 +#: build/parsePrep.c:223 msgid "line %d: Bad %%setup option %s: %s" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÁÑ ÏĞÃÉÑ %%setup %s: %s" -#: build/parsePrep.c:351 +#: build/parsePrep.c:346 msgid "line %d: Need arg to %%patch -b: %s" msgstr "ÓÔÒÏËÁ %d: äÌÑ %%patch -b ÎÕÖÅÎ ÁÒÇÕÍÅÎÔ: %s" -#: build/parsePrep.c:359 +#: build/parsePrep.c:354 msgid "line %d: Need arg to %%patch -z: %s" msgstr "ÓÔÒÏËÁ %d: äÌÑ %%patch -z ÎÕÖÅÎ ÁÒÇÕÍÅÎÔ: %s" -#: build/parsePrep.c:371 +#: build/parsePrep.c:366 msgid "line %d: Need arg to %%patch -p: %s" msgstr "ÓÔÒÏËÁ %d: äÌÑ %%patch -p ÎÕÖÅÎ ÁÒÇÕÍÅÎÔ: %s" -#: build/parsePrep.c:377 +#: build/parsePrep.c:372 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %%patch -p: %s" -#: build/parsePrep.c:384 +#: build/parsePrep.c:379 msgid "Too many patches!" msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ĞÁÔŞÅÊ!" -#: build/parsePrep.c:388 +#: build/parsePrep.c:383 msgid "line %d: Bad arg to %%patch: %s" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %%patch: %s" -#: build/parsePrep.c:424 +#: build/parsePrep.c:419 msgid "line %d: second %%prep" msgstr "ÓÔÒÏËÁ %d: ÷ÔÏÒÏÊ %%prep" @@ -1902,7 +1902,7 @@ msgstr "ÓÔÒÏËÁ %d: ÷ %s ÔÒÅÂÕÅÔÓÑ ×ÅÒÓÉÑ: %s" msgid "line %d: triggers must have --: %s" msgstr "ÓÔÒÏËÁ %d: ôÒÉÇÇÅÒÙ ÄÏÌÖÎÙ ÓÏÄÅÒÖÁÔØ --: %s" -#: build/parseScript.c:146 build/parseScript.c:210 +#: build/parseScript.c:146 build/parseScript.c:209 #, c-format msgid "line %d: Error parsing %s: %s" msgstr "ÓÔÒÏËÁ %d: ïÛÉÂËÁ ÒÁÚÂÏÒÁ %s: %s" @@ -1912,7 +1912,7 @@ msgstr "ÓÔÒÏËÁ %d: ïÛÉÂËÁ ÒÁÚÂÏÒÁ %s: %s" msgid "line %d: script program must begin with '/': %s" msgstr "ÓÔÒÏËÁ %d: ğÒÏÇÒÁÍÍÙ × ÓËÒÉĞÔÁÈ ÄÏÌÖÎÙ ÎÁŞÉÎÁÔØÓÑ Ó '/': %s" -#: build/parseScript.c:201 +#: build/parseScript.c:200 #, c-format msgid "line %d: Second %s" msgstr "ÓÔÒÏËÁ %d: ÷ÔÏÒÏÅ %s" @@ -1922,44 +1922,44 @@ msgstr "ÓÔÒÏËÁ %d: ÷ÔÏÒÏÅ %s" msgid "line %d: %s" msgstr "ÓÔÒÏËÁ %d: %s" -#: build/parseSpec.c:172 +#: build/parseSpec.c:173 #, c-format msgid "Unable to open: %s\n" msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ %s\n" -#: build/parseSpec.c:184 +#: build/parseSpec.c:185 msgid "Unclosed %%if" msgstr "îÅÚÁËÒÙÔÙÊ %%if" -#: build/parseSpec.c:243 +#: build/parseSpec.c:244 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:251 +#: build/parseSpec.c:252 msgid "%s:%d: Got a %%else with no if" msgstr "%s:%d: îÁÊÄÅÎ %%else ÂÅÚ if" #. Got an end with no %if ! -#: build/parseSpec.c:262 +#: build/parseSpec.c:263 msgid "%s:%d: Got a %%endif with no if" msgstr "%s:%d: îÁÊÄÅÎ %%endif ÂÅÚ if" -#: build/parseSpec.c:276 build/parseSpec.c:285 +#: build/parseSpec.c:277 build/parseSpec.c:286 msgid "malformed %%include statement" msgstr "ÎÅ×ÅÒÎÏÅ ÏÂßÑ×ÌÅÎÉÅ %%include" -#: build/parseSpec.c:366 +#: build/parseSpec.c:367 #, c-format msgid "Timecheck value must be an integer: %s" msgstr "úÎÁŞÅÎÉÅ Timecheck ÄÏÌÖÎÏ ÂÙÔØ ÃÅÌÙÍ: %s" -#: build/parseSpec.c:449 +#: build/parseSpec.c:450 msgid "No buildable architectures" msgstr "îÅÔ ÁÒÈÉÔÅËÔÕÒ, ËÏÔÏÒÙÅ ÍÏÖÎÏ ĞÏÓÔÒÏÉÔØ" -#: build/parseSpec.c:494 +#: build/parseSpec.c:497 msgid "Package has no %%description: %s" msgstr "ğÁËÅÔ ÎÅ ÉÍÅÅÔ %%description: %s" @@ -1983,51 +1983,51 @@ msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÏÅ ŞÉÓÌÏ no%s: %d" msgid "line %d: Bad %s number: %s\n" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÏÅ ŞÉÓÌÏ %s: %s\n" -#: lib/cpio.c:385 +#: lib/cpio.c:335 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "ÎÅ ÍÏÇÕ ĞÅÒÅÉÍÅÎÏ×ÁÔØ %s × %s: %s\n" -#: lib/cpio.c:391 +#: lib/cpio.c:341 #, c-format msgid "can't unlink %s: %s\n" msgstr "ÎÅ ÍÏÇÕ ÕÄÁÌÉÔØ %s: %s\n" -#: lib/cpio.c:582 +#: lib/cpio.c:532 #, c-format msgid "getNextHeader: %s\n" msgstr "getNextHeader: %s\n" -#: lib/cpio.c:1044 +#: lib/cpio.c:995 #, c-format msgid "(error 0x%x)" msgstr "(ÏÛÉÂËÁ 0x%x)" -#: lib/cpio.c:1047 +#: lib/cpio.c:998 msgid "Bad magic" msgstr "îÅ×ÅÒÎÙÊ magic" -#: lib/cpio.c:1048 +#: lib/cpio.c:999 msgid "Bad/unreadable header" msgstr "îÅ×ÅÒÎÙÊ/ÎÅŞÉÔÁÅÍÙÊ ÚÁÇÏÌÏ×ÏË" -#: lib/cpio.c:1066 +#: lib/cpio.c:1017 msgid "Header size too big" msgstr "úÁÇÏÌÏ×ÏË ÓÌÉÛËÏÍ ×ÅÌÉË" -#: lib/cpio.c:1067 +#: lib/cpio.c:1018 msgid "Unknown file type" msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÔÉĞ ÆÁÊÌÁ" -#: lib/cpio.c:1068 +#: lib/cpio.c:1019 msgid "Missing hard link" msgstr "ïÔÓÕÔÓÔ×ÕÅÔ ÖÅÓÔËÁÑ ÓÓÙÌËÁ" -#: lib/cpio.c:1069 +#: lib/cpio.c:1020 msgid "Internal error" msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ" -#: lib/cpio.c:1078 +#: lib/cpio.c:1029 msgid " failed - " msgstr "ÎÅ ÕÄÁÌÏÓØ - " @@ -2052,90 +2052,90 @@ msgid "error removing record %s into %s" msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ÚÁĞÉÓÉ %s ÉÚ %s" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:339 +#: lib/depends.c:404 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:368 +#: lib/depends.c:433 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:460 +#: lib/depends.c:525 msgid "dbrecMatchesDepFlags() failed to read header" msgstr "ÏÛÉÂËÁ dbrecMatchesDepFlags() ĞÒÉ ŞÔÅÎÉÉ ÈÅÄÅÒÁ" -#: lib/depends.c:695 +#: lib/depends.c:760 +#, c-format +msgid "%s: %s satisfied by added file list.\n" +msgstr "" + +#: lib/depends.c:799 #, fuzzy, c-format msgid "%s: %s satisfied by added package.\n" msgstr "ÆÁÊÌ %s ÎÅ ĞÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ĞÁËÅÔÏ×\n" -#: lib/depends.c:712 +#: lib/depends.c:816 #, c-format msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:717 -#, c-format -msgid "%s: %s satisfied by added file list.\n" -msgstr "" - -#: lib/depends.c:747 +#: lib/depends.c:847 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:775 +#: lib/depends.c:875 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:797 +#: lib/depends.c:897 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:819 +#: lib/depends.c:919 #, fuzzy, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "ÆÁÊÌ %s ÎÅ ĞÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ĞÁËÅÔÏ×\n" -#: lib/depends.c:832 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:942 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:890 +#: lib/depends.c:990 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ %s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" #. conflicts exist. -#: lib/depends.c:952 +#: lib/depends.c:1052 #, c-format msgid "package %s conflicts: %s\n" msgstr "ĞÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n" -#: lib/depends.c:1007 lib/depends.c:1311 +#: lib/depends.c:1107 lib/depends.c:1415 #, c-format msgid "cannot read header at %d for dependency check" msgstr "ÎÅ ÍÏÇÕ ĞÒÏŞÅÓÔØ ÈÅÄÅÒ × %d ÄÌÑ ĞÒÏ×ÅÒËÉ ÚÁ×ÉÓÉÍÏÓÔÅÊ" -#: lib/depends.c:1102 +#: lib/depends.c:1202 #, c-format msgid "loop in prerequisite chain: %s" msgstr "ÚÁÍËÎÕÔÙÊ ÃÉËÌ × ÃÅĞÏŞËÅ ÔÒÅÂÏ×ÁÎÉÊ ÄÌÑ ÕÓÔÁÎÏ×ËÉ: %s" -#: lib/falloc.c:160 +#: lib/falloc.c:157 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2145,8 +2145,8 @@ msgid "" "if \"rpm --rebuilddb\" fails to correct the problem.\n" msgstr "" -#: lib/formats.c:66 lib/formats.c:84 lib/formats.c:105 lib/formats.c:138 -#: lib/header.c:2122 lib/header.c:2139 lib/header.c:2159 +#: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141 +#: lib/header.c:2138 lib/header.c:2155 lib/header.c:2175 msgid "(not a number)" msgstr "(ÎÅ ŞÉÓÌÏ)" @@ -2241,73 +2241,73 @@ msgstr "ôÉĞ ÄÁÎÎÙÈ %d ÎÅ ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n" msgid "Data type %d not supprted\n" msgstr "ôÉĞ ÄÁÎÎÙÈ %d ÎÅ ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n" -#: lib/header.c:1119 +#: lib/header.c:1120 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "îÅ×ÅÒÎÏÅ ŞÉÓÌÏ ÄÌÑ headerAddEntry(): %d\n" -#: lib/header.c:1520 +#: lib/header.c:1529 #, c-format msgid "missing { after %" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"{\" ĞÏÓÌÅ \"%\"" -#: lib/header.c:1548 +#: lib/header.c:1557 msgid "missing } after %{" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"}\" ĞÏÓÌÅ \"%{\"" -#: lib/header.c:1560 +#: lib/header.c:1569 msgid "empty tag format" msgstr "ĞÕÓÔÏÊ ÆÏÒÍÁÔ ÔÜÇÁ" -#: lib/header.c:1570 +#: lib/header.c:1579 msgid "empty tag name" msgstr "ĞÕÓÔÏÅ ÉÍÑ ÔÜÇÁ" -#: lib/header.c:1585 +#: lib/header.c:1594 msgid "unknown tag" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÜÇ" -#: lib/header.c:1611 +#: lib/header.c:1620 msgid "] expected at end of array" msgstr "× ËÏÎÃÅ ÍÁÓÓÉ×Á ÏÖÉÄÁÌÁÓØ \"]\"" -#: lib/header.c:1627 +#: lib/header.c:1636 msgid "unexpected ]" msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"]\"" -#: lib/header.c:1629 +#: lib/header.c:1638 msgid "unexpected }" msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"}\"" -#: lib/header.c:1682 +#: lib/header.c:1692 msgid "? expected in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÓÑ \"?\"" -#: lib/header.c:1689 +#: lib/header.c:1699 msgid "{ expected after ? in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ĞÏÓÌÅ \"?\" ÏÖÉÄÁÌÁÓØ \"{\"" -#: lib/header.c:1699 lib/header.c:1731 +#: lib/header.c:1709 lib/header.c:1744 msgid "} expected in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÁÓØ \"}\"" -#: lib/header.c:1706 +#: lib/header.c:1717 msgid ": expected following ? subexpression" msgstr "× ×ÙÒÁÖÅÎÉÉ ĞÏÓÌÅ \"?\" ÏÖÉÄÁÌÏÓØ \":\"" -#: lib/header.c:1719 +#: lib/header.c:1731 msgid "{ expected after : in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ĞÏÓÌÅ \":\" ÏÖÉÄÁÌÁÓØ \"{\"" -#: lib/header.c:1738 +#: lib/header.c:1752 msgid "| expected at end of expression" msgstr "× ËÏÎÃÅ ×ÙÒÁÖÅÎÉÑ ÏÖÉÄÁÌÓÑ \"|\"" -#: lib/header.c:1905 +#: lib/header.c:1921 msgid "(unknown type)" msgstr "(ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉĞ)" -#: lib/install.c:141 lib/uninstall.c:179 +#: lib/install.c:141 lib/uninstall.c:193 #, c-format msgid " file: %s action: %s\n" msgstr "ÆÁÊÌ : %s ÄÅÊÓÔ×ÉÅ: %s\n" @@ -2328,86 +2328,86 @@ msgstr "ÚÎÁŞÅÎÉÅ %%instchangelog × ÍÁËÒÏÆÁÊÌÅ ÄÏÌÖÎÏ ÂÙÔØ ŞÉÓÌÏÍ, Á ÏÎÏ ÎÅÔ..." #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:358 +#: lib/install.c:355 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "ÒÁÓĞÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s" -#: lib/install.c:359 +#: lib/install.c:356 msgid " on file " msgstr " ÎÁ ÆÁÊÌÅ " -#: lib/install.c:402 +#: lib/install.c:399 msgid "installing a source package\n" msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÉÓÈÏÄÎÙÊ ĞÁËÅÔ\n" -#: lib/install.c:413 +#: lib/install.c:410 #, fuzzy, c-format msgid "cannot create %s: %s" msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s" -#: lib/install.c:421 lib/install.c:443 +#: lib/install.c:418 lib/install.c:440 #, c-format msgid "cannot write to %s" msgstr "ÎÅ ÍÏÇÕ ĞÉÓÁÔØ × %s" -#: lib/install.c:425 +#: lib/install.c:422 #, c-format msgid "sources in: %s\n" msgstr "ÉÓÈÏÄÎÉËÉ ×: %s\n" -#: lib/install.c:436 +#: lib/install.c:433 #, c-format msgid "cannot create %s" msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s" -#: lib/install.c:447 +#: lib/install.c:444 #, c-format msgid "spec file in: %s\n" msgstr "ÆÁÊÌ spec ×: %s\n" -#: lib/install.c:481 lib/install.c:509 +#: lib/install.c:478 lib/install.c:506 msgid "source package contains no .spec file" msgstr "ÉÓÈÏÄÎÙÊ ĞÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ .spec" -#: lib/install.c:530 +#: lib/install.c:527 #, c-format msgid "renaming %s to %s\n" msgstr "ĞÅÒÅÉÍÅÎÏ×Ù×ÁÀ %s × %s\n" -#: lib/install.c:532 lib/install.c:810 lib/uninstall.c:26 +#: lib/install.c:529 lib/install.c:807 lib/uninstall.c:26 #, c-format msgid "rename of %s to %s failed: %s" msgstr "ÏÛÉÂËÁ ĞÅÒÅÉÍÅÎÏ×ÁÎÉÑ %s × %s: %s" -#: lib/install.c:622 +#: lib/install.c:619 msgid "source package expected, binary found" msgstr "ÏÖÉÄÁÌÓÑ ÉÓÈÏÄÎÙÊ ĞÁËÅÔ, ÎÁÊÄÅÎ ÂÉÎÁÒÎÙÊ" -#: lib/install.c:679 +#: lib/install.c:676 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "ĞÁËÅÔ: %s-%s-%s ÆÁÊÌÏ×; test = %d\n" -#: lib/install.c:740 +#: lib/install.c:737 msgid "stopping install as we're running --test\n" msgstr "ÏÓÔÁÎÁ×ÌÉ×ÁÀ ÕÓÔÁÎÏ×ËÕ, Ô.Ë. ÍÙ ÉÓĞÏÌÎÑÅÍ --test\n" -#: lib/install.c:745 +#: lib/install.c:742 msgid "running preinstall script (if any)\n" msgstr "ÉÓĞÏÌÎÑÀ ÓËÒÉĞÔ preinstall (ÅÓÌÉ ÅÓÔØ)\n" -#: lib/install.c:770 +#: lib/install.c:767 #, c-format msgid "warning: %s created as %s" msgstr "ĞÒÅÄÕĞÒÅÖÄÅÎÉÅ: %s ÓÏÚÄÁÎ ËÁË %s" -#: lib/install.c:806 +#: lib/install.c:803 #, c-format msgid "warning: %s saved as %s" msgstr "ĞÒÅÄÕĞÒÅÖÄÅÎÉÅ: %s ÓÏÈÒÁÎÅÎ ËÁË %s" -#: lib/install.c:880 +#: lib/install.c:877 #, fuzzy msgid "running postinstall scripts (if any)\n" msgstr "ÉÓĞÏÌÎÑÀ ÓËÒÉĞÔ postinstall (ÅÓÌÉ ÅÓÔØ)\n" @@ -2417,83 +2417,83 @@ msgstr "ÉÓĞÏÌÎÑÀ ÓËÒÉĞÔ postinstall (ÅÓÌÉ ÅÓÔØ)\n" msgid "cannot read header at %d for lookup" msgstr "ÎÅ ÍÏÇÕ ĞÒÏŞÅÓÔØ ÈÅÄÅÒ × %d ÄÌÑ ĞÏÉÓËÁ" -#: lib/macro.c:149 +#: lib/macro.c:151 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== ÁËÔÉ×Î %d ĞÕÓÔ. %d\n" #. XXX just in case -#: lib/macro.c:243 +#: lib/macro.c:245 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(ĞÕÓÔÏ)" -#: lib/macro.c:278 +#: lib/macro.c:280 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(ĞÕÓÔÏ)\n" -#: lib/macro.c:457 +#: lib/macro.c:459 msgid "Macro %%%s has unterminated body" msgstr "íÁËÒÏÓ %%%s ÓÏÄÅÒÖÉÔ ÎÅÚÁËÒÙÔÏÅ ÔÅÌÏ" -#: lib/macro.c:483 +#: lib/macro.c:485 msgid "Macro %%%s has illegal name (%%define)" msgstr "íÁËÒÏÓ %%%s ÉÍÅÅÔ ÎÅÄÏĞÕÓÔÉÍÏÅ ÉÍÑ (%%define)" -#: lib/macro.c:489 +#: lib/macro.c:491 msgid "Macro %%%s has unterminated opts" msgstr "íÁËÒÏÓ %%%s ÓÏÄÅÒÖÉÔ ÎÅÚÁËÒÙÔÙÅ ÏĞÃÉÉ" -#: lib/macro.c:494 +#: lib/macro.c:496 msgid "Macro %%%s has empty body" msgstr "íÁËÒÏÓ %%%s ÉÍÅÅÔ ĞÕÓÔÏÅ ÔÅÌÏ" -#: lib/macro.c:499 +#: lib/macro.c:501 msgid "Macro %%%s failed to expand" msgstr "íÁËÒÏÓ %%%s ÒÁÓËÒÙÔØ ÎÅ ÕÄÁÌÏÓØ" -#: lib/macro.c:524 +#: lib/macro.c:526 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "íÁËÒÏÓ %%%s ÉÍÅÅÔ ÎÅÄÏĞÕÓÔÉÍÏÅ ÉÍÑ (%%undefine)" -#: lib/macro.c:601 +#: lib/macro.c:603 msgid "Macro %%%s (%s) was not used below level %d" msgstr "íÁËÒÏÓ %%%s (%s) ÎÅ ÂÙÌ ÉÓĞÏÌØÚÏ×ÁÎ ÎÉÖÅ ÕÒÏ×ÎÑ %d" -#: lib/macro.c:698 +#: lib/macro.c:700 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÏĞÃÉÑ %c × %s(%s)" -#: lib/macro.c:870 +#: lib/macro.c:872 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "çÌÕÂÉÎÁ ÒÅËÕÒÓÉÉ(%d) ÂÏÌØÛÅ max(%d)" -#: lib/macro.c:936 lib/macro.c:952 +#: lib/macro.c:938 lib/macro.c:954 #, c-format msgid "Unterminated %c: %s" msgstr "îÅÚÁËÒÙÔÁÑ %c: %s" -#: lib/macro.c:992 +#: lib/macro.c:994 msgid "A %% is followed by an unparseable macro" msgstr "%% Ó ĞÏÓÌÅÄÕÀİÉÍ ÎÅÒÁÚÂÉÒÁÅÍÙÍ ÍÁËÒÏÓÏÍ" -#: lib/macro.c:1115 +#: lib/macro.c:1117 msgid "Macro %%%.*s not found, skipping" msgstr "íÁËÒÏÓ %s ÎÅ ÎÁÊÄÅÎ, ĞÒÏĞÕÓËÁÀ" -#: lib/macro.c:1196 +#: lib/macro.c:1198 msgid "Target buffer overflow" msgstr "ğÅÒÅĞÏÌÎÅÎÉÅ ÃÅÌÅ×ÏÇÏ ÂÕÆÅÒÁ" -#: lib/macro.c:1343 lib/macro.c:1351 +#: lib/macro.c:1345 lib/macro.c:1353 #, c-format msgid "File %s: %s" msgstr "æÁÊÌ %s: %s" -#: lib/macro.c:1354 +#: lib/macro.c:1356 #, c-format msgid "File %s is smaller than %d bytes" msgstr "æÁÊÌ %s ÍÅÎØÛÅ %d ÂÁÊÔ" @@ -2524,24 +2524,24 @@ msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ %s" msgid "bad file state: %s" msgstr "ÎÅ×ÅÒÎÏÅ ÓÏÓÔÏÑÎÉÅ ÆÁÊÌÁ: %s" -#: lib/package.c:234 +#: lib/package.c:237 msgid "package is a version one package!\n" msgstr "ĞÁËÅÔ - ĞÁËÅÔ RPM ×ÅÒÓÉÉ 1 !\n" -#: lib/package.c:239 +#: lib/package.c:242 msgid "old style source package -- I'll do my best\n" msgstr "ÉÓÈÏÄÎÙÊ ĞÁËÅÔ ÓÔÁÒÏÇÏ ÓÔÉÌÑ -- ÓÄÅÌÁÀ ŞÔÏ ÓÍÏÇÕ\n" -#: lib/package.c:242 +#: lib/package.c:245 #, c-format msgid "archive offset is %d\n" msgstr "ÓÍÅİÅÎÉÅ × ÁÒÈÉ×Å %d\n" -#: lib/package.c:252 +#: lib/package.c:256 msgid "old style binary package\n" msgstr "ÂÉÎÁÒÎÙÊ ĞÁËÅÔ ÓÔÁÒÏÇÏ ÓÔÉÌÑ\n" -#: lib/package.c:298 +#: lib/package.c:316 msgid "" "only packages with major numbers <= 3 are supported by this version of RPM" msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ĞÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ĞÁËÅÔÙ ×ÅÒÓÉÉ <= 3" @@ -2607,192 +2607,192 @@ msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ %d ĞÒÉ ÒÁÂÏÔÅ Ó ĞÁËÅÔÏÍ %s-%s-%s" msgid "error in format: %s\n" msgstr "ÏÛÉÂËÁ × ÆÏÒÍÁÔÅ: %s\n" -#: lib/query.c:180 +#: lib/query.c:181 msgid "(contains no files)" msgstr "(ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÏ×)" -#: lib/query.c:233 +#: lib/query.c:238 msgid "normal " msgstr "ÎÏÒÍÁÌØÎÙÊ " -#: lib/query.c:235 +#: lib/query.c:240 msgid "replaced " msgstr "ÚÁÍÅÎÅÎÎÙÊ " -#: lib/query.c:237 +#: lib/query.c:242 msgid "not installed " msgstr "ÎÅ ÕÓÔÁÎÏ×ÌÅÎ " -#: lib/query.c:239 +#: lib/query.c:244 msgid "net shared " msgstr "ÓÅÔÅ×ÏÊ " -#: lib/query.c:241 +#: lib/query.c:246 #, c-format msgid "(unknown %3d) " msgstr "(ÎÅÉÚ×. %3d) " -#: lib/query.c:245 +#: lib/query.c:250 msgid "(no state) " msgstr "(ÓÏÓÔ. ÎÅÔ) " -#: lib/query.c:261 lib/query.c:291 +#: lib/query.c:267 lib/query.c:308 msgid "package has neither file owner or id lists" msgstr "ĞÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÓĞÉÓËÏ× ÎÉ ÈÏÚÑÅ× ÆÁÊÌÏ×, ÎÉ ÉÈ ID" -#: lib/query.c:400 +#: lib/query.c:421 #, c-format msgid "record number %u\n" msgstr "ÚÁĞÉÓØ ÎÏÍÅÒ %u\n" -#: lib/query.c:404 +#: lib/query.c:425 msgid "error: could not read database record\n" msgstr "ÏÛÉÂËÁ: ÎÅ ÍÏÇÕ ĞÒÏŞÅÓÔØ ÚÁĞÉÓØ ÂÁÚÙ ÄÁÎÎÙÈ\n" -#: lib/query.c:442 +#: lib/query.c:463 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "ÏÔËÒÙÔÉÅ %s ÎÅ ÕÄÁÌÏÓØ\n" -#: lib/query.c:455 +#: lib/query.c:476 msgid "old format source packages cannot be queried\n" msgstr "ÚÁĞÒÏÓÙ Ë SRPM × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ĞÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n" -#: lib/query.c:464 lib/rpminstall.c:203 +#: lib/query.c:485 lib/rpminstall.c:203 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s ÎÅ ĞÏÈÏÖ ÎÁ ĞÁËÅÔ RPM...\n" -#: lib/query.c:467 +#: lib/query.c:488 #, c-format msgid "query of %s failed\n" msgstr "ÏÛÉÂËÁ ÚÁĞÒÏÓÁ %s\n" -#: lib/query.c:494 +#: lib/query.c:515 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "ÚÁĞÒÏÓ spec-ÆÁÊÌÁ %s ÎÅ ÕÄÁÌÓÑ, ÎÅ ÍÏÇÕ ÒÁÚÏÂÒÁÔØ ÆÁÊÌ\n" -#: lib/query.c:519 +#: lib/query.c:540 msgid "could not read database record!\n" msgstr "ÎÅ ÍÏÇÕ ĞÒÏŞÅÓÔØ ÚÁĞÉÓØ ÂÁÚÙ ÄÁÎÎÙÈ!\n" -#: lib/query.c:530 +#: lib/query.c:551 #, c-format msgid "group %s does not contain any packages\n" msgstr "ÇÒÕĞĞÁ %s ÎÅ ÓÏÄÅÒÖÉÔ ÎÉËÁËÉÈ ĞÁËÅÔÏ×\n" -#: lib/query.c:540 +#: lib/query.c:561 #, c-format msgid "no package provides %s\n" msgstr "ÎÉ ÏÄÉÎ ÉÚ ĞÁËÅÔÏ× ÎÅ ĞÒÅÄÏÓÔÁ×ÌÑÅÔ %s\n" -#: lib/query.c:550 +#: lib/query.c:571 #, c-format msgid "no package triggers %s\n" msgstr "ÎÉ ÏÄÉÎ ÉÚ ĞÁËÅÔÏ× ÎÅ ×Ú×ÏÄÉÔ ÔÒÉÇÇÅÒ %s\n" -#: lib/query.c:560 +#: lib/query.c:581 #, c-format msgid "no package requires %s\n" msgstr "ÎÉ ÏÄÉÎ ÉÚ ĞÁËÅÔÏ× ÎÅ ÔÒÅÂÕÅÔ %s\n" -#: lib/query.c:575 +#: lib/query.c:596 #, c-format msgid "file %s: %s\n" msgstr "ÆÁÊÌ %s: %s\n" -#: lib/query.c:578 +#: lib/query.c:599 #, c-format msgid "file %s is not owned by any package\n" msgstr "ÆÁÊÌ %s ÎÅ ĞÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ĞÁËÅÔÏ×\n" -#: lib/query.c:591 +#: lib/query.c:612 #, c-format msgid "invalid package number: %s\n" msgstr "ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ĞÁËÅÔÁ: %s\n" -#: lib/query.c:594 +#: lib/query.c:615 #, c-format msgid "package record number: %d\n" msgstr "ÚÁĞÉÓØ ĞÁËÅÔÁ ÎÏÍÅÒ %d\n" -#: lib/query.c:597 +#: lib/query.c:618 #, c-format msgid "record %d could not be read\n" msgstr "ÚÁĞÉÓØ %d ÎÅ ŞÉÔÁÅÔÓÑ\n" -#: lib/query.c:609 lib/rpminstall.c:393 +#: lib/query.c:630 lib/rpminstall.c:393 #, c-format msgid "package %s is not installed\n" msgstr "ĞÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: lib/query.c:612 +#: lib/query.c:633 #, c-format msgid "error looking for package %s\n" msgstr "ÏÛÉÂËÁ ĞÒÉ ĞÏÉÓËÅ ĞÁËÅÔÁ %s\n" -#: lib/query.c:634 +#: lib/query.c:655 msgid "rpmQuery: rpmdbOpen() failed\n" msgstr "rpmQuery: ÎÅÕÄÁŞÁ rpmdbOpen()\n" -#: lib/query.c:693 +#: lib/query.c:714 msgid "query package owning file" msgstr "ÎÁÊÔÉ ĞÁËÅÔ, ËÏÔÏÒÏÍÕ ĞÒÉÎÁÄÌÅÖÉÔ ÆÁÊÌ" -#: lib/query.c:695 +#: lib/query.c:716 msgid "query packages in group" msgstr "ÚÁĞÒÏÓ ĞÁËÅÔÏ× × ÇÒÕĞĞÅ" -#: lib/query.c:697 +#: lib/query.c:718 msgid "query a package file" msgstr "ÚÁĞÒÏÓÉÔØ ÆÁÊÌ ĞÁËÅÔÁ" -#: lib/query.c:701 +#: lib/query.c:722 msgid "query a spec file" msgstr "ÚÁĞÒÏÓÉÔØ spec-ÆÁÊÌ" -#: lib/query.c:703 +#: lib/query.c:724 msgid "query the pacakges triggered by the package" msgstr "ÚÁĞÒÏÓÉÔØ ĞÁËÅÔÙ Ó ÔÒÉÇÇÅÒ-ÓËÒÉĞÔÁÍÉ ÎÁ ĞÁËÅÔ" -#: lib/query.c:705 +#: lib/query.c:726 msgid "query the packages which require a capability" msgstr "ÎÁÊÔÉ ĞÁËÅÔÙ, ÔÒÅÂÕÀİÉÅ ÓÅÒ×ÉÓÁ" -#: lib/query.c:707 +#: lib/query.c:728 msgid "query the packages which provide a capability" msgstr "ÎÁÊÔÉ ĞÁËÅÔÙ, ĞÒÅÄÏÓÔÁ×ÌÑÀİÉÅ ÓÅÒ×ÉÓ" -#: lib/query.c:746 +#: lib/query.c:767 msgid "list all configuration files" msgstr "ĞÏËÁÚÁÔØ ×ÓÅ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ ÆÁÊÌÙ" -#: lib/query.c:748 +#: lib/query.c:769 msgid "list all documentation files" msgstr "ĞÏËÁÚÁÔØ ×ÓÅ ÆÁÊÌÙ ÄÏËÕÍÅÎÔÁÃÉÉ" -#: lib/query.c:750 +#: lib/query.c:771 msgid "dump basic file information" msgstr "×Ù×ÅÓÔÉ ÂÁÚÏ×ÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÆÁÊÌÅ" -#: lib/query.c:752 +#: lib/query.c:773 msgid "list files in package" msgstr "ĞÏËÁÚÁÔØ ÆÁÊÌÙ ĞÁËÅÔÁ" -#: lib/query.c:756 +#: lib/query.c:777 msgid "use the following query format" msgstr "ÉÓĞ. ÓÌÅÄÕÀİÉÊ ÆÏÒÍÁÔ ÚÁĞÒÏÓÁ" -#: lib/query.c:758 +#: lib/query.c:779 msgid "substitute i18n sections from the following catalogue" msgstr "ĞÏÄÓÔÁ×ÉÔØ ÓÅËÃÉÉ i18n ÉÚ ÓÌÅÄÕÀİÅÇÏ ËÁÔÁÌÏÇÁ" -#: lib/query.c:761 +#: lib/query.c:782 msgid "display the states of the listed files" msgstr "ĞÏËÁÚÁÔØ ÓÏÓÔÏÑÎÉÅ ĞÏËÁÚÁÎÎÙÈ ÆÁÊÌÏ×" -#: lib/query.c:763 +#: lib/query.c:784 msgid "display a verbose file listing" msgstr "×Ù×ÅÓÔÉ ÄÅÔÁÌØÎÙÊ ÓĞÉÓÏË ÆÁÊÌÏ× ĞÁËÅÔÁ" @@ -2868,12 +2868,12 @@ msgstr "ÚÁĞÕÓË ÎÅ ÕÄÁÌÓÑ\n" #: lib/rpmchecksig.c:74 #, fuzzy, c-format -msgid "%s: fdWrite failed: %s\n" -msgstr "%s: ïÛÉÂËÁ ÏÔËÒÙÔÉÑ\n" +msgid "%s: Fwrite failed: %s\n" +msgstr "%s: ÏÛÉÂËÁ readLead\n" #: lib/rpmchecksig.c:80 #, fuzzy, c-format -msgid "%s: fdRead failed: %s\n" +msgid "%s: Fread failed: %s\n" msgstr "%s: ÏÛÉÂËÁ readLead\n" #: lib/rpmchecksig.c:113 lib/rpmchecksig.c:242 @@ -2971,76 +2971,76 @@ msgstr "" "ÎÁÊÄÅÎÁ ÂÁÚÁ ÄÁÎÎÙÈ ÓÔÁÒÏÇÏ ÆÏÒÍÁÔÁ; ÉÓĞÏÌØÚÕÊÔÅ --rebuilddb ÄÌÑ ÇÅÎÅÒÁÃÉÉ " "ÂÁÚÙ ÎÏ×ÏÇÏ ÆÏÒÍÁÔÁ" -#: lib/rpmdb.c:439 +#: lib/rpmdb.c:468 #, c-format msgid "package %s not listed in %s" msgstr "ĞÁËÅÔ %s ÎÅ ×ÎÅÓÅÎ × %s" -#: lib/rpmdb.c:450 +#: lib/rpmdb.c:479 #, c-format msgid "package %s not found in %s" msgstr "ĞÁËÅÔ %s ÎÅ ÎÁÊÄÅÎ × %s" -#: lib/rpmdb.c:475 lib/uninstall.c:85 +#: lib/rpmdb.c:503 lib/uninstall.c:85 #, c-format msgid "cannot read header at %d for uninstall" msgstr "ÎÅ ÍÏÇÕ ĞÒÏŞÉÔÁÔØ ÈÅÄÅÒ × %d ÄÌÑ ÕÄÁÌÅÎÉÑ" -#: lib/rpmdb.c:483 +#: lib/rpmdb.c:511 msgid "package has no name" msgstr "Õ ĞÁËÅÔÁ ÎÅÔ ÉÍÅÎÉ" -#: lib/rpmdb.c:485 +#: lib/rpmdb.c:513 msgid "removing name index\n" msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÉÍÅÎ\n" -#: lib/rpmdb.c:490 +#: lib/rpmdb.c:518 msgid "package has no group\n" msgstr "Õ ĞÁËÅÔÁ ÎÅÔ ÇÒÕĞĞÙ\n" -#: lib/rpmdb.c:492 +#: lib/rpmdb.c:520 msgid "removing group index\n" msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÇÒÕĞĞ\n" -#: lib/rpmdb.c:499 +#: lib/rpmdb.c:527 #, c-format msgid "removing provides index for %s\n" msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ĞÒÅÄÏÓÔÁ×ÌÑÅÍÙÈ ÓÅÒ×ÉÓÏ× ÄÌÑ %s\n" -#: lib/rpmdb.c:514 +#: lib/rpmdb.c:542 #, c-format msgid "removing requiredby index for %s\n" msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÔÒÅÂÏ×ÁÎÉÊ ÄÌÑ %s\n" -#: lib/rpmdb.c:526 +#: lib/rpmdb.c:554 #, c-format msgid "removing trigger index for %s\n" msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÔÒÉÇÇÅÒÏ× ÄÌÑ %s\n" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:565 #, c-format msgid "removing conflict index for %s\n" msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ËÏÎÆÌÉËÔÏ× ÄÌÑ %s\n" -#: lib/rpmdb.c:554 +#: lib/rpmdb.c:576 #, c-format msgid "removing file index for %s\n" msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n" -#: lib/rpmdb.c:563 +#: lib/rpmdb.c:585 msgid "package has no files\n" msgstr "ĞÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÏ×\n" -#: lib/rpmdb.c:645 +#: lib/rpmdb.c:667 msgid "cannot allocate space for database" msgstr "ÎÅ ÍÏÇÕ ×ÙÄÅÌÉÔØ ÍÅÓÔÏ ÄÌÑ ÂÁÚÙ ÄÁÎÎÙÈ" -#: lib/rpmdb.c:711 +#: lib/rpmdb.c:726 #, c-format msgid "cannot read header at %d for update" msgstr "ÎÅ ÍÏÇÕ ĞÒÏŞÉÔÁÔØ ÈÅÄÅÒ × %d ÄÌÑ ÁĞÇÒÅÊÄÁ" -#: lib/rpmdb.c:720 +#: lib/rpmdb.c:735 msgid "header changed size!" msgstr "ÈÅÄÅÒ ÉÚÍÅÎÉÌ ÒÁÚÍÅÒ!" @@ -3199,37 +3199,37 @@ msgstr "îÅ ÍÏÇÕ ĞÒÏŞÅÓÔØ %s: %s." msgid "missing ':' at %s:%d" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ':' × %s:%d" -#: lib/rpmrc.c:655 lib/rpmrc.c:729 +#: lib/rpmrc.c:655 lib/rpmrc.c:730 #, c-format msgid "missing argument for %s at %s:%d" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ÁÒÇÕÍÅÎÔ ÄÌÑ %s × %s:%d" -#: lib/rpmrc.c:672 lib/rpmrc.c:694 +#: lib/rpmrc.c:672 lib/rpmrc.c:695 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "ÏÛÉÂËÁ ÒÁÓËÒÙÔÉÑ %s ÎÁ %s:%d \"%s\"" -#: lib/rpmrc.c:680 +#: lib/rpmrc.c:681 #, c-format msgid "cannot open %s at %s:%d" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s ÎÁ %s:%d" -#: lib/rpmrc.c:721 +#: lib/rpmrc.c:722 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ÁÒÈÉÔÅËÔÕÒÁ ÄÌÑ %s × %s:%d" -#: lib/rpmrc.c:788 +#: lib/rpmrc.c:789 #, c-format msgid "bad option '%s' at %s:%d" msgstr "ÎÅ×ÅÒÎÁÑ ÏĞÃÉÑ '%s' × %s:%d" -#: lib/rpmrc.c:1147 +#: lib/rpmrc.c:1149 #, c-format msgid "Unknown system: %s\n" msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÁ: %s\n" -#: lib/rpmrc.c:1148 +#: lib/rpmrc.c:1150 msgid "Please contact rpm-list@redhat.com\n" msgstr "ó×ÑÖÉÔÅÓØ Ó rpm-list@redhat.com\n" @@ -3375,17 +3375,27 @@ msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_gpg_name:\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_pgp_name:\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ" -#: lib/transaction.c:363 +#: lib/transaction.c:386 +#, fuzzy, c-format +msgid "excluding file %s%s\n" +msgstr "ÉÓËÌÀŞÁÀ %s\n" + +#: lib/transaction.c:412 lib/transaction.c:496 +#, fuzzy, c-format +msgid "excluding directory %s\n" +msgstr "ÓÏÚÄÁÀ ËÁÔÁÌÏÇ: %s\n" + +#: lib/transaction.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "ĞÅÒÅÍÅİÁÀ %s × %s\n" -#: lib/transaction.c:370 -#, c-format -msgid "excluding %s\n" -msgstr "ÉÓËÌÀŞÁÀ %s\n" - #: lib/transaction.c:489 +#, fuzzy, c-format +msgid "relocating directory %s to %s\n" +msgstr "ĞÅÒÅÍÅİÁÀ %s × %s\n" + +#: lib/transaction.c:637 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ĞÒÏĞÕİÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n" @@ -3415,15 +3425,15 @@ msgstr "ÎÅ ÍÏÇÕ ĞÒÏŞÉÔÁÔØ ĞÁËÅÔÙ %s ÄÌÑ ÕÄ×ÌÅÎÉÑ" msgid "will remove files test = %d\n" msgstr "ÕÄÁÌÉÔ ÆÁÊÌÙ; test = %d\n" -#: lib/uninstall.c:191 +#: lib/uninstall.c:207 msgid "running postuninstall script (if any)\n" msgstr "ÉÓĞÏÌÎÑÀ ÓËÒÉĞÔ postuninstall (ÅÓÌÉ ÅÓÔØ)\n" -#: lib/uninstall.c:204 +#: lib/uninstall.c:220 msgid "removing database entry\n" msgstr "ÕÄÁÌÑÀ ÚÁĞÉÓØ ÂÁÚÙ ÄÁÎÎÙÈ\n" -#: lib/uninstall.c:365 +#: lib/uninstall.c:381 msgid "execution of script failed" msgstr "ÏÛÉÂËÁ ÉÓĞÏÌÎÅÎÉÑ ÓËÒÉĞÔÁ" @@ -3456,28 +3466,32 @@ msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s\n" msgid "don't verify files in package" msgstr "ÎÅ ĞÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ĞÁËÅÔÁ" -#: lib/verify.c:208 +#: lib/verify.c:213 msgid "package lacks both user name and id lists (this should never happen)" msgstr "× ĞÁËÅÔÅ ÎÅÔ ÎÉ ÉÍÅÎ ĞÏÌØÚÏ×ÁÔÅÌÅÊ, ÎÉ ÉÈ ID (ÔÁË ÎÅ ÂÙ×ÁÅÔ)" -#: lib/verify.c:226 +#: lib/verify.c:231 msgid "package lacks both group name and id lists (this should never happen)" msgstr "× ĞÁËÅÔÅ ÎÅÔ ÎÉ ÉÍÅÎ ÇÒÕĞĞ, ÎÉ ÉÈ ID (ÔÁË ÎÅ ÂÙ×ÁÅÔ)" -#: lib/verify.c:259 +#: lib/verify.c:266 #, c-format msgid "missing %s\n" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ %s\n" -#: lib/verify.c:321 +#: lib/verify.c:328 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: " -#: lib/verify.c:369 +#: lib/verify.c:376 msgid "rpmVerify: rpmdbOpen() failed\n" msgstr "rpmVerify: ÎÅÕÄÁŞÁ rpmdbOpen()\n" +#, fuzzy +#~ msgid "%s: fdWrite failed: %s\n" +#~ msgstr "%s: ïÛÉÂËÁ ÏÔËÒÙÔÉÑ\n" + #~ msgid "File contains non-printable characters(%c): %s\n" #~ msgstr "æÁÊÌ ÓÏÄÅÒÖÉÔ ÎÅĞÅŞÁÔÁÅÍÙÅ ÓÉÍ×ÏÌÙ(%c): %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 2.93\n" -"POT-Creation-Date: 1999-10-04 16:05-0400\n" +"POT-Creation-Date: 1999-10-27 12:52-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" @@ -1255,36 +1255,36 @@ msgstr "neboli zadané ¾iadne balíky na podpis" msgid "no packages files given for rebuild" msgstr "neboli zadané ¾iadne balíky pre znovuzostavenie" -#: rpm.c:1230 +#: rpm.c:1234 msgid "no spec files given for build" msgstr "neboli zadané ¾iadne spec-súbory pre zostavenie" -#: rpm.c:1232 +#: rpm.c:1236 msgid "no tar files given for build" msgstr "neboli zadané ¾iadne tar-súbory pre zostavenie" -#: rpm.c:1244 +#: rpm.c:1248 msgid "no packages given for uninstall" msgstr "neboli zadané ¾iadne balíky pre odin¹talovanie" -#: rpm.c:1294 +#: rpm.c:1298 msgid "no packages given for install" msgstr "neboli zadané ¾iadne balíky pre in¹taláciu" -#: rpm.c:1317 +#: rpm.c:1321 msgid "extra arguments given for query of all packages" msgstr "boli zadané nadbytoèné argumenty otázky pre v¹etky balíky" -#: rpm.c:1322 +#: rpm.c:1326 msgid "no arguments given for query" msgstr "neboli zadané ¾iadne argumenty pre otázku" -#: rpm.c:1339 +#: rpm.c:1343 #, fuzzy msgid "extra arguments given for verify of all packages" msgstr "boli zadané nadbytoèné argumenty otázky pre v¹etky balíky" -#: rpm.c:1343 +#: rpm.c:1347 msgid "no arguments given for verify" msgstr "neboli zadané ¾iadne argumenty pre overenie" @@ -1296,7 +1296,7 @@ msgstr "argument nie je RPM balík\n" msgid "error reading header from package\n" msgstr "chyba pri èítaní hlavièky balíka\n" -#: build/build.c:83 build/pack.c:263 +#: build/build.c:83 build/pack.c:267 msgid "Unable to open temp file" msgstr "Nie je mo¾né otvori» doèasnı súbor" @@ -1315,59 +1315,59 @@ msgstr "Vykonanie %s zlyhalo (%s)" msgid "Bad exit status from %s (%s)" msgstr "Chybnı vıstupnı kód z %s (%s)" -#: build/expression.c:208 +#: build/expression.c:207 #, fuzzy msgid "syntax error while parsing ==" msgstr "chyba syntaxe vo vıraze" -#: build/expression.c:238 +#: build/expression.c:237 #, fuzzy msgid "syntax error while parsing &&" msgstr "chyba syntaxe vo vıraze" -#: build/expression.c:247 +#: build/expression.c:246 #, fuzzy msgid "syntax error while parsing ||" msgstr "chyba syntaxe vo vıraze" -#: build/expression.c:289 +#: build/expression.c:288 msgid "parse error in expression" msgstr "chyba pri analıze vırazu" -#: build/expression.c:319 +#: build/expression.c:318 msgid "unmatched (" msgstr "nepárová (" -#: build/expression.c:337 +#: build/expression.c:336 msgid "undefined identifier" msgstr "nedefinovanı identifikátor" -#: build/expression.c:356 +#: build/expression.c:355 msgid "- only on numbers" msgstr "- ibe pre èísla" -#: build/expression.c:372 +#: build/expression.c:371 msgid "! only on numbers" msgstr "! iba pre èísla" -#: build/expression.c:411 build/expression.c:456 build/expression.c:513 -#: build/expression.c:600 +#: build/expression.c:410 build/expression.c:455 build/expression.c:512 +#: build/expression.c:599 msgid "types must match" msgstr "typy sa musia zhodova»" -#: build/expression.c:424 +#: build/expression.c:423 msgid "* / not suported for strings" msgstr "* / nie sú podporované pre re»azce" -#: build/expression.c:472 +#: build/expression.c:471 msgid "- not suported for strings" msgstr "- nie je podporované pre re»azce" -#: build/expression.c:613 +#: build/expression.c:612 msgid "&& and || not suported for strings" msgstr "&& a || nie sú podporované pre re»azce" -#: build/expression.c:644 build/expression.c:689 +#: build/expression.c:645 build/expression.c:692 msgid "syntax error in expression" msgstr "chyba syntaxe vo vıraze" @@ -1448,81 +1448,81 @@ msgstr "Nie je mo¾né mie¹a» ¹peciálne %%doc s inımi formami: %s" msgid "File listed twice: %s" msgstr "Súbor zadanı dvakrát: %s." -#: build/files.c:951 +#: build/files.c:953 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "Súbor nesúhlasí s prefixom (%s): %s." -#: build/files.c:961 +#: build/files.c:963 #, c-format msgid "File not found: %s" msgstr "Súbor nebol nájdenı: %s" -#: build/files.c:1004 +#: build/files.c:1006 #, c-format msgid "Bad owner/group: %s\n" msgstr "Chybnı vlastník/skupina: %s\n" -#: build/files.c:1018 +#: build/files.c:1020 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Súbor %4d: 0%o %s.%s\t %s\n" -#: build/files.c:1088 +#: build/files.c:1090 #, c-format msgid "File needs leading \"/\": %s" msgstr "Súbor potrebuje na zaèiatku \"/\": %s" -#: build/files.c:1132 +#: build/files.c:1134 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Súbor nebol nájdenı: %s" -#: build/files.c:1174 +#: build/files.c:1176 msgid "Could not open %%files file: %s" msgstr "chybe: nie je mo¾né otvori» %%files súbor: %s" -#: build/files.c:1181 build/pack.c:485 +#: build/files.c:1183 build/pack.c:488 #, c-format msgid "line: %s" msgstr "riadok: %s" -#: build/files.c:1508 build/parsePrep.c:29 +#: build/files.c:1510 build/parsePrep.c:29 #, c-format msgid "Bad owner/group: %s" msgstr "Chybnı vlastník/skupina: %s" -#: build/files.c:1562 +#: build/files.c:1564 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "Nie je mo¾né spusti» %s" -#: build/files.c:1567 +#: build/files.c:1569 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Nie je mo¾né vytvori» proces %s" -#: build/files.c:1649 +#: build/files.c:1651 #, c-format msgid "%s failed" msgstr "%s zlyhalo" -#: build/files.c:1653 +#: build/files.c:1655 #, c-format msgid "failed to write all data to %s" msgstr "nepodarilo sa zapísa» v¹etky dáta do %s" -#: build/files.c:1742 +#: build/files.c:1744 #, fuzzy, c-format msgid "Finding %s: (using %s)...\n" msgstr "Zis»ujú sa po¾adované vlastnosti...\n" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1772 build/files.c:1781 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "Nepodarilo sa zisti» poskytované vlastnosti" -#: build/files.c:1885 +#: build/files.c:1887 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Spracovávajú sa súbory: %s\n" @@ -1540,106 +1540,106 @@ msgstr "RPMERR_INTERNAL: Dosiahnutı limit v getGname()\n" msgid "Could not canonicalize hostname: %s\n" msgstr "Nie je mo¾né kanonizova» názov poèítaèa: %s\n" -#: build/pack.c:131 +#: build/pack.c:132 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "Nie je mo¾né vytvori» meno vıstupného súboru pre balík %s: %s\n" -#: build/pack.c:148 +#: build/pack.c:149 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "nie je mo¾né zapísa» do %s: " -#: build/pack.c:183 +#: build/pack.c:184 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: otvorenie %s: %s\n" -#: build/pack.c:193 +#: build/pack.c:194 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: èítanie %s: %s\n" -#: build/pack.c:213 +#: build/pack.c:215 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s nie je RPM balík\n" -#: build/pack.c:219 +#: build/pack.c:221 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: èítanie hlavièky %s\n" -#: build/pack.c:274 +#: build/pack.c:278 msgid "Bad CSA data" msgstr "Chybné CSA dáta" -#: build/pack.c:305 +#: build/pack.c:311 #, c-format msgid "Could not open %s\n" msgstr "Otvorenie %s zlyhalo\n" -#: build/pack.c:337 build/pack.c:379 +#: build/pack.c:343 build/pack.c:385 #, c-format msgid "Unable to write package: %s" msgstr "Nie je mo¾né zapísa» balík: %s" -#: build/pack.c:352 +#: build/pack.c:358 #, c-format msgid "Generating signature: %d\n" msgstr "Vytvára sa PGP podpis: %d\n" -#: build/pack.c:369 +#: build/pack.c:375 #, c-format msgid "Unable to read sigtarget: %s" msgstr "Nie je preèíta» sigtarget: %s" -#: build/pack.c:394 +#: build/pack.c:400 #, c-format msgid "Wrote: %s\n" msgstr "Zapísané: %s\n" -#: build/pack.c:411 build/pack.c:435 +#: build/pack.c:416 build/pack.c:439 #, c-format msgid "create archive failed on file %s: %s" msgstr "vytvorenie archívu zlyhalo pri súbore %s: %s" -#: build/pack.c:455 +#: build/pack.c:458 #, c-format msgid "cpio_copy write failed: %s" msgstr "cpio_copy zápis zlyhal: %s" -#: build/pack.c:462 +#: build/pack.c:465 #, c-format msgid "cpio_copy read failed: %s" msgstr "cpio_copy èítanie zlyhalo: %s" -#: build/pack.c:541 +#: build/pack.c:544 #, c-format msgid "Could not open PreIn file: %s" msgstr "Nie je mo¾né otvori» PreIn súbor: %s" -#: build/pack.c:548 +#: build/pack.c:551 #, c-format msgid "Could not open PreUn file: %s" msgstr "Nie je mo¾né otvori» PreUn súbor: %s" -#: build/pack.c:555 +#: build/pack.c:558 #, c-format msgid "Could not open PostIn file: %s" msgstr "Nie je mo¾né otvori» PostIn súbor: %s" -#: build/pack.c:562 +#: build/pack.c:565 #, c-format msgid "Could not open PostUn file: %s" msgstr "Nie je mo¾né otvori» PostUn súbor: %s" -#: build/pack.c:570 +#: build/pack.c:573 #, c-format msgid "Could not open VerifyScript file: %s" msgstr "Nie je mo¾né otvori» VerifyScript súbor: %s" -#: build/pack.c:586 +#: build/pack.c:589 #, c-format msgid "Could not open Trigger script file: %s" msgstr "Nie je mo¾né otvori» Trigger skriptovı súbor: %s" @@ -1682,17 +1682,17 @@ msgstr "riadok %d: Chyba pri analıze %%description: %s" msgid "line %d: Bad option %s: %s" msgstr "riadok %d: Chybná voµba %s: %s" -#: build/parseDescription.c:60 build/parseFiles.c:54 build/parseScript.c:182 +#: build/parseDescription.c:59 build/parseFiles.c:53 build/parseScript.c:181 #, c-format msgid "line %d: Too many names: %s" msgstr "riadok %d: Priveµa názvov: %s" -#: build/parseDescription.c:70 build/parseFiles.c:64 build/parseScript.c:192 +#: build/parseDescription.c:69 build/parseFiles.c:63 build/parseScript.c:191 #, c-format msgid "line %d: Package does not exist: %s" msgstr "riadok %d: Balík neexistuje: %s" -#: build/parseDescription.c:82 +#: build/parseDescription.c:81 #, c-format msgid "line %d: Second description" msgstr "riadok %d: Druhı popis" @@ -1701,7 +1701,7 @@ msgstr "riadok %d: Druhı popis" msgid "line %d: Error parsing %%files: %s" msgstr "riadok %d: Chyba pri analıze %%files: %s" -#: build/parseFiles.c:72 +#: build/parseFiles.c:71 msgid "line %d: Second %%files list" msgstr "riadok %d: Druhı %%files zoznam" @@ -1796,22 +1796,22 @@ msgstr "riadok %d: Chybnı formát BuildArchitecture: %s" msgid "Internal error: Bogus tag %d" msgstr "Interná chyba: Èudnı popis %d " -#: build/parsePreamble.c:657 +#: build/parsePreamble.c:656 #, c-format msgid "Bad package specification: %s" msgstr "Chybná ¹pecifikácia balíka: %s" -#: build/parsePreamble.c:663 +#: build/parsePreamble.c:662 #, c-format msgid "Package already exists: %s" msgstr "Balík u¾ existuje: %s" -#: build/parsePreamble.c:690 +#: build/parsePreamble.c:689 #, c-format msgid "line %d: Unknown tag: %s" msgstr "riadok %d: Neznámy popis: %s" -#: build/parsePreamble.c:715 +#: build/parsePreamble.c:714 msgid "Spec file can't use BuildRoot" msgstr "Spec súbor nemô¾e pou¾i» BuildRoot" @@ -1835,43 +1835,43 @@ msgstr "Neexistuje zdroj èíslo %d" msgid "Couldn't download nosource %s: %s" msgstr "Nebolo mo¾né prenies» nie-zdroj %s: %s" -#: build/parsePrep.c:191 +#: build/parsePrep.c:190 msgid "Error parsing %%setup: %s" msgstr "Chyba pri analıze %%setup: %s" -#: build/parsePrep.c:206 +#: build/parsePrep.c:205 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "riadok %d: Chybnı argument pre %%setup %c: %s" -#: build/parsePrep.c:227 +#: build/parsePrep.c:223 msgid "line %d: Bad %%setup option %s: %s" msgstr "riadok %d: Chybná voµba pre %%setup %s: %s" -#: build/parsePrep.c:351 +#: build/parsePrep.c:346 msgid "line %d: Need arg to %%patch -b: %s" msgstr "riadok %d: %%patch -b potrebuje argument: %s" -#: build/parsePrep.c:359 +#: build/parsePrep.c:354 msgid "line %d: Need arg to %%patch -z: %s" msgstr "riadok %d: %%patch -z potrebuje argument: %s" -#: build/parsePrep.c:371 +#: build/parsePrep.c:366 msgid "line %d: Need arg to %%patch -p: %s" msgstr "riadok %d: %%patch -p potrebuje argument: %s" -#: build/parsePrep.c:377 +#: build/parsePrep.c:372 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "riadok %d: Chybnı argument pre %%patch -p: %s" -#: build/parsePrep.c:384 +#: build/parsePrep.c:379 msgid "Too many patches!" msgstr "Priveµa záplat!" -#: build/parsePrep.c:388 +#: build/parsePrep.c:383 msgid "line %d: Bad arg to %%patch: %s" msgstr "riadok %d: Chybnı argument pre %%patch: %s" -#: build/parsePrep.c:424 +#: build/parsePrep.c:419 msgid "line %d: second %%prep" msgstr "riadok %d: druhı %%prep" @@ -1906,7 +1906,7 @@ msgstr "riadok %d: V %s sú vy¾adované verzie: %s" msgid "line %d: triggers must have --: %s" msgstr "riadok %d: triggers musia obsahova» --: %s" -#: build/parseScript.c:146 build/parseScript.c:210 +#: build/parseScript.c:146 build/parseScript.c:209 #, c-format msgid "line %d: Error parsing %s: %s" msgstr "riadok %d: Chyba pri analıze %s: %s" @@ -1916,7 +1916,7 @@ msgstr "riadok %d: Chyba pri analıze %s: %s" msgid "line %d: script program must begin with '/': %s" msgstr "riadok %d: program skriptu musí zaèína» '/': %s" -#: build/parseScript.c:201 +#: build/parseScript.c:200 #, c-format msgid "line %d: Second %s" msgstr "riadok %d: Druhı %s" @@ -1926,44 +1926,44 @@ msgstr "riadok %d: Druhı %s" msgid "line %d: %s" msgstr "riadok %d: %s" -#: build/parseSpec.c:172 +#: build/parseSpec.c:173 #, c-format msgid "Unable to open: %s\n" msgstr "otvorenie zlyhalo: %s\n" -#: build/parseSpec.c:184 +#: build/parseSpec.c:185 msgid "Unclosed %%if" msgstr "Neuzavretı %%if" -#: build/parseSpec.c:243 +#: build/parseSpec.c:244 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:251 +#: build/parseSpec.c:252 msgid "%s:%d: Got a %%else with no if" msgstr "%s:%d: %%else bez if" #. Got an end with no %if ! -#: build/parseSpec.c:262 +#: build/parseSpec.c:263 msgid "%s:%d: Got a %%endif with no if" msgstr "%s:%d: %%endif bez if" -#: build/parseSpec.c:276 build/parseSpec.c:285 +#: build/parseSpec.c:277 build/parseSpec.c:286 msgid "malformed %%include statement" msgstr "znetvorenı príkaz %%include" -#: build/parseSpec.c:366 +#: build/parseSpec.c:367 #, c-format msgid "Timecheck value must be an integer: %s" msgstr "Èasovı limit musí by» celé èíslo: %s" -#: build/parseSpec.c:449 +#: build/parseSpec.c:450 msgid "No buildable architectures" msgstr "®iadne zostaviteµné architektúry" -#: build/parseSpec.c:494 +#: build/parseSpec.c:497 msgid "Package has no %%description: %s" msgstr "Balík neobsahuje %%description: %s" @@ -1987,51 +1987,51 @@ msgstr "riadok %d: Chybné no%s èíslo: %d" msgid "line %d: Bad %s number: %s\n" msgstr "riadok %d: Chybné %s èíslo: %s\n" -#: lib/cpio.c:385 +#: lib/cpio.c:335 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "premenovanie %s na %s zlyhalo: %s\n" -#: lib/cpio.c:391 +#: lib/cpio.c:341 #, c-format msgid "can't unlink %s: %s\n" msgstr "zmazanie %s zlyhalo: %s\n" -#: lib/cpio.c:582 +#: lib/cpio.c:532 #, c-format msgid "getNextHeader: %s\n" msgstr "getNextHeader: %s\n" -#: lib/cpio.c:1044 +#: lib/cpio.c:995 #, c-format msgid "(error 0x%x)" msgstr "(chyba 0x%x)" -#: lib/cpio.c:1047 +#: lib/cpio.c:998 msgid "Bad magic" msgstr "Chybné magické èíslo" -#: lib/cpio.c:1048 +#: lib/cpio.c:999 msgid "Bad/unreadable header" msgstr "Chybná/neèitateµná hlavièka" -#: lib/cpio.c:1066 +#: lib/cpio.c:1017 msgid "Header size too big" msgstr "Priveµká hlavièka" -#: lib/cpio.c:1067 +#: lib/cpio.c:1018 msgid "Unknown file type" msgstr "Neznámy typ súboru" -#: lib/cpio.c:1068 +#: lib/cpio.c:1019 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1069 +#: lib/cpio.c:1020 msgid "Internal error" msgstr "Interná chyba" -#: lib/cpio.c:1078 +#: lib/cpio.c:1029 msgid " failed - " msgstr " zlyhalo - " @@ -2056,90 +2056,90 @@ msgid "error removing record %s into %s" msgstr "chyba pri odstraòovaní záznamu %s z %s" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:339 +#: lib/depends.c:404 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:368 +#: lib/depends.c:433 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:460 +#: lib/depends.c:525 msgid "dbrecMatchesDepFlags() failed to read header" msgstr "dbrecMatchesDepFlags() sa nepodarilo preèíta» hlavièku" -#: lib/depends.c:695 +#: lib/depends.c:760 +#, c-format +msgid "%s: %s satisfied by added file list.\n" +msgstr "" + +#: lib/depends.c:799 #, fuzzy, c-format msgid "%s: %s satisfied by added package.\n" msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n" -#: lib/depends.c:712 +#: lib/depends.c:816 #, c-format msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:717 -#, c-format -msgid "%s: %s satisfied by added file list.\n" -msgstr "" - -#: lib/depends.c:747 +#: lib/depends.c:847 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:775 +#: lib/depends.c:875 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:797 +#: lib/depends.c:897 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:819 +#: lib/depends.c:919 #, fuzzy, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n" -#: lib/depends.c:832 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:942 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:890 +#: lib/depends.c:990 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" #. conflicts exist. -#: lib/depends.c:952 +#: lib/depends.c:1052 #, c-format msgid "package %s conflicts: %s\n" msgstr "balík %s koliduje: %s\n" -#: lib/depends.c:1007 lib/depends.c:1311 +#: lib/depends.c:1107 lib/depends.c:1415 #, c-format msgid "cannot read header at %d for dependency check" msgstr "nie je mo¾né preèíta» hlavièku na %d pre kontrolu závislostí" -#: lib/depends.c:1102 +#: lib/depends.c:1202 #, c-format msgid "loop in prerequisite chain: %s" msgstr "sluèka v re»azi po¾iadaviek: %s" -#: lib/falloc.c:160 +#: lib/falloc.c:157 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2149,8 +2149,8 @@ msgid "" "if \"rpm --rebuilddb\" fails to correct the problem.\n" msgstr "" -#: lib/formats.c:66 lib/formats.c:84 lib/formats.c:105 lib/formats.c:138 -#: lib/header.c:2122 lib/header.c:2139 lib/header.c:2159 +#: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141 +#: lib/header.c:2138 lib/header.c:2155 lib/header.c:2175 msgid "(not a number)" msgstr "(nie je èíslo)" @@ -2245,73 +2245,73 @@ msgstr "Typ údajov %d nie je podorovanı\n" msgid "Data type %d not supprted\n" msgstr "Typ údajov %d nie je podorovanı\n" -#: lib/header.c:1119 +#: lib/header.c:1120 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "Chybnı poèet pre headerAddEntry(): %d\n" -#: lib/header.c:1520 +#: lib/header.c:1529 #, c-format msgid "missing { after %" msgstr "chıbajúce { po %" -#: lib/header.c:1548 +#: lib/header.c:1557 msgid "missing } after %{" msgstr "chıbajúce } po %{" -#: lib/header.c:1560 +#: lib/header.c:1569 msgid "empty tag format" msgstr "prázdny tag formát" -#: lib/header.c:1570 +#: lib/header.c:1579 msgid "empty tag name" msgstr "prázdne meno tagu" -#: lib/header.c:1585 +#: lib/header.c:1594 msgid "unknown tag" msgstr "neznámy tag" -#: lib/header.c:1611 +#: lib/header.c:1620 msgid "] expected at end of array" msgstr "] oèakávané na konci poµa" -#: lib/header.c:1627 +#: lib/header.c:1636 msgid "unexpected ]" msgstr "neoèakávané ]" -#: lib/header.c:1629 +#: lib/header.c:1638 msgid "unexpected }" msgstr "neoèakávané }" -#: lib/header.c:1682 +#: lib/header.c:1692 msgid "? expected in expression" msgstr "? oèakávané vo vıraze" -#: lib/header.c:1689 +#: lib/header.c:1699 msgid "{ expected after ? in expression" msgstr "{ oèakávané po ? vo vıraze" -#: lib/header.c:1699 lib/header.c:1731 +#: lib/header.c:1709 lib/header.c:1744 msgid "} expected in expression" msgstr "} oèakávané vo vıraze" -#: lib/header.c:1706 +#: lib/header.c:1717 msgid ": expected following ? subexpression" msgstr ": oèakávané po ? podvıraze" -#: lib/header.c:1719 +#: lib/header.c:1731 msgid "{ expected after : in expression" msgstr "{ oèakávané po : vo vıraze" -#: lib/header.c:1738 +#: lib/header.c:1752 msgid "| expected at end of expression" msgstr "| oèakávené na konci vırazu" -#: lib/header.c:1905 +#: lib/header.c:1921 msgid "(unknown type)" msgstr "(neznámy typ)" -#: lib/install.c:141 lib/uninstall.c:179 +#: lib/install.c:141 lib/uninstall.c:193 #, c-format msgid " file: %s action: %s\n" msgstr " súbor: akcia %s: %s\n" @@ -2332,86 +2332,86 @@ msgstr "hodnota %%instchangelog v makro-súbore by mala by» èíselná, ale nie je" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:358 +#: lib/install.c:355 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "rozbalenie archívu zlyhalo%s%s: %s" -#: lib/install.c:359 +#: lib/install.c:356 msgid " on file " msgstr " pre súbor " -#: lib/install.c:402 +#: lib/install.c:399 msgid "installing a source package\n" msgstr "in¹taluje sa zdrojovı balík\n" -#: lib/install.c:413 +#: lib/install.c:410 #, fuzzy, c-format msgid "cannot create %s: %s" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/install.c:421 lib/install.c:443 +#: lib/install.c:418 lib/install.c:440 #, c-format msgid "cannot write to %s" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/install.c:425 +#: lib/install.c:422 #, c-format msgid "sources in: %s\n" msgstr "zdroje v: %s\n" -#: lib/install.c:436 +#: lib/install.c:433 #, fuzzy, c-format msgid "cannot create %s" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/install.c:447 +#: lib/install.c:444 #, c-format msgid "spec file in: %s\n" msgstr "spec-súbor v: %s\n" -#: lib/install.c:481 lib/install.c:509 +#: lib/install.c:478 lib/install.c:506 msgid "source package contains no .spec file" msgstr "zdrojovı balík neobsahuje ¾iadny .spec súbor" -#: lib/install.c:530 +#: lib/install.c:527 #, c-format msgid "renaming %s to %s\n" msgstr "premenováva sa %s na %s\n" -#: lib/install.c:532 lib/install.c:810 lib/uninstall.c:26 +#: lib/install.c:529 lib/install.c:807 lib/uninstall.c:26 #, c-format msgid "rename of %s to %s failed: %s" msgstr "premenovanie %s na %s zlyhalo: %s" -#: lib/install.c:622 +#: lib/install.c:619 msgid "source package expected, binary found" msgstr "oèakávanı zdrojovı balík, nájdenı binárny" -#: lib/install.c:679 +#: lib/install.c:676 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "balík: %s-%s-%s test súborov = %d\n" -#: lib/install.c:740 +#: lib/install.c:737 msgid "stopping install as we're running --test\n" msgstr "in¹talácia zastavená kvôli re¾imu --test\n" -#: lib/install.c:745 +#: lib/install.c:742 msgid "running preinstall script (if any)\n" msgstr "vykonávajú sa predin¹talaèné skripty (ak existujú)\n" -#: lib/install.c:770 +#: lib/install.c:767 #, c-format msgid "warning: %s created as %s" msgstr "varovanie: %s vytvorené ako %s" -#: lib/install.c:806 +#: lib/install.c:803 #, c-format msgid "warning: %s saved as %s" msgstr "varovanie: %s uchovanı ako %s" -#: lib/install.c:880 +#: lib/install.c:877 #, fuzzy msgid "running postinstall scripts (if any)\n" msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n" @@ -2421,83 +2421,83 @@ msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n" msgid "cannot read header at %d for lookup" msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie" -#: lib/macro.c:149 +#: lib/macro.c:151 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== aktívnych %d prázdnych %d\n" #. XXX just in case -#: lib/macro.c:243 +#: lib/macro.c:245 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(prázdne)" -#: lib/macro.c:278 +#: lib/macro.c:280 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(prázdne)\n" -#: lib/macro.c:457 +#: lib/macro.c:459 msgid "Macro %%%s has unterminated body" msgstr "Makro %%%s obsahuje neukonèené telo" -#: lib/macro.c:483 +#: lib/macro.c:485 msgid "Macro %%%s has illegal name (%%define)" msgstr "Makro %%%s obsahuje chybnı názov (%%define)" -#: lib/macro.c:489 +#: lib/macro.c:491 msgid "Macro %%%s has unterminated opts" msgstr "Makro %%%s obsahuje neukonèené voµby" -#: lib/macro.c:494 +#: lib/macro.c:496 msgid "Macro %%%s has empty body" msgstr "Makro %%%s obsahuje prázdne telo" -#: lib/macro.c:499 +#: lib/macro.c:501 msgid "Macro %%%s failed to expand" msgstr "Makro %%%s sa nepodarilo expandova»" -#: lib/macro.c:524 +#: lib/macro.c:526 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "Makro %%%s obsahuje chybnı názov (%%undefine)" -#: lib/macro.c:601 +#: lib/macro.c:603 msgid "Macro %%%s (%s) was not used below level %d" msgstr "Makro %%%s (%s) nebolo pou¾ité pod úrovòou %d " -#: lib/macro.c:698 +#: lib/macro.c:700 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "Neznáma voµba %c v %s(%s)" -#: lib/macro.c:870 +#: lib/macro.c:872 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "Håbka rekurzie (%d) väè¹ia ako maximálna (%d)" -#: lib/macro.c:936 lib/macro.c:952 +#: lib/macro.c:938 lib/macro.c:954 #, c-format msgid "Unterminated %c: %s" msgstr "Neukonèené %c: %s" -#: lib/macro.c:992 +#: lib/macro.c:994 msgid "A %% is followed by an unparseable macro" msgstr "" -#: lib/macro.c:1115 +#: lib/macro.c:1117 msgid "Macro %%%.*s not found, skipping" msgstr "balík %%%.*s nebol nájdenı, vynecháva sa" -#: lib/macro.c:1196 +#: lib/macro.c:1198 msgid "Target buffer overflow" msgstr "Preplnenie cieµovej vyrovnávacej pamäti" -#: lib/macro.c:1343 lib/macro.c:1351 +#: lib/macro.c:1345 lib/macro.c:1353 #, c-format msgid "File %s: %s" msgstr "Súbor %s: %s" -#: lib/macro.c:1354 +#: lib/macro.c:1356 #, c-format msgid "File %s is smaller than %d bytes" msgstr "Súbor %s je men¹í ako %d bajtov" @@ -2528,24 +2528,24 @@ msgstr "chyba pri vytváraní doèasného súboru %s" msgid "bad file state: %s" msgstr "chybnı stav súboru: %s" -#: lib/package.c:234 +#: lib/package.c:237 msgid "package is a version one package!\n" msgstr "balík je verzie jedna!\n" -#: lib/package.c:239 +#: lib/package.c:242 msgid "old style source package -- I'll do my best\n" msgstr "zdrojovı balík v starom ¹tıle - urobím, èo sa dá\n" -#: lib/package.c:242 +#: lib/package.c:245 #, c-format msgid "archive offset is %d\n" msgstr "posunutie v archíve je %d\n" -#: lib/package.c:252 +#: lib/package.c:256 msgid "old style binary package\n" msgstr "binárny balík v starom ¹tıle\n" -#: lib/package.c:298 +#: lib/package.c:316 msgid "" "only packages with major numbers <= 3 are supported by this version of RPM" msgstr "táto verzia RPM podporuje iba balíky s hlavnım èíslom <= 3" @@ -2611,193 +2611,193 @@ msgstr "" msgid "error in format: %s\n" msgstr "chyba formátu: %s\n" -#: lib/query.c:180 +#: lib/query.c:181 msgid "(contains no files)" msgstr "(neobsahuje ¾iadne súbory)" -#: lib/query.c:233 +#: lib/query.c:238 msgid "normal " msgstr "normálny " -#: lib/query.c:235 +#: lib/query.c:240 msgid "replaced " msgstr "nahradenı " -#: lib/query.c:237 +#: lib/query.c:242 msgid "not installed " msgstr "nein¹talovanı " -#: lib/query.c:239 +#: lib/query.c:244 msgid "net shared " msgstr "zdieµanı " -#: lib/query.c:241 +#: lib/query.c:246 #, c-format msgid "(unknown %3d) " msgstr "(neznámy %d) " -#: lib/query.c:245 +#: lib/query.c:250 msgid "(no state) " msgstr "(¾iadny stav) " -#: lib/query.c:261 lib/query.c:291 +#: lib/query.c:267 lib/query.c:308 msgid "package has neither file owner or id lists" msgstr "balík neobsahuje ani vlastníka súboru, ani zoznamy identifikácií" -#: lib/query.c:400 +#: lib/query.c:421 #, fuzzy, c-format msgid "record number %u\n" msgstr "overuje sa záznam èíslo %u\n" -#: lib/query.c:404 +#: lib/query.c:425 msgid "error: could not read database record\n" msgstr "chyba: nie je mo¾né preèíta» záznam v databáze\n" -#: lib/query.c:442 +#: lib/query.c:463 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" -#: lib/query.c:455 +#: lib/query.c:476 msgid "old format source packages cannot be queried\n" msgstr "nie je mo¾né pıta» sa zdrojovıch balíkov v starom formáte\n" -#: lib/query.c:464 lib/rpminstall.c:203 +#: lib/query.c:485 lib/rpminstall.c:203 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s zrejme nie je RPM balík\n" -#: lib/query.c:467 +#: lib/query.c:488 #, c-format msgid "query of %s failed\n" msgstr "otázka na %s zlyhala\n" -#: lib/query.c:494 +#: lib/query.c:515 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "otázka na spec-súbor %s zlyhala, nie je mo¾né analyzova»\n" -#: lib/query.c:519 +#: lib/query.c:540 msgid "could not read database record!\n" msgstr "nie je mo¾né preèíta» záznam v databáze!\n" -#: lib/query.c:530 +#: lib/query.c:551 #, c-format msgid "group %s does not contain any packages\n" msgstr "skupina %s neobsahuje ¾iadne balíky\n" -#: lib/query.c:540 +#: lib/query.c:561 #, c-format msgid "no package provides %s\n" msgstr "¾iadny z balíkov neposkytuje %s\n" -#: lib/query.c:550 +#: lib/query.c:571 #, c-format msgid "no package triggers %s\n" msgstr "¾iadny z balíkov nespú¹»a %s\n" -#: lib/query.c:560 +#: lib/query.c:581 #, c-format msgid "no package requires %s\n" msgstr "¾iadny z balíkov nevy¾aduje %s\n" -#: lib/query.c:575 +#: lib/query.c:596 #, c-format msgid "file %s: %s\n" msgstr "súbor %s: %s\n" -#: lib/query.c:578 +#: lib/query.c:599 #, c-format msgid "file %s is not owned by any package\n" msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n" -#: lib/query.c:591 +#: lib/query.c:612 #, c-format msgid "invalid package number: %s\n" msgstr "chybné èíslo balíku: %s\n" -#: lib/query.c:594 +#: lib/query.c:615 #, fuzzy, c-format msgid "package record number: %d\n" msgstr "po¾aduje sa záznam èíslo %d\n" -#: lib/query.c:597 +#: lib/query.c:618 #, c-format msgid "record %d could not be read\n" msgstr "záznam %d nie je mo¾né preèíta»\n" -#: lib/query.c:609 lib/rpminstall.c:393 +#: lib/query.c:630 lib/rpminstall.c:393 #, c-format msgid "package %s is not installed\n" msgstr "balík %s nie je nain¹talovanı\n" -#: lib/query.c:612 +#: lib/query.c:633 #, c-format msgid "error looking for package %s\n" msgstr "chyba pri hµadaní balíka %s\n" -#: lib/query.c:634 +#: lib/query.c:655 msgid "rpmQuery: rpmdbOpen() failed\n" msgstr "rpmQuery: rpmdbOpen() zlyhalo\n" -#: lib/query.c:693 +#: lib/query.c:714 msgid "query package owning file" msgstr "opıta» sa balíku vlastniaceho súbor" -#: lib/query.c:695 +#: lib/query.c:716 msgid "query packages in group" msgstr "opıta» sa v¹etkıch balíkov v skupine" -#: lib/query.c:697 +#: lib/query.c:718 msgid "query a package file" msgstr "opıta» sa súboru balíka" -#: lib/query.c:701 +#: lib/query.c:722 msgid "query a spec file" msgstr "opıta» sa spec súboru" -#: lib/query.c:703 +#: lib/query.c:724 msgid "query the pacakges triggered by the package" msgstr "opıta» sa balíkov spustenıch balíkom" -#: lib/query.c:705 +#: lib/query.c:726 msgid "query the packages which require a capability" msgstr "opıta» sa balíkov vy¾adujúcich schopnos»" -#: lib/query.c:707 +#: lib/query.c:728 msgid "query the packages which provide a capability" msgstr "opıta» sa balíkov poskytujúcich schopnos»" -#: lib/query.c:746 +#: lib/query.c:767 msgid "list all configuration files" msgstr "zobrazi» v¹etky konfiguraèné súbory" -#: lib/query.c:748 +#: lib/query.c:769 #, fuzzy msgid "list all documentation files" msgstr "zobrazi» v¹etky dokumentaèné súbory" -#: lib/query.c:750 +#: lib/query.c:771 msgid "dump basic file information" msgstr "zobrazi» základné informácie o balíku" -#: lib/query.c:752 +#: lib/query.c:773 msgid "list files in package" msgstr "zobrazi» súbory v balíku" -#: lib/query.c:756 +#: lib/query.c:777 msgid "use the following query format" msgstr "pou¾i» nasledovnı formát otázky" -#: lib/query.c:758 +#: lib/query.c:779 msgid "substitute i18n sections from the following catalogue" msgstr "" -#: lib/query.c:761 +#: lib/query.c:782 msgid "display the states of the listed files" msgstr "zobrazii» stav danıch súborov" -#: lib/query.c:763 +#: lib/query.c:784 msgid "display a verbose file listing" msgstr "zobrazi» podrobnı zoznam súborov balíka" @@ -2873,12 +2873,12 @@ msgstr "vykonanie zlyhalo\n" #: lib/rpmchecksig.c:74 #, fuzzy, c-format -msgid "%s: fdWrite failed: %s\n" -msgstr "%s: otvorenie zlyhalo\n" +msgid "%s: Fwrite failed: %s\n" +msgstr "%s: readLead zlyhalo\n" #: lib/rpmchecksig.c:80 #, fuzzy, c-format -msgid "%s: fdRead failed: %s\n" +msgid "%s: Fread failed: %s\n" msgstr "%s: readLead zlyhalo\n" #: lib/rpmchecksig.c:113 lib/rpmchecksig.c:242 @@ -2976,76 +2976,76 @@ msgstr "" "existuje databáza v starom formáte; pou¾ite --rebuilddb pre vytvorenie " "databázy v novom formáte" -#: lib/rpmdb.c:439 +#: lib/rpmdb.c:468 #, c-format msgid "package %s not listed in %s" msgstr "balík %s nie je uvedenı v %s" -#: lib/rpmdb.c:450 +#: lib/rpmdb.c:479 #, c-format msgid "package %s not found in %s" msgstr "balík %s nebol nájdenı v %s" -#: lib/rpmdb.c:475 lib/uninstall.c:85 +#: lib/rpmdb.c:503 lib/uninstall.c:85 #, c-format msgid "cannot read header at %d for uninstall" msgstr "nie je mo¾né preèíta» hlavièku na %d pre odin¹talovanie" -#: lib/rpmdb.c:483 +#: lib/rpmdb.c:511 msgid "package has no name" msgstr "balík nemá meno" -#: lib/rpmdb.c:485 +#: lib/rpmdb.c:513 msgid "removing name index\n" msgstr "odstraòuje sa index názvov\n" -#: lib/rpmdb.c:490 +#: lib/rpmdb.c:518 msgid "package has no group\n" msgstr "balík nemá skupinu\n" -#: lib/rpmdb.c:492 +#: lib/rpmdb.c:520 msgid "removing group index\n" msgstr "odstraòuje sa index skupín\n" -#: lib/rpmdb.c:499 +#: lib/rpmdb.c:527 #, c-format msgid "removing provides index for %s\n" msgstr "odstraòuje sa index poskytovanıch vlastností pre %s\n" -#: lib/rpmdb.c:514 +#: lib/rpmdb.c:542 #, c-format msgid "removing requiredby index for %s\n" msgstr "odstraòuje sa index po¾iadaviek pre %s\n" -#: lib/rpmdb.c:526 +#: lib/rpmdb.c:554 #, c-format msgid "removing trigger index for %s\n" msgstr "odstraòuje sa index triggerov pre %s\n" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:565 #, c-format msgid "removing conflict index for %s\n" msgstr "odstraòuje sa index kolízií pre %s\n" -#: lib/rpmdb.c:554 +#: lib/rpmdb.c:576 #, c-format msgid "removing file index for %s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: lib/rpmdb.c:563 +#: lib/rpmdb.c:585 msgid "package has no files\n" msgstr "balík neobsahuje ¾iadne súbory\n" -#: lib/rpmdb.c:645 +#: lib/rpmdb.c:667 msgid "cannot allocate space for database" msgstr "nie je mo¾né prideli» miesto pre databázu" -#: lib/rpmdb.c:711 +#: lib/rpmdb.c:726 #, c-format msgid "cannot read header at %d for update" msgstr "nie je mo¾né preèíta» hlavièku na %d pre úpravu" -#: lib/rpmdb.c:720 +#: lib/rpmdb.c:735 msgid "header changed size!" msgstr "zmenila sa veµkos» hlavièky!" @@ -3204,37 +3204,37 @@ msgstr "Nie je mo¾né preèíta» %s: %s." msgid "missing ':' at %s:%d" msgstr "chıbajúca ':' na %s:%d" -#: lib/rpmrc.c:655 lib/rpmrc.c:729 +#: lib/rpmrc.c:655 lib/rpmrc.c:730 #, c-format msgid "missing argument for %s at %s:%d" msgstr "chıbajúci argument pre %s na %s:%d" -#: lib/rpmrc.c:672 lib/rpmrc.c:694 +#: lib/rpmrc.c:672 lib/rpmrc.c:695 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "expanzia %s zlyhala na %s:%d \"%s\"" -#: lib/rpmrc.c:680 +#: lib/rpmrc.c:681 #, c-format msgid "cannot open %s at %s:%d" msgstr "nie je mo¾né otvori» %s na %s:%d" -#: lib/rpmrc.c:721 +#: lib/rpmrc.c:722 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "chıbajúca architektúra pre %s na %s:%d" -#: lib/rpmrc.c:788 +#: lib/rpmrc.c:789 #, c-format msgid "bad option '%s' at %s:%d" msgstr "chybná voµba '%s' na %s:%d" -#: lib/rpmrc.c:1147 +#: lib/rpmrc.c:1149 #, c-format msgid "Unknown system: %s\n" msgstr "Neznámy systém: %s\n" -#: lib/rpmrc.c:1148 +#: lib/rpmrc.c:1150 msgid "Please contact rpm-list@redhat.com\n" msgstr "Kontaktujte prosím rpm-list@redhat.com\n" @@ -3377,17 +3377,27 @@ msgstr "Musíte nastavi» \"%%gpg_name\" vo va¹om makro-súbore" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "Musíte nastavi» \"%%pgp_name\" vo va¹om makro-súbore" -#: lib/transaction.c:363 +#: lib/transaction.c:386 +#, fuzzy, c-format +msgid "excluding file %s%s\n" +msgstr "vynecháva sa %s\n" + +#: lib/transaction.c:412 lib/transaction.c:496 +#, fuzzy, c-format +msgid "excluding directory %s\n" +msgstr "vytvára sa adresár %s\n" + +#: lib/transaction.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "presúva sa %s do %s\n" -#: lib/transaction.c:370 -#, c-format -msgid "excluding %s\n" -msgstr "vynecháva sa %s\n" - #: lib/transaction.c:489 +#, fuzzy, c-format +msgid "relocating directory %s to %s\n" +msgstr "presúva sa %s do %s\n" + +#: lib/transaction.c:637 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s vynechané kvôli príznaku missingok\n" @@ -3417,15 +3427,15 @@ msgstr "nie je mo¾né preèíta» balíky %s pre odin¹talovanie" msgid "will remove files test = %d\n" msgstr "budú sa odstraòova» súbory test = %d\n" -#: lib/uninstall.c:191 +#: lib/uninstall.c:207 msgid "running postuninstall script (if any)\n" msgstr "vykonávajú sa postdein¹talaèné skripty (ak existujú)\n" -#: lib/uninstall.c:204 +#: lib/uninstall.c:220 msgid "removing database entry\n" msgstr "odstraòuje sa záznam z databázy\n" -#: lib/uninstall.c:365 +#: lib/uninstall.c:381 msgid "execution of script failed" msgstr "vykonanie skriptu zlyhalo" @@ -3459,34 +3469,38 @@ msgstr "nepodarilo sa vytvori» %s\n" msgid "don't verify files in package" msgstr "zobrazi» súbory v balíku" -#: lib/verify.c:208 +#: lib/verify.c:213 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" "v balíku chıba tak meno pou¾ívateµa, ako aj zoznamy identifikácií (nemalo by " "sa nikdy sta»)" -#: lib/verify.c:226 +#: lib/verify.c:231 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" "v balíku chıba tak meno skupiny, ako aj zoznamy identifikácií (nemalo by sa " "nikdy sta»)" -#: lib/verify.c:259 +#: lib/verify.c:266 #, c-format msgid "missing %s\n" msgstr "chıbajúce %s\n" -#: lib/verify.c:321 +#: lib/verify.c:328 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: " -#: lib/verify.c:369 +#: lib/verify.c:376 #, fuzzy msgid "rpmVerify: rpmdbOpen() failed\n" msgstr "rpmQuery: rpmdbOpen() zlyhalo\n" #, fuzzy +#~ msgid "%s: fdWrite failed: %s\n" +#~ msgstr "%s: otvorenie zlyhalo\n" + +#, fuzzy #~ msgid "failed build prerequisites:\n" #~ msgstr "nevyrie¹ené závislosti:\n" @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 1999-10-04 16:05-0400\n" +"POT-Creation-Date: 1999-10-27 12:52-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" @@ -1279,36 +1279,36 @@ msgstr "nedostaje paket za potpisivanje" msgid "no packages files given for rebuild" msgstr "nedosataje paket za rekreiranje" -#: rpm.c:1230 +#: rpm.c:1234 msgid "no spec files given for build" msgstr "nedostaje specifikacije za kreiranje" -#: rpm.c:1232 +#: rpm.c:1236 msgid "no tar files given for build" msgstr "nedostaju 'tar' datoteke za kreiranje" -#: rpm.c:1244 +#: rpm.c:1248 msgid "no packages given for uninstall" msgstr "neodstaje paket za deinstalaciju" -#: rpm.c:1294 +#: rpm.c:1298 msgid "no packages given for install" msgstr "nedostaje paket za instalaciju" -#: rpm.c:1317 +#: rpm.c:1321 msgid "extra arguments given for query of all packages" msgstr "suvi¹ni argumenti su navedeni za upit nad svim paketima" -#: rpm.c:1322 +#: rpm.c:1326 msgid "no arguments given for query" msgstr "nedostaju argumenti za upit" -#: rpm.c:1339 +#: rpm.c:1343 #, fuzzy msgid "extra arguments given for verify of all packages" msgstr "suvi¹ni argumenti su navedeni za upit nad svim paketima" -#: rpm.c:1343 +#: rpm.c:1347 msgid "no arguments given for verify" msgstr "nedostaju argumenti za proveru" @@ -1321,7 +1321,7 @@ msgstr "" msgid "error reading header from package\n" msgstr "gre¹ka potrage za paketom %s\n" -#: build/build.c:83 build/pack.c:263 +#: build/build.c:83 build/pack.c:267 #, fuzzy msgid "Unable to open temp file" msgstr "Ne mogu da otvorim %s za èitanje: %s" @@ -1341,60 +1341,60 @@ msgstr "neuspelo otvaranje %s: %s\n" msgid "Bad exit status from %s (%s)" msgstr "" -#: build/expression.c:208 +#: build/expression.c:207 #, fuzzy msgid "syntax error while parsing ==" msgstr "oèekivan znak ? u izrazu" -#: build/expression.c:238 +#: build/expression.c:237 #, fuzzy msgid "syntax error while parsing &&" msgstr "oèekivan znak ? u izrazu" -#: build/expression.c:247 +#: build/expression.c:246 #, fuzzy msgid "syntax error while parsing ||" msgstr "oèekivan znak ? u izrazu" -#: build/expression.c:289 +#: build/expression.c:288 #, fuzzy msgid "parse error in expression" msgstr "oèekivan znak ? u izrazu" -#: build/expression.c:319 +#: build/expression.c:318 msgid "unmatched (" msgstr "" -#: build/expression.c:337 +#: build/expression.c:336 msgid "undefined identifier" msgstr "" -#: build/expression.c:356 +#: build/expression.c:355 msgid "- only on numbers" msgstr "" -#: build/expression.c:372 +#: build/expression.c:371 msgid "! only on numbers" msgstr "" -#: build/expression.c:411 build/expression.c:456 build/expression.c:513 -#: build/expression.c:600 +#: build/expression.c:410 build/expression.c:455 build/expression.c:512 +#: build/expression.c:599 msgid "types must match" msgstr "" -#: build/expression.c:424 +#: build/expression.c:423 msgid "* / not suported for strings" msgstr "" -#: build/expression.c:472 +#: build/expression.c:471 msgid "- not suported for strings" msgstr "" -#: build/expression.c:613 +#: build/expression.c:612 msgid "&& and || not suported for strings" msgstr "" -#: build/expression.c:644 build/expression.c:689 +#: build/expression.c:645 build/expression.c:692 #, fuzzy msgid "syntax error in expression" msgstr "oèekivan znak ? u izrazu" @@ -1475,82 +1475,82 @@ msgstr "" msgid "File listed twice: %s" msgstr "Neuspelo èitanje %s: %s." -#: build/files.c:951 +#: build/files.c:953 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s" msgstr "Neuspelo èitanje %s: %s." -#: build/files.c:961 +#: build/files.c:963 #, fuzzy, c-format msgid "File not found: %s" msgstr "Datoteka nije pronağena na serveru" -#: build/files.c:1004 +#: build/files.c:1006 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1018 +#: build/files.c:1020 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/files.c:1088 +#: build/files.c:1090 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1132 +#: build/files.c:1134 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Datoteka nije pronağena na serveru" -#: build/files.c:1174 +#: build/files.c:1176 #, fuzzy msgid "Could not open %%files file: %s" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/files.c:1181 build/pack.c:485 +#: build/files.c:1183 build/pack.c:488 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1508 build/parsePrep.c:29 +#: build/files.c:1510 build/parsePrep.c:29 #, c-format msgid "Bad owner/group: %s" msgstr "" -#: build/files.c:1562 +#: build/files.c:1564 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "Ne mogu da izvr¹im PGP" -#: build/files.c:1567 +#: build/files.c:1569 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Ne mogu da proèitam 'sigtarget'" -#: build/files.c:1649 +#: build/files.c:1651 #, fuzzy, c-format msgid "%s failed" msgstr "PGP omanuo" -#: build/files.c:1653 +#: build/files.c:1655 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "neuspelo kreiranje %s\n" -#: build/files.c:1742 +#: build/files.c:1744 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1772 build/files.c:1781 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "neuspelo kreiranje %s\n" -#: build/files.c:1885 +#: build/files.c:1887 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "neuspelo otvaranje %s: %s" @@ -1568,106 +1568,106 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:131 +#: build/pack.c:132 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:148 +#: build/pack.c:149 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: build/pack.c:183 +#: build/pack.c:184 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/pack.c:193 +#: build/pack.c:194 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "Neuspelo èitanje %s: %s." -#: build/pack.c:213 +#: build/pack.c:215 #, fuzzy, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "gre¹ka: èini se da %s nije RPM paket\n" -#: build/pack.c:219 +#: build/pack.c:221 #, fuzzy, c-format msgid "readRPM: reading header from %s\n" msgstr "gre¹ka kod uzimanja sloga %s iz %s" -#: build/pack.c:274 +#: build/pack.c:278 msgid "Bad CSA data" msgstr "" -#: build/pack.c:305 +#: build/pack.c:311 #, fuzzy, c-format msgid "Could not open %s\n" msgstr "neuspelo otvaranje %s\n" -#: build/pack.c:337 build/pack.c:379 +#: build/pack.c:343 build/pack.c:385 #, fuzzy, c-format msgid "Unable to write package: %s" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:352 +#: build/pack.c:358 #, fuzzy, c-format msgid "Generating signature: %d\n" msgstr "napravi PGP potpis" -#: build/pack.c:369 +#: build/pack.c:375 #, fuzzy, c-format msgid "Unable to read sigtarget: %s" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:394 +#: build/pack.c:400 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:411 build/pack.c:435 +#: build/pack.c:416 build/pack.c:439 #, fuzzy, c-format msgid "create archive failed on file %s: %s" msgstr "neuspelo otvaranje %s: %s" -#: build/pack.c:455 +#: build/pack.c:458 #, c-format msgid "cpio_copy write failed: %s" msgstr "" -#: build/pack.c:462 +#: build/pack.c:465 #, fuzzy, c-format msgid "cpio_copy read failed: %s" msgstr "neuspelo èitanje: %s (%d)" -#: build/pack.c:541 +#: build/pack.c:544 #, fuzzy, c-format msgid "Could not open PreIn file: %s" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/pack.c:548 +#: build/pack.c:551 #, fuzzy, c-format msgid "Could not open PreUn file: %s" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/pack.c:555 +#: build/pack.c:558 #, fuzzy, c-format msgid "Could not open PostIn file: %s" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/pack.c:562 +#: build/pack.c:565 #, fuzzy, c-format msgid "Could not open PostUn file: %s" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/pack.c:570 +#: build/pack.c:573 #, c-format msgid "Could not open VerifyScript file: %s" msgstr "" -#: build/pack.c:586 +#: build/pack.c:589 #, c-format msgid "Could not open Trigger script file: %s" msgstr "" @@ -1710,17 +1710,17 @@ msgstr "" msgid "line %d: Bad option %s: %s" msgstr "neuspelo otvaranje %s: %s" -#: build/parseDescription.c:60 build/parseFiles.c:54 build/parseScript.c:182 +#: build/parseDescription.c:59 build/parseFiles.c:53 build/parseScript.c:181 #, c-format msgid "line %d: Too many names: %s" msgstr "" -#: build/parseDescription.c:70 build/parseFiles.c:64 build/parseScript.c:192 +#: build/parseDescription.c:69 build/parseFiles.c:63 build/parseScript.c:191 #, fuzzy, c-format msgid "line %d: Package does not exist: %s" msgstr "paket %s nije naveden u %s" -#: build/parseDescription.c:82 +#: build/parseDescription.c:81 #, c-format msgid "line %d: Second description" msgstr "" @@ -1729,7 +1729,7 @@ msgstr "" msgid "line %d: Error parsing %%files: %s" msgstr "" -#: build/parseFiles.c:72 +#: build/parseFiles.c:71 msgid "line %d: Second %%files list" msgstr "" @@ -1824,22 +1824,22 @@ msgstr "nedostaje arhitektura za %s na %s:%d" msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:657 +#: build/parsePreamble.c:656 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Opcije odrednice paketa:" -#: build/parsePreamble.c:663 +#: build/parsePreamble.c:662 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:690 +#: build/parsePreamble.c:689 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:715 +#: build/parsePreamble.c:714 msgid "Spec file can't use BuildRoot" msgstr "" @@ -1863,43 +1863,43 @@ msgstr "" msgid "Couldn't download nosource %s: %s" msgstr "Neuspelo èitanje %s: %s." -#: build/parsePrep.c:191 +#: build/parsePrep.c:190 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:206 +#: build/parsePrep.c:205 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:227 +#: build/parsePrep.c:223 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:351 +#: build/parsePrep.c:346 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:359 +#: build/parsePrep.c:354 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:371 +#: build/parsePrep.c:366 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:377 +#: build/parsePrep.c:372 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:384 +#: build/parsePrep.c:379 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:388 +#: build/parsePrep.c:383 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:424 +#: build/parsePrep.c:419 msgid "line %d: second %%prep" msgstr "" @@ -1934,7 +1934,7 @@ msgstr "neuspelo otvaranje %s: %s" msgid "line %d: triggers must have --: %s" msgstr "" -#: build/parseScript.c:146 build/parseScript.c:210 +#: build/parseScript.c:146 build/parseScript.c:209 #, c-format msgid "line %d: Error parsing %s: %s" msgstr "" @@ -1944,7 +1944,7 @@ msgstr "" msgid "line %d: script program must begin with '/': %s" msgstr "" -#: build/parseScript.c:201 +#: build/parseScript.c:200 #, c-format msgid "line %d: Second %s" msgstr "" @@ -1954,45 +1954,45 @@ msgstr "" msgid "line %d: %s" msgstr "neuspelo otvaranje %s: %s" -#: build/parseSpec.c:172 +#: build/parseSpec.c:173 #, fuzzy, c-format msgid "Unable to open: %s\n" msgstr "neuspelo otvaranje %s\n" -#: build/parseSpec.c:184 +#: build/parseSpec.c:185 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:243 +#: build/parseSpec.c:244 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:251 +#: build/parseSpec.c:252 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:262 +#: build/parseSpec.c:263 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:276 build/parseSpec.c:285 +#: build/parseSpec.c:277 build/parseSpec.c:286 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:366 +#: build/parseSpec.c:367 #, c-format msgid "Timecheck value must be an integer: %s" msgstr "" -#: build/parseSpec.c:449 +#: build/parseSpec.c:450 #, fuzzy msgid "No buildable architectures" msgstr "nemoj proveravati arhitekturu paketa" -#: build/parseSpec.c:494 +#: build/parseSpec.c:497 #, fuzzy msgid "Package has no %%description: %s" msgstr "paket %s nije naveden u %s" @@ -2017,53 +2017,53 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "pogre¹an broj paketa: %s\n" -#: lib/cpio.c:385 +#: lib/cpio.c:335 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "Neuspelo èitanje %s: %s." -#: lib/cpio.c:391 +#: lib/cpio.c:341 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:582 +#: lib/cpio.c:532 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1044 +#: lib/cpio.c:995 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "gre¹ka: " -#: lib/cpio.c:1047 +#: lib/cpio.c:998 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1048 +#: lib/cpio.c:999 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1066 +#: lib/cpio.c:1017 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1067 +#: lib/cpio.c:1018 #, fuzzy msgid "Unknown file type" msgstr "(nepoznat tip)" -#: lib/cpio.c:1068 +#: lib/cpio.c:1019 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1069 +#: lib/cpio.c:1020 #, fuzzy msgid "Internal error" msgstr "fatalna gre¹ka: " -#: lib/cpio.c:1078 +#: lib/cpio.c:1029 #, fuzzy msgid " failed - " msgstr "PGP omanuo" @@ -2089,90 +2089,90 @@ msgid "error removing record %s into %s" msgstr "gre¹ka uklanjanja sloga %s u %s" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:339 +#: lib/depends.c:404 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:368 +#: lib/depends.c:433 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:460 +#: lib/depends.c:525 msgid "dbrecMatchesDepFlags() failed to read header" msgstr "" -#: lib/depends.c:695 +#: lib/depends.c:760 +#, c-format +msgid "%s: %s satisfied by added file list.\n" +msgstr "" + +#: lib/depends.c:799 #, fuzzy, c-format msgid "%s: %s satisfied by added package.\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:712 +#: lib/depends.c:816 #, c-format msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:717 -#, c-format -msgid "%s: %s satisfied by added file list.\n" -msgstr "" - -#: lib/depends.c:747 +#: lib/depends.c:847 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:775 +#: lib/depends.c:875 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:797 +#: lib/depends.c:897 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:819 +#: lib/depends.c:919 #, fuzzy, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:832 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:942 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:890 +#: lib/depends.c:990 #, fuzzy, c-format msgid "package %s require not satisfied: %s\n" msgstr "paket %s nije naveden u %s" #. conflicts exist. -#: lib/depends.c:952 +#: lib/depends.c:1052 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s nije naveden u %s" -#: lib/depends.c:1007 lib/depends.c:1311 +#: lib/depends.c:1107 lib/depends.c:1415 #, c-format msgid "cannot read header at %d for dependency check" msgstr "ne mogu da proèitam zaglavlje na %s za proveru zavisnosti" -#: lib/depends.c:1102 +#: lib/depends.c:1202 #, c-format msgid "loop in prerequisite chain: %s" msgstr "petlja u lancu: %s" -#: lib/falloc.c:160 +#: lib/falloc.c:157 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2182,8 +2182,8 @@ msgid "" "if \"rpm --rebuilddb\" fails to correct the problem.\n" msgstr "" -#: lib/formats.c:66 lib/formats.c:84 lib/formats.c:105 lib/formats.c:138 -#: lib/header.c:2122 lib/header.c:2139 lib/header.c:2159 +#: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141 +#: lib/header.c:2138 lib/header.c:2155 lib/header.c:2175 msgid "(not a number)" msgstr "(nije broj)" @@ -2286,75 +2286,75 @@ msgstr "" msgid "Data type %d not supprted\n" msgstr "" -#: lib/header.c:1119 +#: lib/header.c:1120 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" -#: lib/header.c:1520 +#: lib/header.c:1529 #, c-format msgid "missing { after %" msgstr "nedostaje { posle %" -#: lib/header.c:1548 +#: lib/header.c:1557 msgid "missing } after %{" msgstr "nedostaje } posle %" -#: lib/header.c:1560 +#: lib/header.c:1569 msgid "empty tag format" msgstr "prazan 'tag' format'" -#: lib/header.c:1570 +#: lib/header.c:1579 msgid "empty tag name" msgstr "prazno ime tag-a" -#: lib/header.c:1585 +#: lib/header.c:1594 msgid "unknown tag" msgstr "nepoznat tag" -#: lib/header.c:1611 +#: lib/header.c:1620 msgid "] expected at end of array" msgstr "] oèekivano na kraju niza" -#: lib/header.c:1627 +#: lib/header.c:1636 msgid "unexpected ]" msgstr "neoèekivano ]" -#: lib/header.c:1629 +#: lib/header.c:1638 msgid "unexpected }" msgstr "neoèekivano }" -#: lib/header.c:1682 +#: lib/header.c:1692 msgid "? expected in expression" msgstr "oèekivan znak ? u izrazu" -#: lib/header.c:1689 +#: lib/header.c:1699 #, fuzzy msgid "{ expected after ? in expression" msgstr "{ oèekivano posle ? u izrazu" -#: lib/header.c:1699 lib/header.c:1731 +#: lib/header.c:1709 lib/header.c:1744 msgid "} expected in expression" msgstr "} oèekivano u izrazu" -#: lib/header.c:1706 +#: lib/header.c:1717 msgid ": expected following ? subexpression" msgstr "oèekivano : praæeno ? podizrazom" -#: lib/header.c:1719 +#: lib/header.c:1731 #, fuzzy msgid "{ expected after : in expression" msgstr "{ oèekivano posle : u izrazu" -#: lib/header.c:1738 +#: lib/header.c:1752 msgid "| expected at end of expression" msgstr "| oèekivano na kraju izraza" -#: lib/header.c:1905 +#: lib/header.c:1921 msgid "(unknown type)" msgstr "(nepoznat tip)" -#: lib/install.c:141 lib/uninstall.c:179 +#: lib/install.c:141 lib/uninstall.c:193 #, fuzzy, c-format msgid " file: %s action: %s\n" msgstr "neuspelo otvaranje %s: %s" @@ -2375,88 +2375,88 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:358 +#: lib/install.c:355 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:359 +#: lib/install.c:356 msgid " on file " msgstr "" -#: lib/install.c:402 +#: lib/install.c:399 #, fuzzy msgid "installing a source package\n" msgstr "instaliraj paket" -#: lib/install.c:413 +#: lib/install.c:410 #, fuzzy, c-format msgid "cannot create %s: %s" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/install.c:421 lib/install.c:443 +#: lib/install.c:418 lib/install.c:440 #, fuzzy, c-format msgid "cannot write to %s" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/install.c:425 +#: lib/install.c:422 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:436 +#: lib/install.c:433 #, fuzzy, c-format msgid "cannot create %s" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/install.c:447 +#: lib/install.c:444 #, fuzzy, c-format msgid "spec file in: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/install.c:481 lib/install.c:509 +#: lib/install.c:478 lib/install.c:506 #, fuzzy msgid "source package contains no .spec file" msgstr "upit nad paketom koji ima <datoteku>" -#: lib/install.c:530 +#: lib/install.c:527 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:532 lib/install.c:810 lib/uninstall.c:26 +#: lib/install.c:529 lib/install.c:807 lib/uninstall.c:26 #, c-format msgid "rename of %s to %s failed: %s" msgstr "preimenovanje %s u %s nije uspelo: %s" -#: lib/install.c:622 +#: lib/install.c:619 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:679 +#: lib/install.c:676 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/install.c:740 +#: lib/install.c:737 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:745 +#: lib/install.c:742 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:770 +#: lib/install.c:767 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:806 +#: lib/install.c:803 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:880 +#: lib/install.c:877 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2465,84 +2465,84 @@ msgstr "" msgid "cannot read header at %d for lookup" msgstr "ne mogu da proèitam zaglavlje na %d za proveru" -#: lib/macro.c:149 +#: lib/macro.c:151 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: lib/macro.c:243 +#: lib/macro.c:245 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: lib/macro.c:278 +#: lib/macro.c:280 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: lib/macro.c:457 +#: lib/macro.c:459 msgid "Macro %%%s has unterminated body" msgstr "" -#: lib/macro.c:483 +#: lib/macro.c:485 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: lib/macro.c:489 +#: lib/macro.c:491 msgid "Macro %%%s has unterminated opts" msgstr "" -#: lib/macro.c:494 +#: lib/macro.c:496 msgid "Macro %%%s has empty body" msgstr "" -#: lib/macro.c:499 +#: lib/macro.c:501 msgid "Macro %%%s failed to expand" msgstr "" -#: lib/macro.c:524 +#: lib/macro.c:526 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: lib/macro.c:601 +#: lib/macro.c:603 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: lib/macro.c:698 +#: lib/macro.c:700 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: lib/macro.c:870 +#: lib/macro.c:872 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: lib/macro.c:936 lib/macro.c:952 +#: lib/macro.c:938 lib/macro.c:954 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: lib/macro.c:992 +#: lib/macro.c:994 msgid "A %% is followed by an unparseable macro" msgstr "" -#: lib/macro.c:1115 +#: lib/macro.c:1117 #, fuzzy msgid "Macro %%%.*s not found, skipping" msgstr "paket %s nije nağen u %s" -#: lib/macro.c:1196 +#: lib/macro.c:1198 msgid "Target buffer overflow" msgstr "" -#: lib/macro.c:1343 lib/macro.c:1351 +#: lib/macro.c:1345 lib/macro.c:1353 #, fuzzy, c-format msgid "File %s: %s" msgstr "neuspelo otvaranje %s: %s" -#: lib/macro.c:1354 +#: lib/macro.c:1356 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -2573,24 +2573,24 @@ msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" msgid "bad file state: %s" msgstr "neuspelo otvaranje %s: %s" -#: lib/package.c:234 +#: lib/package.c:237 msgid "package is a version one package!\n" msgstr "" -#: lib/package.c:239 +#: lib/package.c:242 msgid "old style source package -- I'll do my best\n" msgstr "" -#: lib/package.c:242 +#: lib/package.c:245 #, c-format msgid "archive offset is %d\n" msgstr "" -#: lib/package.c:252 +#: lib/package.c:256 msgid "old style binary package\n" msgstr "" -#: lib/package.c:298 +#: lib/package.c:316 msgid "" "only packages with major numbers <= 3 are supported by this version of RPM" msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a" @@ -2656,205 +2656,205 @@ msgstr "" msgid "error in format: %s\n" msgstr "gre¹ka u formatu: %s\n" -#: lib/query.c:180 +#: lib/query.c:181 msgid "(contains no files)" msgstr "(nema datoteka)" -#: lib/query.c:233 +#: lib/query.c:238 msgid "normal " msgstr "" -#: lib/query.c:235 +#: lib/query.c:240 msgid "replaced " msgstr "" -#: lib/query.c:237 +#: lib/query.c:242 #, fuzzy msgid "not installed " msgstr "paket %s nije instaliran\n" -#: lib/query.c:239 +#: lib/query.c:244 msgid "net shared " msgstr "" -#: lib/query.c:241 +#: lib/query.c:246 #, fuzzy, c-format msgid "(unknown %3d) " msgstr "(nepoznat tip)" -#: lib/query.c:245 +#: lib/query.c:250 msgid "(no state) " msgstr "" -#: lib/query.c:261 lib/query.c:291 +#: lib/query.c:267 lib/query.c:308 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:400 +#: lib/query.c:421 #, c-format msgid "record number %u\n" msgstr "" -#: lib/query.c:404 +#: lib/query.c:425 msgid "error: could not read database record\n" msgstr "gre¹ka: neuspelo èitanje sloga baze podataka\n" -#: lib/query.c:442 +#: lib/query.c:463 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/query.c:455 +#: lib/query.c:476 msgid "old format source packages cannot be queried\n" msgstr "Upit se ne mo¾e izvesti nad izvorni paketima u starom formatu\n" -#: lib/query.c:464 lib/rpminstall.c:203 +#: lib/query.c:485 lib/rpminstall.c:203 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s ne lièi na RPM paket\n" -#: lib/query.c:467 +#: lib/query.c:488 #, c-format msgid "query of %s failed\n" msgstr "upit nad %s neuspeo\n" -#: lib/query.c:494 +#: lib/query.c:515 #, fuzzy, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "upit nad %s neuspeo\n" -#: lib/query.c:519 +#: lib/query.c:540 msgid "could not read database record!\n" msgstr "neuspelo èitanje sloga baze podataka!\n" -#: lib/query.c:530 +#: lib/query.c:551 #, c-format msgid "group %s does not contain any packages\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/query.c:540 +#: lib/query.c:561 #, c-format msgid "no package provides %s\n" msgstr "nijedan paket ne obezbeğuje %s\n" -#: lib/query.c:550 +#: lib/query.c:571 #, c-format msgid "no package triggers %s\n" msgstr "nijedan paket ne aktivira %s\n" -#: lib/query.c:560 +#: lib/query.c:581 #, c-format msgid "no package requires %s\n" msgstr "nijedan paket ne zahteva %s\n" -#: lib/query.c:575 +#: lib/query.c:596 #, fuzzy, c-format msgid "file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/query.c:578 +#: lib/query.c:599 #, c-format msgid "file %s is not owned by any package\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/query.c:591 +#: lib/query.c:612 #, c-format msgid "invalid package number: %s\n" msgstr "pogre¹an broj paketa: %s\n" -#: lib/query.c:594 +#: lib/query.c:615 #, fuzzy, c-format msgid "package record number: %d\n" msgstr "pogre¹an broj paketa: %s\n" -#: lib/query.c:597 +#: lib/query.c:618 #, c-format msgid "record %d could not be read\n" msgstr "ne mogu da proèitam slog %d\n" -#: lib/query.c:609 lib/rpminstall.c:393 +#: lib/query.c:630 lib/rpminstall.c:393 #, c-format msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" -#: lib/query.c:612 +#: lib/query.c:633 #, c-format msgid "error looking for package %s\n" msgstr "gre¹ka kod potrage za paketom %s\n" -#: lib/query.c:634 +#: lib/query.c:655 #, fuzzy msgid "rpmQuery: rpmdbOpen() failed\n" msgstr "%s: Neuspelo otvaranje\n" -#: lib/query.c:693 +#: lib/query.c:714 #, fuzzy msgid "query package owning file" msgstr "upit nad paketom koji ima <datoteku>" -#: lib/query.c:695 +#: lib/query.c:716 #, fuzzy msgid "query packages in group" msgstr "paket nema imena" -#: lib/query.c:697 +#: lib/query.c:718 #, fuzzy msgid "query a package file" msgstr "upit nad svim paketima" -#: lib/query.c:701 +#: lib/query.c:722 #, fuzzy msgid "query a spec file" msgstr "upit nad %s neuspeo\n" -#: lib/query.c:703 +#: lib/query.c:724 #, fuzzy msgid "query the pacakges triggered by the package" msgstr "upit nad paketom koji ima <datoteku>" -#: lib/query.c:705 +#: lib/query.c:726 #, fuzzy msgid "query the packages which require a capability" msgstr "upit za pakete koji zahtevaju <i> svojstvo" -#: lib/query.c:707 +#: lib/query.c:728 #, fuzzy msgid "query the packages which provide a capability" msgstr "upit za pakete koji omoguæavaju <i> svojstvo" -#: lib/query.c:746 +#: lib/query.c:767 #, fuzzy msgid "list all configuration files" msgstr "prika¾i samo konfiguracione datoteke (povlaèi -i)" -#: lib/query.c:748 +#: lib/query.c:769 #, fuzzy msgid "list all documentation files" msgstr "instaliraj dokumentaciju" -#: lib/query.c:750 +#: lib/query.c:771 #, fuzzy msgid "dump basic file information" msgstr "prika¾i informacije o paketu" -#: lib/query.c:752 +#: lib/query.c:773 #, fuzzy msgid "list files in package" msgstr "instaliraj paket" -#: lib/query.c:756 +#: lib/query.c:777 msgid "use the following query format" msgstr "" -#: lib/query.c:758 +#: lib/query.c:779 msgid "substitute i18n sections from the following catalogue" msgstr "" -#: lib/query.c:761 +#: lib/query.c:782 msgid "display the states of the listed files" msgstr "" -#: lib/query.c:763 +#: lib/query.c:784 #, fuzzy msgid "display a verbose file listing" msgstr "prika¾i listu datoteka u paketu" @@ -2931,12 +2931,12 @@ msgstr "%s: Neuspelo otvaranje\n" #: lib/rpmchecksig.c:74 #, fuzzy, c-format -msgid "%s: fdWrite failed: %s\n" -msgstr "%s: Neuspelo otvaranje\n" +msgid "%s: Fwrite failed: %s\n" +msgstr "%s: Neuspeo 'readLead'\n" #: lib/rpmchecksig.c:80 #, fuzzy, c-format -msgid "%s: fdRead failed: %s\n" +msgid "%s: Fread failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" #: lib/rpmchecksig.c:113 lib/rpmchecksig.c:242 @@ -3033,78 +3033,78 @@ msgid "" "database" msgstr "" -#: lib/rpmdb.c:439 +#: lib/rpmdb.c:468 #, c-format msgid "package %s not listed in %s" msgstr "paket %s nije naveden u %s" -#: lib/rpmdb.c:450 +#: lib/rpmdb.c:479 #, c-format msgid "package %s not found in %s" msgstr "paket %s nije nağen u %s" -#: lib/rpmdb.c:475 lib/uninstall.c:85 +#: lib/rpmdb.c:503 lib/uninstall.c:85 #, c-format msgid "cannot read header at %d for uninstall" msgstr "ne mogu da proèitam zaglavlje na %d za deinstalaciju" -#: lib/rpmdb.c:483 +#: lib/rpmdb.c:511 msgid "package has no name" msgstr "paket nema imena" -#: lib/rpmdb.c:485 +#: lib/rpmdb.c:513 msgid "removing name index\n" msgstr "" -#: lib/rpmdb.c:490 +#: lib/rpmdb.c:518 #, fuzzy msgid "package has no group\n" msgstr "paket nema imena" -#: lib/rpmdb.c:492 +#: lib/rpmdb.c:520 msgid "removing group index\n" msgstr "" -#: lib/rpmdb.c:499 +#: lib/rpmdb.c:527 #, fuzzy, c-format msgid "removing provides index for %s\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: lib/rpmdb.c:514 +#: lib/rpmdb.c:542 #, fuzzy, c-format msgid "removing requiredby index for %s\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: lib/rpmdb.c:526 +#: lib/rpmdb.c:554 #, fuzzy, c-format msgid "removing trigger index for %s\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:565 #, c-format msgid "removing conflict index for %s\n" msgstr "" -#: lib/rpmdb.c:554 +#: lib/rpmdb.c:576 #, c-format msgid "removing file index for %s\n" msgstr "" -#: lib/rpmdb.c:563 +#: lib/rpmdb.c:585 #, fuzzy msgid "package has no files\n" msgstr "paket nema imena" -#: lib/rpmdb.c:645 +#: lib/rpmdb.c:667 msgid "cannot allocate space for database" msgstr "ne mogu da zauzmem prostor za bazu podataka" -#: lib/rpmdb.c:711 +#: lib/rpmdb.c:726 #, c-format msgid "cannot read header at %d for update" msgstr "ne mogu da proèitam zaglavlje na %d za a¾uriranje" -#: lib/rpmdb.c:720 +#: lib/rpmdb.c:735 msgid "header changed size!" msgstr "" @@ -3266,37 +3266,37 @@ msgstr "Neuspelo èitanje %s: %s." msgid "missing ':' at %s:%d" msgstr "nedostaje ':' na %s:%d" -#: lib/rpmrc.c:655 lib/rpmrc.c:729 +#: lib/rpmrc.c:655 lib/rpmrc.c:730 #, c-format msgid "missing argument for %s at %s:%d" msgstr "nedostaje argument za %s na %s:%d" -#: lib/rpmrc.c:672 lib/rpmrc.c:694 +#: lib/rpmrc.c:672 lib/rpmrc.c:695 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "neuspelo otvaranje %s: %s" -#: lib/rpmrc.c:680 +#: lib/rpmrc.c:681 #, fuzzy, c-format msgid "cannot open %s at %s:%d" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/rpmrc.c:721 +#: lib/rpmrc.c:722 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "nedostaje arhitektura za %s na %s:%d" -#: lib/rpmrc.c:788 +#: lib/rpmrc.c:789 #, c-format msgid "bad option '%s' at %s:%d" msgstr "lo¹a opcija '%s' na %s:%d" -#: lib/rpmrc.c:1147 +#: lib/rpmrc.c:1149 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1148 +#: lib/rpmrc.c:1150 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3449,17 +3449,27 @@ msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci" -#: lib/transaction.c:363 +#: lib/transaction.c:386 +#, fuzzy, c-format +msgid "excluding file %s%s\n" +msgstr "Pribavljam %s\n" + +#: lib/transaction.c:412 lib/transaction.c:496 +#, fuzzy, c-format +msgid "excluding directory %s\n" +msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" + +#: lib/transaction.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:370 +#: lib/transaction.c:489 #, fuzzy, c-format -msgid "excluding %s\n" -msgstr "Pribavljam %s\n" +msgid "relocating directory %s to %s\n" +msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/transaction.c:489 +#: lib/transaction.c:637 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3489,15 +3499,15 @@ msgstr "ne mogu da proèitam zaglavlje na %d za deinstalaciju" msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:191 +#: lib/uninstall.c:207 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:204 +#: lib/uninstall.c:220 msgid "removing database entry\n" msgstr "" -#: lib/uninstall.c:365 +#: lib/uninstall.c:381 msgid "execution of script failed" msgstr "neuspelo izvr¹avanje skripta" @@ -3532,30 +3542,34 @@ msgstr "neuspelo kreiranje %s\n" msgid "don't verify files in package" msgstr "instaliraj paket" -#: lib/verify.c:208 +#: lib/verify.c:213 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:226 +#: lib/verify.c:231 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:259 +#: lib/verify.c:266 #, fuzzy, c-format msgid "missing %s\n" msgstr "nedostaje { posle %" -#: lib/verify.c:321 +#: lib/verify.c:328 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nezadovoljene meğuzavisnosti za %s-%s-%s: " -#: lib/verify.c:369 +#: lib/verify.c:376 #, fuzzy msgid "rpmVerify: rpmdbOpen() failed\n" msgstr "%s: Neuspelo otvaranje\n" #, fuzzy +#~ msgid "%s: fdWrite failed: %s\n" +#~ msgstr "%s: Neuspelo otvaranje\n" + +#, fuzzy #~ msgid "failed build prerequisites:\n" #~ msgstr "lo¹e meğuzavisnosti:\n" @@ -1,5 +1,5 @@ msgid "" -msgstr "POT-Creation-Date: 1999-10-04 16:05-0400\n" +msgstr "POT-Creation-Date: 1999-10-27 12:52-0400\n" #: build.c:23 lib/rpminstall.c:222 lib/rpminstall.c:382 #, c-format @@ -1339,38 +1339,38 @@ msgstr "inga paket angivna för avinstallation" msgid "no packages files given for rebuild" msgstr "inga paket filer angivna för omtillverkning" -#: rpm.c:1230 +#: rpm.c:1234 msgid "no spec files given for build" msgstr "ingen spec filer angivna för tillverkning" -#: rpm.c:1232 +#: rpm.c:1236 #, fuzzy msgid "no tar files given for build" msgstr "ingen spec filer angivna för tillverkning" -#: rpm.c:1244 +#: rpm.c:1248 msgid "no packages given for uninstall" msgstr "inga paket angivna för avinstallation" -#: rpm.c:1294 +#: rpm.c:1298 msgid "no packages given for install" msgstr "inga paket angivna för installation" -#: rpm.c:1317 +#: rpm.c:1321 #, fuzzy msgid "extra arguments given for query of all packages" msgstr "inga parametrar angivna för undersökning" -#: rpm.c:1322 +#: rpm.c:1326 msgid "no arguments given for query" msgstr "inga parametrar angivna för undersökning" -#: rpm.c:1339 +#: rpm.c:1343 #, fuzzy msgid "extra arguments given for verify of all packages" msgstr "inga parametrar angivna för undersökning" -#: rpm.c:1343 +#: rpm.c:1347 msgid "no arguments given for verify" msgstr "inga parametrar angivna för verifiering" @@ -1382,7 +1382,7 @@ msgstr "" msgid "error reading header from package\n" msgstr "" -#: build/build.c:83 build/pack.c:263 +#: build/build.c:83 build/pack.c:267 #, fuzzy msgid "Unable to open temp file" msgstr "kan inte öppna: %s\n" @@ -1402,56 +1402,56 @@ msgstr "" msgid "Bad exit status from %s (%s)" msgstr "" -#: build/expression.c:208 +#: build/expression.c:207 msgid "syntax error while parsing ==" msgstr "" -#: build/expression.c:238 +#: build/expression.c:237 msgid "syntax error while parsing &&" msgstr "" -#: build/expression.c:247 +#: build/expression.c:246 msgid "syntax error while parsing ||" msgstr "" -#: build/expression.c:289 +#: build/expression.c:288 msgid "parse error in expression" msgstr "" -#: build/expression.c:319 +#: build/expression.c:318 msgid "unmatched (" msgstr "" -#: build/expression.c:337 +#: build/expression.c:336 msgid "undefined identifier" msgstr "" -#: build/expression.c:356 +#: build/expression.c:355 msgid "- only on numbers" msgstr "" -#: build/expression.c:372 +#: build/expression.c:371 msgid "! only on numbers" msgstr "" -#: build/expression.c:411 build/expression.c:456 build/expression.c:513 -#: build/expression.c:600 +#: build/expression.c:410 build/expression.c:455 build/expression.c:512 +#: build/expression.c:599 msgid "types must match" msgstr "" -#: build/expression.c:424 +#: build/expression.c:423 msgid "* / not suported for strings" msgstr "" -#: build/expression.c:472 +#: build/expression.c:471 msgid "- not suported for strings" msgstr "" -#: build/expression.c:613 +#: build/expression.c:612 msgid "&& and || not suported for strings" msgstr "" -#: build/expression.c:644 build/expression.c:689 +#: build/expression.c:645 build/expression.c:692 msgid "syntax error in expression" msgstr "" @@ -1531,82 +1531,82 @@ msgstr "" msgid "File listed twice: %s" msgstr "" -#: build/files.c:951 +#: build/files.c:953 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "" -#: build/files.c:961 +#: build/files.c:963 #, fuzzy, c-format msgid "File not found: %s" msgstr "inga paket angivna för avinstallation" -#: build/files.c:1004 +#: build/files.c:1006 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1018 +#: build/files.c:1020 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1088 +#: build/files.c:1090 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1132 +#: build/files.c:1134 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "inga paket angivna för avinstallation" -#: build/files.c:1174 +#: build/files.c:1176 #, fuzzy msgid "Could not open %%files file: %s" msgstr "kan inte öppna: %s\n" -#: build/files.c:1181 build/pack.c:485 +#: build/files.c:1183 build/pack.c:488 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1508 build/parsePrep.c:29 +#: build/files.c:1510 build/parsePrep.c:29 #, c-format msgid "Bad owner/group: %s" msgstr "" -#: build/files.c:1562 +#: build/files.c:1564 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "kan inte öppna: %s\n" -#: build/files.c:1567 +#: build/files.c:1569 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "kan inte öppna: %s\n" -#: build/files.c:1649 +#: build/files.c:1651 #, fuzzy, c-format msgid "%s failed" msgstr "Tillverkningen misslyckades.\n" -#: build/files.c:1653 +#: build/files.c:1655 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "kan inte öppna: %s\n" -#: build/files.c:1742 +#: build/files.c:1744 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1772 build/files.c:1781 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "kan inte öppna: %s\n" -#: build/files.c:1885 +#: build/files.c:1887 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1624,106 +1624,106 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:131 +#: build/pack.c:132 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:148 +#: build/pack.c:149 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "kan inte öppna: %s\n" -#: build/pack.c:183 +#: build/pack.c:184 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "kan inte öppna: %s\n" -#: build/pack.c:193 +#: build/pack.c:194 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "kan inte öppna: %s\n" -#: build/pack.c:213 +#: build/pack.c:215 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:219 +#: build/pack.c:221 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:274 +#: build/pack.c:278 msgid "Bad CSA data" msgstr "" -#: build/pack.c:305 +#: build/pack.c:311 #, fuzzy, c-format msgid "Could not open %s\n" msgstr "kan inte öppna: %s\n" -#: build/pack.c:337 build/pack.c:379 +#: build/pack.c:343 build/pack.c:385 #, fuzzy, c-format msgid "Unable to write package: %s" msgstr "kan inte öppna: %s\n" -#: build/pack.c:352 +#: build/pack.c:358 #, fuzzy, c-format msgid "Generating signature: %d\n" msgstr " --sign - tillverka en PGP signatur" -#: build/pack.c:369 +#: build/pack.c:375 #, fuzzy, c-format msgid "Unable to read sigtarget: %s" msgstr "kan inte öppna: %s\n" -#: build/pack.c:394 +#: build/pack.c:400 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:411 build/pack.c:435 +#: build/pack.c:416 build/pack.c:439 #, fuzzy, c-format msgid "create archive failed on file %s: %s" msgstr "kan inte öppna: %s\n" -#: build/pack.c:455 +#: build/pack.c:458 #, c-format msgid "cpio_copy write failed: %s" msgstr "" -#: build/pack.c:462 +#: build/pack.c:465 #, c-format msgid "cpio_copy read failed: %s" msgstr "" -#: build/pack.c:541 +#: build/pack.c:544 #, c-format msgid "Could not open PreIn file: %s" msgstr "" -#: build/pack.c:548 +#: build/pack.c:551 #, c-format msgid "Could not open PreUn file: %s" msgstr "" -#: build/pack.c:555 +#: build/pack.c:558 #, c-format msgid "Could not open PostIn file: %s" msgstr "" -#: build/pack.c:562 +#: build/pack.c:565 #, c-format msgid "Could not open PostUn file: %s" msgstr "" -#: build/pack.c:570 +#: build/pack.c:573 #, c-format msgid "Could not open VerifyScript file: %s" msgstr "" -#: build/pack.c:586 +#: build/pack.c:589 #, c-format msgid "Could not open Trigger script file: %s" msgstr "" @@ -1766,17 +1766,17 @@ msgstr "" msgid "line %d: Bad option %s: %s" msgstr "kan inte öppna: %s\n" -#: build/parseDescription.c:60 build/parseFiles.c:54 build/parseScript.c:182 +#: build/parseDescription.c:59 build/parseFiles.c:53 build/parseScript.c:181 #, c-format msgid "line %d: Too many names: %s" msgstr "" -#: build/parseDescription.c:70 build/parseFiles.c:64 build/parseScript.c:192 +#: build/parseDescription.c:69 build/parseFiles.c:63 build/parseScript.c:191 #, c-format msgid "line %d: Package does not exist: %s" msgstr "" -#: build/parseDescription.c:82 +#: build/parseDescription.c:81 #, c-format msgid "line %d: Second description" msgstr "" @@ -1785,7 +1785,7 @@ msgstr "" msgid "line %d: Error parsing %%files: %s" msgstr "" -#: build/parseFiles.c:72 +#: build/parseFiles.c:71 msgid "line %d: Second %%files list" msgstr "" @@ -1880,22 +1880,22 @@ msgstr "" msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:657 +#: build/parsePreamble.c:656 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Paket urvals parametrar:" -#: build/parsePreamble.c:663 +#: build/parsePreamble.c:662 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:690 +#: build/parsePreamble.c:689 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:715 +#: build/parsePreamble.c:714 msgid "Spec file can't use BuildRoot" msgstr "" @@ -1919,43 +1919,43 @@ msgstr "" msgid "Couldn't download nosource %s: %s" msgstr "kan inte öppna: %s\n" -#: build/parsePrep.c:191 +#: build/parsePrep.c:190 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:206 +#: build/parsePrep.c:205 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:227 +#: build/parsePrep.c:223 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:351 +#: build/parsePrep.c:346 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:359 +#: build/parsePrep.c:354 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:371 +#: build/parsePrep.c:366 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:377 +#: build/parsePrep.c:372 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:384 +#: build/parsePrep.c:379 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:388 +#: build/parsePrep.c:383 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:424 +#: build/parsePrep.c:419 msgid "line %d: second %%prep" msgstr "" @@ -1990,7 +1990,7 @@ msgstr "kan inte öppna: %s\n" msgid "line %d: triggers must have --: %s" msgstr "" -#: build/parseScript.c:146 build/parseScript.c:210 +#: build/parseScript.c:146 build/parseScript.c:209 #, c-format msgid "line %d: Error parsing %s: %s" msgstr "" @@ -2000,7 +2000,7 @@ msgstr "" msgid "line %d: script program must begin with '/': %s" msgstr "" -#: build/parseScript.c:201 +#: build/parseScript.c:200 #, c-format msgid "line %d: Second %s" msgstr "" @@ -2010,45 +2010,45 @@ msgstr "" msgid "line %d: %s" msgstr "kan inte öppna: %s\n" -#: build/parseSpec.c:172 +#: build/parseSpec.c:173 #, fuzzy, c-format msgid "Unable to open: %s\n" msgstr "kan inte öppna: %s\n" -#: build/parseSpec.c:184 +#: build/parseSpec.c:185 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:243 +#: build/parseSpec.c:244 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:251 +#: build/parseSpec.c:252 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:262 +#: build/parseSpec.c:263 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:276 build/parseSpec.c:285 +#: build/parseSpec.c:277 build/parseSpec.c:286 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:366 +#: build/parseSpec.c:367 #, c-format msgid "Timecheck value must be an integer: %s" msgstr "" -#: build/parseSpec.c:449 +#: build/parseSpec.c:450 #, fuzzy msgid "No buildable architectures" msgstr "%s går inte att tillverka på den här platformen\n" -#: build/parseSpec.c:494 +#: build/parseSpec.c:497 #, fuzzy msgid "Package has no %%description: %s" msgstr "inga paket angivna för avinstallation" @@ -2073,51 +2073,51 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:385 +#: lib/cpio.c:335 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "kan inte öppna: %s\n" -#: lib/cpio.c:391 +#: lib/cpio.c:341 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:582 +#: lib/cpio.c:532 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1044 +#: lib/cpio.c:995 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1047 +#: lib/cpio.c:998 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1048 +#: lib/cpio.c:999 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1066 +#: lib/cpio.c:1017 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1067 +#: lib/cpio.c:1018 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1068 +#: lib/cpio.c:1019 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1069 +#: lib/cpio.c:1020 msgid "Internal error" msgstr "" -#: lib/cpio.c:1078 +#: lib/cpio.c:1029 #, fuzzy msgid " failed - " msgstr "Tillverkningen misslyckades.\n" @@ -2143,90 +2143,90 @@ msgid "error removing record %s into %s" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:339 +#: lib/depends.c:404 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:368 +#: lib/depends.c:433 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:460 +#: lib/depends.c:525 msgid "dbrecMatchesDepFlags() failed to read header" msgstr "" -#: lib/depends.c:695 +#: lib/depends.c:760 #, c-format -msgid "%s: %s satisfied by added package.\n" +msgid "%s: %s satisfied by added file list.\n" msgstr "" -#: lib/depends.c:712 +#: lib/depends.c:799 #, c-format -msgid "%s: %s satisfied by added provide.\n" +msgid "%s: %s satisfied by added package.\n" msgstr "" -#: lib/depends.c:717 +#: lib/depends.c:816 #, c-format -msgid "%s: %s satisfied by added file list.\n" +msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:747 +#: lib/depends.c:847 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:775 +#: lib/depends.c:875 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:797 +#: lib/depends.c:897 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:819 +#: lib/depends.c:919 #, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:942 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:890 +#: lib/depends.c:990 #, fuzzy, c-format msgid "package %s require not satisfied: %s\n" msgstr "inga paket angivna för installation" #. conflicts exist. -#: lib/depends.c:952 +#: lib/depends.c:1052 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "inga paket angivna för avinstallation" -#: lib/depends.c:1007 lib/depends.c:1311 +#: lib/depends.c:1107 lib/depends.c:1415 #, c-format msgid "cannot read header at %d for dependency check" msgstr "" -#: lib/depends.c:1102 +#: lib/depends.c:1202 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" -#: lib/falloc.c:160 +#: lib/falloc.c:157 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2236,8 +2236,8 @@ msgid "" "if \"rpm --rebuilddb\" fails to correct the problem.\n" msgstr "" -#: lib/formats.c:66 lib/formats.c:84 lib/formats.c:105 lib/formats.c:138 -#: lib/header.c:2122 lib/header.c:2139 lib/header.c:2159 +#: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141 +#: lib/header.c:2138 lib/header.c:2155 lib/header.c:2175 msgid "(not a number)" msgstr "" @@ -2332,75 +2332,75 @@ msgstr "" msgid "Data type %d not supprted\n" msgstr "" -#: lib/header.c:1119 +#: lib/header.c:1120 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" -#: lib/header.c:1520 +#: lib/header.c:1529 #, c-format msgid "missing { after %" msgstr "" -#: lib/header.c:1548 +#: lib/header.c:1557 msgid "missing } after %{" msgstr "" -#: lib/header.c:1560 +#: lib/header.c:1569 msgid "empty tag format" msgstr "" -#: lib/header.c:1570 +#: lib/header.c:1579 msgid "empty tag name" msgstr "" -#: lib/header.c:1585 +#: lib/header.c:1594 msgid "unknown tag" msgstr "" -#: lib/header.c:1611 +#: lib/header.c:1620 msgid "] expected at end of array" msgstr "" -#: lib/header.c:1627 +#: lib/header.c:1636 #, fuzzy msgid "unexpected ]" msgstr "oväntad undersöknings källa" -#: lib/header.c:1629 +#: lib/header.c:1638 #, fuzzy msgid "unexpected }" msgstr "oväntad undersöknings källa" -#: lib/header.c:1682 +#: lib/header.c:1692 msgid "? expected in expression" msgstr "" -#: lib/header.c:1689 +#: lib/header.c:1699 msgid "{ expected after ? in expression" msgstr "" -#: lib/header.c:1699 lib/header.c:1731 +#: lib/header.c:1709 lib/header.c:1744 msgid "} expected in expression" msgstr "" -#: lib/header.c:1706 +#: lib/header.c:1717 msgid ": expected following ? subexpression" msgstr "" -#: lib/header.c:1719 +#: lib/header.c:1731 msgid "{ expected after : in expression" msgstr "" -#: lib/header.c:1738 +#: lib/header.c:1752 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:1905 +#: lib/header.c:1921 msgid "(unknown type)" msgstr "" -#: lib/install.c:141 lib/uninstall.c:179 +#: lib/install.c:141 lib/uninstall.c:193 #, c-format msgid " file: %s action: %s\n" msgstr "" @@ -2421,88 +2421,88 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:358 +#: lib/install.c:355 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:359 +#: lib/install.c:356 msgid " on file " msgstr "" -#: lib/install.c:402 +#: lib/install.c:399 #, fuzzy msgid "installing a source package\n" msgstr " --install <paketfil>" -#: lib/install.c:413 +#: lib/install.c:410 #, fuzzy, c-format msgid "cannot create %s: %s" msgstr "kan inte öppna: %s\n" -#: lib/install.c:421 lib/install.c:443 +#: lib/install.c:418 lib/install.c:440 #, fuzzy, c-format msgid "cannot write to %s" msgstr "kan inte öppna: %s\n" -#: lib/install.c:425 +#: lib/install.c:422 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:436 +#: lib/install.c:433 #, fuzzy, c-format msgid "cannot create %s" msgstr "kan inte öppna: %s\n" -#: lib/install.c:447 +#: lib/install.c:444 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:481 lib/install.c:509 +#: lib/install.c:478 lib/install.c:506 #, fuzzy msgid "source package contains no .spec file" msgstr " -f <fil>+ - undersök paket som äger <fil>" -#: lib/install.c:530 +#: lib/install.c:527 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:532 lib/install.c:810 lib/uninstall.c:26 +#: lib/install.c:529 lib/install.c:807 lib/uninstall.c:26 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:622 +#: lib/install.c:619 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:679 +#: lib/install.c:676 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "inga paket angivna för installation" -#: lib/install.c:740 +#: lib/install.c:737 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:745 +#: lib/install.c:742 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:770 +#: lib/install.c:767 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:806 +#: lib/install.c:803 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:880 +#: lib/install.c:877 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2511,84 +2511,84 @@ msgstr "" msgid "cannot read header at %d for lookup" msgstr "" -#: lib/macro.c:149 +#: lib/macro.c:151 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: lib/macro.c:243 +#: lib/macro.c:245 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: lib/macro.c:278 +#: lib/macro.c:280 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: lib/macro.c:457 +#: lib/macro.c:459 msgid "Macro %%%s has unterminated body" msgstr "" -#: lib/macro.c:483 +#: lib/macro.c:485 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: lib/macro.c:489 +#: lib/macro.c:491 msgid "Macro %%%s has unterminated opts" msgstr "" -#: lib/macro.c:494 +#: lib/macro.c:496 msgid "Macro %%%s has empty body" msgstr "" -#: lib/macro.c:499 +#: lib/macro.c:501 msgid "Macro %%%s failed to expand" msgstr "" -#: lib/macro.c:524 +#: lib/macro.c:526 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: lib/macro.c:601 +#: lib/macro.c:603 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: lib/macro.c:698 +#: lib/macro.c:700 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: lib/macro.c:870 +#: lib/macro.c:872 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: lib/macro.c:936 lib/macro.c:952 +#: lib/macro.c:938 lib/macro.c:954 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: lib/macro.c:992 +#: lib/macro.c:994 msgid "A %% is followed by an unparseable macro" msgstr "" -#: lib/macro.c:1115 +#: lib/macro.c:1117 #, fuzzy msgid "Macro %%%.*s not found, skipping" msgstr "inga paket angivna för avinstallation" -#: lib/macro.c:1196 +#: lib/macro.c:1198 msgid "Target buffer overflow" msgstr "" -#: lib/macro.c:1343 lib/macro.c:1351 +#: lib/macro.c:1345 lib/macro.c:1353 #, fuzzy, c-format msgid "File %s: %s" msgstr "kan inte öppna: %s\n" -#: lib/macro.c:1354 +#: lib/macro.c:1356 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -2619,24 +2619,24 @@ msgstr "" msgid "bad file state: %s" msgstr "kan inte öppna: %s\n" -#: lib/package.c:234 +#: lib/package.c:237 msgid "package is a version one package!\n" msgstr "" -#: lib/package.c:239 +#: lib/package.c:242 msgid "old style source package -- I'll do my best\n" msgstr "" -#: lib/package.c:242 +#: lib/package.c:245 #, c-format msgid "archive offset is %d\n" msgstr "" -#: lib/package.c:252 +#: lib/package.c:256 msgid "old style binary package\n" msgstr "" -#: lib/package.c:298 +#: lib/package.c:316 msgid "" "only packages with major numbers <= 3 are supported by this version of RPM" msgstr "" @@ -2702,204 +2702,204 @@ msgstr "" msgid "error in format: %s\n" msgstr "" -#: lib/query.c:180 +#: lib/query.c:181 msgid "(contains no files)" msgstr "" -#: lib/query.c:233 +#: lib/query.c:238 #, fuzzy msgid "normal " msgstr " -h" -#: lib/query.c:235 +#: lib/query.c:240 msgid "replaced " msgstr "" -#: lib/query.c:237 +#: lib/query.c:242 #, fuzzy msgid "not installed " msgstr "inga paket angivna för installation" -#: lib/query.c:239 +#: lib/query.c:244 msgid "net shared " msgstr "" -#: lib/query.c:241 +#: lib/query.c:246 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:245 +#: lib/query.c:250 msgid "(no state) " msgstr "" -#: lib/query.c:261 lib/query.c:291 +#: lib/query.c:267 lib/query.c:308 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:400 +#: lib/query.c:421 #, c-format msgid "record number %u\n" msgstr "" -#: lib/query.c:404 +#: lib/query.c:425 msgid "error: could not read database record\n" msgstr "" -#: lib/query.c:442 +#: lib/query.c:463 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "Tillverkningen misslyckades.\n" -#: lib/query.c:455 +#: lib/query.c:476 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:464 lib/rpminstall.c:203 +#: lib/query.c:485 lib/rpminstall.c:203 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:467 +#: lib/query.c:488 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:494 +#: lib/query.c:515 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:519 +#: lib/query.c:540 msgid "could not read database record!\n" msgstr "" -#: lib/query.c:530 +#: lib/query.c:551 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:540 +#: lib/query.c:561 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:550 +#: lib/query.c:571 #, fuzzy, c-format msgid "no package triggers %s\n" msgstr "inga paket angivna för installation" -#: lib/query.c:560 +#: lib/query.c:581 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:575 +#: lib/query.c:596 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:578 +#: lib/query.c:599 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:612 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:594 +#: lib/query.c:615 #, c-format msgid "package record number: %d\n" msgstr "" -#: lib/query.c:597 +#: lib/query.c:618 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:393 +#: lib/query.c:630 lib/rpminstall.c:393 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "inga paket angivna för installation" -#: lib/query.c:612 +#: lib/query.c:633 #, c-format msgid "error looking for package %s\n" msgstr "" -#: lib/query.c:634 +#: lib/query.c:655 msgid "rpmQuery: rpmdbOpen() failed\n" msgstr "" -#: lib/query.c:693 +#: lib/query.c:714 #, fuzzy msgid "query package owning file" msgstr " -f <fil>+ - undersök paket som äger <fil>" -#: lib/query.c:695 +#: lib/query.c:716 #, fuzzy msgid "query packages in group" msgstr "inga paket angivna för avinstallation" -#: lib/query.c:697 +#: lib/query.c:718 #, fuzzy msgid "query a package file" msgstr " -f <fil>+ - undersök paket som äger <fil>" -#: lib/query.c:701 +#: lib/query.c:722 msgid "query a spec file" msgstr "" -#: lib/query.c:703 +#: lib/query.c:724 #, fuzzy msgid "query the pacakges triggered by the package" msgstr " -f <fil>+ - undersök paket som äger <fil>" -#: lib/query.c:705 +#: lib/query.c:726 msgid "query the packages which require a capability" msgstr "" -#: lib/query.c:707 +#: lib/query.c:728 msgid "query the packages which provide a capability" msgstr "" -#: lib/query.c:746 +#: lib/query.c:767 #, fuzzy msgid "list all configuration files" msgstr "" " -c - visa enbart konfiguration filer (implicerar -l)" -#: lib/query.c:748 +#: lib/query.c:769 #, fuzzy msgid "list all documentation files" msgstr "" " -d - visa enbart dokumentation filer (implicerar -l)" -#: lib/query.c:750 +#: lib/query.c:771 #, fuzzy msgid "dump basic file information" msgstr " -i - visa paket information" -#: lib/query.c:752 +#: lib/query.c:773 #, fuzzy msgid "list files in package" msgstr " --install <paketfil>" -#: lib/query.c:756 +#: lib/query.c:777 msgid "use the following query format" msgstr "" -#: lib/query.c:758 +#: lib/query.c:779 msgid "substitute i18n sections from the following catalogue" msgstr "" -#: lib/query.c:761 +#: lib/query.c:782 msgid "display the states of the listed files" msgstr "" -#: lib/query.c:763 +#: lib/query.c:784 #, fuzzy msgid "display a verbose file listing" msgstr " -l - visa paketets fil lista" @@ -2975,14 +2975,14 @@ msgid "makeTempFile failed\n" msgstr "Tillverkningen misslyckades.\n" #: lib/rpmchecksig.c:74 -#, c-format -msgid "%s: fdWrite failed: %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%s: Fwrite failed: %s\n" +msgstr "kan inte öppna: %s\n" #: lib/rpmchecksig.c:80 -#, c-format -msgid "%s: fdRead failed: %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%s: Fread failed: %s\n" +msgstr "kan inte öppna: %s\n" #: lib/rpmchecksig.c:113 lib/rpmchecksig.c:242 #, c-format @@ -3077,78 +3077,78 @@ msgid "" "database" msgstr "" -#: lib/rpmdb.c:439 +#: lib/rpmdb.c:468 #, c-format msgid "package %s not listed in %s" msgstr "" -#: lib/rpmdb.c:450 +#: lib/rpmdb.c:479 #, fuzzy, c-format msgid "package %s not found in %s" msgstr "inga paket angivna för avinstallation" -#: lib/rpmdb.c:475 lib/uninstall.c:85 +#: lib/rpmdb.c:503 lib/uninstall.c:85 #, fuzzy, c-format msgid "cannot read header at %d for uninstall" msgstr "inga paket angivna för avinstallation" -#: lib/rpmdb.c:483 +#: lib/rpmdb.c:511 msgid "package has no name" msgstr "" -#: lib/rpmdb.c:485 +#: lib/rpmdb.c:513 msgid "removing name index\n" msgstr "" -#: lib/rpmdb.c:490 +#: lib/rpmdb.c:518 #, fuzzy msgid "package has no group\n" msgstr "inga paket angivna för avinstallation" -#: lib/rpmdb.c:492 +#: lib/rpmdb.c:520 msgid "removing group index\n" msgstr "" -#: lib/rpmdb.c:499 +#: lib/rpmdb.c:527 #, c-format msgid "removing provides index for %s\n" msgstr "" -#: lib/rpmdb.c:514 +#: lib/rpmdb.c:542 #, c-format msgid "removing requiredby index for %s\n" msgstr "" -#: lib/rpmdb.c:526 +#: lib/rpmdb.c:554 #, c-format msgid "removing trigger index for %s\n" msgstr "" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:565 #, c-format msgid "removing conflict index for %s\n" msgstr "" -#: lib/rpmdb.c:554 +#: lib/rpmdb.c:576 #, c-format msgid "removing file index for %s\n" msgstr "" -#: lib/rpmdb.c:563 +#: lib/rpmdb.c:585 #, fuzzy msgid "package has no files\n" msgstr "inga paket angivna för installation" -#: lib/rpmdb.c:645 +#: lib/rpmdb.c:667 msgid "cannot allocate space for database" msgstr "" -#: lib/rpmdb.c:711 +#: lib/rpmdb.c:726 #, c-format msgid "cannot read header at %d for update" msgstr "" -#: lib/rpmdb.c:720 +#: lib/rpmdb.c:735 msgid "header changed size!" msgstr "" @@ -3309,37 +3309,37 @@ msgstr "" msgid "missing ':' at %s:%d" msgstr "" -#: lib/rpmrc.c:655 lib/rpmrc.c:729 +#: lib/rpmrc.c:655 lib/rpmrc.c:730 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:672 lib/rpmrc.c:694 +#: lib/rpmrc.c:672 lib/rpmrc.c:695 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "kan inte öppna: %s\n" -#: lib/rpmrc.c:680 +#: lib/rpmrc.c:681 #, c-format msgid "cannot open %s at %s:%d" msgstr "" -#: lib/rpmrc.c:721 +#: lib/rpmrc.c:722 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:788 +#: lib/rpmrc.c:789 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1147 +#: lib/rpmrc.c:1149 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1148 +#: lib/rpmrc.c:1150 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3486,17 +3486,27 @@ msgstr "" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "" -#: lib/transaction.c:363 +#: lib/transaction.c:386 +#, fuzzy, c-format +msgid "excluding file %s%s\n" +msgstr "RPM version %s\n" + +#: lib/transaction.c:412 lib/transaction.c:496 +#, fuzzy, c-format +msgid "excluding directory %s\n" +msgstr "RPM version %s\n" + +#: lib/transaction.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:370 +#: lib/transaction.c:489 #, fuzzy, c-format -msgid "excluding %s\n" -msgstr "RPM version %s\n" +msgid "relocating directory %s to %s\n" +msgstr "kan inte öppna: %s\n" -#: lib/transaction.c:489 +#: lib/transaction.c:637 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3526,15 +3536,15 @@ msgstr "inga paket angivna för avinstallation" msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:191 +#: lib/uninstall.c:207 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:204 +#: lib/uninstall.c:220 msgid "removing database entry\n" msgstr "" -#: lib/uninstall.c:365 +#: lib/uninstall.c:381 msgid "execution of script failed" msgstr "" @@ -3568,25 +3578,25 @@ msgstr "kan inte öppna: %s\n" msgid "don't verify files in package" msgstr " --install <paketfil>" -#: lib/verify.c:208 +#: lib/verify.c:213 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:226 +#: lib/verify.c:231 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:259 +#: lib/verify.c:266 #, c-format msgid "missing %s\n" msgstr "" -#: lib/verify.c:321 +#: lib/verify.c:328 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: lib/verify.c:369 +#: lib/verify.c:376 msgid "rpmVerify: rpmdbOpen() failed\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-10-04 16:05-0400\n" +"POT-Creation-Date: 1999-10-27 12:52-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" @@ -1315,36 +1315,36 @@ msgstr "imzalanacak paketler belirtilmedi" msgid "no packages files given for rebuild" msgstr "yeniden oluşturmak için paket dosyaları belirtilmedi" -#: rpm.c:1230 +#: rpm.c:1234 msgid "no spec files given for build" msgstr "oluşturma için gerekli spec dosyası belirtilmedi" -#: rpm.c:1232 +#: rpm.c:1236 msgid "no tar files given for build" msgstr "oluşturma için gereken tar dosyaları belirttilmedi" -#: rpm.c:1244 +#: rpm.c:1248 msgid "no packages given for uninstall" msgstr "sistemden silinecek paketler belirtilmedi" -#: rpm.c:1294 +#: rpm.c:1298 msgid "no packages given for install" msgstr "yüklenecek paketler belirtilmedi" -#: rpm.c:1317 +#: rpm.c:1321 msgid "extra arguments given for query of all packages" msgstr "tüm paketlerin sorgulanması için fazladan argümanlar belirtildi" -#: rpm.c:1322 +#: rpm.c:1326 msgid "no arguments given for query" msgstr "sorgulama için hiç argüman belirtilmedi" -#: rpm.c:1339 +#: rpm.c:1343 #, fuzzy msgid "extra arguments given for verify of all packages" msgstr "tüm paketlerin sorgulanması için fazladan argümanlar belirtildi" -#: rpm.c:1343 +#: rpm.c:1347 msgid "no arguments given for verify" msgstr "doğrulama için hiç argüman belirtilmedi" @@ -1357,7 +1357,7 @@ msgstr "" msgid "error reading header from package\n" msgstr "%s paketi bulunamadı\n" -#: build/build.c:83 build/pack.c:263 +#: build/build.c:83 build/pack.c:267 #, fuzzy msgid "Unable to open temp file" msgstr "%s okuma erişimi için açılamadı:%s." @@ -1377,60 +1377,60 @@ msgstr "%s 'ye erisimde belirtilen hata oluştu: %s\n" msgid "Bad exit status from %s (%s)" msgstr "" -#: build/expression.c:208 +#: build/expression.c:207 #, fuzzy msgid "syntax error while parsing ==" msgstr "dizi içerisinde ? bekleniyordu" -#: build/expression.c:238 +#: build/expression.c:237 #, fuzzy msgid "syntax error while parsing &&" msgstr "dizi içerisinde ? bekleniyordu" -#: build/expression.c:247 +#: build/expression.c:246 #, fuzzy msgid "syntax error while parsing ||" msgstr "dizi içerisinde ? bekleniyordu" -#: build/expression.c:289 +#: build/expression.c:288 #, fuzzy msgid "parse error in expression" msgstr "dizi içerisinde ? bekleniyordu" -#: build/expression.c:319 +#: build/expression.c:318 msgid "unmatched (" msgstr "" -#: build/expression.c:337 +#: build/expression.c:336 msgid "undefined identifier" msgstr "" -#: build/expression.c:356 +#: build/expression.c:355 msgid "- only on numbers" msgstr "" -#: build/expression.c:372 +#: build/expression.c:371 msgid "! only on numbers" msgstr "" -#: build/expression.c:411 build/expression.c:456 build/expression.c:513 -#: build/expression.c:600 +#: build/expression.c:410 build/expression.c:455 build/expression.c:512 +#: build/expression.c:599 msgid "types must match" msgstr "" -#: build/expression.c:424 +#: build/expression.c:423 msgid "* / not suported for strings" msgstr "" -#: build/expression.c:472 +#: build/expression.c:471 msgid "- not suported for strings" msgstr "" -#: build/expression.c:613 +#: build/expression.c:612 msgid "&& and || not suported for strings" msgstr "" -#: build/expression.c:644 build/expression.c:689 +#: build/expression.c:645 build/expression.c:692 #, fuzzy msgid "syntax error in expression" msgstr "dizi içerisinde ? bekleniyordu" @@ -1511,82 +1511,82 @@ msgstr "" msgid "File listed twice: %s" msgstr "%s okunamadı: %s" -#: build/files.c:951 +#: build/files.c:953 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s" msgstr "%s okunamadı: %s" -#: build/files.c:961 +#: build/files.c:963 #, fuzzy, c-format msgid "File not found: %s" msgstr "Dosya sunucuda bulunamadı" -#: build/files.c:1004 +#: build/files.c:1006 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1018 +#: build/files.c:1020 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "%s açılamadı: %s" -#: build/files.c:1088 +#: build/files.c:1090 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1132 +#: build/files.c:1134 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Dosya sunucuda bulunamadı" -#: build/files.c:1174 +#: build/files.c:1176 #, fuzzy msgid "Could not open %%files file: %s" msgstr "hata: %s dosyası okunamadı\n" -#: build/files.c:1181 build/pack.c:485 +#: build/files.c:1183 build/pack.c:488 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1508 build/parsePrep.c:29 +#: build/files.c:1510 build/parsePrep.c:29 #, c-format msgid "Bad owner/group: %s" msgstr "" -#: build/files.c:1562 +#: build/files.c:1564 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "PGP çalıştırılamadı" -#: build/files.c:1567 +#: build/files.c:1569 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "İmza hedefi 'sigtarget' okunamadı" -#: build/files.c:1649 +#: build/files.c:1651 #, fuzzy, c-format msgid "%s failed" msgstr "PGP hata verdi" -#: build/files.c:1653 +#: build/files.c:1655 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "%s yaratılamıyor\n" -#: build/files.c:1742 +#: build/files.c:1744 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1772 build/files.c:1781 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "%s yaratılamıyor\n" -#: build/files.c:1885 +#: build/files.c:1887 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "%s açılamadı: %s" @@ -1604,107 +1604,107 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:131 +#: build/pack.c:132 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:148 +#: build/pack.c:149 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "%s dosyası açılamıyor: " -#: build/pack.c:183 +#: build/pack.c:184 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "%s açılamadı: %s" -#: build/pack.c:193 +#: build/pack.c:194 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "%s okunamadı: %s" -#: build/pack.c:213 +#: build/pack.c:215 #, fuzzy, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "hata: %s herhangi bir RPM pakedine ait görünmüyor\n" -#: build/pack.c:219 +#: build/pack.c:221 #, fuzzy, c-format msgid "readRPM: reading header from %s\n" msgstr "%s kaydına %s dosyasında erişilemiyor:" -#: build/pack.c:274 +#: build/pack.c:278 msgid "Bad CSA data" msgstr "" # , c-format -#: build/pack.c:305 +#: build/pack.c:311 #, fuzzy, c-format msgid "Could not open %s\n" msgstr "%s 'ye erişimde hata oluştu\n" -#: build/pack.c:337 build/pack.c:379 +#: build/pack.c:343 build/pack.c:385 #, fuzzy, c-format msgid "Unable to write package: %s" msgstr "%s 'nin yazılması mümkün değil" -#: build/pack.c:352 +#: build/pack.c:358 #, fuzzy, c-format msgid "Generating signature: %d\n" msgstr "PGP-imzası yaratır" -#: build/pack.c:369 +#: build/pack.c:375 #, fuzzy, c-format msgid "Unable to read sigtarget: %s" msgstr "%s 'nin yazılması mümkün değil" -#: build/pack.c:394 +#: build/pack.c:400 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:411 build/pack.c:435 +#: build/pack.c:416 build/pack.c:439 #, fuzzy, c-format msgid "create archive failed on file %s: %s" msgstr "%s açılamadı: %s" -#: build/pack.c:455 +#: build/pack.c:458 #, c-format msgid "cpio_copy write failed: %s" msgstr "" -#: build/pack.c:462 +#: build/pack.c:465 #, fuzzy, c-format msgid "cpio_copy read failed: %s" msgstr "okuma hatası: %s (%d)" -#: build/pack.c:541 +#: build/pack.c:544 #, fuzzy, c-format msgid "Could not open PreIn file: %s" msgstr "hata: %s dosyası okunamadı\n" -#: build/pack.c:548 +#: build/pack.c:551 #, fuzzy, c-format msgid "Could not open PreUn file: %s" msgstr "hata: %s dosyası okunamadı\n" -#: build/pack.c:555 +#: build/pack.c:558 #, fuzzy, c-format msgid "Could not open PostIn file: %s" msgstr "hata: %s dosyası okunamadı\n" -#: build/pack.c:562 +#: build/pack.c:565 #, fuzzy, c-format msgid "Could not open PostUn file: %s" msgstr "hata: %s dosyası okunamadı\n" -#: build/pack.c:570 +#: build/pack.c:573 #, c-format msgid "Could not open VerifyScript file: %s" msgstr "" -#: build/pack.c:586 +#: build/pack.c:589 #, c-format msgid "Could not open Trigger script file: %s" msgstr "" @@ -1747,17 +1747,17 @@ msgstr "" msgid "line %d: Bad option %s: %s" msgstr "%s açılamadı: %s" -#: build/parseDescription.c:60 build/parseFiles.c:54 build/parseScript.c:182 +#: build/parseDescription.c:59 build/parseFiles.c:53 build/parseScript.c:181 #, c-format msgid "line %d: Too many names: %s" msgstr "" -#: build/parseDescription.c:70 build/parseFiles.c:64 build/parseScript.c:192 +#: build/parseDescription.c:69 build/parseFiles.c:63 build/parseScript.c:191 #, fuzzy, c-format msgid "line %d: Package does not exist: %s" msgstr "%s paketi %s altında gözükmüyor" -#: build/parseDescription.c:82 +#: build/parseDescription.c:81 #, c-format msgid "line %d: Second description" msgstr "" @@ -1766,7 +1766,7 @@ msgstr "" msgid "line %d: Error parsing %%files: %s" msgstr "" -#: build/parseFiles.c:72 +#: build/parseFiles.c:71 msgid "line %d: Second %%files list" msgstr "" @@ -1861,22 +1861,22 @@ msgstr "%s için %s te eksik mimari:%d" msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:657 +#: build/parsePreamble.c:656 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Paket seçim seçenekleri:" -#: build/parsePreamble.c:663 +#: build/parsePreamble.c:662 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:690 +#: build/parsePreamble.c:689 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:715 +#: build/parsePreamble.c:714 msgid "Spec file can't use BuildRoot" msgstr "" @@ -1900,43 +1900,43 @@ msgstr "" msgid "Couldn't download nosource %s: %s" msgstr "%s okunamadı: %s" -#: build/parsePrep.c:191 +#: build/parsePrep.c:190 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:206 +#: build/parsePrep.c:205 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:227 +#: build/parsePrep.c:223 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:351 +#: build/parsePrep.c:346 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:359 +#: build/parsePrep.c:354 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:371 +#: build/parsePrep.c:366 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:377 +#: build/parsePrep.c:372 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:384 +#: build/parsePrep.c:379 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:388 +#: build/parsePrep.c:383 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:424 +#: build/parsePrep.c:419 msgid "line %d: second %%prep" msgstr "" @@ -1971,7 +1971,7 @@ msgstr "%s açılamadı: %s" msgid "line %d: triggers must have --: %s" msgstr "" -#: build/parseScript.c:146 build/parseScript.c:210 +#: build/parseScript.c:146 build/parseScript.c:209 #, c-format msgid "line %d: Error parsing %s: %s" msgstr "" @@ -1981,7 +1981,7 @@ msgstr "" msgid "line %d: script program must begin with '/': %s" msgstr "" -#: build/parseScript.c:201 +#: build/parseScript.c:200 #, c-format msgid "line %d: Second %s" msgstr "" @@ -1992,45 +1992,45 @@ msgid "line %d: %s" msgstr "%s açılamadı: %s" # , c-format -#: build/parseSpec.c:172 +#: build/parseSpec.c:173 #, fuzzy, c-format msgid "Unable to open: %s\n" msgstr "%s 'ye erişimde hata oluştu\n" -#: build/parseSpec.c:184 +#: build/parseSpec.c:185 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:243 +#: build/parseSpec.c:244 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:251 +#: build/parseSpec.c:252 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:262 +#: build/parseSpec.c:263 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:276 build/parseSpec.c:285 +#: build/parseSpec.c:277 build/parseSpec.c:286 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:366 +#: build/parseSpec.c:367 #, c-format msgid "Timecheck value must be an integer: %s" msgstr "" -#: build/parseSpec.c:449 +#: build/parseSpec.c:450 #, fuzzy msgid "No buildable architectures" msgstr "paket mimarisini doğrulamaz" -#: build/parseSpec.c:494 +#: build/parseSpec.c:497 #, fuzzy msgid "Package has no %%description: %s" msgstr "%s paketi %s altında gözükmüyor" @@ -2055,53 +2055,53 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "geçersiz paket numarsı: %s\n" -#: lib/cpio.c:385 +#: lib/cpio.c:335 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "%s okunamadı: %s" -#: lib/cpio.c:391 +#: lib/cpio.c:341 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:582 +#: lib/cpio.c:532 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1044 +#: lib/cpio.c:995 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "hata: " -#: lib/cpio.c:1047 +#: lib/cpio.c:998 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1048 +#: lib/cpio.c:999 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1066 +#: lib/cpio.c:1017 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1067 +#: lib/cpio.c:1018 #, fuzzy msgid "Unknown file type" msgstr "(bilinmeyen tip)" -#: lib/cpio.c:1068 +#: lib/cpio.c:1019 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1069 +#: lib/cpio.c:1020 #, fuzzy msgid "Internal error" msgstr "ölümcül hata: " -#: lib/cpio.c:1078 +#: lib/cpio.c:1029 #, fuzzy msgid " failed - " msgstr "PGP hata verdi" @@ -2127,90 +2127,90 @@ msgid "error removing record %s into %s" msgstr "%s kaydının %s dosyasından silinmesinde hata" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:339 +#: lib/depends.c:404 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:368 +#: lib/depends.c:433 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:460 +#: lib/depends.c:525 msgid "dbrecMatchesDepFlags() failed to read header" msgstr "" -#: lib/depends.c:695 +#: lib/depends.c:760 +#, c-format +msgid "%s: %s satisfied by added file list.\n" +msgstr "" + +#: lib/depends.c:799 #, fuzzy, c-format msgid "%s: %s satisfied by added package.\n" msgstr "%s dosyası, hiç bir pakete ait değil\n" -#: lib/depends.c:712 +#: lib/depends.c:816 #, c-format msgid "%s: %s satisfied by added provide.\n" msgstr "" -#: lib/depends.c:717 -#, c-format -msgid "%s: %s satisfied by added file list.\n" -msgstr "" - -#: lib/depends.c:747 +#: lib/depends.c:847 #, c-format msgid "%s: %s satisfied by rpmrc provides.\n" msgstr "" -#: lib/depends.c:775 +#: lib/depends.c:875 #, c-format msgid "%s: %s satisfied by db file lists.\n" msgstr "" -#: lib/depends.c:797 +#: lib/depends.c:897 #, c-format msgid "%s: %s satisfied by db provides.\n" msgstr "" -#: lib/depends.c:819 +#: lib/depends.c:919 #, fuzzy, c-format msgid "%s: %s satisfied by db packages.\n" msgstr "%s dosyası, hiç bir pakete ait değil\n" -#: lib/depends.c:832 +#: lib/depends.c:932 #, c-format msgid "%s: %s satisfied by rpmlib version.\n" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:942 #, c-format msgid "%s: %s unsatisfied.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:890 +#: lib/depends.c:990 #, fuzzy, c-format msgid "package %s require not satisfied: %s\n" msgstr "%s paketi %s altında gözükmüyor" #. conflicts exist. -#: lib/depends.c:952 +#: lib/depends.c:1052 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "%s paketi %s altında gözükmüyor" -#: lib/depends.c:1007 lib/depends.c:1311 +#: lib/depends.c:1107 lib/depends.c:1415 #, c-format msgid "cannot read header at %d for dependency check" msgstr "bağımlılık sorgulaması için %d numaralı başlık okunamıyor" -#: lib/depends.c:1102 +#: lib/depends.c:1202 #, c-format msgid "loop in prerequisite chain: %s" msgstr "gerekenler zincirinde döngü: %s" -#: lib/falloc.c:160 +#: lib/falloc.c:157 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2220,8 +2220,8 @@ msgid "" "if \"rpm --rebuilddb\" fails to correct the problem.\n" msgstr "" -#: lib/formats.c:66 lib/formats.c:84 lib/formats.c:105 lib/formats.c:138 -#: lib/header.c:2122 lib/header.c:2139 lib/header.c:2159 +#: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141 +#: lib/header.c:2138 lib/header.c:2155 lib/header.c:2175 msgid "(not a number)" msgstr "(üye değil)" @@ -2324,75 +2324,75 @@ msgstr "" msgid "Data type %d not supprted\n" msgstr "" -#: lib/header.c:1119 +#: lib/header.c:1120 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" -#: lib/header.c:1520 +#: lib/header.c:1529 #, c-format msgid "missing { after %" msgstr "% den sonra eksik {" -#: lib/header.c:1548 +#: lib/header.c:1557 msgid "missing } after %{" msgstr "%{ den sonra eksik }" -#: lib/header.c:1560 +#: lib/header.c:1569 msgid "empty tag format" msgstr "boş tag tanımlaması" -#: lib/header.c:1570 +#: lib/header.c:1579 msgid "empty tag name" msgstr "boş tag ismi" -#: lib/header.c:1585 +#: lib/header.c:1594 msgid "unknown tag" msgstr "bilinmeyen tag" -#: lib/header.c:1611 +#: lib/header.c:1620 msgid "] expected at end of array" msgstr "dizinin sonunda ] bekleniyordu" -#: lib/header.c:1627 +#: lib/header.c:1636 msgid "unexpected ]" msgstr "beklenmeyen ]" -#: lib/header.c:1629 +#: lib/header.c:1638 msgid "unexpected }" msgstr "beklenmeyen }" -#: lib/header.c:1682 +#: lib/header.c:1692 msgid "? expected in expression" msgstr "dizi içerisinde ? bekleniyordu" -#: lib/header.c:1689 +#: lib/header.c:1699 #, fuzzy msgid "{ expected after ? in expression" msgstr "dizi içerisinde ? den sonra { bekleniyordu" -#: lib/header.c:1699 lib/header.c:1731 +#: lib/header.c:1709 lib/header.c:1744 msgid "} expected in expression" msgstr "dizi içerisinde } bekleniyordu" -#: lib/header.c:1706 +#: lib/header.c:1717 msgid ": expected following ? subexpression" msgstr "? altdizisinden sonra : bekleniyordu" -#: lib/header.c:1719 +#: lib/header.c:1731 #, fuzzy msgid "{ expected after : in expression" msgstr "dizide : den sonra { bekleniyordu" -#: lib/header.c:1738 +#: lib/header.c:1752 msgid "| expected at end of expression" msgstr "dizinin sonunda | bekleniyordu" -#: lib/header.c:1905 +#: lib/header.c:1921 msgid "(unknown type)" msgstr "(bilinmeyen tip)" -#: lib/install.c:141 lib/uninstall.c:179 +#: lib/install.c:141 lib/uninstall.c:193 #, fuzzy, c-format msgid " file: %s action: %s\n" msgstr "%s açılamadı: %s" @@ -2413,88 +2413,88 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:358 +#: lib/install.c:355 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:359 +#: lib/install.c:356 msgid " on file " msgstr "" -#: lib/install.c:402 +#: lib/install.c:399 #, fuzzy msgid "installing a source package\n" msgstr "paket yüklemek" -#: lib/install.c:413 +#: lib/install.c:410 #, fuzzy, c-format msgid "cannot create %s: %s" msgstr "%s dosyası açılamıyor: " -#: lib/install.c:421 lib/install.c:443 +#: lib/install.c:418 lib/install.c:440 #, fuzzy, c-format msgid "cannot write to %s" msgstr "%s dosyası açılamıyor: " -#: lib/install.c:425 +#: lib/install.c:422 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:436 +#: lib/install.c:433 #, fuzzy, c-format msgid "cannot create %s" msgstr "%s dosyası açılamıyor: " -#: lib/install.c:447 +#: lib/install.c:444 #, fuzzy, c-format msgid "spec file in: %s\n" msgstr "%s açılamadı: %s" -#: lib/install.c:481 lib/install.c:509 +#: lib/install.c:478 lib/install.c:506 #, fuzzy msgid "source package contains no .spec file" msgstr "<dosya> isimli dosyayı içeren paketi sorgulamak" -#: lib/install.c:530 +#: lib/install.c:527 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:532 lib/install.c:810 lib/uninstall.c:26 +#: lib/install.c:529 lib/install.c:807 lib/uninstall.c:26 #, c-format msgid "rename of %s to %s failed: %s" msgstr "%s 'nin isminin %s 'ye çevrilmesinde belirtilen hata oluştu: %s" -#: lib/install.c:622 +#: lib/install.c:619 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:679 +#: lib/install.c:676 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n" -#: lib/install.c:740 +#: lib/install.c:737 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:745 +#: lib/install.c:742 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:770 +#: lib/install.c:767 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:806 +#: lib/install.c:803 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:880 +#: lib/install.c:877 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2503,84 +2503,84 @@ msgstr "" msgid "cannot read header at %d for lookup" msgstr "%d kaydından başlık bilgisi okunamadı" -#: lib/macro.c:149 +#: lib/macro.c:151 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: lib/macro.c:243 +#: lib/macro.c:245 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: lib/macro.c:278 +#: lib/macro.c:280 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: lib/macro.c:457 +#: lib/macro.c:459 msgid "Macro %%%s has unterminated body" msgstr "" -#: lib/macro.c:483 +#: lib/macro.c:485 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: lib/macro.c:489 +#: lib/macro.c:491 msgid "Macro %%%s has unterminated opts" msgstr "" -#: lib/macro.c:494 +#: lib/macro.c:496 msgid "Macro %%%s has empty body" msgstr "" -#: lib/macro.c:499 +#: lib/macro.c:501 msgid "Macro %%%s failed to expand" msgstr "" -#: lib/macro.c:524 +#: lib/macro.c:526 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: lib/macro.c:601 +#: lib/macro.c:603 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: lib/macro.c:698 +#: lib/macro.c:700 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: lib/macro.c:870 +#: lib/macro.c:872 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: lib/macro.c:936 lib/macro.c:952 +#: lib/macro.c:938 lib/macro.c:954 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: lib/macro.c:992 +#: lib/macro.c:994 msgid "A %% is followed by an unparseable macro" msgstr "" -#: lib/macro.c:1115 +#: lib/macro.c:1117 #, fuzzy msgid "Macro %%%.*s not found, skipping" msgstr "%s pakedi %s içerisinde bulunamadı" -#: lib/macro.c:1196 +#: lib/macro.c:1198 msgid "Target buffer overflow" msgstr "" -#: lib/macro.c:1343 lib/macro.c:1351 +#: lib/macro.c:1345 lib/macro.c:1353 #, fuzzy, c-format msgid "File %s: %s" msgstr "%s açılamadı: %s" -#: lib/macro.c:1354 +#: lib/macro.c:1356 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -2611,24 +2611,24 @@ msgstr "%s dizinin oluşturulmasında hata: %s" msgid "bad file state: %s" msgstr "%s açılamadı: %s" -#: lib/package.c:234 +#: lib/package.c:237 msgid "package is a version one package!\n" msgstr "" -#: lib/package.c:239 +#: lib/package.c:242 msgid "old style source package -- I'll do my best\n" msgstr "" -#: lib/package.c:242 +#: lib/package.c:245 #, c-format msgid "archive offset is %d\n" msgstr "" -#: lib/package.c:252 +#: lib/package.c:256 msgid "old style binary package\n" msgstr "" -#: lib/package.c:298 +#: lib/package.c:316 msgid "" "only packages with major numbers <= 3 are supported by this version of RPM" msgstr "" @@ -2695,206 +2695,206 @@ msgstr "" msgid "error in format: %s\n" msgstr "format hatası: %s\n" -#: lib/query.c:180 +#: lib/query.c:181 msgid "(contains no files)" msgstr "(hiç dosya içermiyor)" -#: lib/query.c:233 +#: lib/query.c:238 msgid "normal " msgstr "" -#: lib/query.c:235 +#: lib/query.c:240 msgid "replaced " msgstr "" -#: lib/query.c:237 +#: lib/query.c:242 #, fuzzy msgid "not installed " msgstr "%s pakedi yüklenmemiş\n" -#: lib/query.c:239 +#: lib/query.c:244 msgid "net shared " msgstr "" -#: lib/query.c:241 +#: lib/query.c:246 #, fuzzy, c-format msgid "(unknown %3d) " msgstr "(bilinmeyen tip)" -#: lib/query.c:245 +#: lib/query.c:250 msgid "(no state) " msgstr "" -#: lib/query.c:261 lib/query.c:291 +#: lib/query.c:267 lib/query.c:308 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:400 +#: lib/query.c:421 #, c-format msgid "record number %u\n" msgstr "" -#: lib/query.c:404 +#: lib/query.c:425 msgid "error: could not read database record\n" msgstr "hata: veritabanı kaydı okunamadı\n" -#: lib/query.c:442 +#: lib/query.c:463 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "%s 'ye erisimde belirtilen hata oluştu: %s\n" -#: lib/query.c:455 +#: lib/query.c:476 msgid "old format source packages cannot be queried\n" msgstr "eski tip kaynak paketleri sorgulanamıyor\n" -#: lib/query.c:464 lib/rpminstall.c:203 +#: lib/query.c:485 lib/rpminstall.c:203 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s bir RPM paketi değil (gibi)\n" -#: lib/query.c:467 +#: lib/query.c:488 #, c-format msgid "query of %s failed\n" msgstr "%s 'nin sorgulaması başarısızlıkla sonuçlandı\n" -#: lib/query.c:494 +#: lib/query.c:515 #, fuzzy, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "%s 'nin sorgulaması başarısızlıkla sonuçlandı\n" -#: lib/query.c:519 +#: lib/query.c:540 msgid "could not read database record!\n" msgstr "veritabanı kaydı okunamadı!\n" -#: lib/query.c:530 +#: lib/query.c:551 #, c-format msgid "group %s does not contain any packages\n" msgstr "%s grubu hiç paket içermiyor\n" -#: lib/query.c:540 +#: lib/query.c:561 #, c-format msgid "no package provides %s\n" msgstr "hiç bir paket %s sağlamıyor\n" -#: lib/query.c:550 +#: lib/query.c:571 #, c-format msgid "no package triggers %s\n" msgstr "hiç bir paket %s tetiklemiyor\n" -#: lib/query.c:560 +#: lib/query.c:581 #, c-format msgid "no package requires %s\n" msgstr "hiç bir paket %s gerektirmiyor\n" -#: lib/query.c:575 +#: lib/query.c:596 #, fuzzy, c-format msgid "file %s: %s\n" msgstr "%s açılamadı: %s" -#: lib/query.c:578 +#: lib/query.c:599 #, c-format msgid "file %s is not owned by any package\n" msgstr "%s dosyası, hiç bir pakete ait değil\n" -#: lib/query.c:591 +#: lib/query.c:612 #, c-format msgid "invalid package number: %s\n" msgstr "geçersiz paket numarsı: %s\n" -#: lib/query.c:594 +#: lib/query.c:615 #, fuzzy, c-format msgid "package record number: %d\n" msgstr "geçersiz paket numarsı: %s\n" -#: lib/query.c:597 +#: lib/query.c:618 #, c-format msgid "record %d could not be read\n" msgstr "%d numaralı kayıt okunamadı\n" -#: lib/query.c:609 lib/rpminstall.c:393 +#: lib/query.c:630 lib/rpminstall.c:393 #, c-format msgid "package %s is not installed\n" msgstr "%s pakedi yüklenmemiş\n" -#: lib/query.c:612 +#: lib/query.c:633 #, c-format msgid "error looking for package %s\n" msgstr "%s pakedi aranırken hata oluştu\n" -#: lib/query.c:634 +#: lib/query.c:655 #, fuzzy msgid "rpmQuery: rpmdbOpen() failed\n" msgstr "%s: Erişilemedi\n" -#: lib/query.c:693 +#: lib/query.c:714 #, fuzzy msgid "query package owning file" msgstr "<dosya> isimli dosyayı içeren paketi sorgulamak" -#: lib/query.c:695 +#: lib/query.c:716 #, fuzzy msgid "query packages in group" msgstr "pakedin adı yok :-)" -#: lib/query.c:697 +#: lib/query.c:718 #, fuzzy msgid "query a package file" msgstr "Tüm paketleri sorgulama" -#: lib/query.c:701 +#: lib/query.c:722 #, fuzzy msgid "query a spec file" msgstr "%s 'nin sorgulaması başarısızlıkla sonuçlandı\n" -#: lib/query.c:703 +#: lib/query.c:724 #, fuzzy msgid "query the pacakges triggered by the package" msgstr "<dosya> isimli dosyayı içeren paketi sorgulamak" -#: lib/query.c:705 +#: lib/query.c:726 #, fuzzy msgid "query the packages which require a capability" msgstr "<i> yeteneğine ihtiyaç duyan paketleri sorgulama" -#: lib/query.c:707 +#: lib/query.c:728 #, fuzzy msgid "query the packages which provide a capability" msgstr "<i> yeteneği olan paketleri sorgulama" -#: lib/query.c:746 +#: lib/query.c:767 #, fuzzy msgid "list all configuration files" msgstr "" "sadece yapılandırma (configuration) dosyalarını gösterir (impliziert -l)" -#: lib/query.c:748 +#: lib/query.c:769 #, fuzzy msgid "list all documentation files" msgstr "paket ile gelen belgeleri de yükler" -#: lib/query.c:750 +#: lib/query.c:771 #, fuzzy msgid "dump basic file information" msgstr "Paket bilgisini gösterme" -#: lib/query.c:752 +#: lib/query.c:773 #, fuzzy msgid "list files in package" msgstr "paket yüklemek" -#: lib/query.c:756 +#: lib/query.c:777 msgid "use the following query format" msgstr "" -#: lib/query.c:758 +#: lib/query.c:779 msgid "substitute i18n sections from the following catalogue" msgstr "" -#: lib/query.c:761 +#: lib/query.c:782 msgid "display the states of the listed files" msgstr "" -#: lib/query.c:763 +#: lib/query.c:784 #, fuzzy msgid "display a verbose file listing" msgstr "Paketin içerdiği dosyaları gösterme" @@ -2971,12 +2971,12 @@ msgstr "%s: Erişilemedi\n" #: lib/rpmchecksig.c:74 #, fuzzy, c-format -msgid "%s: fdWrite failed: %s\n" -msgstr "%s: Erişilemedi\n" +msgid "%s: Fwrite failed: %s\n" +msgstr "%s: 'readLead' hata verdi\n" #: lib/rpmchecksig.c:80 #, fuzzy, c-format -msgid "%s: fdRead failed: %s\n" +msgid "%s: Fread failed: %s\n" msgstr "%s: 'readLead' hata verdi\n" #: lib/rpmchecksig.c:113 lib/rpmchecksig.c:242 @@ -3074,79 +3074,79 @@ msgid "" "database" msgstr "" -#: lib/rpmdb.c:439 +#: lib/rpmdb.c:468 #, c-format msgid "package %s not listed in %s" msgstr "%s paketi %s altında gözükmüyor" -#: lib/rpmdb.c:450 +#: lib/rpmdb.c:479 #, c-format msgid "package %s not found in %s" msgstr "%s pakedi %s içerisinde bulunamadı" -#: lib/rpmdb.c:475 lib/uninstall.c:85 +#: lib/rpmdb.c:503 lib/uninstall.c:85 #, c-format msgid "cannot read header at %d for uninstall" msgstr "%d numaralı paketin silmek için gereken 'header' kısmı okunamadı" -#: lib/rpmdb.c:483 +#: lib/rpmdb.c:511 msgid "package has no name" msgstr "pakedin adı yok :-)" -#: lib/rpmdb.c:485 +#: lib/rpmdb.c:513 msgid "removing name index\n" msgstr "" -#: lib/rpmdb.c:490 +#: lib/rpmdb.c:518 #, fuzzy msgid "package has no group\n" msgstr "pakedin adı yok :-)" -#: lib/rpmdb.c:492 +#: lib/rpmdb.c:520 msgid "removing group index\n" msgstr "" -#: lib/rpmdb.c:499 +#: lib/rpmdb.c:527 #, fuzzy, c-format msgid "removing provides index for %s\n" msgstr "%s kaydının %s dosyasından silinmesinde hata" -#: lib/rpmdb.c:514 +#: lib/rpmdb.c:542 #, fuzzy, c-format msgid "removing requiredby index for %s\n" msgstr "%s kaydının %s dosyasından silinmesinde hata" -#: lib/rpmdb.c:526 +#: lib/rpmdb.c:554 #, fuzzy, c-format msgid "removing trigger index for %s\n" msgstr "%s kaydının %s dosyasından silinmesinde hata" -#: lib/rpmdb.c:537 +#: lib/rpmdb.c:565 #, c-format msgid "removing conflict index for %s\n" msgstr "" -#: lib/rpmdb.c:554 +#: lib/rpmdb.c:576 #, c-format msgid "removing file index for %s\n" msgstr "" -#: lib/rpmdb.c:563 +#: lib/rpmdb.c:585 #, fuzzy msgid "package has no files\n" msgstr "pakedin adı yok :-)" # reservieren??? -#: lib/rpmdb.c:645 +#: lib/rpmdb.c:667 msgid "cannot allocate space for database" msgstr "Veritabanı için yer bulunamadı" -#: lib/rpmdb.c:711 +#: lib/rpmdb.c:726 #, c-format msgid "cannot read header at %d for update" msgstr "%d numaralı paketin güncelleme için gereken 'header' kısmı okunamadı" -#: lib/rpmdb.c:720 +#: lib/rpmdb.c:735 msgid "header changed size!" msgstr "" @@ -3308,37 +3308,37 @@ msgstr "%s okunamadı: %s" msgid "missing ':' at %s:%d" msgstr "%s te eksik ':' :%d" -#: lib/rpmrc.c:655 lib/rpmrc.c:729 +#: lib/rpmrc.c:655 lib/rpmrc.c:730 #, c-format msgid "missing argument for %s at %s:%d" msgstr "%s için %s te eksik argüman :%d" -#: lib/rpmrc.c:672 lib/rpmrc.c:694 +#: lib/rpmrc.c:672 lib/rpmrc.c:695 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "%s açılamadı: %s" -#: lib/rpmrc.c:680 +#: lib/rpmrc.c:681 #, fuzzy, c-format msgid "cannot open %s at %s:%d" msgstr "%s dosyası açılamıyor: " -#: lib/rpmrc.c:721 +#: lib/rpmrc.c:722 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "%s için %s te eksik mimari:%d" -#: lib/rpmrc.c:788 +#: lib/rpmrc.c:789 #, c-format msgid "bad option '%s' at %s:%d" msgstr "%s geçersiz seçenek %s:%d" -#: lib/rpmrc.c:1147 +#: lib/rpmrc.c:1149 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1148 +#: lib/rpmrc.c:1150 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3491,17 +3491,27 @@ msgstr "rpmrc dosyanızda \"pgp_name:\" tanımlanmış olmalı" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "rpmrc dosyanızda \"pgp_name:\" tanımlanmış olmalı" -#: lib/transaction.c:363 +#: lib/transaction.c:386 +#, fuzzy, c-format +msgid "excluding file %s%s\n" +msgstr "%s alınıyor\n" + +#: lib/transaction.c:412 lib/transaction.c:496 +#, fuzzy, c-format +msgid "excluding directory %s\n" +msgstr "%s dizinin oluşturulmasında hata: %s" + +#: lib/transaction.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:370 +#: lib/transaction.c:489 #, fuzzy, c-format -msgid "excluding %s\n" -msgstr "%s alınıyor\n" +msgid "relocating directory %s to %s\n" +msgstr "%s dizinin oluşturulmasında hata: %s" -#: lib/transaction.c:489 +#: lib/transaction.c:637 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3531,15 +3541,15 @@ msgstr "%d numaralı paketin silmek için gereken 'header' kısmı okunamadı" msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:191 +#: lib/uninstall.c:207 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:204 +#: lib/uninstall.c:220 msgid "removing database entry\n" msgstr "" -#: lib/uninstall.c:365 +#: lib/uninstall.c:381 msgid "execution of script failed" msgstr "betik (script) çalıştırılamadı " @@ -3574,30 +3584,34 @@ msgstr "%s yaratılamıyor\n" msgid "don't verify files in package" msgstr "paket yüklemek" -#: lib/verify.c:208 +#: lib/verify.c:213 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:226 +#: lib/verify.c:231 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:259 +#: lib/verify.c:266 #, fuzzy, c-format msgid "missing %s\n" msgstr "% den sonra eksik {" -#: lib/verify.c:321 +#: lib/verify.c:328 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "%s-%s-%s 'nin bağımlılık sorunları: " -#: lib/verify.c:369 +#: lib/verify.c:376 #, fuzzy msgid "rpmVerify: rpmdbOpen() failed\n" msgstr "%s: Erişilemedi\n" #, fuzzy +#~ msgid "%s: fdWrite failed: %s\n" +#~ msgstr "%s: Erişilemedi\n" + +#, fuzzy #~ msgid "failed build prerequisites:\n" #~ msgstr "bağımlılık hatası, aşağıdaki paketlere ihtiyacınız var:\n" diff --git a/popt/po/popt.pot b/popt/po/popt.pot index 6793fcf01..7e9bfbf9c 100644 --- a/popt/po/popt.pot +++ b/popt/po/popt.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-10-25 16:06-0400\n" +"POT-Creation-Date: 1999-10-26 13:07-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" diff --git a/popt/po/ro.po b/popt/po/ro.po index f01b2de64..0f7b8050c 100644 --- a/popt/po/ro.po +++ b/popt/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: POPT\n" -"POT-Creation-Date: 1999-10-22 17:29-0400\n" +"POT-Creation-Date: 1999-10-26 13:07-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Cristian Gafton <gafton@redhat.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/popt/po/sk.po b/popt/po/sk.po index 712b63e39..1f492eede 100644 --- a/popt/po/sk.po +++ b/popt/po/sk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: popt\n" -"POT-Creation-Date: 1999-10-22 17:29-0400\n" +"POT-Creation-Date: 1999-10-26 13:07-0400\n" "PO-Revision-Date: 1999-08-04 21:40+0200\n" "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n" "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n" diff --git a/popt/popt.3 b/popt/popt.3 index 96848d339..b07b39465 100644 --- a/popt/popt.3 +++ b/popt/popt.3 @@ -6,7 +6,7 @@ popt \- Parse command line options .B #include <popt.h> .sp .BI "poptContext poptGetContext(const char * " name ", int " argc , -.BI " har ** "argv , +.BI " const char ** "argv , .BI " const struct poptOption * " options , .BI " int " flags ); .sp @@ -16,9 +16,9 @@ popt \- Parse command line options .sp .BI "int poptGetNextOpt(poptContext " con ); .sp -.BI "char * poptGetOptArg(poptContext " con ); +.BI "const char * poptGetOptArg(poptContext " con ); .sp -.BI "char * poptGetArg(poptContext " con ); +.BI "const char * poptGetArg(poptContext " con ); .sp .BI "const char * poptPeekArg(poptContext " con ); .sp @@ -246,7 +246,7 @@ modified outside the popt library. .sp .nf .BI "poptContext poptGetContext(const char * " name ", int "argc ", -.BI " char ** "argv ", +.BI " const char ** "argv ", .BI " const struct poptOption * "options ", .BI " int "flags ");" .fi @@ -333,7 +333,7 @@ ways to discover them. One is to ask popt to fill in a variable with the .sp .nf .B #include <popt.h> -.BI "char * poptGetOptArg(poptContext " con ");" +.BI "const char * poptGetOptArg(poptContext " con ");" .fi .sp This function returns the argument given for the final option returned by @@ -347,7 +347,7 @@ of leftover arguments. Three functions allow applications to access such arguments: .nf .HP -.BI "char * poptGetArg(poptContext " con ");" +.BI "const char * poptGetArg(poptContext " con ");" .fi This function returns the next leftover argument and marks it as processed. diff --git a/popt/popt.c b/popt/popt.c index 3fb54f7db..75c8b9205 100644 --- a/popt/popt.c +++ b/popt/popt.c @@ -43,7 +43,7 @@ static void invokeCallbacks(poptContext con, const struct poptOption * table, } } -poptContext poptGetContext(const char * name, int argc, char ** argv, +poptContext poptGetContext(const char * name, int argc, const char ** argv, const struct poptOption * options, int flags) { poptContext con = malloc(sizeof(*con)); @@ -51,7 +51,7 @@ poptContext poptGetContext(const char * name, int argc, char ** argv, con->os = con->optionStack; con->os->argc = argc; - con->os->argv = (const char **) argv; /* XXX don't change the API */ + con->os->argv = argv; con->os->argb = NULL; if (!(flags & POPT_CONTEXT_KEEP_FIRST)) @@ -569,15 +569,15 @@ int poptGetNextOpt(poptContext con) return opt->val; } -char * poptGetOptArg(poptContext con) { - char * ret = (char *)con->os->nextArg; /* XXX don't change the API */ +const char * poptGetOptArg(poptContext con) { + const char * ret = con->os->nextArg; con->os->nextArg = NULL; return ret; } -char * poptGetArg(poptContext con) { +const char * poptGetArg(poptContext con) { if (con->numLeftovers == con->nextLeftover) return NULL; - return (char *)con->leftovers[con->nextLeftover++]; /* XXX don't change the API */ + return con->leftovers[con->nextLeftover++]; } const char * poptPeekArg(poptContext con) { diff --git a/popt/popt.h b/popt/popt.h index b1e58faba..5046fade2 100644 --- a/popt/popt.h +++ b/popt/popt.h @@ -86,16 +86,16 @@ typedef void (*poptCallbackType)(poptContext con, const char * arg, const void * data); /*@only@*/ poptContext poptGetContext(/*@keep@*/ const char * name, - int argc, /*@keep@*/ char ** argv, + int argc, /*@keep@*/ const char ** argv, /*@keep@*/ const struct poptOption * options, int flags); void poptResetContext(poptContext con); /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */ int poptGetNextOpt(poptContext con); /* returns NULL if no argument is available */ -/*@observer@*/ /*@null@*/ char * poptGetOptArg(poptContext con); +/*@observer@*/ /*@null@*/ const char * poptGetOptArg(poptContext con); /* returns NULL if no more options are available */ -/*@observer@*/ /*@null@*/ char * poptGetArg(poptContext con); +/*@observer@*/ /*@null@*/ const char * poptGetArg(poptContext con); /*@observer@*/ /*@null@*/ const char * poptPeekArg(poptContext con); /*@observer@*/ /*@null@*/ const char ** poptGetArgs(poptContext con); /* returns the option which caused the most recent error */ diff --git a/popt/test1.c b/popt/test1.c index 68ec7fdeb..416d59e8f 100644 --- a/popt/test1.c +++ b/popt/test1.c @@ -66,7 +66,7 @@ static void resetVars(void) pass2 = 0; } -int main(int argc, char ** argv) { +int main(int argc, const char ** argv) { int rc; int ec = 0; poptContext optCon; diff --git a/popt/test2.c b/popt/test2.c index 5deb89d0d..f4e4baeec 100644 --- a/popt/test2.c +++ b/popt/test2.c @@ -46,7 +46,7 @@ char *fax = NULL; int -main(int argc, char**argv ) { +main(int argc, const char ** argv) { poptContext optCon; /* context for parsing command-line options */ struct poptOption userOptionsTable[] = { diff --git a/python/rpmmodule.c b/python/rpmmodule.c index d2e3631b7..d32f636a5 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -60,7 +60,7 @@ static PyObject * rpmtransRun(rpmtransObject * s, PyObject * args); static PyObject * rpmtransOrder(rpmtransObject * s, PyObject * args); static void rpmtransDealloc(PyObject * o); static PyObject * rpmtransGetAttr(rpmtransObject * o, char * name); -static int rpmtransSetAttr(rpmtransObject * o, char * name, +static int rpmtransSetAttr(rpmtransObject * o, char * name, PyObject * val); /* Types */ @@ -74,7 +74,7 @@ static PyMethodDef rpmModuleMethods[] = { { "headerLoad", (PyCFunction) hdrLoad, METH_VARARGS, NULL }, { "opendb", (PyCFunction) rpmOpenDB, METH_VARARGS, NULL }, { "rebuilddb", (PyCFunction) rebuildDB, METH_VARARGS, NULL }, - { "readHeaderListFromFD", (PyCFunction) rpmHeaderFromFD, METH_VARARGS, NULL }, + { "readHeaderListFromFD", (PyCFunction) rpmHeaderFromFD, METH_VARARGS, NULL }, { "readHeaderListFromFile", (PyCFunction) rpmHeaderFromFile, METH_VARARGS, NULL }, { "errorSetCallback", (PyCFunction) errorSetCallback, METH_VARARGS, NULL }, { "errorString", (PyCFunction) errorString, METH_VARARGS, NULL }, @@ -202,7 +202,7 @@ static struct PyMethodDef hdrMethods[] = { /* External functions */ int mdfile(const char *fn, unsigned char *digest); - + /* Code */ void initrpm(void) { @@ -228,22 +228,22 @@ void initrpm(void) { PyDict_SetItemString(d, "tagnames", dict); - PyDict_SetItemString(d, "RPMFILE_STATE_NORMAL", + PyDict_SetItemString(d, "RPMFILE_STATE_NORMAL", PyInt_FromLong(RPMFILE_STATE_NORMAL)); - PyDict_SetItemString(d, "RPMFILE_STATE_REPLACED", + PyDict_SetItemString(d, "RPMFILE_STATE_REPLACED", PyInt_FromLong(RPMFILE_STATE_REPLACED)); - PyDict_SetItemString(d, "RPMFILE_STATE_NOTINSTALLED", + PyDict_SetItemString(d, "RPMFILE_STATE_NOTINSTALLED", PyInt_FromLong(RPMFILE_STATE_NOTINSTALLED)); - PyDict_SetItemString(d, "RPMFILE_CONFIG", + PyDict_SetItemString(d, "RPMFILE_CONFIG", PyInt_FromLong(RPMFILE_CONFIG)); PyDict_SetItemString(d, "RPMFILE_MISSINGOK", PyInt_FromLong(RPMFILE_MISSINGOK)); - PyDict_SetItemString(d, "RPMFILE_DOC", + PyDict_SetItemString(d, "RPMFILE_DOC", PyInt_FromLong(RPMFILE_DOC)); - PyDict_SetItemString(d, "RPMDEP_SENSE_REQUIRES", + PyDict_SetItemString(d, "RPMDEP_SENSE_REQUIRES", PyInt_FromLong(RPMDEP_SENSE_REQUIRES)); - PyDict_SetItemString(d, "RPMDEP_SENSE_CONFLICTS", + PyDict_SetItemString(d, "RPMDEP_SENSE_CONFLICTS", PyInt_FromLong(RPMDEP_SENSE_CONFLICTS)); PyDict_SetItemString(d, "RPMSENSE_SERIAL", @@ -421,12 +421,12 @@ static PyObject * findUpgradeSet(PyObject * self, PyObject * args) { list.packages[i]->selected = 0; list.packages[i]->data = hdr; - headerGetEntry(hdr->h, RPMTAG_NAME, NULL, + headerGetEntry(hdr->h, RPMTAG_NAME, NULL, (void **) &list.packages[i]->name, NULL); } pkgSort (&list); - + if (ugFindUpgradePackages(&list, root)) { PyErr_SetString(pyrpmError, "error during upgrade check"); return NULL; @@ -457,7 +457,7 @@ static rpmdbObject * rpmOpenDB(PyObject * self, PyObject * args) { char * errmsg = "cannot open database in %s"; char * errstr = NULL; int errsize; - + Py_DECREF(o); /* PyErr_SetString should take varargs... */ errsize = strlen(errmsg) + *root == '\0' ? 15 /* "/var/lib/rpm" */ : strlen(root); @@ -518,12 +518,12 @@ static PyObject * rpmHeaderFromFD(PyObject * self, PyObject * args) { FD_t fd; int fileno; PyObject * list; - + if (!PyArg_ParseTuple(args, "i", &fileno)) return NULL; fd = fdDup(fileno); - + list = rpmReadHeaders (fd); - fdClose(fd); + Fclose(fd); return list; } @@ -548,7 +548,7 @@ static PyObject * hdrLoad(PyObject * self, PyObject * args) { h->fileList = h->linkList = h->md5list = NULL; h->uids = h->gids = h->mtimes = h->fileSizes = NULL; h->modes = h->rdevs = NULL; - + return (PyObject *) h; } @@ -566,8 +566,8 @@ static PyObject * rpmHeaderFromFile(PyObject * self, PyObject * args) { } list = rpmReadHeaders (fd); - fdClose(fd); - + Fclose(fd); + return list; } @@ -577,7 +577,7 @@ static void errorcb (void) { PyObject * result, * args = NULL; - if (errorData) + if (errorData) args = Py_BuildValue("(O)", errorData); result = PyEval_CallObject(errorCB, args); @@ -602,15 +602,15 @@ static PyObject * errorSetCallback (PyObject * self, PyObject * args) { } if (!PyArg_ParseTuple(args, "O|O", &errorCB, &errorData)) return NULL; - + if (!PyCallable_Check (errorCB)) { PyErr_SetString(PyExc_TypeError, "parameter must be callable"); return NULL; - } + } Py_INCREF (errorCB); Py_XINCREF (errorData); - + rpmErrorSetCallback (errorcb); Py_INCREF(Py_None); @@ -623,7 +623,7 @@ static PyObject * errorString (PyObject * self, PyObject * args) { static PyObject * versionCompare (PyObject * self, PyObject * args) { hdrObject * h1, * h2; - + if (!PyArg_ParseTuple(args, "O!O!", &hdrType, &h1, &hdrType, &h2)) return NULL; return Py_BuildValue("i", rpmVersionCompare(h1->h, h2->h)); @@ -639,7 +639,7 @@ static PyObject * labelCompare (PyObject * self, PyObject * args) { if (e1 && !e2) return Py_BuildValue("i", 1); - else if (!e1 && e2) + else if (!e1 && e2) return Py_BuildValue("i", -1); else if (e1 && e2) { int ep1, ep2; @@ -650,7 +650,7 @@ static PyObject * labelCompare (PyObject * self, PyObject * args) { else if (ep1 > ep2) return Py_BuildValue("i", 1); } - + rc = rpmvercmp(v1, v2); if (rc) return Py_BuildValue("i", rc); @@ -670,7 +670,7 @@ static PyObject * rpmHeaderFromPackage(PyObject * self, PyObject * args) { fd = fdDup(rawFd); rc = rpmReadPackageHeader(fd, &header, &isSource, NULL, NULL); - fdClose(fd); + Fclose(fd); switch (rc) { case 0: @@ -808,7 +808,7 @@ static int rpmdbLength(rpmdbObject * s) { static hdrObject * rpmdbSubscript(rpmdbObject * s, PyObject * key) { int offset; hdrObject * h; - + if (!PyInt_Check(key)) { PyErr_SetString(PyExc_TypeError, "integer expected"); return NULL; @@ -827,7 +827,7 @@ static hdrObject * rpmdbSubscript(rpmdbObject * s, PyObject * key) { PyErr_SetString(pyrpmError, "cannot read rpmdb entry"); return NULL; } - + return h; } @@ -872,7 +872,7 @@ static PyObject * hdrSubscript(hdrObject * s, PyObject * item) { } switch (tag) { - case RPMTAG_FILENAMES: + case RPMTAG_OLDFILENAMES: case RPMTAG_FILESIZES: case RPMTAG_FILESTATES: case RPMTAG_FILEMODES: @@ -952,7 +952,7 @@ static PyObject * hdrSubscript(hdrObject * s, PyObject * item) { case RPM_STRING_TYPE: if (count != 1 || forceArray) { stringArray = data; - + metao = PyList_New(0); for (i=0; i < count; i++) { o = PyString_FromString(stringArray[i]); @@ -1009,7 +1009,7 @@ static PyObject * hdrUnload(hdrObject * s, PyObject * args) { len = headerSizeof(s->h, 0); buf = headerUnload(s->h); - + rc = PyString_FromStringAndSize(buf, len); free(buf); @@ -1050,7 +1050,7 @@ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) { if (!verifyResult) return list; if (!s->fileList) { - headerGetEntry(s->h, RPMTAG_FILENAMES, &type, (void **) &s->fileList, + headerGetEntry(s->h, RPMTAG_OLDFILENAMES, &type, (void **) &s->fileList, &count); } @@ -1058,14 +1058,14 @@ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) { if (verifyResult & RPMVERIFY_MD5) { if (!s->md5list) { - headerGetEntry(s->h, RPMTAG_FILEMD5S, &type, (void **) &s->md5list, + headerGetEntry(s->h, RPMTAG_FILEMD5S, &type, (void **) &s->md5list, &count); } - + if (mdfile(s->fileList[fileNumber], buf)) { strcpy(buf, "(unknown)"); - } - + } + tuple = PyTuple_New(3); attrName = PyString_FromString("checksum"); PyTuple_SetItem(tuple, 0, attrName); @@ -1076,7 +1076,7 @@ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) { if (verifyResult & RPMVERIFY_FILESIZE) { if (!s->fileSizes) { - headerGetEntry(s->h, RPMTAG_FILESIZES, &type, (void **) &s->fileSizes, + headerGetEntry(s->h, RPMTAG_FILESIZES, &type, (void **) &s->fileSizes, &count); } @@ -1094,7 +1094,7 @@ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) { if (verifyResult & RPMVERIFY_LINKTO) { if (!s->linkList) { - headerGetEntry(s->h, RPMTAG_FILELINKTOS, &type, (void **) &s->linkList, + headerGetEntry(s->h, RPMTAG_FILELINKTOS, &type, (void **) &s->linkList, &count); } @@ -1114,7 +1114,7 @@ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) { if (verifyResult & RPMVERIFY_MTIME) { if (!s->mtimes) { - headerGetEntry(s->h, RPMTAG_FILEMTIMES, &type, (void **) &s->mtimes, + headerGetEntry(s->h, RPMTAG_FILEMTIMES, &type, (void **) &s->mtimes, &count); } @@ -1138,7 +1138,7 @@ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) { if (verifyResult & RPMVERIFY_RDEV) { if (!s->rdevs) { - headerGetEntry(s->h, RPMTAG_FILERDEVS, &type, (void **) &s->rdevs, + headerGetEntry(s->h, RPMTAG_FILERDEVS, &type, (void **) &s->rdevs, &count); } @@ -1157,7 +1157,7 @@ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) { doesn't do these correctly either. At least this is consisten */ if (verifyResult & RPMVERIFY_USER) { if (!s->uids) { - headerGetEntry(s->h, RPMTAG_FILEUIDS, &type, (void **) &s->uids, + headerGetEntry(s->h, RPMTAG_FILEUIDS, &type, (void **) &s->uids, &count); } @@ -1173,7 +1173,7 @@ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) { if (verifyResult & RPMVERIFY_GROUP) { if (!s->gids) { - headerGetEntry(s->h, RPMTAG_FILEGIDS, &type, (void **) &s->gids, + headerGetEntry(s->h, RPMTAG_FILEGIDS, &type, (void **) &s->gids, &count); } @@ -1189,7 +1189,7 @@ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) { if (verifyResult & RPMVERIFY_MODE) { if (!s->modes) { - headerGetEntry(s->h, RPMTAG_FILEMODES, &type, (void **) &s->modes, + headerGetEntry(s->h, RPMTAG_FILEMODES, &type, (void **) &s->modes, &count); } @@ -1235,7 +1235,7 @@ static void rpmtransDealloc(PyObject * o) { if (trans->dbo) { Py_DECREF(trans->dbo); } - if (trans->scriptFd) fdClose(trans->scriptFd); + if (trans->scriptFd) Fclose(trans->scriptFd); /* this will free the keyList, and decrement the ref count of all the items on the list as well :-) */ Py_DECREF(trans->keyList); @@ -1318,10 +1318,10 @@ static PyObject * rpmtransDepCheck(rpmtransObject * s, PyObject * args) { list = PyList_New(0); for (i = 0; i < numConflicts; i++) { - cf = Py_BuildValue("((sss)(ss)iOi)", conflicts[i].byName, + cf = Py_BuildValue("((sss)(ss)iOi)", conflicts[i].byName, conflicts[i].byVersion, conflicts[i].byRelease, - conflicts[i].needsName, + conflicts[i].needsName, conflicts[i].needsVersion, conflicts[i].needsFlags, @@ -1347,7 +1347,7 @@ struct tsCallbackType { int pythonError; }; -static void * tsCallback(const Header h, const rpmCallbackType what, +static void * tsCallback(const Header h, const rpmCallbackType what, const unsigned long amount, const unsigned long total, const void * pkgKey, void * data) { struct tsCallbackType * cbInfo = data; @@ -1379,7 +1379,7 @@ static void * tsCallback(const Header h, const rpmCallbackType what, } if (what == RPMCALLBACK_INST_CLOSE_FILE) { - fdClose (fdt); + Fclose (fdt); } Py_DECREF(result); @@ -1395,16 +1395,16 @@ static PyObject * rpmtransRun(rpmtransObject * s, PyObject * args) { struct tsCallbackType cbInfo; if (!PyArg_ParseTuple(args, "iiOO", &flags, &ignoreSet, &cbInfo.cb, - &cbInfo.data)) + &cbInfo.data)) return NULL; cbInfo.pythonError = 0; - rc = rpmRunTransactions(s->ts, tsCallback, &cbInfo, NULL, &probs, flags, + rc = rpmRunTransactions(s->ts, tsCallback, &cbInfo, NULL, &probs, flags, ignoreSet); if (cbInfo.pythonError) { - if (rc > 0) + if (rc > 0) rpmProblemSetFree(probs); return NULL; } @@ -499,7 +499,7 @@ static void printHelp(void) { _("use <dir> as the top level directory")); } -int main(int argc, char ** argv) +int main(int argc, const char ** argv) { enum modes bigMode = MODE_UNKNOWN; QVA_t *qva = &rpmQVArgs; @@ -514,7 +514,7 @@ int main(int argc, char ** argv) char * tce; char * passPhrase = ""; char * cookie = NULL; - char * optArg; + const char * optArg; pid_t pipeChild = 0; const char * pkg; char * errString = NULL; diff --git a/rpm2cpio.c b/rpm2cpio.c index 59eb6810d..09e86681a 100644 --- a/rpm2cpio.c +++ b/rpm2cpio.c @@ -42,18 +42,18 @@ int main(int argc, char **argv) gzdi = gzdFdopen(fdi, "r"); /* XXX gzdi == fdi */ - while ((ct = gzdRead(gzdi, &buffer, sizeof(buffer))) > 0) { - fdWrite(fdo, &buffer, ct); + while ((ct = Fread(buffer, sizeof(buffer), 1, gzdi)) > 0) { + Fwrite(buffer, ct, 1, fdo); } if (ct < 0) { - fprintf (stderr, "rpm2cpio: zlib: %s\n", gzdStrerror(gzdi)); + fprintf (stderr, "rpm2cpio: zlib: %s\n", Fstrerror(gzdi)); rc = EXIT_FAILURE; } else { rc = EXIT_SUCCESS; } - gzdClose(gzdi); /* XXX gzdi == fdi */ + Fclose(gzdi); /* XXX gzdi == fdi */ return rc; } diff --git a/rpmio/macro.c b/rpmio/macro.c index fedf24587..24d4b5d71 100644 --- a/rpmio/macro.c +++ b/rpmio/macro.c @@ -3,7 +3,9 @@ #include <assert.h> #include <stdarg.h> +#if !defined(isblank) #define isblank(_c) ((_c) == ' ' || (_c) == '\t') +#endif #define iseol(_c) ((_c) == '\n' || (_c) == '\r') #define STREQ(_t, _f, _fn) ((_fn) == (sizeof(_t)-1) && !strncmp((_t), (_f), (_fn))) @@ -25,8 +27,8 @@ typedef int FD_t; #define fdFileno(_x) (_x) #define fdOpen open -#define fdRead read -#define fdClose close +#define Fread(_b, _s, _n, _fd) read(_fd, _b, _s) +#define Fclose(_fd) close(_fd) #else #include <rpmlib.h> #endif @@ -1343,9 +1345,9 @@ int isCompressed(const char *file, int *compressed) rpmError(RPMERR_BADSPEC, _("File %s: %s"), file, strerror(errno)); return 1; } - nb = fdRead(fd, magic, sizeof(magic)); + nb = Fread(magic, sizeof(magic), 1, fd); rderrno = errno; - fdClose(fd); + Fclose(fd); if (nb < 0) { rpmError(RPMERR_BADSPEC, _("File %s: %s"), file, strerror(rderrno)); @@ -233,6 +233,23 @@ char *__progname; #include <pwd.h> #endif +#if HAVE_LIBIO_H +#include <libio.h> +#else +typedef ssize_t cookie_read_function_t (void *cookie, void *buf, size_t nbytes); +typedef ssize_t cookie_write_function_t (void *cookie, const void *buf, size_t nbytes); +typedef int cookie_seek_function_t (void *cookie, fpos_t *pos, int whence); +typedef int cookie_close_function_t (void *cookie); + +typedef struct { + cookie_read_function_t *read; + cookie_write_function_t *write; + cookie_seek_function_t *seek; + cookie_close_function_t *close; +} cookie_io_functions_t; + +#endif + /* Take care of NLS matters. */ #if HAVE_LOCALE_H diff --git a/tools/dump.c b/tools/dump.c index 24ad90277..4cc290b7e 100644 --- a/tools/dump.c +++ b/tools/dump.c @@ -24,7 +24,7 @@ int main(int argc, char ** argv) fprintf(stderr, _("headerRead error: %s\n"), strerror(errno)); exit(1); } - fdClose(fdi); + Fclose(fdi); headerDump(h, stdout, HEADER_DUMP_INLINE, rpmTagTable); headerFree(h); diff --git a/tools/rpmarchive.c b/tools/rpmarchive.c index 46813fccd..415969092 100644 --- a/tools/rpmarchive.c +++ b/tools/rpmarchive.c @@ -27,8 +27,8 @@ int main(int argc, char **argv) HEADER_MAGIC_YES : HEADER_MAGIC_NO); fdo = fdDup(STDOUT_FILENO); - while ((ct = fdRead(fdi, &buffer, 1024))) { - fdWrite(fdo, &buffer, ct); + while ((ct = Fread(buffer, sizeof(buffer), 1, fdi))) { + Fwrite(buffer, ct, 1, fdo); } return 0; diff --git a/tools/rpmgettext.c b/tools/rpmgettext.c index 4c8308abe..6cb552c83 100644 --- a/tools/rpmgettext.c +++ b/tools/rpmgettext.c @@ -761,7 +761,7 @@ rewriteBinaryRPM(char *fni, char *fno, message_list_ty *mlp) DPRINTF(99, ("rewriteBinaryRPM(\"%s\",\"%s\",%p)\n", fni, fno, mlp)); csa->cpioArchiveSize = 0; - csa->cpioFdIn = fdNew(); + csa->cpioFdIn = fdNew(&fdio); csa->cpioList = NULL; csa->cpioCount = 0; csa->lead = &lead; /* XXX FIXME: exorcize lead/arch/os */ @@ -784,7 +784,7 @@ rewriteBinaryRPM(char *fni, char *fno, message_list_ty *mlp) } exit: - fdClose(csa->cpioFdIn); + Fclose(csa->cpioFdIn); return rc; } @@ -847,7 +847,7 @@ rpmgettext(FD_t fd, const char *file, FILE *ofp) if (ofp != stdout) fclose(ofp); - fdClose(fd); + Fclose(fd); return 0; } diff --git a/tools/rpminject.c b/tools/rpminject.c index 2389a5b33..6f9aec914 100644 --- a/tools/rpminject.c +++ b/tools/rpminject.c @@ -444,7 +444,7 @@ rewriteRPM(const char *fni, const char *fno, cmd_t *cmds[], int ncmds) int rc; csa->cpioArchiveSize = 0; - csa->cpioFdIn = fdNew(); + csa->cpioFdIn = fdNew(&fdio); csa->cpioList = NULL; csa->cpioCount = 0; csa->lead = &lead; /* XXX FIXME: exorcize lead/arch/os */ @@ -467,7 +467,7 @@ rewriteRPM(const char *fni, const char *fno, cmd_t *cmds[], int ncmds) } exit: - fdClose(csa->cpioFdIn); + Fclose(csa->cpioFdIn); return rc; } |