From 23fcf67cb51b54c4c1f23188ee355dbcbfba0a28 Mon Sep 17 00:00:00 2001 From: jbj Date: Wed, 3 Jan 2001 20:19:27 +0000 Subject: - fix: avoid locale issues with strcasecmp/strncasecmp (#23199). - remove almost all explicit uses of stderr in rpmlib using rpmError(). CVS patchset: 4406 CVS date: 2001/01/03 20:19:27 --- CHANGES | 2 + Doxyfile.in | 1 + build/parsePreamble.c | 40 ++---- build/parseSpec.c | 9 +- configure.in | 5 +- lib/cpio.c | 8 +- lib/db1.c | 11 +- lib/db2.c | 8 +- lib/db3.c | 24 ++-- lib/falloc.c | 3 +- lib/header.c | 50 ------- lib/install.c | 14 +- lib/poptBT.c | 5 +- lib/rpmchecksig.c | 38 ++--- lib/rpminstall.c | 6 +- lib/rpmrc.c | 14 +- lib/signature.c | 10 +- misc/Makefile.am | 4 +- misc/strcasecmp.c | 77 ---------- misc/strncasecmp.c | 80 ----------- po/cs.po | 376 +++++++++++++++++++++++++------------------------ po/da.po | 368 ++++++++++++++++++++++++------------------------ po/de.po | 367 ++++++++++++++++++++++++------------------------ po/es.po | 363 ++++++++++++++++++++++++------------------------ po/fi.po | 366 ++++++++++++++++++++++++------------------------ po/fr.po | 365 ++++++++++++++++++++++++------------------------ po/gl.po | 363 ++++++++++++++++++++++++------------------------ po/hu.po | 363 ++++++++++++++++++++++++------------------------ po/id.po | 363 ++++++++++++++++++++++++------------------------ po/is.po | 365 ++++++++++++++++++++++++------------------------ po/it.po | 363 ++++++++++++++++++++++++------------------------ po/ja.po | 366 ++++++++++++++++++++++++------------------------ po/ko.po | 363 ++++++++++++++++++++++++------------------------ po/no.po | 365 ++++++++++++++++++++++++------------------------ po/pl.po | 365 ++++++++++++++++++++++++------------------------ po/pt.po | 365 ++++++++++++++++++++++++------------------------ po/pt_BR.po | 366 ++++++++++++++++++++++++------------------------ po/ro.po | 363 ++++++++++++++++++++++++------------------------ po/rpm.pot | 363 ++++++++++++++++++++++++------------------------ po/ru.po | 376 +++++++++++++++++++++++++------------------------ po/sk.po | 365 ++++++++++++++++++++++++------------------------ po/sl.po | 378 +++++++++++++++++++++++++------------------------- po/sr.po | 366 ++++++++++++++++++++++++------------------------ po/sv.po | 376 +++++++++++++++++++++++++------------------------ po/tr.po | 366 ++++++++++++++++++++++++------------------------ po/uk.po | 363 ++++++++++++++++++++++++------------------------ po/wa.po | 363 ++++++++++++++++++++++++------------------------ po/zh.po | 363 ++++++++++++++++++++++++------------------------ po/zh_CN.GB2312.po | 363 ++++++++++++++++++++++++------------------------ python/rpmmodule.c | 6 +- python/upgrade.c | 2 +- rpm.spec | 6 +- rpm.spec.in | 6 +- rpmio/Makefile.am | 2 +- rpmio/rpmerr.h | 43 +++--- rpmio/rpmio.c | 4 +- rpmio/rpmio.h | 34 +++-- rpmio/rpmrpc.c | 4 +- rpmio/strcasecmp.c | 52 +++++++ rpmio/stubs.c | 8 -- tools/rpminject.c | 6 +- 61 files changed, 5558 insertions(+), 5641 deletions(-) delete mode 100644 misc/strcasecmp.c delete mode 100644 misc/strncasecmp.c create mode 100644 rpmio/strcasecmp.c diff --git a/CHANGES b/CHANGES index f41481a18..b2bb19ad8 100644 --- a/CHANGES +++ b/CHANGES @@ -89,6 +89,8 @@ - (popt): add POPT_ARGFLAG_OPTIONAL for long options with optional arg. - (popt): diddle auto-help to include type of arg expected. - use popt autohelp for rpm helper binaries. + - fix: avoid locale issues with strcasecmp/strncasecmp (#23199). + - remove almost all explicit uses of stderr in rpmlib using rpmError(). 3.0.6 -> 4.0 - use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db. diff --git a/Doxyfile.in b/Doxyfile.in index 142cb9bb5..22a45c148 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -335,6 +335,7 @@ INPUT = \ ./rpmio/rpmmessages.h \ ./rpmio/rpmrpc.c \ ./rpmio/rpmurl.h \ + ./rpmio/strcasecmp.c \ ./rpmio/stubs.c \ ./rpmio/ugid.c \ ./rpmio/ugid.h \ diff --git a/build/parsePreamble.c b/build/parsePreamble.c index 3294d4135..8c64b66d0 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c @@ -80,16 +80,11 @@ static int parseSimplePart(char *line, /*@out@*/char **name, /*@out@*/int *flag) return (strtok(NULL, " \t\n")) ? 1 : 0; } -static int parseYesNo(char *s) +static inline int parseYesNo(const char *s) { - if (!s || (s[0] == 'n' || s[0] == 'N') || - !strcasecmp(s, "false") || - !strcasecmp(s, "off") || - !strcmp(s, "0")) { - return 0; - } - - return 1; + return ((!s || (s[0] == 'n' || s[0] == 'N' || s[0] == '0') || + !xstrcasecmp(s, "false") || !xstrcasecmp(s, "off")) + ? 0 : 1); } struct tokenBits { @@ -163,26 +158,17 @@ static inline char * findLastChar(char * s) static int isMemberInEntry(Header header, const char *name, int tag) { - char **names; + const char ** names; int count; - /* - * XXX The strcasecmp below is necessary so the old (rpm < 2.90) style - * XXX os-from-uname (e.g. "Linux") is compatible with the new - * XXX os-from-platform (e.g "linux" from "sparc-*-linux"). - */ - if (headerGetEntry(header, tag, NULL, (void **)&names, &count)) { - while (count--) { - if (!strcasecmp(names[count], name)) { - FREE(names); - return 1; - } - } - FREE(names); - return 0; + if (!headerGetEntry(header, tag, NULL, (void **)&names, &count)) + return -1; + while (count--) { + if (!xstrcasecmp(names[count], name)) + break; } - - return -1; + FREE(names); + return (count >= 0 ? 1 : 0); } static int checkForValidArchitectures(Spec spec) @@ -694,7 +680,7 @@ static int findPreambleTag(Spec spec, /*@out@*/int *tag, /*@out@*/char **macro, initPreambleList(); for (p = preambleList; p->token; p++) { - if (!strncasecmp(spec->line, p->token, p->len)) + if (!xstrncasecmp(spec->line, p->token, p->len)) break; } if (p->token == NULL) diff --git a/build/parseSpec.c b/build/parseSpec.c index b27d62360..7c728c5e8 100644 --- a/build/parseSpec.c +++ b/build/parseSpec.c @@ -53,7 +53,7 @@ rpmParseState isPart(const char *line) for (p = partList; p->token != NULL; p++) { char c; - if (strncasecmp(line, p->token, p->len)) + if (xstrncasecmp(line, p->token, p->len)) continue; c = *(line + p->len); if (c == '\0' || isspace(c)) @@ -75,12 +75,7 @@ static int matchTok(const char *token, const char *line) SKIPNONSPACE(be); if (be == b) break; - /* - * XXX The strncasecmp below is necessary so the old (rpm < 2.90) style - * XXX os-from-uname (e.g. "Linux") is compatible with the new - * XXX os-from-platform (e.g "linux" from "sparc-*-linux"). - */ - if (toklen != (be-b) || strncasecmp(token, b, (be-b))) + if (toklen != (be-b) || xstrncasecmp(token, b, (be-b))) continue; rc = 1; break; diff --git a/configure.in b/configure.in index 8c5c62efb..2398d33a6 100644 --- a/configure.in +++ b/configure.in @@ -276,9 +276,6 @@ test "$with_v5_packages" = yes && AC_DEFINE(ENABLE_V5_PACKAGES) dnl Checks for libraries. -AC_CHECK_FUNC(strcasecmp, [], [ - AC_CHECK_LIB(ucb, strcasecmp, [LIBS="$LIBS -lc -lucb" USEUCB=y]) -]) AC_CHECK_FUNC(setreuid, [], [ AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi]) ]) @@ -654,7 +651,7 @@ dnl XXX AC_FUNC_VFORK dnl XXX AC_CHECK_FUNCS(gethostname mkdir mkfifo rmdir select uname) AC_CHECK_FUNCS(basename getcwd getwd inet_aton mtrace putenv realpath setenv) -AC_CHECK_FUNCS(stpcpy stpncpy strcasecmp strncasecmp strcspn) +AC_CHECK_FUNCS(stpcpy stpncpy strcspn) AC_CHECK_FUNCS(strdup strerror strtol strtoul strspn strstr) AC_CHECK_FUNCS(regcomp) diff --git a/lib/cpio.c b/lib/cpio.c index e5bc39245..7537a405d 100644 --- a/lib/cpio.c +++ b/lib/cpio.c @@ -9,6 +9,7 @@ #include "system.h" #include "cpio.h" +#include "rpmerr.h" #include "debug.h" /*@access FD_t@*/ @@ -441,13 +442,13 @@ static int expandRegular(FD_t cfd, const struct cpioHeader * hdr, strcpy(buf, hdr->path); strcat(buf, "-RPMDELETE"); if (rename(hdr->path, buf)) { - fprintf(stderr, _("can't rename %s to %s: %s\n"), + rpmError(RPMERR_RENAME, _("can't rename %s to %s: %s\n"), hdr->path, buf, strerror(errno)); return CPIOERR_UNLINK_FAILED; } if (unlink(buf)) { - fprintf(stderr, _("can't unlink %s: %s\n"), + rpmError(RPMERR_UNLINK, _("can't unlink %s: %s\n"), buf, strerror(errno)); #if 0 return CPIOERR_UNLINK_FAILED; @@ -754,7 +755,8 @@ int cpioInstallArchive(FD_t cfd, const struct cpioFileMapping * mappings, } if ((rc = getNextHeader(cfd, hdr))) { #if 0 /* XXX this is the failure point for an unreadable rpm */ - fprintf(stderr, _("getNextHeader: %s\n"), cpioStrerror(rc)); + rpmError(RPMERR_BADPACKAGE, _("getNextHeader: %s\n"), + cpioStrerror(rc)); #endif return rc; } diff --git a/lib/db1.c b/lib/db1.c index d0319c67b..74bfff88f 100644 --- a/lib/db1.c +++ b/lib/db1.c @@ -88,10 +88,12 @@ static int cvtdberr(dbiIndex dbi, const char * msg, int error, int printit) { rc = -1; if (printit && rc) { - fprintf(stderr, _("db%d error(%d)"), dbi->dbi_api, rc); if (msg) - fprintf(stderr, _(" performing %s"), msg); - fprintf(stderr, ": %s\n", db_strerror(error)); + rpmError(RPMERR_DBERR, _("db%d error(%d) from %s: %s\n"), + dbi->dbi_api, rc, msg, db_strerror(error)); + else + rpmError(RPMERR_DBERR, _("db%d error(%d): %s\n"), + dbi->dbi_api, rc, db_strerror(error)); } return rc; @@ -382,9 +384,6 @@ static int db1close(/*@only@*/ dbiIndex dbi, /*@unused@*/ unsigned int flags) dbi->dbi_db = NULL; } - if (dbi->dbi_debug) - fprintf(stderr, "db1close: rc %d db %p\n", rc, dbi->dbi_db); - rpmMessage(RPMMESS_DEBUG, _("closed db file %s\n"), urlfn); /* Remove temporary databases */ if (dbi->dbi_temporary) { diff --git a/lib/db2.c b/lib/db2.c index f397d2d9f..bc28671ce 100644 --- a/lib/db2.c +++ b/lib/db2.c @@ -108,8 +108,12 @@ static int cvtdberr(dbiIndex dbi, const char * msg, int error, int printit) { rc = -1; if (printit && rc) { - fprintf(stderr, "*** db%d %s rc %d %s\n", dbi->dbi_api, msg, - rc, db_strerror(error)); + if (msg) + rpmError(RPMERR_DBERR, _("db%d error(%d) from %s: %s\n"), + dbi->dbi_api, rc, msg, db_strerror(error)); + else + rpmError(RPMERR_DBERR, _("db%d error(%d): %s\n"), + dbi->dbi_api, rc, db_strerror(error)); } return rc; diff --git a/lib/db3.c b/lib/db3.c index a5caa3186..2f0505ddb 100644 --- a/lib/db3.c +++ b/lib/db3.c @@ -264,7 +264,8 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag) break; } if (opt->longName == NULL) { - fprintf(stderr, _("dbiSetConfig: unrecognized db option: \"%s\" ignored\n"), o); + rpmError(RPMERR_DBCONFIG, + _("unrecognized db option: \"%s\" ignored\n"), o); continue; } @@ -287,12 +288,13 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag) case POPT_ARG_LONG: aLong = strtol(p, &pe, 0); if (pe) { - if (!strncasecmp(pe, "Mb", 2)) + if (!xstrncasecmp(pe, "Mb", 2)) aLong *= 1024 * 1024; - else if (!strncasecmp(pe, "Kb", 2)) + else if (!xstrncasecmp(pe, "Kb", 2)) aLong *= 1024; else if (*pe != '\0') { - fprintf(stderr,_("%s has invalid numeric value, skipped\n"), + rpmError(RPMERR_DBCONFIG, + _("%s has invalid numeric value, skipped\n"), opt->longName); continue; } @@ -300,7 +302,8 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag) if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_LONG) { if (aLong == LONG_MIN || aLong == LONG_MAX) { - fprintf(stderr, _("%s has too large or too small long value, skipped\n"), + rpmError(RPMERR_DBCONFIG, + _("%s has too large or too small long value, skipped\n"), opt->longName); continue; } @@ -308,7 +311,8 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag) break; } else { if (aLong > INT_MAX || aLong < INT_MIN) { - fprintf(stderr, _("%s has too large or too small integer value, skipped\n"), + rpmError(RPMERR_DBCONFIG, + _("%s has too large or too small integer value, skipped\n"), opt->longName); continue; } @@ -448,10 +452,12 @@ static int cvtdberr(dbiIndex dbi, const char * msg, int error, int printit) { rc = error; if (printit && rc) { - fprintf(stderr, _("db%d error(%d)"), dbi->dbi_api, rc); if (msg) - fprintf(stderr, _(" performing %s"), msg); - fprintf(stderr, ": %s\n", db_strerror(error)); + rpmError(RPMERR_DBERR, _("db%d error(%d) from %s: %s\n"), + dbi->dbi_api, rc, msg, db_strerror(error)); + else + rpmError(RPMERR_DBERR, _("db%d error(%d): %s\n"), + dbi->dbi_api, rc, db_strerror(error)); } return rc; diff --git a/lib/falloc.c b/lib/falloc.c index 55faf471a..3a5936fdd 100644 --- a/lib/falloc.c +++ b/lib/falloc.c @@ -13,6 +13,7 @@ #include "system.h" #include +#include #include "falloc.h" #include "debug.h" @@ -137,7 +138,7 @@ unsigned int fadAlloc(FD_t fd, unsigned int size) /* XXX W2DO? exit(EXIT_FAILURE) forces the user to discover rpm --rebuilddb */ if (!header.isFree) { - fprintf(stderr, _("free list corrupt (%u)- please run\n" + rpmError(RPMERR_FREELIST, _("free list corrupt (%u)- please run\n" "\t\"rpm --rebuilddb\"\n" "More information is available from http://www.rpm.org " "or the rpm-list@redhat.com mailing list\n" diff --git a/lib/header.c b/lib/header.c index 8fa756982..80eb31e98 100644 --- a/lib/header.c +++ b/lib/header.c @@ -149,54 +149,6 @@ struct sprintfToken { } u; }; -#if HAVE_MCHECK_H -static int probe_headers = 0; -#define HEADERPROBE(_h, _msg) if (probe_headers) headerProbe((_h), (_msg)) - -static void headerProbeAddr(Header h, const char * msg, - void * p, const char * imsg) -{ - const char * mchkstr = NULL; - switch (mprobe(p)) { - case MCHECK_DISABLED: - case MCHECK_OK: - return; - /*@notreached@*/ break; - case MCHECK_HEAD: - mchkstr = "HEAD"; - break; - case MCHECK_TAIL: - mchkstr = "TAIL"; - break; - case MCHECK_FREE: - mchkstr = "FREE"; - break; - } - fprintf(stderr, "*** MCHECK_%s h %p", mchkstr, h); - if (imsg && p) - fprintf(stderr, " %s %p", imsg, p); - if (msg) - fprintf(stderr, " %s", msg); - fprintf(stderr, "\n"); -} - -static void headerProbe(Header h, const char *msg) -{ - char imsg[256]; - int i; - - headerProbeAddr(h, msg, h, "header"); - sprintf(imsg, "index (used %d)", h->indexUsed); - headerProbeAddr(h, msg, h->index, imsg); - for (i = 0; i < h->indexUsed; i++) { - sprintf(imsg, "index[%d:%d].data", i, h->indexUsed); - headerProbeAddr(h, msg, h->index[i].data, imsg); - } -} -#else /* HAVE_MCHECK_H */ -#define HEADERPROBE(_h, _msg) -#endif /* HAVE_MCHECK_H */ - /** * Return length of entry data. * @param type entry data type @@ -1273,7 +1225,6 @@ static int intGetEntry(Header h, int_32 tag, /*@out@*/ int_32 *type, { struct indexEntry * entry; - HEADERPROBE(h, "intGetEntry"); /* First find the tag */ entry = findEntry(h, tag, RPM_NULL_TYPE); if (entry == NULL) { @@ -1357,7 +1308,6 @@ void headerFree(Header h) Header headerLink(Header h) { - HEADERPROBE(h, "headerLink"); h->nrefs++; /*@-refcounttrans@*/ return h; /*@=refcounttrans@*/ } diff --git a/lib/install.c b/lib/install.c index cbb9d18f6..98e8e4ae5 100644 --- a/lib/install.c +++ b/lib/install.c @@ -278,7 +278,7 @@ static void trimChangelog(Header h) * @param h header from * @param newH header to * @param actions array of file dispositions - * @return 0 always + * @return 0 on success, 1 on failure */ static int mergeFiles(Header h, Header newH, enum fileActions * actions) { @@ -362,9 +362,10 @@ static int mergeFiles(Header h, Header newH, enum fileActions * actions) free (data); break; default: - fprintf(stderr, _("Data type %d not supported\n"), (int) type); - exit(EXIT_FAILURE); - /*@notreached@*/ + rpmError(RPMERR_DATATYPE, _("Data type %d not supported\n"), + (int) type); + return 1; + /*@notreached@*/ break; } } headerGetEntry(newH, RPMTAG_DIRINDEXES, NULL, (void **) &newDirIndexes, @@ -1178,7 +1179,10 @@ int installBinaryPackage(const rpmTransactionSet ts, FD_t fd, Header h, headerModifyEntry(oldH, RPMTAG_MULTILIBS, RPM_INT32_TYPE, &multiLib, 1); } - mergeFiles(oldH, h, actions); + if (mergeFiles(oldH, h, actions)) { + rc = 2; + goto exit; + } } if (rpmdbAdd(ts->rpmdb, h)) { diff --git a/lib/poptBT.c b/lib/poptBT.c index 3de85cf1e..b2f2e96f5 100644 --- a/lib/poptBT.c +++ b/lib/poptBT.c @@ -91,9 +91,8 @@ static void buildArgCallback( /*@unused@*/ poptContext con, case POPT_RMBUILD: rba->buildAmount |= RPMBUILD_RMBUILD; break; case POPT_BUILDROOT: if (rba->buildRootOverride) { - fprintf(stderr, _("buildroot already specified")); - exit(EXIT_FAILURE); - /*@notreached@*/ + rpmError(RPMERR_BUILDROOT, _("buildroot already specified, ignoring %s\n"), arg); + break; } rba->buildRootOverride = xstrdup(arg); break; diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c index 818eb3766..6f409e12d 100644 --- a/lib/rpmchecksig.c +++ b/lib/rpmchecksig.c @@ -35,7 +35,7 @@ static int manageFile(FD_t *fdp, const char **fnp, int flags, int rc) if (*fdp == NULL && fnp && *fnp) { fd = Fopen(*fnp, ((flags & O_WRONLY) ? "w.ufdio" : "r.ufdio")); if (fd == NULL || Ferror(fd)) { - fprintf(stderr, _("%s: open failed: %s\n"), *fnp, + rpmError(RPMERR_OPEN, _("%s: open failed: %s\n"), *fnp, Fstrerror(fd)); return 1; } @@ -46,7 +46,7 @@ static int manageFile(FD_t *fdp, const char **fnp, int flags, int rc) /* open a temp file */ if (*fdp == NULL && (fnp == NULL || *fnp == NULL)) { if (makeTempFile(NULL, (fnp ? &fn : NULL), &fd)) { - fprintf(stderr, _("makeTempFile failed\n")); + rpmError(RPMERR_MAKETEMP, _("makeTempFile failed\n")); return 1; } if (fnp) @@ -78,13 +78,13 @@ static int copyFile(FD_t *sfdp, const char **sfnp, while ((count = Fread(buffer, sizeof(buffer[0]), sizeof(buffer), *sfdp)) > 0) { if (Fwrite(buffer, sizeof(buffer[0]), count, *tfdp) < 0) { - fprintf(stderr, _("%s: Fwrite failed: %s\n"), *tfnp, + rpmError(RPMERR_FWRITE, _("%s: Fwrite failed: %s\n"), *tfnp, Fstrerror(*tfdp)); goto exit; } } if (count < 0) { - fprintf(stderr, _("%s: Fread failed: %s\n"), *sfnp, Fstrerror(*sfdp)); + rpmError(RPMERR_FREAD, _("%s: Fread failed: %s\n"), *sfnp, Fstrerror(*sfdp)); goto exit; } @@ -133,16 +133,16 @@ l = malloc(sizeof(*l)); goto exit; if (readLead(fd, l)) { - fprintf(stderr, _("%s: readLead failed\n"), rpm); + rpmError(RPMERR_READLEAD, _("%s: readLead failed\n"), rpm); goto exit; } switch (l->major) { case 1: - fprintf(stderr, _("%s: Can't sign v1.0 RPM\n"), rpm); + rpmError(RPMERR_BADSIGTYPE, _("%s: Can't sign v1.0 RPM\n"), rpm); goto exit; /*@notreached@*/ break; case 2: - fprintf(stderr, _("%s: Can't re-sign v2.0 RPM\n"), rpm); + rpmError(RPMERR_BADSIGTYPE, _("%s: Can't re-sign v2.0 RPM\n"), rpm); goto exit; /*@notreached@*/ break; default: @@ -150,11 +150,11 @@ l = malloc(sizeof(*l)); } if (rpmReadSignature(fd, &sig, l->signature_type)) { - fprintf(stderr, _("%s: rpmReadSignature failed\n"), rpm); + rpmError(RPMERR_SIGGEN, _("%s: rpmReadSignature failed\n"), rpm); goto exit; } if (sig == NULL) { - fprintf(stderr, _("%s: No signature available\n"), rpm); + rpmError(RPMERR_SIGGEN, _("%s: No signature available\n"), rpm); goto exit; } @@ -187,13 +187,13 @@ l = malloc(sizeof(*l)); l->signature_type = RPMSIG_HEADERSIG; if (writeLead(ofd, l)) { - fprintf(stderr, _("%s: writeLead failed: %s\n"), trpm, + rpmError(RPMERR_WRITELEAD, _("%s: writeLead failed: %s\n"), trpm, Fstrerror(ofd)); goto exit; } if (rpmWriteSignature(ofd, sig)) { - fprintf(stderr, _("%s: rpmWriteSignature failed: %s\n"), trpm, + rpmError(RPMERR_SIGGEN, _("%s: rpmWriteSignature failed: %s\n"), trpm, Fstrerror(ofd)); goto exit; } @@ -267,13 +267,13 @@ l = malloc(sizeof(*l)); } if (readLead(fd, &lead)) { - fprintf(stderr, _("%s: readLead failed\n"), rpm); + rpmError(RPMERR_READLEAD, _("%s: readLead failed\n"), rpm); res++; goto bottom; } switch (l->major) { case 1: - fprintf(stderr, _("%s: No signature available (v1.0 RPM)\n"), rpm); + rpmError(RPMERR_BADSIGTYPE, _("%s: No signature available (v1.0 RPM)\n"), rpm); res++; goto bottom; /*@notreached@*/ break; @@ -281,12 +281,12 @@ l = malloc(sizeof(*l)); break; } if (rpmReadSignature(fd, &sig, l->signature_type)) { - fprintf(stderr, _("%s: rpmReadSignature failed\n"), rpm); + rpmError(RPMERR_SIGGEN, _("%s: rpmReadSignature failed\n"), rpm); res++; goto bottom; } if (sig == NULL) { - fprintf(stderr, _("%s: No signature available\n"), rpm); + rpmError(RPMERR_SIGGEN, _("%s: No signature available\n"), rpm); res++; goto bottom; } @@ -432,9 +432,9 @@ l = malloc(sizeof(*l)); if (res2) { if (rpmIsVerbose()) { - fprintf(stderr, "%s", (char *)buffer); + rpmError(RPMERR_SIGVFY, "%s", (char *)buffer); } else { - fprintf(stderr, "%s%s%s%s%s%s%s%s\n", (char *)buffer, + rpmError(RPMERR_SIGVFY, "%s%s%s%s%s%s%s%s\n", (char *)buffer, _("NOT OK"), (missingKeys[0] != '\0') ? _(" (MISSING KEYS:") : "", (char *)missingKeys, @@ -446,9 +446,9 @@ l = malloc(sizeof(*l)); } } else { if (rpmIsVerbose()) { - fprintf(stdout, "%s", (char *)buffer); + rpmError(RPMERR_SIGVFY, "%s", (char *)buffer); } else { - fprintf(stdout, "%s%s%s%s%s%s%s%s\n", (char *)buffer, + rpmError(RPMERR_SIGVFY, "%s%s%s%s%s%s%s%s\n", (char *)buffer, _("OK"), (missingKeys[0] != '\0') ? _(" (MISSING KEYS:") : "", (char *)missingKeys, diff --git a/lib/rpminstall.c b/lib/rpminstall.c index 6e9e6f2da..1cac761e0 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -330,7 +330,9 @@ int rpmInstall(const char * rootdir, const char ** fileArgv, rpmMessage(RPMMESS_ERROR, _("cannot open Packages database in %s\n"), dn); free((void *)dn); - exit(EXIT_FAILURE); + numFailed++; + pkgURL[i] = NULL; + break; } rpmdep = rpmtransCreateSet(db, rootdir); dbIsOpen = 1; @@ -532,7 +534,7 @@ int rpmErase(const char * rootdir, const char ** argv, dn = rpmGetPath( (rootdir ? rootdir : ""), "%{_dbpath}", NULL); rpmMessage(RPMMESS_ERROR, _("cannot open %s/packages.rpm\n"), dn); free((void *)dn); - exit(EXIT_FAILURE); + return -1; } rpmdep = rpmtransCreateSet(db, rootdir); diff --git a/lib/rpmrc.c b/lib/rpmrc.c index 187721402..292aaf0e2 100644 --- a/lib/rpmrc.c +++ b/lib/rpmrc.c @@ -117,7 +117,7 @@ static void rpmSetVarArch(int var, const char * val, const char * arch); static void rebuildCompatTables(int type, const char *name); static int optionCompare(const void * a, const void * b) { - return strcasecmp(((struct rpmOption *) a)->name, + return xstrcasecmp(((struct rpmOption *) a)->name, ((struct rpmOption *) b)->name); } @@ -207,16 +207,8 @@ static /*@observer@*/ struct machEquivInfo * { int i; -/* - * XXX The strcasecmp below is necessary so the old (rpm < 2.90) style - * XXX os-from-uname (e.g. "Linux") is compatible with the new - * XXX os-from-platform (e.g "linux" from "sparc-*-linux"). - * XXX A copy of this string is embedded in headers and is - * XXX used by rpmInstallPackage->{os,arch}Okay->rpmMachineScore->. - * XXX to verify correct arch/os from headers. - */ for (i = 0; i < table->count; i++) - if (!strcasecmp(table->list[i].name, name)) + if (!xstrcasecmp(table->list[i].name, name)) return table->list + i; return NULL; @@ -1238,7 +1230,7 @@ void rpmRebuildTargetVars(const char **buildtarget, const char ** canontarget) if ((co = strrchr(c, '-')) == NULL) { co = c; } else { - if (!strcasecmp(co, "-gnu")) + if (!xstrcasecmp(co, "-gnu")) *co = '\0'; if ((co = strrchr(c, '-')) == NULL) co = c; diff --git a/lib/signature.c b/lib/signature.c index 75f3dea2f..d57b6e800 100644 --- a/lib/signature.c +++ b/lib/signature.c @@ -51,13 +51,13 @@ int rpmLookupSignatureType(int action) { const char *name = rpmExpand("%{_signature}", NULL); if (!(name && *name != '%')) rc = 0; - else if (!strcasecmp(name, "none")) + else if (!xstrcasecmp(name, "none")) rc = 0; - else if (!strcasecmp(name, "pgp")) + else if (!xstrcasecmp(name, "pgp")) rc = RPMSIGTAG_PGP; - else if (!strcasecmp(name, "pgp5")) /* XXX legacy */ + else if (!xstrcasecmp(name, "pgp5")) /* XXX legacy */ rc = RPMSIGTAG_PGP; - else if (!strcasecmp(name, "gpg")) + else if (!xstrcasecmp(name, "gpg")) rc = RPMSIGTAG_GPG; else rc = -1; /* Invalid %_signature spec in macro file */ @@ -641,7 +641,7 @@ verifyGPGSignature(const char *datafile, const void * sig, int count, char *resu result[0] = '\0'; while (fgets(buf, 1024, file)) { strcat(result, buf); - if (!strncasecmp("gpg: Can't check signature: Public key not found", buf, 48)) { + if (!xstrncasecmp("gpg: Can't check signature: Public key not found", buf, 48)) { res = RPMSIG_NOKEY; } } diff --git a/misc/Makefile.am b/misc/Makefile.am index 5a67c24f7..e52e8a432 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -9,8 +9,8 @@ EXTRA_DIST = \ fakefork.c fnmatch.c getcwd.c getmntent.c \ getwd.c glob.c memcmp.c \ mktime.c myrealloc.c putenv.c realpath.c \ - setenv.c stpcpy.c stpncpy.c strcasecmp.c \ - strncasecmp.c strcspn.c strdup.c strerror.c \ + setenv.c stpcpy.c stpncpy.c \ + strcspn.c strdup.c strerror.c \ strftime.c strcspn.c strstr.c strtol.c \ strtoul.c diff --git a/misc/strcasecmp.c b/misc/strcasecmp.c deleted file mode 100644 index 776d62ada..000000000 --- a/misc/strcasecmp.c +++ /dev/null @@ -1,77 +0,0 @@ -/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc. - - NOTE: The canonical source of this file is maintained with the GNU C Library. - Bugs can be reported to bug-glibc@prep.ai.mit.edu. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include - -#ifndef weak_alias -# define __strcasecmp strcasecmp -# define TOLOWER(Ch) tolower (Ch) -#else -# ifdef USE_IN_EXTENDED_LOCALE_MODEL -# define __strcasecmp __strcasecmp_l -# define TOLOWER(Ch) __tolower_l ((Ch), loc) -# else -# define TOLOWER(Ch) tolower (Ch) -# endif -#endif - -#ifdef USE_IN_EXTENDED_LOCALE_MODEL -# define LOCALE_PARAM , loc -# define LOCALE_PARAM_DECL __locale_t loc; -#else -# define LOCALE_PARAM -# define LOCALE_PARAM_DECL -#endif - -/* Compare S1 and S2, ignoring case, returning less than, equal to or - greater than zero if S1 is lexicographically less than, - equal to or greater than S2. */ -int -__strcasecmp (s1, s2 LOCALE_PARAM) - const char *s1; - const char *s2; - LOCALE_PARAM_DECL -{ - const unsigned char *p1 = (const unsigned char *) s1; - const unsigned char *p2 = (const unsigned char *) s2; - unsigned char c1, c2; - - if (p1 == p2) - return 0; - - do - { - c1 = TOLOWER (*p1++); - c2 = TOLOWER (*p2++); - if (c1 == '\0') - break; - } - while (c1 == c2); - - return c1 - c2; -} -#ifndef __strcasecmp -weak_alias (__strcasecmp, strcasecmp) -#endif diff --git a/misc/strncasecmp.c b/misc/strncasecmp.c deleted file mode 100644 index 52af434b1..000000000 --- a/misc/strncasecmp.c +++ /dev/null @@ -1,80 +0,0 @@ -/* Compare at most N characters of two strings without taking care for - the case. - Copyright (C) 1992, 1996, 1997 Free Software Foundation, Inc. - - NOTE: The canonical source of this file is maintained with the GNU C Library. - Bugs can be reported to bug-glibc@prep.ai.mit.edu. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include - -#ifndef weak_alias -# define __strncasecmp strncasecmp -# define TOLOWER(Ch) tolower (Ch) -#else -# ifdef USE_IN_EXTENDED_LOCALE_MODEL -# define __strncasecmp __strncasecmp_l -# define TOLOWER(Ch) __tolower_l ((Ch), loc) -# else -# define TOLOWER(Ch) tolower (Ch) -# endif -#endif - -#ifdef USE_IN_EXTENDED_LOCALE_MODEL -# define LOCALE_PARAM , loc -# define LOCALE_PARAM_DECL __locale_t loc; -#else -# define LOCALE_PARAM -# define LOCALE_PARAM_DECL -#endif - -/* Compare no more than N characters of S1 and S2, - ignoring case, returning less than, equal to or - greater than zero if S1 is lexicographically less - than, equal to or greater than S2. */ -int -__strncasecmp (s1, s2, n LOCALE_PARAM) - const char *s1; - const char *s2; - size_t n; - LOCALE_PARAM_DECL -{ - const unsigned char *p1 = (const unsigned char *) s1; - const unsigned char *p2 = (const unsigned char *) s2; - unsigned char c1, c2; - - if (p1 == p2 || n == 0) - return 0; - - do - { - c1 = TOLOWER (*p1++); - c2 = TOLOWER (*p2++); - if (c1 == '\0' || c1 != c2) - return c1 - c2; - } while (--n > 0); - - return c1 - c2; -} -#ifndef __strncasecmp -weak_alias (__strncasecmp, strncasecmp) -#endif diff --git a/po/cs.po b/po/cs.po index 7503a4f65..4667184d8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: 2000-08-23 22:24+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -523,7 +523,7 @@ msgstr "" "ověřit instalaci balíčku použitím stejných voleb pro specifikaci balíčku, " "jako pro -q" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "nekontrolovat závislosti balíčků" @@ -722,15 +722,15 @@ msgstr "bin msgid "bin/src package (prep, compile, install, package)" msgstr "bin/src balíček (příprava, kompilace, instalace, zabalení)" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "přeskočit přímo na určenou etapu (pouze pro c,i)" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "po dokončení odstranit sestavovací strom" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "po dokončení odstranit zdrojové kódy" @@ -738,7 +738,7 @@ msgstr "po dokon msgid "remove spec file when done" msgstr "po dokončení odstranit spec soubor" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "generovat PGP/GPG podpis" @@ -1215,7 +1215,7 @@ msgstr "znovu vytvo msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -2040,118 +2040,118 @@ msgstr " msgid "line %d: Second %%files list" msgstr "řádek %d: Druhý %%files seznam" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "Architektura je vyřazena: %s" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "Architektura není vyřazena: %s" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "OS je vyřazen: %s" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "OS není vyřazen: %s" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "Položka %s musí být v balíčku přítomna: %s" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "Duplikovaná položka %s v balíčku: %s" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "Nemohu otevřít ikonu %s: %s" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "Nemohu přečíst ikonu %s: %s" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "Neznámý typ ikony: %s" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "řádek %d: Počkozená značka: %s" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "řádek %d: Prázdná značka: %s" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "řádek %d: Nepřípustný znak '-' v %s: %s" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "BuildRoot nemůže být \"/\": %s" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "řádek %d: Prefixy nesmí končit znakem \"/\": %s" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "řádek %d: Docdir musí začínat '/': %s" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "řádek %d: Položka Epoch/Serial musí být číslo: %s" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, fuzzy, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "řádek %d: Špatné číslo %s: %s\n" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "řádek %d: Špatný formát BuildArchitecture: %s" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "Interní chyba: Špatná značka: %d" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "špatná specifikace balíčku: %s" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "Balíček již existuje: %s" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "řádek %d: Neznámá značka: %s" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "Spec soubor nemůže použít BuildRoot" @@ -2258,45 +2258,45 @@ msgstr " msgid "line %d: Second %s" msgstr "řádek %d: Druhý %s" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "řádek %d: %s" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "Nemohu otevřít %s: %s\n" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "Neuzavřený %%if" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "%s:%d: parseExpressionBoolean vrátil %d" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "%s:%d: %%else bez počítečního if" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "%s:%d: %%endif bez počátečního if" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "poškozený příkaz %%include" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "Žádné architektury pro sestavení" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "Balíček nemá žádné %%description: %s" @@ -2320,55 +2320,55 @@ msgstr " msgid "line %d: Bad %s number: %s\n" msgstr "řádek %d: Špatné číslo %s: %s\n" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "Nemohu přejmenovat %s na %s: %s\n" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "Nemohu provést unlink %s: %s\n" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "getNextHeader: %s\n" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "(chyba: 0x%x)" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "Špatné magické číslo" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "Špatná nebo nečitelná hlavička" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "Velikost hlavičky je přiliš velká" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "Neznámý typ souboru" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "Chybějící hardlink" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "Interní chyba" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr "selhal - " @@ -2472,131 +2472,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 -#, c-format -msgid "db%d error(%d)" +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 +#, fuzzy, c-format +msgid "db%d error(%d) from %s: %s\n" msgstr "db%d error(%d)" -#: lib/db1.c:93 lib/db3.c:453 -#, c-format -msgid " performing %s" -msgstr " provádím %s" +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 +#, fuzzy, c-format +msgid "db%d error(%d): %s\n" +msgstr "db%d error(%d)" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "zavřen db soubor %s\n" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "odstraněn db soubor %s\n" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "špatný db soubor %s" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "otevírám db soubor %s mode 0x%x\n" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "nemohu zamknout databázi %s" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "výhradní" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "sdílený" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "zavřeno db prostředí %s/%s(%s)\n" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "smazáno db prostředí %s/%s(%s)\n" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "otevřeno db prostředí %s/%s(%s) %s\n" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "zavřen db index %s/%s(%s)\n" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "otevřen db index %s/%s(%s) %s mode=0x%x\n" -#: lib/db3.c:267 -#, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +#: lib/db3.c:268 +#, fuzzy, c-format +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "dbiSetConfig: ignorována neznámá db volba: \"%s\"\n" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s má neplatnou numerickou hodnotu, přeskočeno\n" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s má moc velkou nebo moc malou long hodnotu, přeskočeno\n" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s má příliš velkou nebo moc malou celočíselnou hodnotu, přeskočeno\n" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "uzavřeno DB prostředí %s/%s\n" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "odstraněno db prostředí %s/%s\n" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "otevírám db environment %s/%s %s\n" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "uzavřen db index %s/%s\n" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "otevírám db index %s/%s %s mode=0x%x\n" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "nemohu zamknout databázi zámkem %s v %s/%s\n" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "uzamčen db index %s/%s\n" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2611,7 +2611,7 @@ msgstr "" "na http://www.rpm.org nebo v diskuzním listu rpm-list@redhat.com.\n" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "(není číslo)" @@ -2640,93 +2640,93 @@ msgid "file %s is on an unknown device" msgstr "soubor %s je na neznámém zařízení" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "Počet RPM_STRING_TYPE pro grabData() musí být 1.\n" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "Datový typ %d není podporován\n" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "Chybný počet pro headerAddEntry(): %d\n" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "chybí { po %" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "po %{ chybí }" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "prázdný formát značky" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "prázdné jméno značky" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "neznámá značka" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "na konci pole očekáváno ]" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "neočekávaná ]" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "neočekávaná }" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "ve výrazu očekáván ?" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "ve výrazu je po ? očekávána {" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "ve výrazu je očekávána }" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "v podvýrazu je po ? očekávána :" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "ve výrazu je po : očekávána {" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "na konci výrazu je očekáváno |" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "(neznámý typ)" @@ -2748,91 +2748,91 @@ msgstr "skupina %s neexistuje - pou #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "rozbalování archívu selhalo %s%s: %s" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr " na souboru " -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "instaluji zdrojový balíček\n" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "nemohu vytvořir adresář pro zdrojové soubory: %s" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "nemohu zapsat do %s" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "zdrojové soubory v: %s\n" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "nemohu vytvořit adresář pro spec soubory: %s" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "spec soubor v: %s\n" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "zdrojový balíček neobsahuje spec soubor" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "přejmenovávám %s na %s\n" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "přejmenování %s na %s selhalo: %s" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "očekávám balíček se zdrojovými kódy, nalezen však binární" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "balíček: %s-%s-%s test souborů = %d\n" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "ukončuji instalaci, protože je spuštěn --test\n" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "spouštím případný předinstalační skript\n" -#: lib/install.c:1030 +#: lib/install.c:1031 #, fuzzy msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "přeskakuji %s - přenos selhal - %s\n" -#: lib/install.c:1062 +#: lib/install.c:1063 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "varování: %s vytvořeno jako %s" -#: lib/install.c:1098 +#: lib/install.c:1099 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "varování: %s uloženo jako %s" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "spouštím případný postinstalační skript\n" @@ -2851,135 +2851,136 @@ msgid "" msgstr "tato verze RPM podporuje práci s balíčky s hlavním (major) číslem <= 4" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, fuzzy, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "buildroot již byl nastaven" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "příprava (rozbalí zdroje a aplikuje záplaty)" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 #, fuzzy msgid "build through %build (%prep, then compile) from " msgstr "provádím %%prep část podle spec souboru" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 #, fuzzy msgid "build through %install (%prep, %build, then install) from " msgstr "provádím %%install část podle spec souboru" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, fuzzy, c-format msgid "verify %files section from " msgstr "kontrola části %%files ve spec souboru" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 #, fuzzy msgid "build source and binary packages from " msgstr "vytvoření zdrojového a binárního balíčku podle spec souboru" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 #, fuzzy msgid "build binary package only from " msgstr "vytvoření binárního balíčku podle spec souboru" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 #, fuzzy msgid "build source package only from " msgstr "vytvoření zdrojového balíčku podle spec souboru" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "příprava (rozbalí zdroje a aplikuje záplaty)" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 #, fuzzy msgid "build through %build (%prep, then compile) from " msgstr "provádím %%prep část z tar souboru" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 #, fuzzy msgid "build through %install (%prep, %build, then install) from " msgstr "provádím %%install část z tar souboru" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, fuzzy, c-format msgid "verify %files section from " msgstr "kontrola části %%files z tar souboru" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 #, fuzzy msgid "build source and binary packages from " msgstr "vytvoření zdrojového a binárního balíčku z tar souboru" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 #, fuzzy msgid "build binary package only from " msgstr "vytvoření binárního balíčku z tar souboru" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 #, fuzzy msgid "build source package only from " msgstr "vytvoření zdrojového balíčku z tar souboru" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 #, fuzzy msgid "build binary package from " msgstr "vytvoření binárního balíčku ze zdrojového" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 #, fuzzy msgid "" msgstr "žádné balíčky\n" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 #, fuzzy msgid "" "build through %install (%prep, %build, then install) from " msgstr "provádím %%install část ze zdrojového balíčku" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "build root předefinován" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "nespouštět žádné etapy vytváření balíčku" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 #, fuzzy msgid "do not accept i18N msgstr's from specfile" msgstr "ignorovat I18N zprávy ve spec souboru" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "po dokončení odstranit spec soubor" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "cílová platforma předefinována" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 #, fuzzy msgid "lookup i18N strings in specfile catalog" msgstr "vyhledat I18N řetězce katalogu spec souboru" @@ -3252,7 +3253,7 @@ msgstr "z msgid "record %d could not be read\n" msgstr "záznam %d nelze přečíst\n" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "balíček %s není nainstalován\n" @@ -3609,12 +3610,12 @@ msgstr "p msgid "retrieved %d packages\n" msgstr "přijato %d balíčků\n" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "nemohu otevřít soubor %s: %s\n" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "%s nemůže být nainstalován\n" @@ -3624,54 +3625,54 @@ msgstr "%s nem msgid "cannot open Packages database in %s\n" msgstr "nemohu otevřít databázi balíčků v %s\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "balíček %s není přemístitelný\n" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "chyba při čtení ze souboru %s\n" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "soubor %s vyžaduje novější verzi RPM\n" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "nalezeno %d zdrojových a %d binárních balíčků\n" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "nevyřešené závislosti:\n" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "instaluji binární balíčky\n" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "chyba: nemohu otevřít %s/packages.rpm\n" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" určuje více balíčků\n" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "odstranění těchto balíčků by porušilo závislosti:\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "nemohu otevřít %s: %s\n" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "Instaluji %s\n" @@ -3691,88 +3692,88 @@ msgstr "chyb msgid "missing architecture name at %s:%d" msgstr "chybí název architektury u %s:%d" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "Neúplný datový řádek %s:%d" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "Příliš mnoho parametrů v datovém řádku %s:%d" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "Chybné číslo architektury nebo OS: %s (%s:%d)" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "Neúplný standardní řádek %s:%d" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "Příliš mnoho parametrů ve výchozím řádku u %s:%d" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "Nemohu expandovat %s" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "Nemohu číst %s, HOME je příliš velký." -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "Nemohu otevřít %s pro čtení: %s." #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "Nemohu číst %s: %s." -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "chybí ':' (nalezeno na 0x%02x) v %s:%d" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "chybí parametr pro %s u %s:%d" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "expanze %s selhala na %s:%d \"%s\"" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "nemohu otevřít soubor %s na %s:%d: %s" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "chybí architektura pro %s u %s:%d" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "chybná volba '%s' u %s:%d" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "Neznámý systém: %s\n" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "Zkontaktujte prosím rpm-list@redhat.com\n" @@ -3992,7 +3993,8 @@ msgid "Bad server response" msgstr "Chybná odezva FTP serveru" #: rpmio/rpmio.c:540 -msgid "Server IO error" +#, fuzzy +msgid "Server I/O error" msgstr "IO chyba serveru" #: rpmio/rpmio.c:543 @@ -4016,7 +4018,8 @@ msgid "Failed to establish data connection to server" msgstr "Selhalo navázání datového spojení se serverem" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +#, fuzzy +msgid "I/O error to local file" msgstr "IO chyba při lokálním souboru" #: rpmio/rpmio.c:561 @@ -4187,6 +4190,9 @@ msgstr "nemohu otev msgid "failed to create %s: %s\n" msgstr "nemohu vytvořit %s: %s\n" +#~ msgid " performing %s" +#~ msgstr " provádím %s" + #, fuzzy #~ msgid "" #~ " %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros " diff --git a/po/da.po b/po/da.po index bd871aaf4..9dfc32974 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: 2000-03-07 05:17+01:00\n" "Last-Translator: K. Christiansen \n" "Language-Team: Danish/Dansk \n" @@ -518,7 +518,7 @@ msgid "" "options as -q" msgstr "" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "" @@ -712,15 +712,15 @@ msgstr "" msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "" @@ -728,7 +728,7 @@ msgstr "" msgid "remove spec file when done" msgstr "" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "" @@ -1187,7 +1187,7 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -2005,118 +2005,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2221,45 +2221,45 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "" @@ -2283,55 +2283,55 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr "" @@ -2433,131 +2433,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2568,7 +2568,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "" @@ -2597,92 +2597,92 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "" @@ -2704,90 +2704,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 #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "" -#: lib/install.c:1062 +#: lib/install.c:1063 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/install.c:1098 +#: lib/install.c:1099 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr " ... som %s\n" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2806,122 +2806,123 @@ msgid "" msgstr "" #: lib/poptBT.c:94 -msgid "buildroot already specified" -msgstr "" +#, fuzzy, c-format +msgid "buildroot already specified, ignoring %s\n" +msgstr "Kan ikke ĺbne spec-fil %s: %s\n" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 msgid "build binary package from " msgstr "" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 #, fuzzy msgid "" msgstr "ingen pakker\n" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 msgid "" "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3189,7 +3190,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3519,12 +3520,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "modtager %d pakker\n" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "kan ikke ĺbne fil %s: %s\n" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -3534,54 +3535,54 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "Kan ikke ĺbne %s/packages.rpm\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "installerer binćre pakker\n" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "Kan ikke ĺbne %s/packages.rpm\n" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "kan ikke ĺbne %s: %s\n" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" @@ -3601,88 +3602,88 @@ msgstr "" msgid "missing architecture name at %s:%d" msgstr "" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "Kan ikke udvide %s" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "kan ikke ĺbne %s ved %s:%d: %s" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "manglende arkitektur for %s ved %s:%d" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "ugyldig flag '%s' ved %s:%d" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "Ukendt system: %s\n" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "Kontakt venligst rpm-list@redhat.com\n" @@ -3898,8 +3899,9 @@ msgid "Bad server response" msgstr "" #: rpmio/rpmio.c:540 -msgid "Server IO error" -msgstr "" +#, fuzzy +msgid "Server I/O error" +msgstr "Tidsudlřb for tjener" #: rpmio/rpmio.c:543 msgid "Server timeout" @@ -3922,7 +3924,7 @@ msgid "Failed to establish data connection to server" msgstr "" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +msgid "I/O error to local file" msgstr "" #: rpmio/rpmio.c:561 diff --git a/po/de.po b/po/de.po index 6098d9ce4..2e06a3400 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -595,7 +595,7 @@ msgid "" msgstr "" "Ein Paket mit denselben Paketspezifikations-Optionen wie bei -q überprüfen" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "Dateiabhängigkeiten nicht überprüfen" @@ -808,15 +808,15 @@ msgstr "" "Binär- und Quellpaket erstellen (präparieren, kompilieren, installieren und " "Paketieren" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "Direkt zur angegeben Stufe springen (nur für c und i)" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "Erstellungsdateibaum nach Beendigung löschen" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 #, fuzzy msgid "remove sources when done" msgstr "Quellen und spec-Dateien nach Beendigung löschen" @@ -826,7 +826,7 @@ msgstr "Quellen und spec-Dateien nach Beendigung l msgid "remove spec file when done" msgstr "Quellen und spec-Dateien nach Beendigung löschen" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 #, fuzzy msgid "generate PGP/GPG signature" msgstr "PGP-Signatur generieren" @@ -1331,7 +1331,7 @@ msgstr "Datenbank aus der vorhandenen neu erstellen" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -2225,121 +2225,121 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" # , c-format -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, fuzzy, c-format msgid "Unable to open icon %s: %s" msgstr "Nicht möglich %s zu schreiben" # , c-format -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, fuzzy, c-format msgid "Unable to read icon %s: %s" msgstr "Nicht möglich %s zu schreiben" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, fuzzy, c-format msgid "Unknown icon type: %s" msgstr "(unbekannter Typ)" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" # , c-format -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, fuzzy, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, fuzzy, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "Verschiebungen müssen mit einem ť/Ť beginnen" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, fuzzy, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "ungültige Paket-Nummer: %s\n" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, fuzzy, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "ungültige Paket-Nummer: %s\n" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, fuzzy, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "fehlende Architektur für %s bei %s:%d" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Optionen der Paketauswahl:" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2448,47 +2448,47 @@ msgid "line %d: Second %s" msgstr "" # , c-format -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, fuzzy, c-format msgid "line %d: %s" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, fuzzy, c-format msgid "Unable to open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen\n" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 #, fuzzy msgid "No buildable architectures" msgstr "Paket-Architektur nicht überprüfen" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 #, fuzzy msgid "Package has no %%description: %s" msgstr "Paket %s wird nicht in %s aufgeführt" @@ -2514,57 +2514,57 @@ msgid "line %d: Bad %s number: %s\n" msgstr "ungültige Paket-Nummer: %s\n" # , c-format -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "Lesen von %s fehlgeschlagen: %s." -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "Fehler: " -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 #, fuzzy msgid "Unknown file type" msgstr "(unbekannter Typ)" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 #, fuzzy msgid "Internal error" msgstr "Fataler Fehler: " -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 #, fuzzy msgid " failed - " msgstr "pgp fehlgeschlagen" @@ -2668,132 +2668,132 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" # , c-format -#: lib/db1.c:422 +#: lib/db1.c:421 #, fuzzy, c-format msgid "bad db file %s" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/db1.c:427 +#: lib/db1.c:426 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "Datenbank aus der vorhandenen neu erstellen" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "kann %s lock für die Datenbank nicht bekommen" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "exklusiv" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "geteilt" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "kann %s lock für die Datenbank nicht bekommen" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2804,7 +2804,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "(keine Zahl)" @@ -2835,95 +2835,95 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "fehlende { nach %{" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "fehlende } nach %{" # ťTagŤ übersetzen??? -ke- #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "leeres ťTagŤ-Format" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "leerer ťTagŤ-Name" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "unbekannter ťTagŤ" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "] am Ende des Arrays erwartet" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "unerwartete ]" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "unerwartete }" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "? im Ausdruck erwartet" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 #, fuzzy msgid "{ expected after ? in expression" msgstr "{ nach ? im Ausdruck erwartet" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "} im Ausdruck erwartet" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr ": nach ? Unterausdruck erwartet" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 #, fuzzy msgid "{ expected after : in expression" msgstr "{ nach : im Ausdruck erwartet" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "| am Ende des Ausdrucks erwartet" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "(unbekannter Typ)" @@ -2946,95 +2946,95 @@ msgstr "Gruppe %s beinhaltet kein einziges Paket\n" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 #, fuzzy msgid "installing a source package\n" msgstr "Paket installieren" -#: lib/install.c:720 +#: lib/install.c:721 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "kann Datei %s nicht öffnen: " -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, fuzzy, c-format msgid "cannot write to %s" msgstr "kann Datei %s nicht öffnen: " -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "kann Datei %s nicht öffnen: " # , c-format -#: lib/install.c:760 +#: lib/install.c:761 #, fuzzy, c-format msgid "spec file in: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 #, fuzzy msgid "source package contains no .spec file" msgstr "Anfrage nach Paket, das die Datei besitzt" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "umbennen von %s nach %s fehlgeschlagen: %s" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/install.c:974 +#: lib/install.c:975 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 #, fuzzy msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n" -#: lib/install.c:1062 +#: lib/install.c:1063 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/install.c:1098 +#: lib/install.c:1099 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3056,136 +3056,138 @@ msgid "" msgstr "" "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt" +# , c-format #: lib/poptBT.c:94 -msgid "buildroot already specified" -msgstr "" +#, fuzzy, c-format +msgid "buildroot already specified, ignoring %s\n" +msgstr "Lesen von %s fehlgeschlagen: %s." -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "präparieren (Quellen entpacken und Patch-Dateien anwenden" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 #, fuzzy msgid "build through %install (%prep, %build, then install) from " msgstr "Paket installieren" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, fuzzy, c-format msgid "verify %files section from " msgstr "Anfrage nach Paket, das die Datei besitzt" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 #, fuzzy msgid "build source and binary packages from " msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 #, fuzzy msgid "build binary package only from " msgstr "Anfrage nach Paket, das die Datei besitzt" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 #, fuzzy msgid "build source package only from " msgstr "Anfrage nach Paket, das die Datei besitzt" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "präparieren (Quellen entpacken und Patch-Dateien anwenden" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, fuzzy, c-format msgid "verify %files section from " msgstr "Anfrage nach Paket, das die Datei besitzt" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 #, fuzzy msgid "build source and binary packages from " msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 #, fuzzy msgid "build binary package only from " msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 #, fuzzy msgid "build source package only from " msgstr "Erstelle die Pakete für das Betriebssystem " -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 #, fuzzy msgid "build binary package from " msgstr "" "Binärpaket erstellen (präparieren, kompilieren, installieren und paketieren)" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 #, fuzzy msgid "" msgstr "Anfrage an alle Pakete" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 #, fuzzy msgid "" "build through %install (%prep, %build, then install) from " msgstr "Paket installieren" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 #, fuzzy msgid "override build root" msgstr "Benutze als Stammverzeichnis beim Erstellen" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 #, fuzzy msgid "do not execute any stages of the build" msgstr "Keine Stufen ausführen" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 #, fuzzy msgid "remove specfile when done" msgstr "Quellen und spec-Dateien nach Beendigung löschen" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3476,7 +3478,7 @@ msgstr "ung msgid "record %d could not be read\n" msgstr "Eintrag %d konnte nicht gelesen werden\n" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" @@ -3818,12 +3820,12 @@ msgstr "Fehler: msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "Fehler: %s kann nicht installiert werden\n" @@ -3833,56 +3835,56 @@ msgstr "Fehler: %s kann nicht installiert werden\n" msgid "cannot open Packages database in %s\n" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 #, fuzzy msgid "installing binary packages\n" msgstr "Paket installieren" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, fuzzy, c-format msgid "cannot open %s/packages.rpm\n" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" bezeichnet mehrere Pakete\n" # oder besser: "... verletzen" ? -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "Installiere %s\n" @@ -3902,91 +3904,91 @@ msgstr "fehlendes zweites ':' bei %s:%d" msgid "missing architecture name at %s:%d" msgstr "fehlender Name cer Architektur bei %s:%d" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "Unvollständige Datenzeile bei %s:%d" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "Zu viele Argumente in der Datenzeile bei %s:%d" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "Unzureichende arch/os Zahl: %s (%s:%d)" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "Unvollständige Standardzeile bei %s:%d" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "Zu viele Argumente in der Standardzeile bei %s:%d" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" # , c-format -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s." # , c-format #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "Lesen von %s fehlgeschlagen: %s." -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, fuzzy, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "fehlender ':' bei %s:%d" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "fehlendes Argument für %s bei %s:%d" # , c-format -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, fuzzy, c-format msgid "cannot open %s at %s:%d: %s" msgstr "kann Datei %s nicht öffnen: " -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "fehlende Architektur für %s bei %s:%d" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "unzureichende Option '%s' bei %s:%d" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -4217,7 +4219,7 @@ msgstr "Nicht passende Antwort des FTP-Servers" #: rpmio/rpmio.c:540 #, fuzzy -msgid "Server IO error" +msgid "Server I/O error" msgstr "FTP IO-Fehler" #: rpmio/rpmio.c:543 @@ -4246,7 +4248,8 @@ msgid "Failed to establish data connection to server" msgstr "Aufbau einer Datenverbindung zum FTP-Server fehlgeschlagen" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +#, fuzzy +msgid "I/O error to local file" msgstr "IO-Fehler bei lokaler Datei" #: rpmio/rpmio.c:561 diff --git a/po/es.po b/po/es.po index 8faba4c22..7a658b4e6 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -503,7 +503,7 @@ msgid "" "options as -q" msgstr "" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "" @@ -697,15 +697,15 @@ msgstr "" msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "" @@ -713,7 +713,7 @@ msgstr "" msgid "remove spec file when done" msgstr "" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "" @@ -1170,7 +1170,7 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -1972,118 +1972,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2188,45 +2188,45 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "" @@ -2250,55 +2250,55 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr "" @@ -2400,131 +2400,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2535,7 +2535,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "" @@ -2564,92 +2564,92 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "" @@ -2671,90 +2671,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 #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "" -#: lib/install.c:1062 +#: lib/install.c:1063 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/install.c:1098 +#: lib/install.c:1099 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2773,121 +2773,122 @@ msgid "" msgstr "" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 msgid "build binary package from " msgstr "" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 msgid "" msgstr "" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 msgid "" "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3153,7 +3154,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3483,12 +3484,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -3498,54 +3499,54 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "" @@ -3565,88 +3566,88 @@ msgstr "" msgid "missing architecture name at %s:%d" msgstr "" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3862,7 +3863,7 @@ msgid "Bad server response" msgstr "" #: rpmio/rpmio.c:540 -msgid "Server IO error" +msgid "Server I/O error" msgstr "" #: rpmio/rpmio.c:543 @@ -3886,7 +3887,7 @@ msgid "Failed to establish data connection to server" msgstr "" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +msgid "I/O error to local file" msgstr "" #: rpmio/rpmio.c:561 diff --git a/po/fi.po b/po/fi.po index 1bbdfd8b7..1c126dfb4 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -557,7 +557,7 @@ msgstr "" "tarkista paketin asennus käyttäen samoja paketin määrittelyparametrejä kuin " "-q " -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "älä tarkista paketin riippuvuuksia" @@ -763,15 +763,15 @@ msgstr "bin msgid "bin/src package (prep, compile, install, package)" msgstr "bin/src-paketti (valmistele, käännä, asenna, paketoi)" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "siirry suoraan määriteltyyn vaiheeseen (vain c ja i yhteydessä)" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "poista käännöspuu, kun valmis" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 #, fuzzy msgid "remove sources when done" msgstr "poista lähdekoodit ja määrittelytiedosto, kun valmis" @@ -781,7 +781,7 @@ msgstr "poista l msgid "remove spec file when done" msgstr "poista lähdekoodit ja määrittelytiedosto, kun valmis" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 #, fuzzy msgid "generate PGP/GPG signature" msgstr "generoi PGP-allekirjoitus" @@ -1282,7 +1282,7 @@ msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -2157,118 +2157,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, fuzzy, c-format msgid "Unable to open icon %s: %s" msgstr "%s:n kirjoitus ei onnistu" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, fuzzy, c-format msgid "Unable to read icon %s: %s" msgstr "%s:n kirjoitus ei onnistu" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, fuzzy, c-format msgid "Unknown icon type: %s" msgstr "(tuntematon tyyppi)" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, fuzzy, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "en voinut avata %s: %s" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, fuzzy, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "siirtojen pitää alkaa /-merkillä" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, fuzzy, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "virheellinen paketin numero: %s\n" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, fuzzy, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "virheellinen paketin numero: %s\n" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, fuzzy, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "%s:n puuttuva arkkitehtuuri %s:%d" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Paketin määrittelyparametrit:" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2373,46 +2373,46 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, fuzzy, c-format msgid "line %d: %s" msgstr "en voinut avata %s: %s" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, fuzzy, c-format msgid "Unable to open %s: %s\n" msgstr "%s:n avaus epäonnistui\n" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 #, fuzzy msgid "No buildable architectures" msgstr "älä tarkista paketin arkkitehtuuria" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 #, fuzzy msgid "Package has no %%description: %s" msgstr "paketti %s ei ole %s:ssä" @@ -2437,57 +2437,57 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "virheellinen paketin numero: %s\n" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "En voi lukea %s: %s." -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "virhe: " -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 #, fuzzy msgid "Unknown file type" msgstr "(tuntematon tyyppi)" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 #, fuzzy msgid "Internal error" msgstr "vakava virhe: " -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 #, fuzzy msgid " failed - " msgstr "pgp epäonnistui" @@ -2590,131 +2590,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, fuzzy, c-format msgid "bad db file %s" msgstr "en voinut avata %s: %s" -#: lib/db1.c:427 +#: lib/db1.c:426 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "en voi saada %s lukitusta tietokantaan" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "poissulkevaa" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "jaettua" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "en voi saada %s lukitusta tietokantaan" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2725,7 +2725,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "(ei ole luku)" @@ -2754,94 +2754,94 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "puuttuva '{' '%':n jälkeen" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "puuttuva '{' '%{':n jälkeen" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "tyhjä nimiön formaatti" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "tyhjä nimiön nimi" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "tuntematon nimiö" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "']' puuttuu taulukkomäärittelyn lopusta" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "odottamaton ']'" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "odottamaton '}'" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "odotin '?'-merkkiä ilmauksessa" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 #, fuzzy msgid "{ expected after ? in expression" msgstr "odotin '{' '?'-merkin jälkeen ilmauksessa " #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "odotin '}'-merkkiä ilmauksessa" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "odotin ':' '?'-merkin jälkeen ali-ilmauksessa " #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 #, fuzzy msgid "{ expected after : in expression" msgstr "odotin '{' ':'-merkin jälkeen ilmauksessa " #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "odotin '}'-merkkiä ilmauksen lopussa" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "(tuntematon tyyppi)" @@ -2863,93 +2863,93 @@ msgstr "ryhm #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 #, fuzzy msgid "installing a source package\n" msgstr "asenna paketti" -#: lib/install.c:720 +#: lib/install.c:721 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "en voinut avata tiedostoa %s: " -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, fuzzy, c-format msgid "cannot write to %s" msgstr "en voinut avata tiedostoa %s: " -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "en voinut avata tiedostoa %s: " -#: lib/install.c:760 +#: lib/install.c:761 #, fuzzy, c-format msgid "spec file in: %s\n" msgstr "en voinut avata %s: %s" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 #, fuzzy msgid "source package contains no .spec file" msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "%s:n nimeäminen %s:ksi epäonnistui: %s" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, 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:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 #, fuzzy msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n" -#: lib/install.c:1062 +#: lib/install.c:1063 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/install.c:1098 +#: lib/install.c:1099 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2972,134 +2972,135 @@ msgstr "" "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja" #: lib/poptBT.c:94 -msgid "buildroot already specified" -msgstr "" +#, fuzzy, c-format +msgid "buildroot already specified, ignoring %s\n" +msgstr "En voi lukea %s: %s." -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "valmistele (pura lähdekoodi ja tee korjaukset)" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 #, fuzzy msgid "build through %install (%prep, %build, then install) from " msgstr "asenna paketti" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, fuzzy, c-format msgid "verify %files section from " msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 #, fuzzy msgid "build source and binary packages from " msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 #, fuzzy msgid "build binary package only from " msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 #, fuzzy msgid "build source package only from " msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "valmistele (pura lähdekoodi ja tee korjaukset)" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, fuzzy, c-format msgid "verify %files section from " msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 #, fuzzy msgid "build source and binary packages from " msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 #, fuzzy msgid "build binary package only from " msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 #, fuzzy msgid "build source package only from " msgstr "käännä paketit käyttöjärjestelmälle " -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 #, fuzzy msgid "build binary package from " msgstr "binääripaketti (valmistele, käännä, asenna, paketoi)" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 #, fuzzy msgid "" msgstr "kysele kaikki paketit" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 #, fuzzy msgid "" "build through %install (%prep, %build, then install) from " msgstr "asenna paketti" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 #, fuzzy msgid "override build root" msgstr "käytä käännöspuun juurena" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 #, fuzzy msgid "do not execute any stages of the build" msgstr "älä suorita mitään vaiheita" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 #, fuzzy msgid "remove specfile when done" msgstr "poista lähdekoodit ja määrittelytiedosto, kun valmis" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3384,7 +3385,7 @@ msgstr "virheellinen paketin numero: %s\n" msgid "record %d could not be read\n" msgstr "tietuetta %d ei voitu lukea\n" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" @@ -3719,12 +3720,12 @@ msgstr "virhe: ohitan %s:n, siirto ep msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "virhe: %s ei voida asentaa\n" @@ -3734,55 +3735,55 @@ msgstr "virhe: %s ei voida asentaa\n" msgid "cannot open Packages database in %s\n" msgstr "virhe: en voi avata %s%s/packages.rpm\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "puuttuvat riippuvuudet:\n" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 #, fuzzy msgid "installing binary packages\n" msgstr "asenna paketti" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, fuzzy, c-format msgid "cannot open %s/packages.rpm\n" msgstr "virhe: en voi avata %s%s/packages.rpm\n" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" määrittää useita paketteja\n" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "Asennan: %s\n" @@ -3802,88 +3803,88 @@ msgstr "toinen ':' puuttuu, %s:%d" msgid "missing architecture name at %s:%d" msgstr "puuttuva arkkitehtuurin nimi, %s:%d" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "Epätäydellinen datarivi, %s:%d" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "liian monta parametriä datarivillä %s:%d" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "Huono arkkitehtuuri/käyttöjärjestelmä numero: %s (%s:%d)" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "Epätäydellinen oletusrivi, %s:%d" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "liian monta parametriä oletusrivillä %s:%d" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "En voi avata %s luettavaksi: %s." #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "En voi lukea %s: %s." -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, fuzzy, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "puuttuva ':', %s:%d" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "%s:n puuttuva parametri %s:%d" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "en voinut avata %s: %s" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, fuzzy, c-format msgid "cannot open %s at %s:%d: %s" msgstr "en voinut avata tiedostoa %s: " -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "%s:n puuttuva arkkitehtuuri %s:%d" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "huono parametri '%s', %s:%d" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -4113,7 +4114,7 @@ msgstr "Virheellinen FTP-palvelijan vastaus" #: rpmio/rpmio.c:540 #, fuzzy -msgid "Server IO error" +msgid "Server I/O error" msgstr "FTP:n IO-virhe" #: rpmio/rpmio.c:543 @@ -4142,7 +4143,8 @@ msgid "Failed to establish data connection to server" msgstr "En saanut data-yhteyttä FTP-palvelijaan" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +#, fuzzy +msgid "I/O error to local file" msgstr "Paikallisen tiedoston IO-virhe" #: rpmio/rpmio.c:561 diff --git a/po/fr.po b/po/fr.po index 8c9a1c5cc..12cc038e7 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,5 +1,5 @@ msgid "" -msgstr "POT-Creation-Date: 2001-01-01 19:44-0500\n" +msgstr "POT-Creation-Date: 2001-01-03 14:05-0500\n" #: build.c:26 #, fuzzy, c-format @@ -540,7 +540,7 @@ msgid "" "options as -q" msgstr "\t\t\t męmes options de spécification de package qu'avec -q" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "" @@ -764,19 +764,19 @@ msgstr "\t\t\t b - package binaire (pr msgid "bin/src package (prep, compile, install, package)" msgstr "\t\t\t a - package bin/src (prépare, compile, installe, package)" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 #, fuzzy msgid "skip straight to specified stage (only for c,i)" msgstr "" " --short-circuit - passe directement ŕ l'étape spécifiée (seulement " "pour c,i)" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 #, fuzzy msgid "remove build tree when done" msgstr " --clean - efface l'arborescence aprčs construction" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 #, fuzzy msgid "remove sources when done" msgstr " --clean - efface l'arborescence aprčs construction" @@ -786,7 +786,7 @@ msgstr " --clean - efface l'arborescence apr msgid "remove spec file when done" msgstr " --clean - efface l'arborescence aprčs construction" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 #, fuzzy msgid "generate PGP/GPG signature" msgstr " --sign - genčre une signature PGP" @@ -1313,7 +1313,7 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -2171,118 +2171,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, fuzzy, c-format msgid "Unable to open icon %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, fuzzy, c-format msgid "Unable to read icon %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, fuzzy, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, fuzzy, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "les arguments de --root (-r) doivent commencer par un /" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, fuzzy, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Options de spécification de package:" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2387,46 +2387,46 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, fuzzy, c-format msgid "line %d: %s" msgstr "impossible d'ouvrir: %s\n" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, fuzzy, c-format msgid "Unable to open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 #, fuzzy msgid "No buildable architectures" msgstr "%s ne peut ętre construit sur cette architecture\n" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 #, fuzzy msgid "Package has no %%description: %s" msgstr "aucun package n'a été spécifié pour la désinstallation" @@ -2451,55 +2451,55 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 #, fuzzy msgid " failed - " msgstr "La construction a échoué.\n" @@ -2602,131 +2602,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, fuzzy, c-format msgid "bad db file %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/db1.c:427 +#: lib/db1.c:426 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "impossible d'ouvrir: %s\n" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, fuzzy, c-format msgid "cannot get %s lock on database" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2737,7 +2737,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "" @@ -2766,94 +2766,94 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 #, fuzzy msgid "unexpected ]" msgstr "source de requęte inattendue" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 #, fuzzy msgid "unexpected }" msgstr "source de requęte inattendue" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "" @@ -2875,92 +2875,92 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "" -#: lib/install.c:720 +#: lib/install.c:721 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, fuzzy, c-format msgid "cannot write to %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 #, fuzzy msgid "source package contains no .spec file" msgstr "" " -f + - interroge le package ŕ qui appartient " -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, 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:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "" -#: lib/install.c:1062 +#: lib/install.c:1063 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/install.c:1098 +#: lib/install.c:1099 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2979,138 +2979,139 @@ msgid "" msgstr "" #: lib/poptBT.c:94 -msgid "buildroot already specified" -msgstr "" +#, fuzzy, c-format +msgid "buildroot already specified, ignoring %s\n" +msgstr "impossible d'ouvrir: %s\n" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "\t\t\t p - prépare (extrait le source et applique les patches)" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, fuzzy, c-format msgid "verify %files section from " msgstr "" " -f + - interroge le package ŕ qui appartient " -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 #, fuzzy msgid "build source and binary packages from " msgstr "" " -f + - interroge le package ŕ qui appartient " -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 #, fuzzy msgid "build binary package only from " msgstr "" " -f + - interroge le package ŕ qui appartient " -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 #, fuzzy msgid "build source package only from " msgstr "" " -f + - interroge le package ŕ qui appartient " -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "\t\t\t p - prépare (extrait le source et applique les patches)" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, fuzzy, c-format msgid "verify %files section from " msgstr "" " -f + - interroge le package ŕ qui appartient " -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 #, fuzzy msgid "build source and binary packages from " msgstr "" " -f + - interroge le package ŕ qui appartient " -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 #, fuzzy msgid "build binary package only from " msgstr "" " -f + - interroge le package ŕ qui appartient " -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 #, fuzzy msgid "build source package only from " msgstr "" " -f + - interroge le package ŕ qui appartient " -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 #, fuzzy msgid "build binary package from " msgstr "\t\t\t b - package binaire (prépare, compile, installe, package)" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 #, fuzzy msgid "" msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 msgid "" "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 #, fuzzy msgid "remove specfile when done" msgstr " --clean - efface l'arborescence aprčs construction" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3402,7 +3403,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "aucun package n'a été spécifié pour l'installation" @@ -3735,12 +3736,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "aucun package n'a été spécifié pour l'installation" @@ -3750,54 +3751,54 @@ msgstr "aucun package n'a msgid "cannot open Packages database in %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "" @@ -3817,88 +3818,88 @@ msgstr "" msgid "missing architecture name at %s:%d" msgstr "" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, fuzzy, c-format msgid "Unable to open %s for reading: %s." msgstr "impossible d'ouvrir: %s\n" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, fuzzy, c-format msgid "cannot open %s at %s:%d: %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -4119,7 +4120,7 @@ msgid "Bad server response" msgstr "" #: rpmio/rpmio.c:540 -msgid "Server IO error" +msgid "Server I/O error" msgstr "" #: rpmio/rpmio.c:543 @@ -4143,7 +4144,7 @@ msgid "Failed to establish data connection to server" msgstr "" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +msgid "I/O error to local file" msgstr "" #: rpmio/rpmio.c:561 diff --git a/po/gl.po b/po/gl.po index 8faba4c22..7a658b4e6 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -503,7 +503,7 @@ msgid "" "options as -q" msgstr "" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "" @@ -697,15 +697,15 @@ msgstr "" msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "" @@ -713,7 +713,7 @@ msgstr "" msgid "remove spec file when done" msgstr "" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "" @@ -1170,7 +1170,7 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -1972,118 +1972,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2188,45 +2188,45 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "" @@ -2250,55 +2250,55 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr "" @@ -2400,131 +2400,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2535,7 +2535,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "" @@ -2564,92 +2564,92 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "" @@ -2671,90 +2671,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 #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "" -#: lib/install.c:1062 +#: lib/install.c:1063 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/install.c:1098 +#: lib/install.c:1099 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2773,121 +2773,122 @@ msgid "" msgstr "" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 msgid "build binary package from " msgstr "" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 msgid "" msgstr "" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 msgid "" "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3153,7 +3154,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3483,12 +3484,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -3498,54 +3499,54 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "" @@ -3565,88 +3566,88 @@ msgstr "" msgid "missing architecture name at %s:%d" msgstr "" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3862,7 +3863,7 @@ msgid "Bad server response" msgstr "" #: rpmio/rpmio.c:540 -msgid "Server IO error" +msgid "Server I/O error" msgstr "" #: rpmio/rpmio.c:543 @@ -3886,7 +3887,7 @@ msgid "Failed to establish data connection to server" msgstr "" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +msgid "I/O error to local file" msgstr "" #: rpmio/rpmio.c:561 diff --git a/po/hu.po b/po/hu.po index 8faba4c22..7a658b4e6 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -503,7 +503,7 @@ msgid "" "options as -q" msgstr "" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "" @@ -697,15 +697,15 @@ msgstr "" msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "" @@ -713,7 +713,7 @@ msgstr "" msgid "remove spec file when done" msgstr "" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "" @@ -1170,7 +1170,7 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -1972,118 +1972,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2188,45 +2188,45 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "" @@ -2250,55 +2250,55 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr "" @@ -2400,131 +2400,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2535,7 +2535,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "" @@ -2564,92 +2564,92 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "" @@ -2671,90 +2671,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 #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "" -#: lib/install.c:1062 +#: lib/install.c:1063 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/install.c:1098 +#: lib/install.c:1099 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2773,121 +2773,122 @@ msgid "" msgstr "" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 msgid "build binary package from " msgstr "" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 msgid "" msgstr "" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 msgid "" "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3153,7 +3154,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3483,12 +3484,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -3498,54 +3499,54 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "" @@ -3565,88 +3566,88 @@ msgstr "" msgid "missing architecture name at %s:%d" msgstr "" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3862,7 +3863,7 @@ msgid "Bad server response" msgstr "" #: rpmio/rpmio.c:540 -msgid "Server IO error" +msgid "Server I/O error" msgstr "" #: rpmio/rpmio.c:543 @@ -3886,7 +3887,7 @@ msgid "Failed to establish data connection to server" msgstr "" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +msgid "I/O error to local file" msgstr "" #: rpmio/rpmio.c:561 diff --git a/po/id.po b/po/id.po index 8faba4c22..7a658b4e6 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -503,7 +503,7 @@ msgid "" "options as -q" msgstr "" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "" @@ -697,15 +697,15 @@ msgstr "" msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "" @@ -713,7 +713,7 @@ msgstr "" msgid "remove spec file when done" msgstr "" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "" @@ -1170,7 +1170,7 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -1972,118 +1972,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2188,45 +2188,45 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "" @@ -2250,55 +2250,55 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr "" @@ -2400,131 +2400,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2535,7 +2535,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "" @@ -2564,92 +2564,92 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "" @@ -2671,90 +2671,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 #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "" -#: lib/install.c:1062 +#: lib/install.c:1063 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/install.c:1098 +#: lib/install.c:1099 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2773,121 +2773,122 @@ msgid "" msgstr "" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 msgid "build binary package from " msgstr "" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 msgid "" msgstr "" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 msgid "" "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3153,7 +3154,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3483,12 +3484,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -3498,54 +3499,54 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "" @@ -3565,88 +3566,88 @@ msgstr "" msgid "missing architecture name at %s:%d" msgstr "" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3862,7 +3863,7 @@ msgid "Bad server response" msgstr "" #: rpmio/rpmio.c:540 -msgid "Server IO error" +msgid "Server I/O error" msgstr "" #: rpmio/rpmio.c:543 @@ -3886,7 +3887,7 @@ msgid "Failed to establish data connection to server" msgstr "" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +msgid "I/O error to local file" msgstr "" #: rpmio/rpmio.c:561 diff --git a/po/is.po b/po/is.po index ffbe891cf..c061433be 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: 2000-08-02 13:00+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -520,7 +520,7 @@ msgid "" "options as -q" msgstr "" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "" @@ -714,15 +714,15 @@ msgstr "" msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "" @@ -730,7 +730,7 @@ msgstr "" msgid "remove spec file when done" msgstr "" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "" @@ -1189,7 +1189,7 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -2005,118 +2005,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2221,45 +2221,45 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "" @@ -2283,55 +2283,55 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr "" @@ -2433,131 +2433,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2568,7 +2568,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "" @@ -2597,92 +2597,92 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "" @@ -2704,90 +2704,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 #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "" -#: lib/install.c:1062 +#: lib/install.c:1063 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "gat ekki búiđ til %s: %s\n" -#: lib/install.c:1098 +#: lib/install.c:1099 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "gat ekki búiđ til %s: %s\n" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2806,122 +2806,123 @@ msgid "" msgstr "" #: lib/poptBT.c:94 -msgid "buildroot already specified" -msgstr "" +#, fuzzy, c-format +msgid "buildroot already specified, ignoring %s\n" +msgstr "Gat ekki lesiđ spec skrá frá %s\n" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 #, fuzzy msgid "build binary package only from " msgstr "fyrirspurn á pakkann sem á " -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 msgid "build binary package from " msgstr "" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 msgid "" msgstr "" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 msgid "" "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3190,7 +3191,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3520,12 +3521,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -3535,54 +3536,54 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "get ekki opnađ pakka gagnagrunn í\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "get ekki opnađ %s/packages.rpm\n" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "" @@ -3602,88 +3603,88 @@ msgstr "" msgid "missing architecture name at %s:%d" msgstr "" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3899,7 +3900,7 @@ msgid "Bad server response" msgstr "" #: rpmio/rpmio.c:540 -msgid "Server IO error" +msgid "Server I/O error" msgstr "" #: rpmio/rpmio.c:543 @@ -3923,7 +3924,7 @@ msgid "Failed to establish data connection to server" msgstr "" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +msgid "I/O error to local file" msgstr "" #: rpmio/rpmio.c:561 diff --git a/po/it.po b/po/it.po index 8faba4c22..7a658b4e6 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -503,7 +503,7 @@ msgid "" "options as -q" msgstr "" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "" @@ -697,15 +697,15 @@ msgstr "" msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "" @@ -713,7 +713,7 @@ msgstr "" msgid "remove spec file when done" msgstr "" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "" @@ -1170,7 +1170,7 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -1972,118 +1972,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2188,45 +2188,45 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "" @@ -2250,55 +2250,55 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr "" @@ -2400,131 +2400,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2535,7 +2535,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "" @@ -2564,92 +2564,92 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "" @@ -2671,90 +2671,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 #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "" -#: lib/install.c:1062 +#: lib/install.c:1063 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/install.c:1098 +#: lib/install.c:1099 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2773,121 +2773,122 @@ msgid "" msgstr "" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 msgid "build binary package from " msgstr "" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 msgid "" msgstr "" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 msgid "" "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3153,7 +3154,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3483,12 +3484,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -3498,54 +3499,54 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "" @@ -3565,88 +3566,88 @@ msgstr "" msgid "missing architecture name at %s:%d" msgstr "" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3862,7 +3863,7 @@ msgid "Bad server response" msgstr "" #: rpmio/rpmio.c:540 -msgid "Server IO error" +msgid "Server I/O error" msgstr "" #: rpmio/rpmio.c:543 @@ -3886,7 +3887,7 @@ msgid "Failed to establish data connection to server" msgstr "" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +msgid "I/O error to local file" msgstr "" #: rpmio/rpmio.c:561 diff --git a/po/ja.po b/po/ja.po index 3dd90a29b..6aef2d4b9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -88,7 +88,7 @@ msgstr " # build root [BuildRoot] # net share [ĽÍĽĂĽČśŚÍ­] # reloate [şĆÇŰĂÖ/°ÜĆ°¤š¤ë] -# $Id: ja.po,v 1.139 2001/01/02 17:19:36 jbj Exp $ +# $Id: ja.po,v 1.140 2001/01/03 20:19:29 jbj Exp $ #: rpm.c:185 rpmqv.c:386 #, c-format msgid "rpm: %s\n" @@ -547,7 +547,7 @@ msgstr "" "-q ¤ČĆąÍͤËĆą¤¸ĽŃĽĂĽąĄźĽ¸ťŘÄ꼪Ľ×ĽˇĽçĽó¤ňźč¤ę\n" "Ľ¤ĽóĽšĽČĄźĽë¤Îžőśˇ¤ň¸ĄžÚ¤ˇ¤Ţ¤š" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "ĽŃĽĂĽąĄźĽ¸¤Î°Í¸´Řˇ¸¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó" @@ -761,15 +761,15 @@ msgstr " msgid "bin/src package (prep, compile, install, package)" msgstr "ĽĐĽ¤ĽĘĽę/Ľ˝ĄźĽš¤ňĽŃĽĂĽąĄźĽ¸˛˝ (prepĄ˘compileĄ˘installĄ˘package)" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "ťŘÄꤡ¤ż˛áÄř¤Ţ¤ÇĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š (cĄ˘i ¤Ç¤Î¤ßÍ­¸ú)" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "ĽŃĽĂĽąĄźĽ¸ĽóĽ°¸ĺşîŔŽĽÄĽęĄź¤ňşď˝ü¤ˇ¤Ţ¤š" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 #, fuzzy msgid "remove sources when done" msgstr "˝ŞÎť¸ĺĽ˝ĄźĽš¤ňşď˝ü¤ˇ¤Ţ¤š" @@ -779,7 +779,7 @@ msgstr " msgid "remove spec file when done" msgstr "˝ŞÎť¸ĺĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľë¤ňşď˝ü¤ˇ¤Ţ¤š" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 #, fuzzy msgid "generate PGP/GPG signature" msgstr "PGP/GPG ˝đĚž¤ňŔ¸ŔŽ¤ˇ¤Ţ¤š" @@ -1267,7 +1267,7 @@ msgstr " msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -2117,118 +2117,118 @@ msgstr "%d msgid "line %d: Second %%files list" msgstr "%d šÔĚÜ: 2ČÖĚܤΠ%%files ĽęĽšĽČ" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "Ľ˘ĄźĽ­ĽĆĽŻĽÁĽă¤Ď˝üł°¤ľ¤ě¤Ć¤¤¤Ţ¤š: %s" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "Ľ˘ĄźĽ­ĽĆĽŻĽÁĽă¤Ď´Ţ¤Ţ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "OS ¤Ď˝üł°¤ľ¤ě¤Ć¤¤¤Ţ¤š: %s" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "OS ¤Ď´Ţ¤Ţ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "%s ĽŐĽŁĄźĽëĽÉ¤ĎĽŃĽĂĽąĄźĽ¸Ăć¤ËÉŹÍפǤš: %s" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĆó˝Ĺ¤Î %s Ľ¨ĽóĽČĽę: %s" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, fuzzy, c-format msgid "Unable to open icon %s: %s" msgstr "Ľ˘Ľ¤ĽłĽó¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó: %s" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, fuzzy, c-format msgid "Unable to read icon %s: %s" msgstr "Ľ˘Ľ¤ĽłĽó¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó: %s" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "ÉÔĚŔ¤ĘĽ˘Ľ¤ĽłĽóĽżĽ¤Ľ×: %s" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "%d šÔĚÜ: ÉÔ´°Á´¤ĘˇÁ¤ÎĽżĽ°: %s" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "%d šÔĚÜ: śő¤ÎĽżĽ°: %s" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, fuzzy, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "%d šÔĚÜ: %s Ăć¤ËÉÔŔľ¤Ęʸťú '-' : %s" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, fuzzy, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "%d šÔĚÜ: BuildRoot ¤Ď \"/\" ¤Ë¤š¤ë¤ł¤Č¤Ď¤Ç¤­¤Ţ¤ť¤ó: %s" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "%d šÔĚÜ: Prefixes ¤Ď \"/\" ¤Ç˝Ş¤ď¤Ă¤Ć¤Ď¤¤¤ą¤Ţ¤ť¤ó: %s" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "%d šÔĚÜ: Docdir ¤Ď '/' ¤ÇťĎ¤Ţ¤é¤Ę¤Ż¤Ć¤Ď¤¤¤ą¤Ţ¤ť¤ó: %s" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, fuzzy, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "%d šÔĚÜ: Epoch/Serial ĽŐĽŁĄźĽëĽÉ¤ĎČÖšć¤Ç¤Ę¤ą¤ě¤Đ¤¤¤ą¤Ţ¤ť¤ó: %s" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, fuzzy, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "%d šÔĚÜ: ÉÔŔľ¤Ę %s ČÖšć: %s\n" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "%d šÔĚÜ: ÉÔŔľ¤Ę BuildArchitecture ĽŐĽŠĄźĽŢĽĂĽČ: %s" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "ĆâÉôĽ¨ĽéĄź: ¤Ë¤ť¤ÎĽżĽ° %d" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "ÉÔŔľ¤ĘĽŃĽĂĽąĄźĽ¸¤ÎťŘÄę: %s" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "ĽŃĽĂĽąĄźĽ¸¤Ď¤š¤Ç¤Ë¸şß¤ˇ¤Ć¤¤¤Ţ¤š: %s" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "%d šÔĚÜ: ÉÔĚŔ¤ĘĽżĽ°: %s" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "ĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľë¤Ď BuildRoot ¤ňťČÍѤǤ­¤Ţ¤ť¤ó" @@ -2334,47 +2334,47 @@ msgstr "%d msgid "line %d: Second %s" msgstr "%d šÔĚÜ: 2ČÖĚܤΠ%s" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "%d šÔĚÜ: %s" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, fuzzy, c-format msgid "Unable to open %s: %s\n" msgstr "ĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó: %s\n" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "%%if ¤ŹĘĤ¸¤Ć¤¤¤Ţ¤ť¤ó" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "%s%d: parseExpressionBoolean ¤Ź %d ¤ňĘÖ¤ˇ¤Ţ¤ˇ¤ż" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 #, fuzzy msgid "%s:%d: Got a %%else with no if" msgstr "%s:%d: if ¤Ź¤Ę¤¤¤Î¤Ë %%else ¤Ź¤˘¤ę¤Ţ¤š" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 #, fuzzy msgid "%s:%d: Got a %%endif with no if" msgstr "%s:%d: if ¤Ź¤Ę¤¤¤Î¤Ë %%endif ¤Ź¤˘¤ę¤Ţ¤š" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "¤Ş¤Ť¤ˇ¤Ę %%include ĽšĽĆĄźĽČĽáĽóĽČ¤Ç¤š" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "şîŔŽ(build)˛ÄÇ˝¤ĘĽ˘ĄźĽ­ĽĆĽŻĽÁĽă¤Ď¤˘¤ę¤Ţ¤ť¤ó" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë¤Ď %%description ¤Ź¤˘¤ę¤Ţ¤ť¤ó: %s" @@ -2398,57 +2398,57 @@ msgstr "%d msgid "line %d: Bad %s number: %s\n" msgstr "%d šÔĚÜ: ÉÔŔľ¤Ę %s ČÖšć: %s\n" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "%s ¤ň %s ¤Ë¤š¤ëĚžÁ°¤ÎĘŃšš¤Ź¤Ç¤­¤Ţ¤ť¤ó: %s\n" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, fuzzy, c-format msgid "can't unlink %s: %s\n" msgstr "%s ¤ňşď˝ü(unlink)¤Ç¤­¤Ţ¤ť¤ó: %s\n" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "(Ľ¨ĽéĄź 0x%x)" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "ÉÔŔľ¤ĘĽŢĽ¸ĽĂĽŻ" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "ÉÔŔľ¤Ę/ÉÔ˛ÄĆɤʼؼüŔ" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "ĽŘĽĂĽŔĽľĽ¤Ľş¤ŹÂ礭¤š¤Ž¤Ţ¤š" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 #, fuzzy msgid "Unknown file type" msgstr "ÉÔĚŔ¤ĘĽŐĽĄĽ¤ĽëĽżĽ¤Ľ×" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "ĽĎĄźĽÉĽęĽóĽŻ¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 #, fuzzy msgid "Internal error" msgstr "ĆâÉôĽ¨ĽéĄź" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 #, fuzzy msgid " failed - " msgstr "źşÇÔ - " @@ -2553,131 +2553,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, fuzzy, c-format msgid "removed db file %s\n" msgstr "%s ÍѤΠfile Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n" -#: lib/db1.c:422 +#: lib/db1.c:421 #, fuzzy, c-format msgid "bad db file %s" msgstr "ÉÔŔľ¤ĘĽŐĽĄĽ¤Ľë¤ÎžőÂÖ: %s" -#: lib/db1.c:427 +#: lib/db1.c:426 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "ĽÇĄźĽżĽŮĄźĽšĽâĄźĽÉ 0x%x ¤ÎĽŞĄźĽ×Ľó (%s)\n" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "ĽÇĄźĽżĽŮĄźĽš¤Î %s ¤ňĽíĽĂĽŻ¤Ç¤­¤Ţ¤ť¤ó" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "˝üł°" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "śŚÍ­" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "%s ÍѤΠfile Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n" -#: lib/db3.c:494 +#: lib/db3.c:500 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "%s ÍѤΠfile Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "%s ÍѤΠfile Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "ĽÇĄźĽżĽŮĄźĽšĽâĄźĽÉ 0x%x ¤ÎĽŞĄźĽ×Ľó (%s)\n" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ĽÇĄźĽżĽŮĄźĽš¤Î %s ¤ňĽíĽĂĽŻ¤Ç¤­¤Ţ¤ť¤ó" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "%s ÍѤΠfile Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2693,7 +2693,7 @@ msgstr "" "žÜşŮ¤ĘžđĘ󤏟čĆŔ¤Ç¤­¤Ţ¤šĄŁ\n" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "(żôťú¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó)" @@ -2722,93 +2722,93 @@ msgid "file %s is on an unknown device" msgstr "ĽŐĽĄĽ¤Ľë %s ¤ĎÉÔĚŔ¤ĘĽÇĽĐĽ¤Ľš¤Ç¤š" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabDate() RPM_STRING_TYPE ĽŤĽŚĽóĽČ¤Ď 1 ¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤óĄŁ\n" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "ĽÇĄźĽżĽżĽ¤Ľ× %d ¤ĎĽľĽÝĄźĽČ¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "headerAddEntry() ¤ÎÉÔŔľ¤ĘĽŤĽŚĽóĽČ: %d\n" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "% ¤Î¸ĺ¤Ë { ¤Ź¤˘¤ę¤Ţ¤ť¤ó" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "%{ ¤Î¸ĺ¤Ë } ¤Ź¤˘¤ę¤Ţ¤ť¤ó" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "śő¤ÎĽżĽ°ĽŐĽŠĄźĽŢĽĂĽČ" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "śő¤ÎĽżĽ°Ěž" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "ÉÔĚŔ¤ĘĽżĽ°" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "ÇŰÎó¤Î¸ĺ¤Ë ] ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "Í˝´ü¤ť¤Ě ]" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "Í˝´ü¤ť¤Ě }" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "ź°Ăć¤Ç ? ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "ź°Ăć¤Ç ? ¤Î¸ĺ¤Ë { ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "ź°Ăć¤Ë } ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "°Ę˛ź¤Î ? ĽľĽÖź°¤Î ¤Ë: ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "ź°Ăć¤Ç : ¤Î¸ĺ¤Ë { ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "ź°¤Î˝Ş¤ę¤Ë | ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "(ÉÔĚŔ¤ĘĽżĽ¤Ľ×)" @@ -2830,92 +2830,92 @@ msgstr " #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "ĽŐĽĄĽ¤Ľë %s ¤ÎĽ˘ĄźĽŤĽ¤ĽÖ¤Îż­Äš¤ËźşÇÔ %s%s: %s" -#: lib/install.c:651 +#: lib/install.c:652 #, fuzzy msgid " on file " msgstr "ĽŐĽĄĽ¤Ľëžĺ" -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ć¤¤¤Ţ¤š\n" -#: lib/install.c:720 +#: lib/install.c:721 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "%s ¤ňşîŔŽ¤Ç¤­¤Ţ¤ť¤ó: %s" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "%s ¤Ř˝ń¤­šţ¤á¤Ţ¤ť¤ó" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "Ľ˝ĄźĽš¤Ď: %s\n" -#: lib/install.c:750 +#: lib/install.c:751 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "%s ¤ňşîŔŽ¤Ç¤­¤Ţ¤ť¤ó: %s" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "spec ĽŐĽĄĽ¤Ľë¤Ď: %s\n" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ď .spec ĽŐĽĄĽ¤Ľë¤ň´Ţ¤ó¤Ç¤¤¤Ţ¤ť¤ó" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "%s ¤ň %s ¤ŘĚžÁ°¤ňĘŃšš¤ˇ¤Ţ¤š\n" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "%s ¤ň %s ¤Ë¤š¤ëĚžÁ°¤ÎĘŃšš¤ËźşÇÔ: %s" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ź´üÂÔ¤ľ¤ě¤Ţ¤šĄ˘ĽĐĽ¤ĽĘĽę¤Ď¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "ĽŃĽĂĽąĄźĽ¸: %s-%s-%s ĽŐĽĄĽ¤ĽëĽĆĽšĽČ = %d\n" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "--test ¤ňźÂšÔ¤š¤ë¤č¤Ś¤ËĽ¤ĽóĽšĽČĄźĽë¤ňĂćťß¤ˇ¤Ć¤¤¤Ţ¤š\n" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "Ľ×ĽęĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ­¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n" -#: lib/install.c:1030 +#: lib/install.c:1031 #, fuzzy msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "%s ¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š - ĹžÁ÷źşÇÔ - %s\n" -#: lib/install.c:1062 +#: lib/install.c:1063 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "ˇŮšđ: %s ¤Ď %s ¤Č¤ˇ¤ĆşîŔŽ¤ľ¤ě¤Ţ¤š" -#: lib/install.c:1098 +#: lib/install.c:1099 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "ˇŮšđ: %s ¤Ď %s ¤Č¤ˇ¤ĆĘݸ¤ľ¤ě¤Ţ¤š" -#: lib/install.c:1189 +#: lib/install.c:1193 #, fuzzy msgid "running postinstall scripts (if any)\n" msgstr "ĽÝĽšĽČĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ­¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n" @@ -2939,135 +2939,136 @@ msgstr "" "ĽáĽ¸ĽăĄźČÖšć <=3 ¤ÎĽŃĽĂĽąĄźĽ¸¤Î¤ß¤ł¤ÎĽĐĄźĽ¸ĽçĽó¤Î RPM ¤ĎĽľĽÝĄźĽČ¤ľ¤ě¤Ć¤¤¤Ţ¤š" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, fuzzy, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "ĽÓĽëĽÉĽëĄźĽČ¤Ď¤š¤Ç¤ËťŘÄꤾ¤ě¤Ć¤¤¤Ţ¤š" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "prep (Ľ˝ĄźĽš¤ňŸłŤ¤ˇĽŃĽĂĽÁ¤ňĹö¤Ć¤Ţ¤š)" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 #, fuzzy msgid "build through %install (%prep, %build, then install) from " msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ć¤¤¤Ţ¤š\n" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, fuzzy, c-format msgid "verify %files section from " msgstr "°Ę˛ź¤ÎĽŤĽżĽíĽ°¤Ť¤é i18n ĽťĽŻĽˇĽçĽó¤ňĂÖ¤­´š¤¨¤Ţ¤š" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 #, fuzzy msgid "build source and binary packages from " msgstr "%d ¸Ä¤ÎĽ˝ĄźĽš¤Č %d ¸Ä¤ÎĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż\n" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 #, fuzzy msgid "build binary package only from " msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ď .spec ĽŐĽĄĽ¤Ľë¤ň´Ţ¤ó¤Ç¤¤¤Ţ¤ť¤ó" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 #, fuzzy msgid "build source package only from " msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ď .spec ĽŐĽĄĽ¤Ľë¤ň´Ţ¤ó¤Ç¤¤¤Ţ¤ť¤ó" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "prep (Ľ˝ĄźĽš¤ňŸłŤ¤ˇĽŃĽĂĽÁ¤ňĹö¤Ć¤Ţ¤š)" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, fuzzy, c-format msgid "verify %files section from " msgstr "°Ę˛ź¤ÎĽŤĽżĽíĽ°¤Ť¤é i18n ĽťĽŻĽˇĽçĽó¤ňĂÖ¤­´š¤¨¤Ţ¤š" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 #, fuzzy msgid "build source and binary packages from " msgstr "%d ¸Ä¤ÎĽ˝ĄźĽš¤Č %d ¸Ä¤ÎĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż\n" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 #, fuzzy msgid "build binary package only from " msgstr "%d ¸Ä¤ÎĽ˝ĄźĽš¤Č %d ¸Ä¤ÎĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż\n" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 #, fuzzy msgid "build source package only from " msgstr "%d ¸Ä¤ÎĽ˝ĄźĽš¤Č %d ¸Ä¤ÎĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż\n" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 #, fuzzy msgid "build binary package from " msgstr "ĽĐĽ¤ĽĘĽę¤ňĽŃĽĂĽąĄźĽ¸˛˝ (prepĄ˘compileĄ˘installĄ˘package)" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 #, fuzzy msgid "" msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 #, fuzzy msgid "" "build through %install (%prep, %build, then install) from " msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ć¤¤¤Ţ¤š\n" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 #, fuzzy msgid "override build root" msgstr "ĽÓĽëĽÉĽëĄźĽČ¤ňžĺ˝ń¤­¤ˇ¤Ţ¤š" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 #, fuzzy msgid "do not execute any stages of the build" msgstr "şîŔŽ¤š¤ë¤ż¤á¤Î¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 #, fuzzy msgid "do not accept i18N msgstr's from specfile" msgstr "ĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľë¤Ť¤é I18N ¤Ę msgstr ¤ňźő¤ąĆţ¤ě¤Ţ¤ť¤ó" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 #, fuzzy msgid "remove specfile when done" msgstr "˝ŞÎť¸ĺĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľë¤ňşď˝ü¤ˇ¤Ţ¤š" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "ĽżĄźĽ˛ĽĂĽČĽ×ĽéĽĂĽČĽŐĽŠĄźĽŕ¤ňžĺ˝ń¤­¤ˇ¤Ţ¤š" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 #, fuzzy msgid "lookup i18N strings in specfile catalog" msgstr "ĽšĽÚĽĂĽŻĽŐĽĄĽ¤ĽëĽŤĽżĽíĽ°Ăć¤Î I18N ʸťúÎó¤ňĂľ¤ˇ¤Ć¤¤¤Ţ¤š" @@ -3362,7 +3363,7 @@ msgstr " msgid "record %d could not be read\n" msgstr "ĽěĽłĄźĽÉ %d ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż\n" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n" @@ -3697,12 +3698,12 @@ msgstr "%s msgid "retrieved %d packages\n" msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ňźčĆŔ¤ˇ¤Ţ¤ˇ¤ż\n" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "ĽŐĽĄĽ¤Ľë %s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó: %s" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽë¤Ç¤­¤Ţ¤ť¤ó\n" @@ -3712,54 +3713,54 @@ msgstr "%s msgid "cannot open Packages database in %s\n" msgstr "%s/packages.rpm ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎşĆÇŰĂ֤Ǥ­¤Ţ¤ť¤ó" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ť¤é¤ÎĆɤߚţ¤ßĽ¨ĽéĄź " -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ë¤Ď¤č¤ężˇ¤ˇ¤¤ RPM ¤ÎĽĐĄźĽ¸ĽçĽó¤ŹÉŹÍפǤš\n" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%d ¸Ä¤ÎĽ˝ĄźĽš¤Č %d ¸Ä¤ÎĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż\n" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "°Í¸Ŕ­¤ÎˇçÇĄ:\n" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "ĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽëĂć\n" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, fuzzy, c-format msgid "cannot open %s/packages.rpm\n" msgstr "%s/packages.rpm ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¤ĎĘŁżô¤ÎĽŃĽĂĽąĄźĽ¸¤ňťŘÄꤡ¤Ć¤¤¤Ţ¤š\n" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "¤ł¤ě¤é¤ÎĽŃĽĂĽąĄźĽ¸¤ňşď˝ü¤š¤ë¤Č°Í¸Ŕ­¤ňÇ˲ő¤ˇ¤Ţ¤š:\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "%s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽëĂć\n" @@ -3779,88 +3780,88 @@ msgstr "2 msgid "missing architecture name at %s:%d" msgstr "%s:%d ¤ËĽ˘ĄźĽ­ĽĆĽŻĽÁĽăĚž¤Ź¤˘¤ę¤Ţ¤ť¤ó" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "%s:%d ¤ÇĽÇĄźĽżšÔ¤ŹÉÔ´°Á´¤Ç¤š" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "%s:%d ¤ÇĽÇĄźĽżšÔ¤Ë°úżô¤ŹÂż¤š¤Ž¤Ţ¤š" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "ÉÔŔľ¤Ę arch/os ČÖšć: %s (%s:%d)" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "%s:%d ¤ÇÉÔ´°Á´¤ĘĽÇĽŐĽŠĽëĽČšÔ" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "%s:%d ¤ÇĽÇĽŐĽŠĽëĽČšÔ¤Ď°úżô¤ŹÂż¤š¤Ž¤Ţ¤š" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "ż­ÄĽ¤Ç¤­¤Ţ¤ť¤ó %s" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "Ćɤߚţ¤ŕ¤ż¤á¤Ë %s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó: %sĄŁ" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "%s ¤ňĆɤŕ¤Î¤ËźşÇÔ: $sĄŁ" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, fuzzy, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "%s:%d ¤Ç ':' ¤Ź¤˘¤ę¤Ţ¤ť¤ó" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "%s ¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó %s:%d" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "%s ¤Îż­ÄĽźşÇÔ %s:%d \"%s\"" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, fuzzy, c-format msgid "cannot open %s at %s:%d: %s" msgstr "%s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó %s:%d" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "%s ÍѤμ˘ĄźĽ­ĽĆĽŻĽÁĽă¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó %s:%d" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "'%s' ¤ÎÉÔŔľ¤ĘĽŞĄźĽ×Ľó %s:%d" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "ÉÔĚŔ¤ĘĽˇĽšĽĆĽŕ: %s\n" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "rpm-list@redhat.com ¤ËϢÍí¤ň˛ź¤ľ¤¤\n" @@ -4097,7 +4098,7 @@ msgstr " #: rpmio/rpmio.c:540 #, fuzzy -msgid "Server IO error" +msgid "Server I/O error" msgstr "ĽľĄźĽĐ IO Ľ¨ĽéĄź" #: rpmio/rpmio.c:543 @@ -4126,7 +4127,8 @@ msgid "Failed to establish data connection to server" msgstr "ĽľĄźĽĐ¤Č¤ÎĽÇĄźĽżĽłĽÍĽŻĽˇĽçĽó¤ÎłÎΊ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +#, fuzzy +msgid "I/O error to local file" msgstr "ĽíĄźĽŤĽëĽŐĽĄĽ¤Ľë¤Î IO Ľ¨ĽéĄź" #: rpmio/rpmio.c:561 diff --git a/po/ko.po b/po/ko.po index 8faba4c22..7a658b4e6 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -503,7 +503,7 @@ msgid "" "options as -q" msgstr "" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "" @@ -697,15 +697,15 @@ msgstr "" msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "" @@ -713,7 +713,7 @@ msgstr "" msgid "remove spec file when done" msgstr "" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "" @@ -1170,7 +1170,7 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -1972,118 +1972,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2188,45 +2188,45 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "" @@ -2250,55 +2250,55 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr "" @@ -2400,131 +2400,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2535,7 +2535,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "" @@ -2564,92 +2564,92 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "" @@ -2671,90 +2671,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 #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "" -#: lib/install.c:1062 +#: lib/install.c:1063 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/install.c:1098 +#: lib/install.c:1099 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2773,121 +2773,122 @@ msgid "" msgstr "" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 msgid "build binary package from " msgstr "" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 msgid "" msgstr "" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 msgid "" "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3153,7 +3154,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3483,12 +3484,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -3498,54 +3499,54 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "" @@ -3565,88 +3566,88 @@ msgstr "" msgid "missing architecture name at %s:%d" msgstr "" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3862,7 +3863,7 @@ msgid "Bad server response" msgstr "" #: rpmio/rpmio.c:540 -msgid "Server IO error" +msgid "Server I/O error" msgstr "" #: rpmio/rpmio.c:543 @@ -3886,7 +3887,7 @@ msgid "Failed to establish data connection to server" msgstr "" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +msgid "I/O error to local file" msgstr "" #: rpmio/rpmio.c:561 diff --git a/po/no.po b/po/no.po index 3da495343..79c47be70 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: 2000-08-17 20:22+02:00\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -525,7 +525,7 @@ msgstr "" "verifisér en pakkeinstallasjon ved ĺ bruke samme alternativer for " "pakkespesifikasjon som -q" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "ikke verifiser pakkeavhengigheter" @@ -723,15 +723,15 @@ msgstr "bin msgid "bin/src package (prep, compile, install, package)" msgstr "bin/src pakke (prep, kompilér, installér, pakk)" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "hopp rett til spesifisert steg (kun for c,i)" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "fjern byggtréet nĺr ferdig" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "fjern kildekoden nĺr ferdig" @@ -739,7 +739,7 @@ msgstr "fjern kildekoden n msgid "remove spec file when done" msgstr "fjern specfilen nĺr ferdig" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "generér PGP/GPG signatur" @@ -1205,7 +1205,7 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -2026,118 +2026,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2242,45 +2242,45 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "" @@ -2304,55 +2304,55 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr "" @@ -2454,131 +2454,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2589,7 +2589,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "" @@ -2618,92 +2618,92 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "" @@ -2725,90 +2725,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 #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "" -#: lib/install.c:1062 +#: lib/install.c:1063 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "kunne ikke opprette %s: %s\n" -#: lib/install.c:1098 +#: lib/install.c:1099 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "kunne ikke opprette %s: %s\n" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2827,125 +2827,126 @@ msgid "" msgstr "" #: lib/poptBT.c:94 -msgid "buildroot already specified" -msgstr "" +#, fuzzy, c-format +msgid "buildroot already specified, ignoring %s\n" +msgstr "Feil under lesing av spec fil fra %s\n" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "prep (pakk ut kildekoden og legg til patcher)" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 #, fuzzy msgid "build source and binary packages from " msgstr "fant %d kilde- og %d binćrpakker\n" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 #, fuzzy msgid "build binary package only from " msgstr "spřr pakke som eier " -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "prep (pakk ut kildekoden og legg til patcher)" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 #, fuzzy msgid "build source and binary packages from " msgstr "fant %d kilde- og %d binćrpakker\n" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 #, fuzzy msgid "build binary package from " msgstr "binćr pakke (prep, kompilér, installér, pakk)" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 msgid "" msgstr "" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 msgid "" "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3217,7 +3218,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3548,12 +3549,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -3563,54 +3564,54 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "kan ikke ĺpne pakkedatabase i %s\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "pakke %s kan ikke relokeres\n" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "feil under lesing fra fil %s\n" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "fil %s trenger en nyere versjon av RPM\n" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "fant %d kilde- og %d binćrpakker\n" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "feilede avhengigheter:\n" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "installerer binćrpakker\n" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "kan ikke ĺpne %s/packages.rpm\n" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" spesifiserer flere pakker\n" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "fjerning av disse pakkene vil řdelegge avhengigheter:\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "kan ikke ĺpne %s: %s\n" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" @@ -3630,88 +3631,88 @@ msgstr "mangler andre ':' ved %s:%d" msgid "missing architecture name at %s:%d" msgstr "manglende navn pĺ arkitektur ved %s:%d" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "Ukomplett datalinje ved %s:%d" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3928,7 +3929,7 @@ msgid "Bad server response" msgstr "" #: rpmio/rpmio.c:540 -msgid "Server IO error" +msgid "Server I/O error" msgstr "" #: rpmio/rpmio.c:543 @@ -3952,7 +3953,7 @@ msgid "Failed to establish data connection to server" msgstr "" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +msgid "I/O error to local file" msgstr "" #: rpmio/rpmio.c:561 diff --git a/po/pl.po b/po/pl.po index 5d696df87..c92ee5213 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Paweł Dziekoński \n" "Language-Team: Polish \n" @@ -548,7 +548,7 @@ msgid "" "options as -q" msgstr "sprawdź stan pakietu (używa tych samych opcji co -q)" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "nie sprawdzaj zależności pakietu" @@ -750,15 +750,15 @@ msgstr "pakiet binarny (preparuj, kompiluj, instaluj, pakiet)" msgid "bin/src package (prep, compile, install, package)" msgstr "pakiet binarny/źródłowy (preparuj, kompiluj, instaluj, pakiet)" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "przejdź od razu do podanego etapu (tylko dla c,i)" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "usuń budowane drzewo po skończeniu" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "usuń źródła po zakończeniu" @@ -767,7 +767,7 @@ msgstr "usu msgid "remove spec file when done" msgstr "usuń speca po zakończeniu" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "generuj sygnaturę PGP/GPG" @@ -1247,7 +1247,7 @@ msgstr "przebuduj istniej msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -2122,118 +2122,118 @@ msgstr "linia %d: B msgid "line %d: Second %%files list" msgstr "linia %d: Druga lista %%files" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "Architektura nie jest wspierana: %s" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "Architektura nie jest wspierana: %s" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "Ten OS nie jest wspierany: %s" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "Ten OS nie jest wspierany: %s" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "pole %s musi być obecne w pakiecie: %s" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "Podwójne wpisy %s w pakiecie: %s" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, fuzzy, c-format msgid "Unable to open icon %s: %s" msgstr "Nie można odczytać ikony: %s" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, fuzzy, c-format msgid "Unable to read icon %s: %s" msgstr "Nie można odczytać ikony: %s" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "Nieznany typ ikony: %s" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "linia %d: Niepoprawna forma etykiety: %s" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "linia %d: Pusta etykieta: %s" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "linia %d: Nielegalny znak '-' w %s: %s" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, fuzzy, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "linia %d: wpis BuildRoot nie może być \"/\": %s" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "linia %d: Prefiksy nie mogą się kończyć na \"/\": %s" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "linia %d: wpis Docdir musi się zaczynać od '/': %s" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "linia %d: pole Epoch/Serial musi być liczbą: %s" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, fuzzy, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "linia %d: Błędny numer %s: %s\n" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "linia %d: Błędny format wpisu BuildArchitecture: %s" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "Błąd wewnętrzny: Fałszywa etykieta %d" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "Błędna specyfikacja pakietu: $s" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "Pakiet już istnieje: %s" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "linia %d: Nieznana etykieta: %s" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "W pliku spec nie można używać wpisów BuildRoot" @@ -2339,45 +2339,45 @@ msgstr "linia %d: skrypt (tu jako program) musi si msgid "line %d: Second %s" msgstr "linia %d: Drugi %s" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "linia %d: %s" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, fuzzy, c-format msgid "Unable to open %s: %s\n" msgstr "Nie można otworzyć: %s\n" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "Niedomknięte %%if" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 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:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "%s:%d: Napotkano %%endif bez if" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "błednie sformatowany wpis %%include" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "Nie można budować na takie architektury" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "Pakiet nie ma %%description: %s" @@ -2401,55 +2401,55 @@ msgstr "linia %d: b msgid "line %d: Bad %s number: %s\n" msgstr "linia %d: Błędny numer %s: %s\n" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, 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:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "nie można odwiązać %s: %s\n" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "getNextHeader: %s\n" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "(błąd 0x%x)" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "Błędny magic" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "Błędny/nieczytelny nagłówek" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "Rozmiar nagłówka jest zbyt duży" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "Nieznany typ pliku" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "Brak twardego dowiązania" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "Błąd wewnętrzny" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr " nie powiodło się -" @@ -2551,131 +2551,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, fuzzy, c-format msgid "removed db file %s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: lib/db1.c:422 +#: lib/db1.c:421 #, fuzzy, c-format msgid "bad db file %s" msgstr "błędny status pliku: %s" -#: lib/db1.c:427 +#: lib/db1.c:426 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "otwiernie bazę danych w trybie 0x%x w %s\n" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "utworzenie blokady %s na bazie danych nie jest możliwe" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: lib/db3.c:494 +#: lib/db3.c:500 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "otwiernie bazę danych w trybie 0x%x w %s\n" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "utworzenie blokady %s na bazie danych nie jest możliwe" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2686,7 +2686,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "(nie jest liczbą)" @@ -2715,93 +2715,93 @@ msgid "file %s is on an unknown device" msgstr "plik %s jest na nieznanym urządzeniu" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE licznik musi być 1.\n" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "Typ danych %d nie jest obsługiwany\n" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "Błedny licznik dla headerAddEntry(): %d\n" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "brak { po %" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "brak } po %{" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "pusty format etykiety" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "pusta nazwa etykiety" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "nieznana etykieta" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "spodziewany ] na końcu tablicy" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "nie spodziewany ]" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "nie spodziewany }" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "spodziewany ? w wyrażeniu" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "spodziewany { po ? w wyrażeniu" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "spodziewany } w wyrażeniu" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "spodziewany : po podwyrażeniu ?" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "spodziewany { po : w wyrażeniu" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "spodziewany | na końcu wyrażenia" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "(nieznany typ)" @@ -2823,91 +2823,91 @@ msgstr "grupa %s nie istnieje - u #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "rozpakowanie archiwum nie powiodło się %s%s: %s" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr " na pliku " -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "instacja pakietu źródłowego\n" -#: lib/install.c:720 +#: lib/install.c:721 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "nie można utworzyć %s" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "nie można zapisać do %s" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "źródła w: %s\n" -#: lib/install.c:750 +#: lib/install.c:751 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "nie można utworzyć %s" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "plik spec w: %s\n" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "pakiet źródłowy nie zawiera pliku .spec" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "zmiana nazwy %s na %s\n" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, 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:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "spodziewany pakiet źródłowy a nie binarny" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "pakiet: %s-%s-%s test plików = %d\n" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "przebieg testowy - instalacja zatrzymana\n" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "uruchamianie skryptu preinstall (jeśli istnieje)\n" -#: lib/install.c:1030 +#: lib/install.c:1031 #, fuzzy msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "%s pomijany - transmisja %s nie powiodła się\n" -#: lib/install.c:1062 +#: lib/install.c:1063 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "ostrzeżenie: %s utworzony jako %s" -#: lib/install.c:1098 +#: lib/install.c:1099 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "ostrzeżenie: %s zapisany jako %s" -#: lib/install.c:1189 +#: lib/install.c:1193 #, fuzzy msgid "running postinstall scripts (if any)\n" msgstr "uruchamianie skryptu postinstall (jeśli istnieje)\n" @@ -2931,132 +2931,133 @@ msgstr "" "tylko pakiety z numerem głównym <= 3 są obsługiwane przez tą wersję RPM'a" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, fuzzy, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "buildroot był już wcześniej podany" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "preparuj (rozpakuj źródła i nałóż łaty)" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 #, fuzzy msgid "build through %install (%prep, %build, then install) from " msgstr "instacja pakietu źródłowego\n" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, fuzzy, c-format msgid "verify %files section from " msgstr "pakiet źródłowy nie zawiera pliku .spec" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 #, fuzzy msgid "build source and binary packages from " msgstr "znaleziono %d pakietów źródłowych i %d binarnych\n" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 #, fuzzy msgid "build binary package only from " msgstr "pakiet źródłowy nie zawiera pliku .spec" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 #, fuzzy msgid "build source package only from " msgstr "pakiet źródłowy nie zawiera pliku .spec" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "preparuj (rozpakuj źródła i nałóż łaty)" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, fuzzy, c-format msgid "verify %files section from " msgstr "pakiet źródłowy nie zawiera pliku .spec" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 #, fuzzy msgid "build source and binary packages from " msgstr "znaleziono %d pakietów źródłowych i %d binarnych\n" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 #, fuzzy msgid "build binary package only from " msgstr "znaleziono %d pakietów źródłowych i %d binarnych\n" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 #, fuzzy msgid "build source package only from " msgstr "znaleziono %d pakietów źródłowych i %d binarnych\n" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 #, fuzzy msgid "build binary package from " msgstr "pakiet binarny (preparuj, kompiluj, instaluj, pakiet)" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 #, fuzzy msgid "" msgstr "znaleziono %d pakietów\n" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 #, fuzzy msgid "" "build through %install (%prep, %build, then install) from " msgstr "instacja pakietu źródłowego\n" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "wymuś build root" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "nie wykonuj żadnych etapów budowania" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 #, fuzzy msgid "do not accept i18N msgstr's from specfile" msgstr "nie akceptuj wpisów I18N ze speca" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "usuń speca po zakończeniu" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "wymuś platformę docelową" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 #, fuzzy msgid "lookup i18N strings in specfile catalog" msgstr "wyszukaj wpisy I18N w katalogu speca" @@ -3336,7 +3337,7 @@ msgstr "numer rekordu pakietu: %d\n" msgid "record %d could not be read\n" msgstr "nie można odczytać rekordu %d\n" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" @@ -3671,12 +3672,12 @@ msgstr "%s pomijany - transmisja %s nie powiod msgid "retrieved %d packages\n" msgstr "ściągnięto %d pakietów\n" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie można otworzyć pliku %s: %s" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie może być zainstalowany\n" @@ -3686,54 +3687,54 @@ msgstr "%s nie mo msgid "cannot open Packages database in %s\n" msgstr "nie można otworzyć %s/packages.rpm\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "pakiet %s nie jest przesuwalny\n" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "błąd czytania z pliku %s\n" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "plik %s wymaga nowszej wersji RPM\n" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "znaleziono %d pakietów źródłowych i %d binarnych\n" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "niespełnione zależności:\n" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "instalacja pakietów binarnych\n" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "nie można otworzyć %s/packages.rpm\n" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" określa wiele pakietów\n" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "usunięcie tych pakietów zerwie zależności:\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie można otworzyć %s\n" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "Instalacja %s\n" @@ -3753,88 +3754,88 @@ msgstr "brak drugiego ':' przy %s:%d" msgid "missing architecture name at %s:%d" msgstr "brak nazwy architektury przy %s:%d" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "Niekompletna linia danych przy %s:%d" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "Zbyt wiele argumentów w linii danych przy %s:%d" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "Błędny numer arch/os: %s (%s:%d)" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "Niekompletna domyślna linia przy %s:%d" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "Zbyt wiele argumentów w linii domyślnej przy %s:%d" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "Nie można rozszerzyć %s" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "Nie można otworzyć %s do odczytu: %s." #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "Odczytanie %s nie powiodło się: %s." -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, fuzzy, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "brak ':' przy %s:%d" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "brak argumentu dla %s przy %s:%d" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, fuzzy, c-format msgid "cannot open %s at %s:%d: %s" msgstr "nie można otworzyć %s przy %s:%d" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "brak architektury dla %s przy %s:%d" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "błędna opcja '%s' przy %s:%d" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "Nieznany system: %s\n" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "Skontaktuj się, proszę, z rpm-list@redhat.com\n" @@ -4057,7 +4058,8 @@ msgid "Bad server response" msgstr "Błędna odpowiedź serwera" #: rpmio/rpmio.c:540 -msgid "Server IO error" +#, fuzzy +msgid "Server I/O error" msgstr "Błąd WE/WY(IO) serwera" #: rpmio/rpmio.c:543 @@ -4081,7 +4083,8 @@ msgid "Failed to establish data connection to server" msgstr "Otwarcie transmisji danych z serwera nie powiodło się" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +#, fuzzy +msgid "I/O error to local file" msgstr "Błąd WE/WY(IO) na lokalnym pliku" #: rpmio/rpmio.c:561 diff --git a/po/pt.po b/po/pt.po index 25ebae770..2700dbef3 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: 2000-08-01 21:11+01:00\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -500,7 +500,7 @@ msgid "" "options as -q" msgstr "" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "" @@ -694,15 +694,15 @@ msgstr "" msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "" @@ -710,7 +710,7 @@ msgstr "" msgid "remove spec file when done" msgstr "" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "" @@ -1167,7 +1167,7 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -1969,118 +1969,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2185,45 +2185,45 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "" @@ -2247,55 +2247,55 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr "" @@ -2397,131 +2397,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2532,7 +2532,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "" @@ -2561,92 +2561,92 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "" @@ -2668,90 +2668,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 #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "" -#: lib/install.c:1062 +#: lib/install.c:1063 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/install.c:1098 +#: lib/install.c:1099 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2770,121 +2770,122 @@ msgid "" msgstr "" #: lib/poptBT.c:94 -msgid "buildroot already specified" -msgstr "" +#, fuzzy, c-format +msgid "buildroot already specified, ignoring %s\n" +msgstr "năo consigo abrir ficheiro spec %s: %s\n" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 msgid "build binary package from " msgstr "" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 msgid "" msgstr "" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 msgid "" "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3150,7 +3151,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3482,12 +3483,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -3497,56 +3498,56 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" "năo consegui abrir %s/packages.rpm\n" "\n" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "" @@ -3566,88 +3567,88 @@ msgstr "" msgid "missing architecture name at %s:%d" msgstr "" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3863,7 +3864,7 @@ msgid "Bad server response" msgstr "" #: rpmio/rpmio.c:540 -msgid "Server IO error" +msgid "Server I/O error" msgstr "" #: rpmio/rpmio.c:543 @@ -3887,7 +3888,7 @@ msgid "Failed to establish data connection to server" msgstr "" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +msgid "I/O error to local file" msgstr "" #: rpmio/rpmio.c:561 diff --git a/po/pt_BR.po b/po/pt_BR.po index caf51fe8c..2e872442e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,7 +2,7 @@ # Revised by Arnaldo Carvalho de Melo , 1998. # msgid "" -msgstr "POT-Creation-Date: 2001-01-01 19:44-0500\n" +msgstr "POT-Creation-Date: 2001-01-03 14:05-0500\n" # , c-format #: build.c:26 @@ -579,7 +579,7 @@ msgstr "" "verifique uma instalaçăo de pacote usando as mesmas opçőes de especificaçăo " "de pacote do -q" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "năo verifique as dependęncias do pacote" @@ -787,15 +787,15 @@ msgstr "pacote bin msgid "bin/src package (prep, compile, install, package)" msgstr "pacote bin/src (prep, compile, instale, pacote)" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "pule direto para o estágio especificado (somente para c,i)" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "remova a árvore de construçăo quando terminar" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 #, fuzzy msgid "remove sources when done" msgstr "remova a árvore de construçăo quando terminar" @@ -805,7 +805,7 @@ msgstr "remova a msgid "remove spec file when done" msgstr "remova a árvore de construçăo quando terminar" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 #, fuzzy msgid "generate PGP/GPG signature" msgstr "gere assinatura PGP" @@ -1324,7 +1324,7 @@ msgstr "reconstrua o banco de dados a partir de um banco de dados existente" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -2227,122 +2227,122 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" # , c-format -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, fuzzy, c-format msgid "Unable to open icon %s: %s" msgstr "Năo consegui abrir: %s\n" # , c-format -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, fuzzy, c-format msgid "Unable to read icon %s: %s" msgstr "Năo consegui abrir: %s\n" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" # , c-format -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, fuzzy, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "Năo consegui abrir: %s\n" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, fuzzy, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "argumentos para o --dbpath devem começar com uma /" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" # , c-format -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, fuzzy, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "Năo consegui abrir: %s\n" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Opcőes para especificaçăo de pacotes:" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2451,48 +2451,48 @@ msgid "line %d: Second %s" msgstr "" # , c-format -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, fuzzy, c-format msgid "line %d: %s" msgstr "Năo consegui ler o arquivo spec de %s\n" # , c-format #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, fuzzy, c-format msgid "Unable to open %s: %s\n" msgstr "Năo consegui abrir: %s\n" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" # , c-format -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 #, fuzzy msgid "No buildable architectures" msgstr "%s năo pode ser construido nesta arquitetura\n" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 #, fuzzy msgid "Package has no %%description: %s" msgstr "năo foi passado pacote para desinstalaçăo" @@ -2518,55 +2518,55 @@ msgid "line %d: Bad %s number: %s\n" msgstr "" # , c-format -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, 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:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 #, fuzzy msgid " failed - " msgstr "Construçăo falhou.\n" @@ -2669,132 +2669,132 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" # , c-format -#: lib/db1.c:422 +#: lib/db1.c:421 #, fuzzy, c-format msgid "bad db file %s" msgstr "Năo consegui abrir: %s\n" -#: lib/db1.c:427 +#: lib/db1.c:426 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, fuzzy, c-format msgid "cannot get %s lock on database" msgstr "năo foi passado pacote para desinstalaçăo" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "năo foi passado pacote para desinstalaçăo" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2805,7 +2805,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "" @@ -2836,94 +2836,94 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 #, fuzzy msgid "unexpected ]" msgstr "fonte de pesquisa năo esperado" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 #, fuzzy msgid "unexpected }" msgstr "fonte de pesquisa năo esperado" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "" @@ -2945,97 +2945,97 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 #, fuzzy msgid "installing a source package\n" msgstr "instale pacote" # , c-format -#: lib/install.c:720 +#: lib/install.c:721 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "Năo consegui abrir: %s\n" # , c-format -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, fuzzy, c-format msgid "cannot write to %s" msgstr "Năo consegui abrir: %s\n" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" # , c-format -#: lib/install.c:750 +#: lib/install.c:751 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "Năo consegui abrir: %s\n" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 #, fuzzy msgid "source package contains no .spec file" msgstr "pesquise o pacote ao qual pertence" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "năo foi passado pacote para instalaçăo" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "" # , c-format -#: lib/install.c:1062 +#: lib/install.c:1063 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "Năo consegui abrir: %s\n" # , c-format -#: lib/install.c:1098 +#: lib/install.c:1099 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "Năo consegui abrir: %s\n" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3053,135 +3053,137 @@ msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" +# , c-format #: lib/poptBT.c:94 -msgid "buildroot already specified" -msgstr "" +#, fuzzy, c-format +msgid "buildroot already specified, ignoring %s\n" +msgstr "Năo consegui ler o arquivo spec de %s\n" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "prep (descompacte fontes e aplique patches)" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 #, fuzzy msgid "build through %install (%prep, %build, then install) from " msgstr "instale pacote" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, fuzzy, c-format msgid "verify %files section from " msgstr "pesquise o pacote ao qual pertence" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 #, fuzzy msgid "build source and binary packages from " msgstr "pesquise o pacote ao qual pertence" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 #, fuzzy msgid "build binary package only from " msgstr "pesquise o pacote ao qual pertence" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 #, fuzzy msgid "build source package only from " msgstr "pesquise o pacote ao qual pertence" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "prep (descompacte fontes e aplique patches)" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, fuzzy, c-format msgid "verify %files section from " msgstr "pesquise o pacote ao qual pertence" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 #, fuzzy msgid "build source and binary packages from " msgstr "pesquise o pacote ao qual pertence" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 #, fuzzy msgid "build binary package only from " msgstr "pesquise o pacote ao qual pertence" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 #, fuzzy msgid "build source package only from " msgstr "pesquise o pacote ao qual pertence" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 #, fuzzy msgid "build binary package from " msgstr "pacote binário (prep, compile, instale, pacote)" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 #, fuzzy msgid "" msgstr "pesquise todos os pacotes" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 #, fuzzy msgid "" "build through %install (%prep, %build, then install) from " msgstr "instale pacote" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 #, fuzzy msgid "override build root" msgstr "use s como o root da construçăo" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 #, fuzzy msgid "do not execute any stages of the build" msgstr "năo execute nenhum estágio" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 #, fuzzy msgid "remove specfile when done" msgstr "remova a árvore de construçăo quando terminar" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3467,7 +3469,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "năo foi passado pacote para instalaçăo" @@ -3830,12 +3832,12 @@ msgid "retrieved %d packages\n" msgstr "" # , c-format -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "Năo consegui abrir: %s\n" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "năo foi passado pacote para instalaçăo" @@ -3846,58 +3848,58 @@ msgstr "n msgid "cannot open Packages database in %s\n" msgstr "Năo consegui abrir: %s\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "năo foi passado pacote para instalaçăo" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 #, fuzzy msgid "failed dependencies:\n" msgstr "lista dependęncias do pacote" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 #, fuzzy msgid "installing binary packages\n" msgstr "instale pacote" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 #, fuzzy msgid "removing these packages would break dependencies:\n" msgstr "lista dependęncias do pacote" # , c-format -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "Năo consegui abrir: %s\n" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "" @@ -3917,92 +3919,92 @@ msgstr "" msgid "missing architecture name at %s:%d" msgstr "" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" # , c-format -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, fuzzy, c-format msgid "Unable to open %s for reading: %s." msgstr "Năo consegui abrir: %s\n" # , c-format #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, fuzzy, c-format msgid "Failed to read %s: %s." msgstr "Năo consegui ler o arquivo spec de %s\n" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" # , c-format -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "Năo consegui abrir: %s\n" # , c-format -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, fuzzy, c-format msgid "cannot open %s at %s:%d: %s" msgstr "Năo consegui abrir: %s\n" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -4243,7 +4245,7 @@ msgid "Bad server response" msgstr "" #: rpmio/rpmio.c:540 -msgid "Server IO error" +msgid "Server I/O error" msgstr "" #: rpmio/rpmio.c:543 @@ -4267,7 +4269,7 @@ msgid "Failed to establish data connection to server" msgstr "" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +msgid "I/O error to local file" msgstr "" #: rpmio/rpmio.c:561 diff --git a/po/ro.po b/po/ro.po index ce536aca1..ed5281a47 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -498,7 +498,7 @@ msgid "" "options as -q" msgstr "" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "" @@ -692,15 +692,15 @@ msgstr "" msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "" @@ -708,7 +708,7 @@ msgstr "" msgid "remove spec file when done" msgstr "" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "" @@ -1165,7 +1165,7 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -1967,118 +1967,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2183,45 +2183,45 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "" @@ -2245,55 +2245,55 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr "" @@ -2395,131 +2395,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2530,7 +2530,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "" @@ -2559,92 +2559,92 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "" @@ -2666,90 +2666,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 #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "" -#: lib/install.c:1062 +#: lib/install.c:1063 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/install.c:1098 +#: lib/install.c:1099 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2768,121 +2768,122 @@ msgid "" msgstr "" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 msgid "build binary package from " msgstr "" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 msgid "" msgstr "" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 msgid "" "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3148,7 +3149,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3478,12 +3479,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -3493,54 +3494,54 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "" @@ -3560,88 +3561,88 @@ msgstr "" msgid "missing architecture name at %s:%d" msgstr "" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3857,7 +3858,7 @@ msgid "Bad server response" msgstr "" #: rpmio/rpmio.c:540 -msgid "Server IO error" +msgid "Server I/O error" msgstr "" #: rpmio/rpmio.c:543 @@ -3881,7 +3882,7 @@ msgid "Failed to establish data connection to server" msgstr "" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +msgid "I/O error to local file" msgstr "" #: rpmio/rpmio.c:561 diff --git a/po/rpm.pot b/po/rpm.pot index 33cc77d25..426b949fb 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -503,7 +503,7 @@ msgid "" "options as -q" msgstr "" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "" @@ -697,15 +697,15 @@ msgstr "" msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "" @@ -713,7 +713,7 @@ msgstr "" msgid "remove spec file when done" msgstr "" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "" @@ -1170,7 +1170,7 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -1972,118 +1972,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2188,45 +2188,45 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "" @@ -2250,55 +2250,55 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr "" @@ -2400,131 +2400,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2535,7 +2535,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "" @@ -2564,92 +2564,92 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "" @@ -2671,90 +2671,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 #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "" -#: lib/install.c:1062 +#: lib/install.c:1063 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/install.c:1098 +#: lib/install.c:1099 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2773,121 +2773,122 @@ msgid "" msgstr "" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 msgid "build binary package from " msgstr "" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 msgid "" msgstr "" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 msgid "" "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3153,7 +3154,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3483,12 +3484,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -3498,54 +3499,54 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "" @@ -3565,88 +3566,88 @@ msgstr "" msgid "missing architecture name at %s:%d" msgstr "" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3862,7 +3863,7 @@ msgid "Bad server response" msgstr "" #: rpmio/rpmio.c:540 -msgid "Server IO error" +msgid "Server I/O error" msgstr "" #: rpmio/rpmio.c:543 @@ -3886,7 +3887,7 @@ msgid "Failed to establish data connection to server" msgstr "" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +msgid "I/O error to local file" msgstr "" #: rpmio/rpmio.c:561 diff --git a/po/ru.po b/po/ru.po index cabdea386..131adeb45 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: 2000-08-08 01:20+0300\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -526,7 +526,7 @@ msgstr "" "×ĹŇÉĆÉĂÉŇĎ×ÁÔŘ ÉÎÓÔÁĚĚŃĂÉŔ ĐÁËĹÔÁ, ÉÓĐĎĚŘÚŐŃ ÔĹ ÖĹ ĎĐĂÉÉ ÓĐĹĂÉĆÉËÁĂÉÉ " "ĐÁËĹÔÁ, ŢÔĎ É -q" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÚÁ×ÉÓÉÍĎÓÔĹĘ ĐÁËĹÔÁ" @@ -727,15 +727,15 @@ msgid "bin/src package (prep, compile, install, package)" msgstr "" "bin/src package (ÉÓĐĎĚÎÉÔŘ %prep, %build, %install, ÓĎÚÄÁÔŘ RPM É SRPM)" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "ĐĹŇĹĘÔÉ ÎĹĐĎÓŇĹÄÓÔ×ĹÎÎĎ Ë ŐËÁÚÁÎÎĎÍŐ ÜÔÁĐŐ (ÔĎĚŘËĎ ÄĚŃ c,i)" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "ĐĎÓĚĹ ÚÁ×ĹŇŰĹÎÉŃ ŐÄÁĚÉÔŘ ÄĹŇĹ×Ď ÉÓČĎÄÎÉËĎ×" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "ĐĎÓĚĹ ÚÁ×ĹŇŰĹÎÉŃ ŐÄÁĚÉÔŘ ÉÓČĎÄÎÉËÉ" @@ -743,7 +743,7 @@ msgstr " msgid "remove spec file when done" msgstr "ŐÄÁĚÉÔŘ spec-ĆÁĘĚ ĐĎÓĚĹ ÚÁ×ĹŇŰĹÎÉŃ" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "ÇĹÎĹŇÉŇĎ×ÁÔŘ PGP/GPG-ĐĎÄĐÉÓŘ" @@ -1228,7 +1228,7 @@ msgstr " msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -2055,118 +2055,118 @@ msgstr " msgid "line %d: Second %%files list" msgstr "ÓÔŇĎËÁ %d: ÷ÔĎŇĎĘ ÓĐÉÓĎË %%files" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "áŇČÉÔĹËÔŐŇÁ ÉÓËĚŔŢĹÎÁ: %s" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "áŇČÉÔĹËÔŐŇÁ ÎĹ ×ËĚŔŢĹÎÁ: %s" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "ďó ÉÓËĚŔŢĹÎÁ: %s" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "ďó ÎĹ ×ËĚŔŢĹÎÁ: %s" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "đĎĚĹ %s ĎÂŃÚÁÎĎ ĐŇÉÓŐÔÓÔ×Ď×ÁÔŘ × ĐÁËĹÔĹ: %s" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "äŐÂĚÉŇŐŔÝÉĹÓŃ ÚÁĐÉÓÉ %s × ĐÁËĹÔĹ: %s" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĐÉËÔĎÇŇÁÍÍŐ %s: %s" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "îĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ ĐÉËÔĎÇŇÁÍÍŐ %s: %s" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "îĹÉÚ×ĹÓÔÎŮĘ ÔÉĐ ĐÉËÔĎÇŇÁÍÍŮ: %s" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "ÓÔŇĎËÁ %d: îĹ×ĹŇÎŮĘ ÔÜÇ: %s" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "ÓÔŇĎËÁ %d: đŐÓÔĎĘ ÔÜÇ: %s" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "ÓÔŇĎËÁ %d: îĹÄĎĐŐÓÔÉÍŮĘ ÓÉÍ×ĎĚ '-' × %s: %s" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "BuildRoot ÎĹ ÍĎÖĹÔ ÂŮÔŘ \"/\": %s" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "ÓÔŇĎËÁ %d: đŇĹĆÉËÓ ÎĹ ÍĎÖĹÔ ÚÁËÁÎŢÉ×ÁÔŘÓŃ ÎÁ \"/\": %s" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "ÓÔŇĎËÁ %d: Docdir ÄĎĚÖĹÎ ÎÁŢÉÎÁÔŘÓŃ Ó '/': %s" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "ÓÔŇĎËÁ %d: đĎĚĹ Epoch/Serial ÄĎĚÖÎĎ ÂŮÔŘ ŢÉÓĚĎÍ: %s" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, fuzzy, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "ÓÔŇĎËÁ %d: îĹ×ĹŇÎĎĹ ŢÉÓĚĎ %s: %s\n" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "ÓÔŇĎËÁ %d: îĹ×ĹŇÎŮĘ ĆĎŇÍÁÔ BuildArchitecture: %s" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "÷ÎŐÔŇĹÎÎŃŃ ĎŰÉÂËÁ: îĹÉÚ×ĹÓÔÎŮĘ ŃŇĚŮË %d" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "îĹ×ĹŇÎÁŃ ÓĐĹĂÉĆÉËÁĂÉŃ ĐÁËĹÔÁ: %s" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "đÁËĹÔ ŐÖĹ ÓŐÝĹÓÔ×ŐĹÔ: %s" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "ÓÔŇĎËÁ %d: îĹÉÚ×ĹÓÔÎŮĘ ÔÜÇ: %s" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "ćÁĘĚ spec ÎĹ ÍĎÖĹÔ ÉÓĐĎĚŘÚĎ×ÁÔŘ BuildRoot" @@ -2273,45 +2273,45 @@ msgstr " msgid "line %d: Second %s" msgstr "ÓÔŇĎËÁ %d: ÷ÔĎŇĎĹ %s" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "ÓÔŇĎËÁ %d: %s" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "îĹÚÁËŇŮÔŮĘ %%if" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "%s:%d: parseExpressionBoolean ËĎÄ ×ĎÚ×ŇÁÔÁ: %d" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "%s:%d: îÁĘÄĹÎ %%else ÂĹÚ %%if" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "%s:%d: îÁĘÄĹÎ %%endif ÂĹÚ %%if" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "ÎĹ×ĹŇÎĎĹ ĎÂßŃ×ĚĹÎÉĹ %%include" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "îĹÔ ÁŇČÉÔĹËÔŐŇ, ÄĚŃ ËĎÔĎŇŮČ ×ĎÚÍĎÖÎÁ ÓÂĎŇËÁ" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "đÁËĹÔ ÎĹ ÉÍĹĹÔ %%description: %s" @@ -2335,55 +2335,55 @@ msgstr " msgid "line %d: Bad %s number: %s\n" msgstr "ÓÔŇĎËÁ %d: îĹ×ĹŇÎĎĹ ŢÉÓĚĎ %s: %s\n" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐĹŇĹÉÍĹÎĎ×ÁÔŘ %s × %s: %s\n" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ŐÄÁĚÉÔŘ ÓÓŮĚËŐ %s: %s\n" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "getNextHeader: %s\n" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "(ĎŰÉÂËÁ 0x%x)" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "îĹ×ĹŇÎŮĘ magic" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "îĹ×ĹŇÎŮĘ/ÎĹŢÉÔÁĹÍŮĘ ÚÁÇĎĚĎ×ĎË" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "úÁÇĎĚĎ×ĎË ÓĚÉŰËĎÍ ×ĹĚÉË" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "îĹÉÚ×ĹÓÔÎŮĘ ÔÉĐ ĆÁĘĚÁ" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "ďÔÓŐÔÓÔ×ŐĹÔ ÖĹÓÔËÁŃ ÓÓŮĚËÁ" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "÷ÎŐÔŇĹÎÎŃŃ ĎŰÉÂËÁ" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr "ÎĹ ŐÄÁĚĎÓŘ - " @@ -2487,132 +2487,132 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 -#, c-format -msgid "db%d error(%d)" +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 +#, fuzzy, c-format +msgid "db%d error(%d) from %s: %s\n" msgstr "db%d ĎŰÉÂËÁ(%d)" -#: lib/db1.c:93 lib/db3.c:453 -#, c-format -msgid " performing %s" -msgstr " ÉÓĐĎĚÎŃĹÔÓŃ %s" +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 +#, fuzzy, c-format +msgid "db%d error(%d): %s\n" +msgstr "db%d ĎŰÉÂËÁ(%d)" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "ÚÁËŇŮÔ ĆÁĘĚ ÂÁÚŮ ÄÁÎÎŮČ %s\n" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "ŐÄÁĚŁÎ ĆÁĘĚ ÂÁÚŮ ÄÁÎÎŮČ %s\n" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "ÎĹ×ĹŇÎŮĘ ĆÁĘĚ ÂÁÚŮ ÄÁÎÎŮČ %s" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "ĎÔËŇŮ×ĹÔÓŃ ĆÁĘĚ %s ÂÁÚŮ ÄÁÎÎŮČ × ŇĹÖÉÍĹ 0x%x\n" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐĎĚŐŢÉÔŘ ÂĚĎËÉŇĎ×ËŐ %s ÂÁÚŮ ÄÁÎÎŮČ" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "ÉÓËĚŔŢÉÔĹĚŘÎŮĘ" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "ŇÁÚÄĹĚŃĹÍŮĘ" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "ÚÁËŇŮÔĎ ĎËŇŐÖĹÎÉĹ ÂÁÚŮ ÄÁÎÎŮČ %s/%s(%s)\n" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "ŐÄÁĚĹÎĎ ĎËŇŐÖĹÎÉĹ ÂÁÚŮ ÄÁÎÎŮČ %s/%s(%s)\n" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "ĎÔËŇŮ×ÁĹÔÓŃ ĎËŇŐÖĹÎÉĹ ÂÁÚŮ ÄÁÎÎŮČ %s/%s(%s) %s\n" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "ÚÁËŇŮÔ ÉÎÄĹËÓ ÂÁÚŮ ÄÁÎÎŮČ %s/%s(%s)\n" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "ĎÔËŇŮ×ÁĹÔÓŃ ÉÎÄĹËÓ ÂÁÚŮ ÄÁÎÎŮČ %s/%s(%s) %s mode=0x%x\n" -#: lib/db3.c:267 -#, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +#: lib/db3.c:268 +#, fuzzy, c-format +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "dbiSetConfig: ÎĹĎĐĎÚÎÁÎÎÁŃ ĎĐĂÉŃ ÂÁÚŮ ÄÁÎÎŮČ: \"%s\" ĐŇĎÉÇÎĎŇÉŇĎ×ÁÎÁ\n" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s ÉÍĹĹÔ ÎĹ×ĹŇÎŐŔ ŢÉÓĚĎ×ŐŔ ×ĹĚÉŢÉÎŐ, ĐŇĎĐŐÝĹÎĎ\n" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s ÉÍĹĹÔ ÓĚÉŰËĎÍ ÍÁĚŐŔ ÉĚÉ ÓĚÉŰËĎÍ ÂĎĚŘŰŐŔ ×ĹĚÉŢÉÎŐ long, ĐŇĎĐŐÝĹÎĎ\n" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" "%s ÉÍĹĹÔ ÓĚÉŰËĎÍ ÍÁĚŐŔ ÉĚÉ ÓĚÉŰËĎÍ ÂĎĚŘŰŐŔ ×ĹĚÉŢÉÎŐ integer, ĐŇĎĐŐÝĹÎĎ\n" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "ÚÁËŇŮÔĎ ĎËŇŐÖĹÎÉĹ ÂÁÚŮ ÄÁÎÎŮČ %s/%s\n" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "ŐÄÁĚĹÎĎ ĎËŇŐÖĹÎÉĹ ÂÁÚŮ ÄÁÎÎŮČ %s/%s\n" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "ĎÔËŇŮ×ÁĹÔÓŃ ĎËŇŐÖĹÎÉĹ ÂÁÚŮ ÄÁÎÎŮČ %s/%s %s\n" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "ÚÁËŇŮÔ ÉÎÄĹËÓ ÂÁÚŮ ÄÁÎÎŮČ %s/%s\n" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "ĎÔËŇŮ×ÁĹÔÓŃ ÉÎÄĹËÓ ÂÁÚŮ ÄÁÎÎŮČ %s/%s %s mode=0x%x\n" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐĎĚŐŢÉÔŘ ÂĚĎËÉŇĎ×ËŐ %s ÎÁ %s/%s\n" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "ÚÁÂĚĎËÉŇĎ×ÁÎ ÉÎÄĹËÓ ÂÁÚŮ ÄÁÎÎŮČ %s/%s\n" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2627,7 +2627,7 @@ msgstr "" "ŇÁÓÓŮĚËÉ rpm-list@redhat.com\n" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "(ÎĹ ŢÉÓĚĎ)" @@ -2656,93 +2656,93 @@ msgid "file %s is on an unknown device" msgstr "ĆÁĘĚ %s - ÎÁ ÎĹÉÚ×ĹÓÔÎĎÍ ŐÓÔŇĎĘÓÔ×Ĺ" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE count must be 1.\n" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "ôÉĐ ÄÁÎÎŮČ %d ÎĹ ĐĎÄÄĹŇÖÉ×ÁĹÔÓŃ\n" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "îĹ×ĹŇÎĎĹ ŢÉÓĚĎ ÄĚŃ headerAddEntry(): %d\n" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ \"{\" ĐĎÓĚĹ \"%\"" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ \"}\" ĐĎÓĚĹ \"%{\"" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "ĐŐÓÔĎĘ ĆĎŇÍÁÔ ÔÜÇÁ" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "ĐŐÓÔĎĹ ÉÍŃ ÔÜÇÁ" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "ÎĹÉÚ×ĹÓÔÎŮĘ ÔÜÇ" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "× ËĎÎĂĹ ÍÁÓÓÉ×Á ĎÖÉÄÁĚÁÓŘ \"]\"" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "ÎĹĎÖÉÄÁÎÎÁŃ \"]\"" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "ÎĹĎÖÉÄÁÎÎÁŃ \"}\"" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "× ×ŮŇÁÖĹÎÉÉ ĎÖÉÄÁĚĎÓŘ \"?\"" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \"?\" ĎÖÉÄÁĚĎÓŘ \"{\"" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "× ×ŮŇÁÖĹÎÉÉ ĎÖÉÄÁĚĎÓŘ \"}\"" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \"?\" ĎÖÉÄÁĚĎÓŘ \":\"" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \":\" ĎÖÉÄÁĚĎÓŘ \"{\"" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "× ËĎÎĂĹ ×ŮŇÁÖĹÎÉŃ ĎÖÉÄÁĚÓŃ \"|\"" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "(ÎĹÉÚ×ĹÓÔÎŮĘ ÔÉĐ)" @@ -2764,91 +2764,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 #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "ŇÁÓĐÁËĎ×ËÁ ÁŇČÉ×Á ÎĹ ŐÄÁĚÁÓŘ%s%s: %s" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr " ÎÁ ĆÁĘĚĹ " -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "ŐÓÔÁÎÁ×ĚÉ×ÁĹÔÓŃ ÉÓČĎÄÎŮĘ ĐÁËĹÔ\n" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ sourcedir %s" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐÉÓÁÔŘ × %s" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "ÉÓČĎÄÎÉËÉ ×: %s\n" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ specdir %s" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "ĆÁĘĚ spec ×: %s\n" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "ÉÓČĎÄÎŮĘ ĐÁËĹÔ ÎĹ ÓĎÄĹŇÖÉÔ ĆÁĘĚÁ .spec" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "ĐĹŇĹÉÍĹÎĎ×Ů×ÁŔ %s × %s\n" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "ĎŰÉÂËÁ ĐĹŇĹÉÍĹÎĎ×ÁÎÉŃ %s × %s: %s" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "ĎÂÎÁŇŐÖĹÎ Ä×ĎÉŢÎŮĘ ĐÁËĹÔ ×ÍĹÓÔĎ ĎÖÉÄÁĹÍĎÇĎ ÉÓČĎÄÎĎÇĎ" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "ĐÁËĹÔ: %s-%s-%s ĆÁĘĚĎ×; test = %d\n" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "ŐÓÔÁÎĎ×ËÁ ĐŇĹËŇÁÝÁĹÔÓŃ, Ô.Ë. ÍŮ ÉÓĐĎĚÎŃĹÍ --test\n" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "ÉÓĐĎĚÎŃĹÔÓŃ ÓËŇÉĐÔ preinstall (ĹÓĚÉ ĹÓÔŘ)\n" -#: lib/install.c:1030 +#: lib/install.c:1031 #, fuzzy msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "%s ĐŇĎĐŐÓËÁĹÔÓŃ - ĎŰÉÂËÁ ĐĹŇĹÄÁŢÉ - %s\n" -#: lib/install.c:1062 +#: lib/install.c:1063 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "×ÎÉÍÁÎÉĹ: %s ÓĎÚÄÁÎ ËÁË %s" -#: lib/install.c:1098 +#: lib/install.c:1099 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "×ÎÉÍÁÎÉĹ: %s ÓĎČŇÁÎĹÎ ËÁË %s" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "×ŮĐĎĚÎŃĹÔÓŃ ÓËŇÉĐÔ postinstall (ĹÓĚÉ ĹÓÔŘ)\n" @@ -2867,135 +2867,136 @@ msgid "" msgstr "ÜÔÁ ×ĹŇÓÉŃ RPM ĐĎÄÄĹŇÖÉ×ÁĹÔ ÔĎĚŘËĎ ĐÁËĹÔŮ ×ĹŇÓÉÉ <= 4" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, fuzzy, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "buildroot ŐÖĹ ŐËÁÚÁÎ" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "prep (ÓĹËĂÉŃ %prep, ŇÁÚ×ĹŇÎŐÔŘ ÉÓČĎÄÎÉËÉ É ÎÁĚĎÖÉÔŘ ÚÁĐĚÁÔŮ)" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 #, fuzzy msgid "build through %build (%prep, then compile) from " msgstr "×ŮĐĎĚÎÉÔŘ ĐĎ ÓÔÁÄÉŔ %%prep ĆÁĘĚÁ ÓĐĹĂÉĆÉËÁĂÉÉ" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 #, fuzzy msgid "build through %install (%prep, %build, then install) from " msgstr "×ŮĐĎĚÎÉÔŘ ĐĎ ÓÔÁÄÉŔ %%install ĆÁĘĚÁ ÓĐĹĂÉĆÉËÁĂÉÉ" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, fuzzy, c-format msgid "verify %files section from " msgstr "ĐŇĎ×ĹŇÉÔŘ ŇÁÚÄĹĚ %%files ĆÁĘĚÁ ÓĐĹĂÉĆÉËÁĂÉÉ" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 #, fuzzy msgid "build source and binary packages from " msgstr "ÓĎÂŇÁÔŘ ÉÓČĎÄÎŮĘ É Ä×ĎÉŢÎŮĘ ĐÁËĹÔŮ ĐĎ ĆÁĘĚŐ ÓĐĹĂÉĆÉËÁĂÉÉ" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 #, fuzzy msgid "build binary package only from " msgstr "ÓĎÂŇÁÔŘ Ä×ĎÉŢÎŮĘ ĐÁËĹÔ ĐĎ ĆÁĘĚŐ ÓĐĹĂÉĆÉËÁĂÉÉ" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 #, fuzzy msgid "build source package only from " msgstr "ÓĎÂŇÁÔŘ ÉÓČĎÄÎŮĘ ĐÁËĹÔ ĐĎ ĆÁĘĚŐ ÓĐĹĂÉĆÉËÁĂÉÉ" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "prep (ÓĹËĂÉŃ %prep, ŇÁÚ×ĹŇÎŐÔŘ ÉÓČĎÄÎÉËÉ É ÎÁĚĎÖÉÔŘ ÚÁĐĚÁÔŮ)" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 #, fuzzy msgid "build through %build (%prep, then compile) from " msgstr "×ŮĐĎĚÎÉÔŘ ĐĎ ÓÔÁÄÉŔ %%prep ÉÚ ÁŇČÉ×Á tar" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 #, fuzzy msgid "build through %install (%prep, %build, then install) from " msgstr "×ŮĐĎĚÎÉÔŘ ĐĎ ÓÔÁÄÉŔ %%install ÉÚ ÁŇČÉ×Á tar" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, fuzzy, c-format msgid "verify %files section from " msgstr "ĐŇĎ×ĹŇÉÔŘ ÓĹËĂÉŔ %%files ÉÚ ÁŇČÉ×Á tar" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 #, fuzzy msgid "build source and binary packages from " msgstr "ÓĎÂŇÁÔŘ ÉÓČĎÄÎŮĘ É Ä×ĎÉŢÎŮĘ ĐÁËĹÔŮ ÉÚ ÁŇČÉ×Á tar" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 #, fuzzy msgid "build binary package only from " msgstr "ÓĎÂŇÁÔŘ Ä×ĎÉŢÎŮĘ ĐÁËĹÔ ÉÚ ÁŇČÉ×Á tar" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 #, fuzzy msgid "build source package only from " msgstr "ÓĎÂŇÁÔŘ ÉÓČĎÄÎŮĘ ĐÁËĹÔ ÉÚ ÁŇČÉ×Á tar" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 #, fuzzy msgid "build binary package from " msgstr "ÓĎÂŇÁÔŘ Ä×ĎÉŢÎŮĘ ĐÁËĹÔ ÉÚ ÉÓČĎÄÎĎÇĎ ĐÁËĹÔÁ" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 #, fuzzy msgid "" msgstr "ÎĹÔ ĐÁËĹÔĎ×\n" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 #, fuzzy msgid "" "build through %install (%prep, %build, then install) from " msgstr "×ŮĐĎĚÎÉÔŘ ĐĎ ÓÔÁÄÉŔ %%install ÉÚ ÁŇČÉ×Á tar" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "ĐĹŇĹĎĐŇĹÄĹĚÉÔŘ build root" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "ÎĹ ×ŮĐĎĚÎŃÔŘ ÎÉËÁËÉČ ÜÔÁĐĎ× ÓÂĎŇËÉ" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 #, fuzzy msgid "do not accept i18N msgstr's from specfile" msgstr "ÎĹ ĐŇÉÎÉÍÁÔŘ ÓÔŇĎË I18N ÉÚ spec-ĆÁĘĚÁ" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "ĐĎÓĚĹ ÚÁ×ĹŇŰĹÎÉŃ ŐÄÁĚÉÔŘ ĆÁĘĚ ÓĐĹĂÉĆÉËÁĂÉÉ" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "ĐĹŇĹĎĐŇĹÄĹĚÉÔŘ ĂĹĚĹ×ŐŔ ĐĚÁÔĆĎŇÍŐ" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 #, fuzzy msgid "lookup i18N strings in specfile catalog" msgstr "ÉÓËÁÔŘ ÓÔŇĎËÉ I18N × ËÁÔÁĚĎÇĹ ĆÁĘĚÁ ÓĐĹĂÉĆÉËÁĂÉÉ" @@ -3268,7 +3269,7 @@ msgstr " msgid "record %d could not be read\n" msgstr "ÚÁĐÉÓŘ %d ÎĹ ŢÉÔÁĹÔÓŃ\n" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "ĐÁËĹÔ %s ÎĹ ŐÓÔÁÎĎ×ĚĹÎ\n" @@ -3627,12 +3628,12 @@ msgstr "%s msgid "retrieved %d packages\n" msgstr "ĐĎĚŐŢĹÎĎ %d ĐÁËĹÔĎ×\n" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ %s: %s\n" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "%s ÎĹ ÍĎÖĹÔ ÂŮÔŘ ŐÓÔÁÎĎ×ĚĹÎ\n" @@ -3642,54 +3643,54 @@ msgstr "%s msgid "cannot open Packages database in %s\n" msgstr "ÎĹ ÍĎÇŐ ĎÔËŇŮÔŘ ÂÁÚŐ ÄÁÎÎŮČ Packages × %s\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "ĐÁËĹÔ %s - ÎĹ ĐĹŇĹÍĹÝÁĹÍŮĘ\n" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "ĎŰÉÂËÁ ŢÔĹÎÉŃ ÉÚ ĆÁĘĚÁ %s\n" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "ÄĚŃ ĆÁĘĚÁ %s ÎĹĎÂČĎÄÉÍÁ ÂĎĚĹĹ ÎĎ×ÁŃ ×ĹŇÓÉŃ RPM\n" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "ÎÁĘÄĹÎĎ %d ÉÓČĎÄÎŮČ É %d ÂÉÎÁŇÎŮČ ĐÁËĹÔĎ×\n" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "ÎĹŐÄĎ×ĚĹÔ×ĎŇĹÎÎŮĹ ÚÁ×ÉÓÉÍĎÓÔÉ:\n" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "ŐÓÔÁÎÁ×ĚÉ×ÁŔ ÂÉÎÁŇÎŮĹ ĐÁËĹÔŮ\n" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "ĎŰÉÂËÁ ĎÔËŇŮÔÉŃ %s/packages.rpm\n" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ÚÁÄÁĹÔ ÎĹÓËĎĚŘËĎ ĐÁËĹÔĎ×\n" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "ŐÄÁĚĹÎÉĹ ÜÔÉČ ĐÁËĹÔĎ× ÎÁŇŐŰÉÔ ÚÁ×ÉÓÉÍĎÓÔÉ:\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "őÓÔÁÎÁ×ĚÉ×ÁĹÔÓŃ %s\n" @@ -3709,88 +3710,88 @@ msgstr " msgid "missing architecture name at %s:%d" msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ ÎÁÚ×ÁÎÉĹ ÁŇČÉÔĹËÔŐŇŮ × %s:%d" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "îĹĐĎĚÎÁŃ ÓÔŇĎËÁ ÄÁÎÎŮČ × %s:%d" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "óĚÉŰËĎÍ ÍÎĎÇĎ ÁŇÇŐÍĹÎÔĎ× × ÓÔŇĎËĹ ÄÁÎÎŮČ × %s:%d" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "îĹ×ĹŇÎŮĘ ÎĎÍĹŇ arch/os: %s (%s:%d)" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "îĹĐĎĚÎÁŃ ÓÔŇĎËÁ ĐĎ ŐÍĎĚŢÁÎÉŔ × %s:%d" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "óĚÉŰËĎÍ ÍÎĎÇĎ ÁŇÇŐÍĹÎÔĎ× × ÓÔŇĎËĹ ĐĎ ŐÍĎĚŢÁÎÉŔ × %s:%d" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "îĹ×ĎÚÍĎÖÎĎ ŇÁÓËŇŮÔŘ %s" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "îĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ %s, ÚÎÁŢĹÎÉĹ HOME ÓĚÉŰËĎÍ ×ĹĚÉËĎ." -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s ÄĚŃ ŢÔĹÎÉŃ: %s." #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "îĹ×ĎÚÍĎÖÎĎ ĐŇĎŢĹÓÔŘ %s: %s." -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ ':' (ÎÁĘÄĹÎ 0x%02x) × %s:%d" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ ÁŇÇŐÍĹÎÔ ÄĚŃ %s × %s:%d" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "ĎŰÉÂËÁ ŇÁÓËŇŮÔÉŃ %s ÎÁ %s:%d \"%s\"" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s × %s:%d %s" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ ÁŇČÉÔĹËÔŐŇÁ ÄĚŃ %s × %s:%d" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "ÎĹ×ĹŇÎÁŃ ĎĐĂÉŃ '%s' × %s:%d" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "îĹÉÚ×ĹÓÔÎÁŃ ÓÉÓÔĹÍÁ: %s\n" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "ó×ŃÖÉÔĹÓŘ Ó rpm-list@redhat.com\n" @@ -4012,7 +4013,8 @@ msgid "Bad server response" msgstr "îĹ×ĹŇÎŮĘ ĎÔ×ĹÔ ÓĹŇ×ĹŇÁ" #: rpmio/rpmio.c:540 -msgid "Server IO error" +#, fuzzy +msgid "Server I/O error" msgstr "ďŰÉÂËÁ ××ĎÄÁ/×Ů×ĎÄÁ ÓĹŇ×ĹŇÁ" #: rpmio/rpmio.c:543 @@ -4036,7 +4038,8 @@ msgid "Failed to establish data connection to server" msgstr "îĹ ÍĎÇŐ ŐÓÔÁÎĎ×ÉÔŘ ÓĎĹÄÉÎĹÎÉĹ ÄĚŃ ÄÁÎÎŮČ Ó ÓĹŇ×ĹŇĎÍ" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +#, fuzzy +msgid "I/O error to local file" msgstr "ďŰÉÂËÁ ××ĎÄÁ/×Ů×ĎÄÁ × ĚĎËÁĚŘÎŮĘ ĆÁĘĚ" #: rpmio/rpmio.c:561 @@ -4207,6 +4210,9 @@ msgstr " msgid "failed to create %s: %s\n" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %s: %s\n" +#~ msgid " performing %s" +#~ msgstr " ÉÓĐĎĚÎŃĹÔÓŃ %s" + #, fuzzy #~ msgid "" #~ " %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros " diff --git a/po/sk.po b/po/sk.po index 967f58d3b..ad0e2d62f 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -552,7 +552,7 @@ msgstr "" "overiť inštaláciu balíka s použitím rovnakých volieb špecifikácia balíka ako " "pre -q" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "neoverovať závislosti balíka" @@ -753,15 +753,15 @@ msgstr "bin msgid "bin/src package (prep, compile, install, package)" msgstr "binárny a zdrojový balík (príprava, kompilácia, inštalácia, zabalenie)" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "preskočiť priamo k určenej etape (iba pre c, i)" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "po ukončení odstrániť adresár, v ktorom sa balík zostavoval" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 #, fuzzy msgid "remove sources when done" msgstr "po ukončení odstrániť zdrojové súbory a spec-súbor" @@ -771,7 +771,7 @@ msgstr "po ukon msgid "remove spec file when done" msgstr "po ukončení odstrániť zdrojové súbory a spec-súbor" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "vytvoriť PGP/GPG podpis" @@ -1255,7 +1255,7 @@ msgstr "znovu vytvori msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -2132,118 +2132,118 @@ msgstr "riadok %d: Chyba pri anal msgid "line %d: Second %%files list" msgstr "riadok %d: Druhý %%files zoznam" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "Architektúra je vynechaná: %s" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "Architektúra nie je obsiahnutá: %s" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "OS je vynechaný: %s" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "OS nie je obsiahnutý: %s" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "V balíku musí existovať pole %s: %s" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "Duplicitné záznamy %s v balíku: %s" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, fuzzy, c-format msgid "Unable to open icon %s: %s" msgstr "Nie je možné prečítať ikonu: %s" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, fuzzy, c-format msgid "Unable to read icon %s: %s" msgstr "Nie je možné prečítať ikonu: %s" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "Neznámy typ ikony: %s" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "riadok %d: Znetvorený popis: %s" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "riadok %d: Prázdny popis: %s" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "riadok %d: Neprípustný znak '-' v %s: %s" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, fuzzy, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "riadok %d: BuildRoot nemôže byť \"/\": %s" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "riadok %d: Prefixy nesmú končiť \"/\": %s" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "riadok %d: Docdir musí začínať '/': %s" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "riadok %d: Epoch/Serial pole musí byť číslo: %s" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, fuzzy, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "riadok %d: Chybné %s číslo: %s\n" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "riadok %d: Chybný formát BuildArchitecture: %s" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "Interná chyba: Čudný popis %d " -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "Chybná špecifikácia balíka: %s" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "Balík už existuje: %s" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "riadok %d: Neznámy popis: %s" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "Spec súbor nemôže použiť BuildRoot" @@ -2348,45 +2348,45 @@ msgstr "riadok %d: program skriptu mus msgid "line %d: Second %s" msgstr "riadok %d: Druhý %s" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "riadok %d: %s" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, fuzzy, c-format msgid "Unable to open %s: %s\n" msgstr "otvorenie zlyhalo: %s\n" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "Neuzavretý %%if" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "%s:%d: %%else bez if" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "%s:%d: %%endif bez if" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "znetvorený príkaz %%include" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "Žiadne zostaviteľné architektúry" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "Balík neobsahuje %%description: %s" @@ -2410,55 +2410,55 @@ msgstr "riadok %d: Chybn msgid "line %d: Bad %s number: %s\n" msgstr "riadok %d: Chybné %s číslo: %s\n" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "premenovanie %s na %s zlyhalo: %s\n" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "zmazanie %s zlyhalo: %s\n" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "getNextHeader: %s\n" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "(chyba 0x%x)" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "Chybné magické číslo" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "Chybná/nečitateľná hlavička" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "Priveľká hlavička" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "Neznámy typ súboru" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "Interná chyba" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr " zlyhalo - " @@ -2560,131 +2560,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, fuzzy, c-format msgid "removed db file %s\n" msgstr "odstraňuje sa index súborov pre %s\n" -#: lib/db1.c:422 +#: lib/db1.c:421 #, fuzzy, c-format msgid "bad db file %s" msgstr "chybný stav súboru: %s" -#: lib/db1.c:427 +#: lib/db1.c:426 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "otvára sa databáza s právami 0x%x v %s\n" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "nie je možné získať %s zámok pre databázu" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "výhradný" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "zdieľaný" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "odstraňuje sa index súborov pre %s\n" -#: lib/db3.c:494 +#: lib/db3.c:500 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "odstraňuje sa index súborov pre %s\n" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "odstraňuje sa index súborov pre %s\n" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "otvára sa databáza s právami 0x%x v %s\n" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "nie je možné získať %s zámok pre databázu" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "odstraňuje sa index súborov pre %s\n" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2695,7 +2695,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "(nie je číslo)" @@ -2724,93 +2724,93 @@ msgid "file %s is on an unknown device" msgstr "súbor %s sa nachádza na neznámom zariadení" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE počet musí byť 1.\n" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "Typ údajov %d nie je podorovaný\n" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "Chybný počet pre headerAddEntry(): %d\n" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "chýbajúce { po %" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "chýbajúce } po %{" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "prázdny tag formát" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "prázdne meno tagu" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "neznámy tag" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "] očakávané na konci poľa" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "neočakávané ]" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "neočakávané }" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "? očakávané vo výraze" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "{ očakávané po ? vo výraze" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "} očakávané vo výraze" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr ": očakávané po ? podvýraze" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "{ očakávané po : vo výraze" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "| očakávené na konci výrazu" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "(neznámy typ)" @@ -2832,91 +2832,91 @@ msgstr "skupina %s neexistuje - pou #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "rozbalenie archívu zlyhalo%s%s: %s" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr " pre súbor " -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "inštaluje sa zdrojový balík\n" -#: lib/install.c:720 +#: lib/install.c:721 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "nie je možné zapísať do %s: " -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "nie je možné zapísať do %s: " -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "zdroje v: %s\n" -#: lib/install.c:750 +#: lib/install.c:751 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "nie je možné zapísať do %s: " -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "spec-súbor v: %s\n" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "zdrojový balík neobsahuje žiadny .spec súbor" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "premenováva sa %s na %s\n" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "premenovanie %s na %s zlyhalo: %s" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "očakávaný zdrojový balík, nájdený binárny" -#: lib/install.c:974 +#: lib/install.c:975 #, 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:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "inštalácia zastavená kvôli režimu --test\n" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "vykonávajú sa predinštalačné skripty (ak existujú)\n" -#: lib/install.c:1030 +#: lib/install.c:1031 #, fuzzy msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "%s vynechané - prenos zlyhal - %s\n" -#: lib/install.c:1062 +#: lib/install.c:1063 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "varovanie: %s vytvorené ako %s" -#: lib/install.c:1098 +#: lib/install.c:1099 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "varovanie: %s uchovaný ako %s" -#: lib/install.c:1189 +#: lib/install.c:1193 #, fuzzy msgid "running postinstall scripts (if any)\n" msgstr "vykonávajú sa poinštalačné skripty (ak existujú)\n" @@ -2938,133 +2938,134 @@ msgid "" msgstr "táto verzia RPM podporuje iba balíky s hlavným číslom <= 3" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, fuzzy, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "buildroot už bol zadaný" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "príprava (rozbaliť zdrojové súbory a aplikovať záplaty)" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 #, fuzzy msgid "build through %install (%prep, %build, then install) from " msgstr "inštaluje sa zdrojový balík\n" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, fuzzy, c-format msgid "verify %files section from " msgstr "zdrojový balík neobsahuje žiadny .spec súbor" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 #, fuzzy msgid "build source and binary packages from " msgstr "nájdených %d zdrojových a %d binárnych balíkov\n" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 #, fuzzy msgid "build binary package only from " msgstr "zdrojový balík neobsahuje žiadny .spec súbor" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 #, fuzzy msgid "build source package only from " msgstr "zdrojový balík neobsahuje žiadny .spec súbor" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "príprava (rozbaliť zdrojové súbory a aplikovať záplaty)" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, fuzzy, c-format msgid "verify %files section from " msgstr "zdrojový balík neobsahuje žiadny .spec súbor" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 #, fuzzy msgid "build source and binary packages from " msgstr "nájdených %d zdrojových a %d binárnych balíkov\n" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 #, fuzzy msgid "build binary package only from " msgstr "nájdených %d zdrojových a %d binárnych balíkov\n" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 #, fuzzy msgid "build source package only from " msgstr "zostaviť balík pre OS/architektúru " -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 #, fuzzy msgid "build binary package from " msgstr "binárny balík (príprava, kompilácia, inštalácia, zabalenie)" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 #, fuzzy msgid "" msgstr "nájdených %d balíkov\n" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 #, fuzzy msgid "" "build through %install (%prep, %build, then install) from " msgstr "inštaluje sa zdrojový balík\n" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "predefinovať adresár pre zostavenie balíka" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "nevykonať žiadne etapy zostavenia" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 #, fuzzy msgid "do not accept i18N msgstr's from specfile" msgstr "neakceptovať lokalizované reťazce zo spec-súboru" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 #, fuzzy msgid "remove specfile when done" msgstr "po ukončení odstrániť zdrojové súbory a spec-súbor" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "predefinovať cieľovú platformu" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 #, fuzzy msgid "lookup i18N strings in specfile catalog" msgstr "pre preklad reťazcov použiť katalóg správ spec-súborov" @@ -3343,7 +3344,7 @@ msgstr "po msgid "record %d could not be read\n" msgstr "záznam %d nie je možné prečítať\n" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "balík %s nie je nainštalovaný\n" @@ -3678,12 +3679,12 @@ msgstr "%s vynechan msgid "retrieved %d packages\n" msgstr "prenieslo sa %d balíkov\n" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie je možné otvoriť súbor %s: %s" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie je možné nainštalovať\n" @@ -3693,54 +3694,54 @@ msgstr "%s nie je mo msgid "cannot open Packages database in %s\n" msgstr "nie je možné otvoriť %s/packages.rpm\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "balík %s nie je nainštalovaný\n" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "chyba pri vytváraní dočasného súboru %s" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "nájdených %d zdrojových a %d binárnych balíkov\n" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "nevyriešené závislosti:\n" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "inštalujú sa binárne balíky\n" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "nie je možné otvoriť %s/packages.rpm\n" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" špecifikuje viac balíkov\n" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "odstránenie týchto balíkov by porušilo závislosti:\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie je možné otvoriť %s\n" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "Inštaluje sa %s\n" @@ -3760,88 +3761,88 @@ msgstr "ch msgid "missing architecture name at %s:%d" msgstr "chýba názov architektúry na %s:%d" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "Neúplný riadok údajov na %s:%d" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "Priveľa argumentov v riadku údajov na %s:%d" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "Chybné číslo arch/os: %s (%s:%d)" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "Neúplný implicitný riadok na %s:%d" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "Priveľa argumentov v implicitnom riadku na %s:%d" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "Nie je možné expandovať %s" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "Nie je možné otvoriť %s pre čítanie: %s." #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "Nie je možné prečítať %s: %s." -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, fuzzy, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "chýbajúca ':' na %s:%d" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "chýbajúci argument pre %s na %s:%d" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "expanzia %s zlyhala na %s:%d \"%s\"" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, fuzzy, c-format msgid "cannot open %s at %s:%d: %s" msgstr "nie je možné otvoriť %s na %s:%d" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "chýbajúca architektúra pre %s na %s:%d" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "chybná voľba '%s' na %s:%d" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "Neznámy systém: %s\n" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "Kontaktujte prosím rpm-list@redhat.com\n" @@ -4065,7 +4066,8 @@ msgid "Bad server response" msgstr "Chybná odpoveď servera" #: rpmio/rpmio.c:540 -msgid "Server IO error" +#, fuzzy +msgid "Server I/O error" msgstr "Chyba vstupu/výstupu servera" #: rpmio/rpmio.c:543 @@ -4089,7 +4091,8 @@ msgid "Failed to establish data connection to server" msgstr "Vytvorenie dátového spojenia k serveru zlyhalo" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +#, fuzzy +msgid "I/O error to local file" msgstr "Chyba vstupu/výstupu lokálneho súboru" #: rpmio/rpmio.c:561 diff --git a/po/sl.po b/po/sl.po index ad51e255c..6f115f248 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primož Peterlin , 2000. -# $Id: sl.po,v 1.124 2001/01/02 17:19:39 jbj Exp $ +# $Id: sl.po,v 1.125 2001/01/03 20:19:31 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -543,7 +543,7 @@ msgid "" "options as -q" msgstr "namestitev paketa preverimo z enakimi izbirnimi določili kot -q" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "brez preverjanja soodvisnosti paketa" @@ -745,15 +745,15 @@ msgstr "" "prevedeni in izvorni paket (priprava, prevajanje, namestitev, izgradnja " "paketa)" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "preskok naravnost na določeno stopnjo (samo za c,i)" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "po zaključku drevo imenikov v katerih smo pakete gradili odstrani" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "po zaključku naj se izvorna koda izbriše" @@ -762,7 +762,7 @@ msgstr "po zaklju msgid "remove spec file when done" msgstr "po zaključku naj se datoteka s specifikacijami izbriše" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "izdelava podpisa PGP/GPG" @@ -1239,7 +1239,7 @@ msgstr "ponovno izgradi zbirko iz obstoje msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -2112,118 +2112,118 @@ msgstr "vrstica %d: Napaka pri raz msgid "line %d: Second %%files list" msgstr "vrstica %d: Drugi seznam %%Files" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "Arhitektura je izključena: %s" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "Arhitektura ni vključena: %s" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "OS je izključen: %s" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "OS ni vključen: %s" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "polje %s mora v paketu obstajati: %s" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "Podvojeni vnosi %s v paketu: %s" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "Ikone %s ni možno odpreti: %s" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "Ikone %s ni možno prebrati: %s" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "Neznan tip ikone: %s" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "vrstica %d: Deformirana značka: %s" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "vrstica %d: Prazna značka: %s" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "vrstica %d: Neveljaven znak ,-` v %s: %s" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "BuildRoot ne more biti \"/\": %s" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "vrstica %d: Predpone se ne smejo končati z /: %s" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "vrstica %d: Docdir se mora začeti z \"/\": %s" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "vrstica %d: polje Epoch/Serial mora biti število: %s" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, fuzzy, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "vrstica %d: Okvarjeno število %s: %s\n" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "vrstica %d: Napačna oblika BuildArchitecture: %s" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "Notranja napaka: Neprava značka %d" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "Nepravilno določilo paketa: %s" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "Paket že obstaja: %s" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "vrstica %d: Neznana značka: %s" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "Datoteka spec ne more uporabiti BuildRoot" @@ -2330,45 +2330,45 @@ msgstr "vrstica %d: skriptni program se mora za msgid "line %d: Second %s" msgstr "vrstica %d: Drugi %s" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "vrstica %d: %s" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "Ni možno odpreti %s: %s\n" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "Nezaključeni %%if" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "%s:%d: parseExpressionBoolean vrne %d" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "%s:%d: Najden je bil %%else brez pripadajočega if" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "%s:%d: Najden je bil %%endif brez pripadajočega if" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "Deformiran stavek %%include" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "Arhitektura za izgradnjo ni prisotna" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "V paketu manjka %%description: %s" @@ -2392,55 +2392,55 @@ msgstr "vrstica %d: Napa msgid "line %d: Bad %s number: %s\n" msgstr "vrstica %d: Napačno število %s: %s\n" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "ni možno preimenovati %s v %s: %s\n" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "ni možno izbrisati %s: %s\n" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "getNextHeader: %s\n" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "(napaka 0x%x)" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "Napačno magično število" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "Poškodovana/neberljiva glava" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "Glava je predolga" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "Neznan tip datoteke" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "Trda povezava manjka" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "Notranja napaka" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr " neuspešno - " @@ -2544,133 +2544,133 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 -#, c-format -msgid "db%d error(%d)" +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 +#, fuzzy, c-format +msgid "db%d error(%d) from %s: %s\n" msgstr "db%d napaka(%d)" -#: lib/db1.c:93 lib/db3.c:453 -#, c-format -msgid " performing %s" -msgstr " izvajanje %s" +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 +#, fuzzy, c-format +msgid "db%d error(%d): %s\n" +msgstr "db%d napaka(%d)" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "zaprta datoteka db %s\n" -#: lib/db1.c:391 +#: lib/db1.c:390 #, fuzzy, c-format msgid "removed db file %s\n" msgstr "odstranjena datoteka db %s\n" -#: lib/db1.c:422 +#: lib/db1.c:421 #, fuzzy, c-format msgid "bad db file %s" msgstr "poškodovana zbirka podatkov %s" -#: lib/db1.c:427 +#: lib/db1.c:426 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "odpiranje datoteke %s v načinu 0x%x\n" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "datoteke ni možno %s zakleniti" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "izključujoče" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "skupno" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "zaprto db okolje %s/%s(%s)\n" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "odstranjeno db okolje %s/%s(%s)\n" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "odpiranje db okolja %s/%s(%s) %s\n" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "zaprto db kazalo %s/%s(%s)\n" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "odpiranje db kazala %s/%s(%s) %s način=0x%x\n" -#: lib/db3.c:267 -#, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +#: lib/db3.c:268 +#, fuzzy, c-format +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "dbiSetConfig: neprepoznana izbira db: \"%s\" prezrto\n" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s ima neveljavno številčno vrednost, prezrto\n" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s ima preveliko ali premajhno dolgo (long) vrednost, prezrto\n" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" "%s ima preveliko ali premajhno vrednost malega (small) celega\n" "števila, prezrto\n" -#: lib/db3.c:478 +#: lib/db3.c:484 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "zaprto db okolje %s/%s\n" -#: lib/db3.c:494 +#: lib/db3.c:500 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "odstranjeno db okolje %s/%s\n" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "odpiranje db okolja %s/%s %s\n" -#: lib/db3.c:917 +#: lib/db3.c:923 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "zaprto db kazalo %s/%s\n" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "odpiranje db kazala %s/%s %s način=0x%x\n" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ni možno zakleniti z %s datotek %s/%s\n" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "zaklenjeno db kazalo %s/%s\n" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2685,7 +2685,7 @@ msgstr "" "na strani http://www.rpm.org ali po dopisni listi rpm-list@redhat.com.\n" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "(ni število)" @@ -2714,93 +2714,93 @@ msgid "file %s is on an unknown device" msgstr "datoteka %s se nahaja na neznani napravi" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "števec grabData() RPM_STRING_TYPE mora biti 1.\n" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "Tip podatkov %d ni podprt\n" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "Nepravilno stanje števca za headerAddEntry(): %d\n" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "manjkajoči { za %" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "manjkajoči } za %{" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "oblika značke manjka" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "ime značke manjka" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "neznana značka" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "na koncu polja je pričakovan ]" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "nepričakovan ]" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "nepričakovan }" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "v izrazu je pričakovan ?" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "v izrazu je za { pričakovan ?" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "v izrazu je pričakovan }" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "za podizrazom ? je pričakovano :" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "v izrazu je za : pričakovan {" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "na koncu izraza je pričakovan |" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "(neznan tip)" @@ -2822,91 +2822,91 @@ msgstr "skupina %s ne obstaja - uporabljam root" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "razširitev arhiva je bilo neuspešno%s%s: %s" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr " za datoteko " -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "nameščanje izvornega paketa\n" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "ni možno ustvariti izvornega imenika %s" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "pisanje na %s ni možno" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "izvori v: %s\n" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "ni možno ustvariti imenika z določili spec %s" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "datoteka s specifikacijami v: %s\n" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "izvorni paket ne vsebuje datoteke .spec" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "preimenovanje %s v %s\n" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "preimenovanje %s v %s je bilo neuspešno: %s" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "pričakovan je bil izvorni paket, najden binarni" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "paket: %s-%s-%s datoteke test = %d\n" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "ustavljanje namestitev, ker tečemo kot --test\n" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "poganjanje prednamestitvenih skript (če obstajajo)\n" -#: lib/install.c:1030 +#: lib/install.c:1031 #, fuzzy msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "preskočeno - %s - prenos neuspešen - %s\n" -#: lib/install.c:1062 +#: lib/install.c:1063 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "opozorilo: %s ustvarjen kot %s" -#: lib/install.c:1098 +#: lib/install.c:1099 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "opozorilo: %s shranjen kot %s" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "poganjanje ponamestitvenih skript (če obstajajo)\n" @@ -2927,135 +2927,136 @@ msgid "" msgstr "ta različica RPM podpira samo pakete z glavnim številom različice <=4" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, fuzzy, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "buildroot je že določen" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "priprava (razpakiraj izvorno kodo in uporabi popravke)" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 #, fuzzy msgid "build through %build (%prep, then compile) from " msgstr "izgradnja prek stopnje %%prep iz datoteke s specifikacijami" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 #, fuzzy msgid "build through %install (%prep, %build, then install) from " msgstr "izgradnja prek stopnje %%install iz datoteke s specifikacijami" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, fuzzy, c-format msgid "verify %files section from " msgstr "preverjanje dela datoteke s specifikacijami %%files" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 #, fuzzy msgid "build source and binary packages from " msgstr "izgradi izvorni in binarni paket iz datoteke s specifikacijami" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 #, fuzzy msgid "build binary package only from " msgstr "izgradi binarni paket iz datoteke .spec" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 #, fuzzy msgid "build source package only from " msgstr "izgradi izvorni paket iz datoteke .spec" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "priprava (razpakiraj izvorno kodo in uporabi popravke)" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 #, fuzzy msgid "build through %build (%prep, then compile) from " msgstr "paket izgradi prek stopnje %%prep iz arhiva tar" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 #, fuzzy msgid "build through %install (%prep, %build, then install) from " msgstr "paket izgradi prek stopnje %%install iz arhiva tar" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, fuzzy, c-format msgid "verify %files section from " msgstr "preverjanje dela %%files iz arhiva tar" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 #, fuzzy msgid "build source and binary packages from " msgstr "iz arhiva tar izgradi izvorni in binarni paket" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 #, fuzzy msgid "build binary package only from " msgstr "iz arhiva tar izgradi binarni paket" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 #, fuzzy msgid "build source package only from " msgstr "iz arhiva tar izgradi izvorni paket" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 #, fuzzy msgid "build binary package from " msgstr "binarni paket izgradi iz izvornega" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 #, fuzzy msgid "" msgstr "ni paketov\n" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 #, fuzzy msgid "" "build through %install (%prep, %build, then install) from " msgstr "izgradnja prek stopnje %%install iz izvornega paketa" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "brez upoštevanja vrhnjega imenika izgradnje" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "brez izvajanja katerekoli od stopenj izgradnje" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 #, fuzzy msgid "do not accept i18N msgstr's from specfile" msgstr "brez sprejemanja internacionaliziranih katalogov iz datoteke spec" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "po zaključku odstrani datoteko s specifikacijami" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "brez upoštevanja strojnega okolja ciljnega sistema" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 #, fuzzy msgid "lookup i18N strings in specfile catalog" msgstr "upoštevanje internacionalizirana sporočila v katalogu spec" @@ -3334,7 +3335,7 @@ msgstr " msgid "record %d could not be read\n" msgstr "zapisa %d ni možno prebrati\n" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "paket %s ni nameščen\n" @@ -3694,12 +3695,12 @@ msgstr "presko msgid "retrieved %d packages\n" msgstr "prenešenih je bilo %d paketov\n" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "ni možno odpreti datoteke %s: %s\n" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "%s ni možno namestiti\n" @@ -3709,54 +3710,54 @@ msgstr "%s ni mo msgid "cannot open Packages database in %s\n" msgstr "zbirko podatkov paketov ni možno odpreti v %s\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "paketa %s ni možno premakniti\n" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "napaka pri branju iz datoteke %s\n" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "datoteka %s zahteva novejšo različico RPM\n" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "najdeno %d izvornih in %d binarnih paketov\n" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "neuspešne soodvisnosti:\n" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "nameščanje binarnih paketov\n" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "datoteke %s/packages.rpm ni možno odpreti\n" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" določa več paketov\n" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "ni možno odpreti %s: %s\n" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "Nameščanje %s\n" @@ -3776,88 +3777,88 @@ msgstr "manjka drugi ,:` v %s:%d" msgid "missing architecture name at %s:%d" msgstr "manjkajoče ime arhitekture v %s:%d" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "Nepopolna podatkovna vrstica v %s:%d" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "Preveč argumentov v podatkovni vrstici v %s:%d" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "Okvarjena številka arh./op.sist.: %s (%s:%d)" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "Nepopolna privzeta vrstica v %s:%d" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "Preveč argumentov v privzeti vrstici v %s:%d" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "Ni možno razširiti %s" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "Ni možno prebrati %s, HOME je prevelik." -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "%s ni možno odpreti za branje: %s." #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "Neuspešno branje %s: %s." -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "manjkajoči ,:` (najden 0x%02x) v %s:%d" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "manjkajoči argument za %s v %s:%d" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "razširitev %s je bila neuspešna v %s:%d \"%s\"" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "ni možno odpreti %s v %s:%d: %s" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "manjkajoča arhitektura za %s v %s:%d" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "nepravilna izbira ,%s` v %s:%d" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "Neznan sistem: %s\n" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "Prosimo, pišite na rpm-list@redhat.com\n" @@ -4076,7 +4077,8 @@ msgid "Bad server response" msgstr "Nepravilen odziv strežnika" #: rpmio/rpmio.c:540 -msgid "Server IO error" +#, fuzzy +msgid "Server I/O error" msgstr "V/I napaka na strežniku" #: rpmio/rpmio.c:543 @@ -4100,7 +4102,8 @@ msgid "Failed to establish data connection to server" msgstr "Neuspešna vzpostavitev podatkovne povezave s strežnikom" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +#, fuzzy +msgid "I/O error to local file" msgstr "V/I napaka na lokalni datoteki" #: rpmio/rpmio.c:561 @@ -4271,6 +4274,9 @@ msgstr "neuspe msgid "failed to create %s: %s\n" msgstr "neuspešno ustvarjanje %s: %s\n" +#~ msgid " performing %s" +#~ msgstr " izvajanje %s" + #, fuzzy #~ msgid "" #~ " %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros " diff --git a/po/sr.po b/po/sr.po index 27bcad399..3da7c7e4f 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" "From: Erik Troan \n" @@ -537,7 +537,7 @@ msgid "" msgstr "" "proveri instalaciju paketa koristeći iste opcije za određenje paketa kao i -q" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "nemoj proveravati zavisnosti paketa" @@ -743,15 +743,15 @@ msgstr "binarni paket (priprema, kompilacija, instalacija, pakovanje)" msgid "bin/src package (prep, compile, install, package)" msgstr "bin/src paket (priprema, kompilacija, instalacija, pakovanje)" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "idi pravo do određene faze (samo za k,i)" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "ukloni stablo direktorijuma po završetku" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 #, fuzzy msgid "remove sources when done" msgstr "ukloni izvorne datoteke i datoteku specifikacije po završetku" @@ -761,7 +761,7 @@ msgstr "ukloni izvorne datoteke i datoteku specifikacije po zavr msgid "remove spec file when done" msgstr "ukloni izvorne datoteke i datoteku specifikacije po završetku" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 #, fuzzy msgid "generate PGP/GPG signature" msgstr "napravi PGP potpis" @@ -1256,7 +1256,7 @@ msgstr "rekreiraj bazu podataka iz postoje msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -2121,118 +2121,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, fuzzy, c-format msgid "Unable to open icon %s: %s" msgstr "Ne mogu da upišem %s" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, fuzzy, c-format msgid "Unable to read icon %s: %s" msgstr "Ne mogu da upišem %s" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, fuzzy, c-format msgid "Unknown icon type: %s" msgstr "(nepoznat tip)" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, fuzzy, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "neuspelo otvaranje %s: %s" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, fuzzy, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "premeštanja moraju početi znakom '/'" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, fuzzy, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "pogrešan broj paketa: %s\n" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, fuzzy, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "pogrešan broj paketa: %s\n" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, fuzzy, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "nedostaje arhitektura za %s na %s:%d" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Opcije odrednice paketa:" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2337,46 +2337,46 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, fuzzy, c-format msgid "line %d: %s" msgstr "neuspelo otvaranje %s: %s" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, fuzzy, c-format msgid "Unable to open %s: %s\n" msgstr "neuspelo otvaranje %s\n" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 #, fuzzy msgid "No buildable architectures" msgstr "nemoj proveravati arhitekturu paketa" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 #, fuzzy msgid "Package has no %%description: %s" msgstr "paket %s nije naveden u %s" @@ -2401,57 +2401,57 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "pogrešan broj paketa: %s\n" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "Neuspelo čitanje %s: %s." -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "greška: " -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 #, fuzzy msgid "Unknown file type" msgstr "(nepoznat tip)" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 #, fuzzy msgid "Internal error" msgstr "fatalna greška: " -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 #, fuzzy msgid " failed - " msgstr "PGP omanuo" @@ -2554,131 +2554,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, fuzzy, c-format msgid "bad db file %s" msgstr "neuspelo otvaranje %s: %s" -#: lib/db1.c:427 +#: lib/db1.c:426 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "rekreiraj bazu podataka iz postojeće baze" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "ne mogu da dobijem %s zaključavanje baze podataka" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "ekskluzivno" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "deljeno" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "rekreiraj bazu podataka iz postojeće baze" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ne mogu da dobijem %s zaključavanje baze podataka" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2689,7 +2689,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "(nije broj)" @@ -2718,94 +2718,94 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "nedostaje { posle %" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "nedostaje } posle %" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "prazan 'tag' format'" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "prazno ime tag-a" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "nepoznat tag" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "] očekivano na kraju niza" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "neočekivano ]" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "neočekivano }" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "očekivan znak ? u izrazu" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 #, fuzzy msgid "{ expected after ? in expression" msgstr "{ očekivano posle ? u izrazu" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "} očekivano u izrazu" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "očekivano : praćeno ? podizrazom" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 #, fuzzy msgid "{ expected after : in expression" msgstr "{ očekivano posle : u izrazu" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "| očekivano na kraju izraza" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "(nepoznat tip)" @@ -2827,93 +2827,93 @@ msgstr "grupa %s ne sadr #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 #, fuzzy msgid "installing a source package\n" msgstr "instaliraj paket" -#: lib/install.c:720 +#: lib/install.c:721 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, fuzzy, c-format msgid "cannot write to %s" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/install.c:760 +#: lib/install.c:761 #, fuzzy, c-format msgid "spec file in: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 #, fuzzy msgid "source package contains no .spec file" msgstr "upit nad paketom koji ima " -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "preimenovanje %s u %s nije uspelo: %s" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, 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:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 #, fuzzy msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "greška: preskačem %s - neuspelo prenošenje - %s\n" -#: lib/install.c:1062 +#: lib/install.c:1063 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/install.c:1098 +#: lib/install.c:1099 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2934,134 +2934,135 @@ msgid "" msgstr "samo paketi sa glavnim brojevima <= 3 su podržani u ovoj verziji RPM-a" #: lib/poptBT.c:94 -msgid "buildroot already specified" -msgstr "" +#, fuzzy, c-format +msgid "buildroot already specified, ignoring %s\n" +msgstr "Neuspelo čitanje %s: %s." -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "priprema (raspakuj izvorne datoteke i primeni zakrpe)" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 #, fuzzy msgid "build through %install (%prep, %build, then install) from " msgstr "instaliraj paket" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, fuzzy, c-format msgid "verify %files section from " msgstr "upit nad paketom koji ima " -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 #, fuzzy msgid "build source and binary packages from " msgstr "grupa %s ne sadrži nijedan paket\n" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 #, fuzzy msgid "build binary package only from " msgstr "upit nad paketom koji ima " -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 #, fuzzy msgid "build source package only from " msgstr "upit nad paketom koji ima " -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "priprema (raspakuj izvorne datoteke i primeni zakrpe)" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, fuzzy, c-format msgid "verify %files section from " msgstr "upit nad paketom koji ima " -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 #, fuzzy msgid "build source and binary packages from " msgstr "grupa %s ne sadrži nijedan paket\n" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 #, fuzzy msgid "build binary package only from " msgstr "grupa %s ne sadrži nijedan paket\n" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 #, fuzzy msgid "build source package only from " msgstr "napravi pakete za operativni sistem " -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 #, fuzzy msgid "build binary package from " msgstr "binarni paket (priprema, kompilacija, instalacija, pakovanje)" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 #, fuzzy msgid "" msgstr "upit nad svim paketima" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 #, fuzzy msgid "" "build through %install (%prep, %build, then install) from " msgstr "instaliraj paket" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 #, fuzzy msgid "override build root" msgstr "koristi kao korenski katalog kod kreiranja" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 #, fuzzy msgid "do not execute any stages of the build" msgstr "nemoj izvršiti nijednu fazu" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 #, fuzzy msgid "remove specfile when done" msgstr "ukloni izvorne datoteke i datoteku specifikacije po završetku" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3346,7 +3347,7 @@ msgstr "pogre msgid "record %d could not be read\n" msgstr "ne mogu da pročitam slog %d\n" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" @@ -3681,12 +3682,12 @@ msgstr "gre msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "greška: %s se ne može instalirati\n" @@ -3696,55 +3697,55 @@ msgstr "gre msgid "cannot open Packages database in %s\n" msgstr "greška: ne mogu da otvorim %s%s/packages.rpm\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "paket %s nije instaliran\n" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "greška kod kreiranja direktorijuma %s: %s" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "grupa %s ne sadrži nijedan paket\n" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "loše međuzavisnosti:\n" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 #, fuzzy msgid "installing binary packages\n" msgstr "instaliraj paket" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, fuzzy, c-format msgid "cannot open %s/packages.rpm\n" msgstr "greška: ne mogu da otvorim %s%s/packages.rpm\n" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" određuje više paketa\n" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "uklanjanje oviha paketa će narušiti zavisnosti:\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "greška: ne mogu da otvorim %s\n" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "Instaliram %s\n" @@ -3764,88 +3765,88 @@ msgstr "nedostaje drugo ':' na %s:%d" msgid "missing architecture name at %s:%d" msgstr "nedostaje ime arhitekture na %s:%d" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "Nepotpuna linija podataka na %s:%d" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "Premnogo argumenata u liniji podataka na %s:%d" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "Loš broj arhitekture/oper.sist.: %s (%s:%d)" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "Nepotpuna podrazumevana linija na %s:%d" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "Premnogo argumenata u podrazumevanoj liniji na %s:%d" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "Ne mogu da otvorim %s za čitanje: %s" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "Neuspelo čitanje %s: %s." -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, fuzzy, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "nedostaje ':' na %s:%d" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "nedostaje argument za %s na %s:%d" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "neuspelo otvaranje %s: %s" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, fuzzy, c-format msgid "cannot open %s at %s:%d: %s" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "nedostaje arhitektura za %s na %s:%d" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "loša opcija '%s' na %s:%d" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -4075,7 +4076,7 @@ msgstr "Lo #: rpmio/rpmio.c:540 #, fuzzy -msgid "Server IO error" +msgid "Server I/O error" msgstr "Ulazno/izlazna FTP greška" #: rpmio/rpmio.c:543 @@ -4104,7 +4105,8 @@ msgid "Failed to establish data connection to server" msgstr "Ne mogu da uspostavim vezu podataka sa FTP serverom" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +#, fuzzy +msgid "I/O error to local file" msgstr "Ulazno/izlazna greška kod lokalne datoteke" #: rpmio/rpmio.c:561 diff --git a/po/sv.po b/po/sv.po index 4c4fb3db7..d48dcdd30 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: 2000-10-09 22:31+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -515,7 +515,7 @@ msgid "" "options as -q" msgstr "verifiera ett pakets installation med samma urvalsflaggor som till -q" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "verifiera inte paketberoenden" @@ -716,15 +716,15 @@ msgstr "bin msgid "bin/src package (prep, compile, install, package)" msgstr "binär- och källpaketera (förbered, kompilera, installera, paketera)" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "gĺ direkt till angivet steg (endast för c,i)" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "ta bort tillverkningsträd efterĺt" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "ta bort källkod efterĺt" @@ -732,7 +732,7 @@ msgstr "ta bort k msgid "remove spec file when done" msgstr "ta bort spec-fil efterĺt" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "tillverka en PGP/GPG-signatur" @@ -1210,7 +1210,7 @@ msgstr "bygg om databasindex fr msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -2032,118 +2032,118 @@ msgstr "rad %d: Fel i parsning av %%files: %s" msgid "line %d: Second %%files list" msgstr "rad %d: En andra %%files-lista" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "Arkitekturen är utesluten: %s" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "Arkitekturen är inte medtagen: %s" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "OS är uteslutet: %s" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "OS är inte medtaget: %s" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "%s-fält mĺste finnas med i paketet: %s" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "Dubbla %s-poster i paketet: %s" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "Kan inte öppna ikon %s: %s" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "Kan inte läsa ikon %s: %s" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "Okänd ikontyp: %s" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "rad %d: Felaktig tagg: %s" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "rad %d: Tom tagg: %s" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "rad %d: Otillĺtet tecken \"-\" i %s: %s" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "BuildRoot kan inte vara \"/\": %s" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "rad %d: Prefix fĺr inte sluta med \"/\": %s" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "rad %d: Docdir mĺste börja med \"/\": %s" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "rad %d: Epoch/Serial-fält mĺste vara numeriskt: %s" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, fuzzy, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "rad %d: Felaktigt %s-tal: %s\n" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "rad %d: Felaktig BuildArchitecture-format: %s" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "Internt fel: felaktig tagg %d" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "Felaktig paketspecifikation: %s" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "Paketet existerar redan: %s" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "rad %d: Okänd tagg: %s" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "Spec-fil kan inte använda BuildRoot" @@ -2248,45 +2248,45 @@ msgstr "rad %d: skriptprogram m msgid "line %d: Second %s" msgstr "rad %d: En andra %s" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "rad %d: %s" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "Kan inte öppna %s: %s\n" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "Oavslutat %%if" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "%s:%d: parseExpressionBoolean returnerar %d" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "%s:%d: Fick ett %%else utan nĺgot if" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "%s:%d: Fick ett %%endif utan nĺgot if" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "felformaterad %%include-sats" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "Inga byggbara arkitekturer" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "Paketet har ingen %%description: %s" @@ -2310,55 +2310,55 @@ msgstr "rad %d: Felaktigt no%s-tal: %d" msgid "line %d: Bad %s number: %s\n" msgstr "rad %d: Felaktigt %s-tal: %s\n" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "kan inte flytta %s till %s: %s\n" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "kan inte ta bort %s: %s\n" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "getNextHeader: %s\n" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "(fel 0x%x)" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "Felaktigt magiskt tal" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "Felaktigt/oläsbart huvud" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "Huvudstorlek för stor" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "Okänd filtyp" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "Saknad hĺrdlänk" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "Internt fel" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr " misslyckades - " @@ -2462,131 +2462,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 -#, c-format -msgid "db%d error(%d)" +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 +#, fuzzy, c-format +msgid "db%d error(%d) from %s: %s\n" msgstr "db%d fel(%d)" -#: lib/db1.c:93 lib/db3.c:453 -#, c-format -msgid " performing %s" -msgstr " utför %s" +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 +#, fuzzy, c-format +msgid "db%d error(%d): %s\n" +msgstr "db%d fel(%d)" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "stängde db fil %s\n" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "tog bort db-fil %s\n" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "felaktig db-fil %s" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "öppnar db-fil %s rättighet 0x%x\n" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "kan inte fĺ %s lĺs pĺ databas" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "uteslutande" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "delat" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "stängde db-miljö %s/%s(%s)\n" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "tog bort db-miljö %s/%s(%s)\n" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "öppnar db-miljö %s/%s(%s) %s\n" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "stängde db-index %s/%s(%s)\n" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "öppnar db-index %s/%s(%s) %s mod=0x%x\n" -#: lib/db3.c:267 -#, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +#: lib/db3.c:268 +#, fuzzy, c-format +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "dbiSetConfig: okänd db-flagga: \"%s\" ignorerad\n" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s har ogiltigt ogiltigt numeriskt värde, hoppar över\n" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s har för stort eller för litet \"long\"-värde, hoppar över\n" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s har för stort eller för litet heltalsvärde, hoppar över\n" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "stängde db-miljö %s/%s\n" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "tar bort db-miljö %s/%s\n" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "öppnar db-miljö %s/%s %s\n" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "tog bort db-index %s/%s\n" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "öppnar db-index %s/%s %s rättighet=0x%x\n" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "kan inte fĺ %s lĺs pĺ %s/%s\n" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "lĺste db-index %s/%s\n" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2602,7 +2602,7 @@ msgstr "" "problemet.\n" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "(inte ett tal)" @@ -2631,93 +2631,93 @@ msgid "file %s is on an unknown device" msgstr "filen %s är pĺ en okänd enhet" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE mĺste vara 1.\n" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "Datatyp %d stöds inte\n" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "Felaktigt antal till headerAddEntry(): %d\n" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "{ fattas efter %" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "} fattas efter %{" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "tomt taggformat" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "tomt taggnamn" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "okänd tagg" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "] förväntades vid slutet pĺ vektor" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "oväntad ]" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "oväntad }" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "? förväntades i uttryck" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "{ förväntades efter ? i uttryck" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "} förväntades i uttryck" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr ": förväntades efter ? i deluttryck" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "{ förväntades efter : i uttryck" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "| förväntades vid slutet pĺ uttryck" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "(okänd typ)" @@ -2739,91 +2739,91 @@ msgstr "gruppen %s finns inte - anv #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "uppackning av arkiv misslyckades%s%s: %s" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr " vid fil " -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "installerar källpaket\n" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "kan inte skapa källkatalog %s" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "kan inte skriva till %s" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "källkod i: %s\n" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "kan inte skapa spec-katalog %s" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "spec-fil i: %s\n" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "källpaket innehĺller ingen spec-fil" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "byter namn pĺ %s till %s\n" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "namnbyte frĺn %s till %s misslyckades: %s" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "källpaket förväntades, fann binärpaket" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "paket: %s-%s-%s filtest = %d\n" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "avbryter installation eftersom vi kör --test\n" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "kör (eventuellt) preinstalltionsskript\n" -#: lib/install.c:1030 +#: lib/install.c:1031 #, fuzzy msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "hoppar över %s - överföring misslyckades - %s\n" -#: lib/install.c:1062 +#: lib/install.c:1063 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "varning: %s skapades som %s" -#: lib/install.c:1098 +#: lib/install.c:1099 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "varning: %s sparades som %s" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "kör (eventuellt) postinstallationsskript\n" @@ -2842,135 +2842,136 @@ msgid "" msgstr "endast paket med huvudnummer <= 4 stöds av denna version av RPM" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, fuzzy, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "buildroot redan specificerad" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "förbered (packa upp källkod samt applicera patchar)" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 #, fuzzy msgid "build through %build (%prep, then compile) from " msgstr "bygg till och med %%prep-steget frĺn spec-fil" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 #, fuzzy msgid "build through %install (%prep, %build, then install) from " msgstr "bygg till och med %%install-steget frĺn spec-fil" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, fuzzy, c-format msgid "verify %files section from " msgstr "verifiera %%files-sektionen i spec-fil" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 #, fuzzy msgid "build source and binary packages from " msgstr "bygg käll- och binärpaket frĺn spec-fil" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 #, fuzzy msgid "build binary package only from " msgstr "bygg binärpaket frĺn spec-fil" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 #, fuzzy msgid "build source package only from " msgstr "bygg källpaket frĺn spec-fil" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "förbered (packa upp källkod samt applicera patchar)" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 #, fuzzy msgid "build through %build (%prep, then compile) from " msgstr "bygg till och med %%prep-steget frĺn tar-arkiv" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 #, fuzzy msgid "build through %install (%prep, %build, then install) from " msgstr "bygg till och med %%install-steget frĺn tar-arkiv" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, fuzzy, c-format msgid "verify %files section from " msgstr "verifiera %%files-sektionen frĺn tar-arkiv" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 #, fuzzy msgid "build source and binary packages from " msgstr "bygg käll- och binärpaket frĺn tar-arkiv" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 #, fuzzy msgid "build binary package only from " msgstr "bygg binärpaket frĺn tar-arkiv" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 #, fuzzy msgid "build source package only from " msgstr "bygg källpaket frĺn tar-arkiv" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 #, fuzzy msgid "build binary package from " msgstr "bygg binärpaket frĺn källpaket" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 #, fuzzy msgid "" msgstr "inga paket\n" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 #, fuzzy msgid "" "build through %install (%prep, %build, then install) from " msgstr "bygg till och med %%install-steget frĺn källpaket" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "ĺsidosätt tillverkningsrot" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "utför inga steg i tillverkningen" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 #, fuzzy msgid "do not accept i18N msgstr's from specfile" msgstr "acceptera inte översatta \"msgstr\" frĺn spec-filen" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "ta bort spec-fil efterĺt" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "ĺsidosätt mĺlplattform" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 #, fuzzy msgid "lookup i18N strings in specfile catalog" msgstr "slĺ upp översatta strängar i spec-fil katalog" @@ -3246,7 +3247,7 @@ msgstr "paketpost nummer: %u\n" msgid "record %d could not be read\n" msgstr "post %d kunde inte läsas\n" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" @@ -3603,12 +3604,12 @@ msgstr "hoppar msgid "retrieved %d packages\n" msgstr "hämtade %d paket\n" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "kan inte öppna filen %s: %s\n" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "%s kan inte installeras\n" @@ -3618,54 +3619,54 @@ msgstr "%s kan inte installeras\n" msgid "cannot open Packages database in %s\n" msgstr "kan inte öppna paketdatabas i %s\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "paket %s är inte relokerbart\n" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "fel vid läsning frĺn fil %s\n" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "filen %s behöver en nyare version av RPM\n" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "hittade %d käll- och %d binärpaket\n" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "ouppfyllda beroenden:\n" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "installerar binärpaket\n" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "kan inte öppna %s/packages.rpm\n" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" anger flera paket\n" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "Installerar %s\n" @@ -3685,88 +3686,88 @@ msgstr "andra \":\" saknas vid %s:%d" msgid "missing architecture name at %s:%d" msgstr "arkitekturnamn saknas vid %s:%d" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "Ofullständig datarad vid %s:%d" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "För mĺnga argument i datarad vid %s:%d" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "Felaktigt arkitektur-/osnummer: %s (%s:%d)" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "Ofullständig skönsfallsrad vid %s:%d" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "För mĺnga argument i skönsfallsrad vid %s:%d" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "Kan inte expandera %s" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "Kan inte läsa %s, HOME är för stor." -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "Kan inte öppna %s för läsning: %s." #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "Misslyckades med att läsa %s: %s." -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "\":\" saknas (hittade 0x%02x) vid %s:%d" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "argument till %s saknas vid %s:%d" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "%s expansion misslyckades vid %s:%d \"%s\"" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "kan inte öppna %s vid %s:%d: %s" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "arkitektur saknas för %s vid %s:%d" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "okänd flagga \"%s\" vid %s:%d" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "Okänt system: %s\n" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "Var god kontakta rpm-list@redhat.com\n" @@ -3985,7 +3986,8 @@ msgid "Bad server response" msgstr "Konstigt svar frĺn server" #: rpmio/rpmio.c:540 -msgid "Server IO error" +#, fuzzy +msgid "Server I/O error" msgstr "IO-fel mot server" #: rpmio/rpmio.c:543 @@ -4009,7 +4011,8 @@ msgid "Failed to establish data connection to server" msgstr "Misslyckades med att etablera en dataförbindelse till servern" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +#, fuzzy +msgid "I/O error to local file" msgstr "IO-fel mot lokal fil" #: rpmio/rpmio.c:561 @@ -4180,6 +4183,9 @@ msgstr "kunde inte msgid "failed to create %s: %s\n" msgstr "kunde inte skapa %s: %s\n" +#~ msgid " performing %s" +#~ msgstr " utför %s" + #, fuzzy #~ msgid "" #~ " %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros " diff --git a/po/tr.po b/po/tr.po index 5c140b6bf..263aec903 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -575,7 +575,7 @@ msgid "" "options as -q" msgstr "paketi -q ile belirtilen paket parametrelerini kullanarak dođrula" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "paket bađýmlýlýklarýný dođrulamaz" @@ -784,15 +784,15 @@ msgstr "" "çalýţtýrýlabilir ve Kaynak paket yaratmak (hazýrlama, derleme, yükleme " "vepaketleme)" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "dođrudan belirtilen adýma atlar (sadece c ve i için)" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "iţlem sonunda paket yaratma yapýsýný siler" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 #, fuzzy msgid "remove sources when done" msgstr "iţlem sonunda kaynaklarý ve spec dosyasýný siler" @@ -802,7 +802,7 @@ msgstr "i msgid "remove spec file when done" msgstr "iţlem sonunda kaynaklarý ve spec dosyasýný siler" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 #, fuzzy msgid "generate PGP/GPG signature" msgstr "PGP-imzasý yaratýr" @@ -1296,7 +1296,7 @@ msgstr "mevcut veritaban msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -2168,118 +2168,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, fuzzy, c-format msgid "Unable to open icon %s: %s" msgstr "%s 'nin yazýlmasý mümkün deđil" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, fuzzy, c-format msgid "Unable to read icon %s: %s" msgstr "%s 'nin yazýlmasý mümkün deđil" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, fuzzy, c-format msgid "Unknown icon type: %s" msgstr "(bilinmeyen tip)" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, fuzzy, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "%s açýlamadý: %s" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, fuzzy, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "relocate iţlemi / ile baţlamalý" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, fuzzy, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "geçersiz paket numarsý: %s\n" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, fuzzy, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "geçersiz paket numarsý: %s\n" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, fuzzy, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "%s için %s te eksik mimari:%d" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Paket seçim seçenekleri:" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2384,47 +2384,47 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, fuzzy, c-format msgid "line %d: %s" msgstr "%s açýlamadý: %s" # , c-format #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, fuzzy, c-format msgid "Unable to open %s: %s\n" msgstr "%s 'ye eriţimde hata oluţtu\n" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 #, fuzzy msgid "No buildable architectures" msgstr "paket mimarisini dođrulamaz" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 #, fuzzy msgid "Package has no %%description: %s" msgstr "%s paketi %s altýnda gözükmüyor" @@ -2449,57 +2449,57 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "geçersiz paket numarsý: %s\n" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "%s okunamadý: %s" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "hata: " -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 #, fuzzy msgid "Unknown file type" msgstr "(bilinmeyen tip)" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 #, fuzzy msgid "Internal error" msgstr "ölümcül hata: " -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 #, fuzzy msgid " failed - " msgstr "PGP hata verdi" @@ -2602,131 +2602,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, fuzzy, c-format msgid "bad db file %s" msgstr "%s açýlamadý: %s" -#: lib/db1.c:427 +#: lib/db1.c:426 #, fuzzy, c-format msgid "opening db file %s mode 0x%x\n" msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluţturur" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "Veritabaný için %s kilit (lock) alýnamadý" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "özel" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "paylaţýlan (shared)" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluţturur" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "Veritabaný için %s kilit (lock) alýnamadý" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2737,7 +2737,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "(üye deđil)" @@ -2766,94 +2766,94 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "% den sonra eksik {" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "%{ den sonra eksik }" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "boţ tag tanýmlamasý" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "boţ tag ismi" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "bilinmeyen tag" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "dizinin sonunda ] bekleniyordu" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "beklenmeyen ]" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "beklenmeyen }" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "dizi içerisinde ? bekleniyordu" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 #, fuzzy msgid "{ expected after ? in expression" msgstr "dizi içerisinde ? den sonra { bekleniyordu" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "dizi içerisinde } bekleniyordu" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "? altdizisinden sonra : bekleniyordu" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 #, fuzzy msgid "{ expected after : in expression" msgstr "dizide : den sonra { bekleniyordu" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "dizinin sonunda | bekleniyordu" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "(bilinmeyen tip)" @@ -2875,93 +2875,93 @@ msgstr "%s grubu hi #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 #, fuzzy msgid "installing a source package\n" msgstr "paket yüklemek" -#: lib/install.c:720 +#: lib/install.c:721 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "%s dosyasý açýlamýyor: " -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, fuzzy, c-format msgid "cannot write to %s" msgstr "%s dosyasý açýlamýyor: " -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "%s dosyasý açýlamýyor: " -#: lib/install.c:760 +#: lib/install.c:761 #, fuzzy, c-format msgid "spec file in: %s\n" msgstr "%s açýlamadý: %s" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 #, fuzzy msgid "source package contains no .spec file" msgstr " isimli dosyayý içeren paketi sorgulamak" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, 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:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, 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:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 #, fuzzy msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "hata: %s atlanýyor - aktarým baţarýsýz - %s\n" -#: lib/install.c:1062 +#: lib/install.c:1063 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "%s dosyasý açýlamýyor: " -#: lib/install.c:1098 +#: lib/install.c:1099 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "%s dosyasý açýlamýyor: " -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2984,135 +2984,136 @@ msgstr "" "RPM'in bu sürümünde sadece major numarasý <= 3 olan paketler destekleniyor" #: lib/poptBT.c:94 -msgid "buildroot already specified" -msgstr "" +#, fuzzy, c-format +msgid "buildroot already specified, ignoring %s\n" +msgstr "%s okunamadý: %s" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "hazýrlama (kaynaklar açýlýr ve yamalar uygulanýr)" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 #, fuzzy msgid "build through %install (%prep, %build, then install) from " msgstr "paket yüklemek" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, fuzzy, c-format msgid "verify %files section from " msgstr " isimli dosyayý içeren paketi sorgulamak" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 #, fuzzy msgid "build source and binary packages from " msgstr "%s grubu hiç paket içermiyor\n" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 #, fuzzy msgid "build binary package only from " msgstr " isimli dosyayý içeren paketi sorgulamak" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 #, fuzzy msgid "build source package only from " msgstr " isimli dosyayý içeren paketi sorgulamak" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, fuzzy, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "hazýrlama (kaynaklar açýlýr ve yamalar uygulanýr)" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, fuzzy, c-format msgid "verify %files section from " msgstr " isimli dosyayý içeren paketi sorgulamak" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 #, fuzzy msgid "build source and binary packages from " msgstr "%s grubu hiç paket içermiyor\n" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 #, fuzzy msgid "build binary package only from " msgstr "%s grubu hiç paket içermiyor\n" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 #, fuzzy msgid "build source package only from " msgstr "paketleri iţletim sistemi için oluţturur" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 #, fuzzy msgid "build binary package from " msgstr "" "çalýţtýrýlabilir paket yaratma (hazýrlama, derleme, yükleme, paketleme)" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 #, fuzzy msgid "" msgstr "Tüm paketleri sorgulama" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 #, fuzzy msgid "" "build through %install (%prep, %build, then install) from " msgstr "paket yüklemek" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 #, fuzzy msgid "override build root" msgstr "paket yaratýlýrken baţlangýç dizini olarak kullanýlýr" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 #, fuzzy msgid "do not execute any stages of the build" msgstr "adýmlarýn hiçbirini çalýţtýrmaz" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 #, fuzzy msgid "remove specfile when done" msgstr "iţlem sonunda kaynaklarý ve spec dosyasýný siler" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3398,7 +3399,7 @@ msgstr "ge msgid "record %d could not be read\n" msgstr "%d numaralý kayýt okunamadý\n" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "%s pakedi yüklenmemiţ\n" @@ -3733,12 +3734,12 @@ msgstr "hata: %s atlan msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "%s dosyasý açýlamýyor: " -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "hata: %s yüklenemedi\n" @@ -3748,55 +3749,55 @@ msgstr "hata: %s y msgid "cannot open Packages database in %s\n" msgstr "hata: %s%s/packages.rpm açýlamýyor\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "%s pakedi yüklenmemiţ\n" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "%s dizinin oluţturulmasýnda hata: %s" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "%s grubu hiç paket içermiyor\n" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "bađýmlýlýk hatasý, aţađýdaki paketlere ihtiyacýnýz var:\n" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 #, fuzzy msgid "installing binary packages\n" msgstr "paket yüklemek" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, fuzzy, c-format msgid "cannot open %s/packages.rpm\n" msgstr "hata: %s%s/packages.rpm açýlamýyor\n" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" birden fazla paketi tanýmlýyor\n" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "bu paketin silinmesi aţađýdaki bađýmlýlýklarý etkileyecektir:\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "hata: %s eriţilemiyor\n" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "%s yükleniyor\n" @@ -3816,88 +3817,88 @@ msgstr "%s te ikinci ':' eksik:%d" msgid "missing architecture name at %s:%d" msgstr "%s te eksik mimari tanýmlamasý:%d" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "%s te eksik data satýrý:%d" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "%s te data satýrýnda çok fazla argüman:%d" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "Kötü arch/os numarasý %s: (%s:%d)" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "%s te eksik default satýrý:%d" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "%s te default satýrýnda çok fazla argüman:%d" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "%s okuma eriţimi için açýlamadý:%s." #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "%s okunamadý: %s" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, fuzzy, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "%s te eksik ':' :%d" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "%s için %s te eksik argüman :%d" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "%s açýlamadý: %s" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, fuzzy, c-format msgid "cannot open %s at %s:%d: %s" msgstr "%s dosyasý açýlamýyor: " -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "%s için %s te eksik mimari:%d" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "%s geçersiz seçenek %s:%d" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -4127,7 +4128,7 @@ msgstr "FTP sunucusundan k #: rpmio/rpmio.c:540 #, fuzzy -msgid "Server IO error" +msgid "Server I/O error" msgstr "FTP I/O hatasý" #: rpmio/rpmio.c:543 @@ -4156,7 +4157,8 @@ msgid "Failed to establish data connection to server" msgstr "FTP sunucusu ile veri alýţveriţi yapýlamadý" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +#, fuzzy +msgid "I/O error to local file" msgstr "Yerel dosyaya eriţim sýrasýnda I/O hatasý" #: rpmio/rpmio.c:561 diff --git a/po/uk.po b/po/uk.po index 8faba4c22..7a658b4e6 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -503,7 +503,7 @@ msgid "" "options as -q" msgstr "" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "" @@ -697,15 +697,15 @@ msgstr "" msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "" @@ -713,7 +713,7 @@ msgstr "" msgid "remove spec file when done" msgstr "" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "" @@ -1170,7 +1170,7 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -1972,118 +1972,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2188,45 +2188,45 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "" @@ -2250,55 +2250,55 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr "" @@ -2400,131 +2400,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2535,7 +2535,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "" @@ -2564,92 +2564,92 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "" @@ -2671,90 +2671,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 #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "" -#: lib/install.c:1062 +#: lib/install.c:1063 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/install.c:1098 +#: lib/install.c:1099 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2773,121 +2773,122 @@ msgid "" msgstr "" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 msgid "build binary package from " msgstr "" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 msgid "" msgstr "" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 msgid "" "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3153,7 +3154,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3483,12 +3484,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -3498,54 +3499,54 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "" @@ -3565,88 +3566,88 @@ msgstr "" msgid "missing architecture name at %s:%d" msgstr "" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3862,7 +3863,7 @@ msgid "Bad server response" msgstr "" #: rpmio/rpmio.c:540 -msgid "Server IO error" +msgid "Server I/O error" msgstr "" #: rpmio/rpmio.c:543 @@ -3886,7 +3887,7 @@ msgid "Failed to establish data connection to server" msgstr "" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +msgid "I/O error to local file" msgstr "" #: rpmio/rpmio.c:561 diff --git a/po/wa.po b/po/wa.po index 8faba4c22..7a658b4e6 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -503,7 +503,7 @@ msgid "" "options as -q" msgstr "" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "" @@ -697,15 +697,15 @@ msgstr "" msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "" @@ -713,7 +713,7 @@ msgstr "" msgid "remove spec file when done" msgstr "" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "" @@ -1170,7 +1170,7 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -1972,118 +1972,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2188,45 +2188,45 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "" @@ -2250,55 +2250,55 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr "" @@ -2400,131 +2400,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2535,7 +2535,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "" @@ -2564,92 +2564,92 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "" @@ -2671,90 +2671,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 #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "" -#: lib/install.c:1062 +#: lib/install.c:1063 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/install.c:1098 +#: lib/install.c:1099 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2773,121 +2773,122 @@ msgid "" msgstr "" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 msgid "build binary package from " msgstr "" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 msgid "" msgstr "" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 msgid "" "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3153,7 +3154,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3483,12 +3484,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -3498,54 +3499,54 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "" @@ -3565,88 +3566,88 @@ msgstr "" msgid "missing architecture name at %s:%d" msgstr "" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3862,7 +3863,7 @@ msgid "Bad server response" msgstr "" #: rpmio/rpmio.c:540 -msgid "Server IO error" +msgid "Server I/O error" msgstr "" #: rpmio/rpmio.c:543 @@ -3886,7 +3887,7 @@ msgid "Failed to establish data connection to server" msgstr "" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +msgid "I/O error to local file" msgstr "" #: rpmio/rpmio.c:561 diff --git a/po/zh.po b/po/zh.po index 8faba4c22..7a658b4e6 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -503,7 +503,7 @@ msgid "" "options as -q" msgstr "" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "" @@ -697,15 +697,15 @@ msgstr "" msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "" @@ -713,7 +713,7 @@ msgstr "" msgid "remove spec file when done" msgstr "" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "" @@ -1170,7 +1170,7 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -1972,118 +1972,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2188,45 +2188,45 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "" @@ -2250,55 +2250,55 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr "" @@ -2400,131 +2400,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2535,7 +2535,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "" @@ -2564,92 +2564,92 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "" @@ -2671,90 +2671,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 #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "" -#: lib/install.c:1062 +#: lib/install.c:1063 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/install.c:1098 +#: lib/install.c:1099 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2773,121 +2773,122 @@ msgid "" msgstr "" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 msgid "build binary package from " msgstr "" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 msgid "" msgstr "" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 msgid "" "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3153,7 +3154,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3483,12 +3484,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -3498,54 +3499,54 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "" @@ -3565,88 +3566,88 @@ msgstr "" msgid "missing architecture name at %s:%d" msgstr "" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3862,7 +3863,7 @@ msgid "Bad server response" msgstr "" #: rpmio/rpmio.c:540 -msgid "Server IO error" +msgid "Server I/O error" msgstr "" #: rpmio/rpmio.c:543 @@ -3886,7 +3887,7 @@ msgid "Failed to establish data connection to server" msgstr "" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +msgid "I/O error to local file" msgstr "" #: rpmio/rpmio.c:561 diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 8faba4c22..7a658b4e6 100644 --- a/po/zh_CN.GB2312.po +++ b/po/zh_CN.GB2312.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-01 19:44-0500\n" +"POT-Creation-Date: 2001-01-03 14:05-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -503,7 +503,7 @@ msgid "" "options as -q" msgstr "" -#: lib/poptBT.c:181 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 +#: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291 #: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677 msgid "do not verify package dependencies" msgstr "" @@ -697,15 +697,15 @@ msgstr "" msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: lib/poptBT.c:192 rpm.c:480 +#: lib/poptBT.c:191 rpm.c:480 msgid "skip straight to specified stage (only for c,i)" msgstr "" -#: lib/poptBT.c:173 rpm.c:482 +#: lib/poptBT.c:172 rpm.c:482 msgid "remove build tree when done" msgstr "" -#: lib/poptBT.c:188 rpm.c:484 +#: lib/poptBT.c:187 rpm.c:484 msgid "remove sources when done" msgstr "" @@ -713,7 +713,7 @@ msgstr "" msgid "remove spec file when done" msgstr "" -#: lib/poptBT.c:194 rpm.c:488 rpmqv.c:224 +#: lib/poptBT.c:193 rpm.c:488 rpmqv.c:224 msgid "generate PGP/GPG signature" msgstr "" @@ -1170,7 +1170,7 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:175 rpmqv.c:208 +#: lib/poptBT.c:174 rpmqv.c:208 msgid "generate headers compatible with rpm4 packaging" msgstr "" @@ -1972,118 +1972,118 @@ msgstr "" msgid "line %d: Second %%files list" msgstr "" -#: build/parsePreamble.c:203 +#: build/parsePreamble.c:189 #, c-format msgid "Architecture is excluded: %s" msgstr "" -#: build/parsePreamble.c:208 +#: build/parsePreamble.c:194 #, c-format msgid "Architecture is not included: %s" msgstr "" -#: build/parsePreamble.c:213 +#: build/parsePreamble.c:199 #, c-format msgid "OS is excluded: %s" msgstr "" -#: build/parsePreamble.c:218 +#: build/parsePreamble.c:204 #, c-format msgid "OS is not included: %s" msgstr "" -#: build/parsePreamble.c:232 +#: build/parsePreamble.c:218 #, c-format msgid "%s field must be present in package: %s" msgstr "" -#: build/parsePreamble.c:257 +#: build/parsePreamble.c:243 #, c-format msgid "Duplicate %s entries in package: %s" msgstr "" -#: build/parsePreamble.c:305 +#: build/parsePreamble.c:291 #, c-format msgid "Unable to open icon %s: %s" msgstr "" -#: build/parsePreamble.c:323 +#: build/parsePreamble.c:309 #, c-format msgid "Unable to read icon %s: %s" msgstr "" -#: build/parsePreamble.c:336 +#: build/parsePreamble.c:322 #, c-format msgid "Unknown icon type: %s" msgstr "" -#: build/parsePreamble.c:402 +#: build/parsePreamble.c:388 #, c-format msgid "line %d: Malformed tag: %s" msgstr "" #. Empty field -#: build/parsePreamble.c:410 +#: build/parsePreamble.c:396 #, c-format msgid "line %d: Empty tag: %s" msgstr "" -#: build/parsePreamble.c:432 build/parsePreamble.c:439 +#: build/parsePreamble.c:418 build/parsePreamble.c:425 #, c-format msgid "line %d: Illegal char '-' in %s: %s" msgstr "" -#: build/parsePreamble.c:496 build/parseSpec.c:379 +#: build/parsePreamble.c:482 build/parseSpec.c:374 #, c-format msgid "BuildRoot can not be \"/\": %s" msgstr "" -#: build/parsePreamble.c:509 +#: build/parsePreamble.c:495 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: build/parsePreamble.c:521 +#: build/parsePreamble.c:507 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "" -#: build/parsePreamble.c:533 +#: build/parsePreamble.c:519 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:573 build/parsePreamble.c:584 +#: build/parsePreamble.c:559 build/parsePreamble.c:570 #, c-format msgid "line %d: Bad %s: qualifiers: %s" msgstr "" -#: build/parsePreamble.c:610 +#: build/parsePreamble.c:596 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:619 +#: build/parsePreamble.c:605 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:757 +#: build/parsePreamble.c:743 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:763 +#: build/parsePreamble.c:749 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:788 +#: build/parsePreamble.c:774 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:810 +#: build/parsePreamble.c:796 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2188,45 +2188,45 @@ msgstr "" msgid "line %d: Second %s" msgstr "" -#: build/parseSpec.c:133 +#: build/parseSpec.c:128 #, c-format msgid "line %d: %s" msgstr "" #. XXX Fstrerror -#: build/parseSpec.c:181 +#: build/parseSpec.c:176 #, c-format msgid "Unable to open %s: %s\n" msgstr "" -#: build/parseSpec.c:193 +#: build/parseSpec.c:188 msgid "Unclosed %%if" msgstr "" -#: build/parseSpec.c:264 +#: build/parseSpec.c:259 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d" msgstr "" #. Got an else with no %if ! -#: build/parseSpec.c:272 +#: build/parseSpec.c:267 msgid "%s:%d: Got a %%else with no if" msgstr "" #. Got an end with no %if ! -#: build/parseSpec.c:283 +#: build/parseSpec.c:278 msgid "%s:%d: Got a %%endif with no if" msgstr "" -#: build/parseSpec.c:297 build/parseSpec.c:306 +#: build/parseSpec.c:292 build/parseSpec.c:301 msgid "malformed %%include statement" msgstr "" -#: build/parseSpec.c:485 +#: build/parseSpec.c:480 msgid "No buildable architectures" msgstr "" -#: build/parseSpec.c:540 +#: build/parseSpec.c:535 msgid "Package has no %%description: %s" msgstr "" @@ -2250,55 +2250,55 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:444 +#: lib/cpio.c:445 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:450 +#: lib/cpio.c:451 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:757 +#: lib/cpio.c:758 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1243 +#: lib/cpio.c:1245 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1246 +#: lib/cpio.c:1248 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1247 +#: lib/cpio.c:1249 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1265 +#: lib/cpio.c:1267 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1266 +#: lib/cpio.c:1268 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1267 +#: lib/cpio.c:1269 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1268 +#: lib/cpio.c:1270 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:1269 +#: lib/cpio.c:1271 msgid "Internal error" msgstr "" -#: lib/cpio.c:1278 +#: lib/cpio.c:1280 msgid " failed - " msgstr "" @@ -2400,131 +2400,131 @@ msgstr "" msgid "========== continuing tsort ...\n" msgstr "" -#: lib/db1.c:91 lib/db3.c:451 +#: lib/db1.c:92 lib/db2.c:112 lib/db3.c:456 #, c-format -msgid "db%d error(%d)" +msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: lib/db1.c:93 lib/db3.c:453 +#: lib/db1.c:95 lib/db2.c:115 lib/db3.c:459 #, c-format -msgid " performing %s" +msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:388 +#: lib/db1.c:387 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:391 +#: lib/db1.c:390 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:422 +#: lib/db1.c:421 #, c-format msgid "bad db file %s" msgstr "" -#: lib/db1.c:427 +#: lib/db1.c:426 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" #. XXX check errno validity -#: lib/db1.c:450 +#: lib/db1.c:449 #, c-format msgid "cannot get %s lock on database" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "exclusive" msgstr "" -#: lib/db1.c:451 lib/db3.c:1114 +#: lib/db1.c:450 lib/db3.c:1120 msgid "shared" msgstr "" -#: lib/db2.c:137 +#: lib/db2.c:141 #, c-format msgid "closed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:149 +#: lib/db2.c:153 #, c-format msgid "removed db environment %s/%s(%s)\n" msgstr "" -#: lib/db2.c:186 +#: lib/db2.c:190 #, c-format msgid "opening db environment %s/%s(%s) %s\n" msgstr "" -#: lib/db2.c:561 +#: lib/db2.c:565 #, c-format msgid "closed db index %s/%s(%s)\n" msgstr "" -#: lib/db2.c:639 +#: lib/db2.c:643 #, c-format msgid "opening db index %s/%s(%s) %s mode=0x%x\n" msgstr "" -#: lib/db3.c:267 +#: lib/db3.c:268 #, c-format -msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n" +msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/db3.c:295 +#: lib/db3.c:297 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/db3.c:303 +#: lib/db3.c:306 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/db3.c:311 +#: lib/db3.c:315 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: lib/db3.c:478 +#: lib/db3.c:484 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db3.c:494 +#: lib/db3.c:500 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db3.c:531 +#: lib/db3.c:537 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db3.c:917 +#: lib/db3.c:923 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db3.c:1007 +#: lib/db3.c:1013 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: lib/db3.c:1112 +#: lib/db3.c:1118 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: lib/db3.c:1119 +#: lib/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/falloc.c:140 +#: lib/falloc.c:141 #, c-format msgid "" "free list corrupt (%u)- please run\n" @@ -2535,7 +2535,7 @@ msgid "" msgstr "" #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182 -#: lib/header.c:2569 lib/header.c:2586 lib/header.c:2606 +#: lib/header.c:2519 lib/header.c:2536 lib/header.c:2556 msgid "(not a number)" msgstr "" @@ -2564,92 +2564,92 @@ msgid "file %s is on an unknown device" msgstr "" #. This should not be allowed -#: lib/header.c:220 +#: lib/header.c:172 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:255 lib/header.c:1052 lib/install.c:365 +#: lib/header.c:207 lib/header.c:1004 lib/install.c:365 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1477 +#: lib/header.c:1427 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1922 +#: lib/header.c:1872 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:1952 +#: lib/header.c:1902 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:1966 +#: lib/header.c:1916 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:1978 +#: lib/header.c:1928 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:1995 +#: lib/header.c:1945 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2022 +#: lib/header.c:1972 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2040 +#: lib/header.c:1990 msgid "unexpected ]" msgstr "" #. @-observertrans@ -#: lib/header.c:2044 +#: lib/header.c:1994 msgid "unexpected }" msgstr "" #. @-observertrans@ -#: lib/header.c:2104 +#: lib/header.c:2054 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2113 +#: lib/header.c:2063 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2126 lib/header.c:2167 +#: lib/header.c:2076 lib/header.c:2117 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2136 +#: lib/header.c:2086 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2152 +#: lib/header.c:2102 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2127 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2348 +#: lib/header.c:2298 msgid "(unknown type)" msgstr "" @@ -2671,90 +2671,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 #. XXX FIXME: Fclose with libio destroys errno -#: lib/install.c:650 +#: lib/install.c:651 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:651 +#: lib/install.c:652 msgid " on file " msgstr "" -#: lib/install.c:700 +#: lib/install.c:701 msgid "installing a source package\n" msgstr "" -#: lib/install.c:720 +#: lib/install.c:721 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:726 lib/install.c:756 +#: lib/install.c:727 lib/install.c:757 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:730 +#: lib/install.c:731 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:750 +#: lib/install.c:751 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:760 +#: lib/install.c:761 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:792 lib/install.c:820 +#: lib/install.c:793 lib/install.c:821 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:838 +#: lib/install.c:839 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:840 lib/install.c:1102 lib/uninstall.c:60 +#: lib/install.c:841 lib/install.c:1103 lib/uninstall.c:60 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:930 +#: lib/install.c:931 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:974 +#: lib/install.c:975 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:1018 +#: lib/install.c:1019 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:1023 +#: lib/install.c:1024 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:1030 +#: lib/install.c:1031 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" msgstr "" -#: lib/install.c:1062 +#: lib/install.c:1063 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/install.c:1098 +#: lib/install.c:1099 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/install.c:1189 +#: lib/install.c:1193 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2773,121 +2773,122 @@ msgid "" msgstr "" #: lib/poptBT.c:94 -msgid "buildroot already specified" +#, c-format +msgid "buildroot already specified, ignoring %s\n" msgstr "" -#: lib/poptBT.c:120 +#: lib/poptBT.c:119 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:121 lib/poptBT.c:124 lib/poptBT.c:127 lib/poptBT.c:130 -#: lib/poptBT.c:133 lib/poptBT.c:136 lib/poptBT.c:139 +#: lib/poptBT.c:120 lib/poptBT.c:123 lib/poptBT.c:126 lib/poptBT.c:129 +#: lib/poptBT.c:132 lib/poptBT.c:135 lib/poptBT.c:138 msgid "" msgstr "" -#: lib/poptBT.c:123 +#: lib/poptBT.c:122 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:126 +#: lib/poptBT.c:125 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:129 +#: lib/poptBT.c:128 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:132 +#: lib/poptBT.c:131 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:135 +#: lib/poptBT.c:134 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:138 +#: lib/poptBT.c:137 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:142 +#: lib/poptBT.c:141 #, c-format msgid "build through %prep (unpack sources and apply patches) from " msgstr "" -#: lib/poptBT.c:143 lib/poptBT.c:146 lib/poptBT.c:149 lib/poptBT.c:152 -#: lib/poptBT.c:155 lib/poptBT.c:158 lib/poptBT.c:161 +#: lib/poptBT.c:142 lib/poptBT.c:145 lib/poptBT.c:148 lib/poptBT.c:151 +#: lib/poptBT.c:154 lib/poptBT.c:157 lib/poptBT.c:160 msgid "" msgstr "" -#: lib/poptBT.c:145 +#: lib/poptBT.c:144 msgid "build through %build (%prep, then compile) from " msgstr "" -#: lib/poptBT.c:148 +#: lib/poptBT.c:147 msgid "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:151 +#: lib/poptBT.c:150 #, c-format msgid "verify %files section from " msgstr "" -#: lib/poptBT.c:154 +#: lib/poptBT.c:153 msgid "build source and binary packages from " msgstr "" -#: lib/poptBT.c:157 +#: lib/poptBT.c:156 msgid "build binary package only from " msgstr "" -#: lib/poptBT.c:160 +#: lib/poptBT.c:159 msgid "build source package only from " msgstr "" -#: lib/poptBT.c:164 +#: lib/poptBT.c:163 msgid "build binary package from " msgstr "" -#: lib/poptBT.c:165 lib/poptBT.c:168 +#: lib/poptBT.c:164 lib/poptBT.c:167 msgid "" msgstr "" -#: lib/poptBT.c:167 +#: lib/poptBT.c:166 msgid "" "build through %install (%prep, %build, then install) from " msgstr "" -#: lib/poptBT.c:171 +#: lib/poptBT.c:170 msgid "override build root" msgstr "" -#: lib/poptBT.c:177 +#: lib/poptBT.c:176 msgid "ignore ExcludeArch: directives from spec file" msgstr "" -#: lib/poptBT.c:179 +#: lib/poptBT.c:178 msgid "do not execute any stages of the build" msgstr "" -#: lib/poptBT.c:183 +#: lib/poptBT.c:182 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:186 +#: lib/poptBT.c:185 msgid "do not accept i18N msgstr's from specfile" msgstr "" -#: lib/poptBT.c:190 +#: lib/poptBT.c:189 msgid "remove specfile when done" msgstr "" -#: lib/poptBT.c:196 +#: lib/poptBT.c:195 msgid "override target platform" msgstr "" -#: lib/poptBT.c:198 +#: lib/poptBT.c:197 msgid "lookup i18N strings in specfile catalog" msgstr "" @@ -3153,7 +3154,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:746 lib/rpminstall.c:546 +#: lib/query.c:746 lib/rpminstall.c:548 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3483,12 +3484,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:298 lib/rpminstall.c:470 +#: lib/rpminstall.c:298 lib/rpminstall.c:472 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:316 lib/rpminstall.c:611 +#: lib/rpminstall.c:316 lib/rpminstall.c:613 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -3498,54 +3499,54 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:353 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:396 +#: lib/rpminstall.c:398 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:401 +#: lib/rpminstall.c:403 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:420 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:429 +#: lib/rpminstall.c:431 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:450 +#: lib/rpminstall.c:452 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:533 +#: lib/rpminstall.c:535 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" -#: lib/rpminstall.c:549 +#: lib/rpminstall.c:551 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:572 +#: lib/rpminstall.c:574 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:602 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:606 +#: lib/rpminstall.c:608 #, c-format msgid "Installing %s\n" msgstr "" @@ -3565,88 +3566,88 @@ msgstr "" msgid "missing architecture name at %s:%d" msgstr "" -#: lib/rpmrc.c:313 +#: lib/rpmrc.c:305 #, c-format msgid "Incomplete data line at %s:%d" msgstr "" -#: lib/rpmrc.c:317 +#: lib/rpmrc.c:309 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: lib/rpmrc.c:324 +#: lib/rpmrc.c:316 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: lib/rpmrc.c:359 +#: lib/rpmrc.c:351 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: lib/rpmrc.c:364 +#: lib/rpmrc.c:356 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: lib/rpmrc.c:554 +#: lib/rpmrc.c:546 #, c-format msgid "Cannot expand %s" msgstr "" -#: lib/rpmrc.c:559 +#: lib/rpmrc.c:551 #, c-format msgid "Cannot read %s, HOME is too large." msgstr "" -#: lib/rpmrc.c:576 +#: lib/rpmrc.c:568 #, c-format msgid "Unable to open %s for reading: %s." msgstr "" #. XXX Feof(fd) -#: lib/rpmrc.c:621 +#: lib/rpmrc.c:613 #, c-format msgid "Failed to read %s: %s." msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:650 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d" msgstr "" -#: lib/rpmrc.c:675 lib/rpmrc.c:749 +#: lib/rpmrc.c:667 lib/rpmrc.c:741 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:692 lib/rpmrc.c:714 +#: lib/rpmrc.c:684 lib/rpmrc.c:706 #, c-format msgid "%s expansion failed at %s:%d \"%s\"" msgstr "" -#: lib/rpmrc.c:701 +#: lib/rpmrc.c:693 #, c-format msgid "cannot open %s at %s:%d: %s" msgstr "" -#: lib/rpmrc.c:741 +#: lib/rpmrc.c:733 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: lib/rpmrc.c:808 +#: lib/rpmrc.c:800 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: lib/rpmrc.c:1205 +#: lib/rpmrc.c:1197 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1206 +#: lib/rpmrc.c:1198 msgid "Please contact rpm-list@redhat.com\n" msgstr "" @@ -3862,7 +3863,7 @@ msgid "Bad server response" msgstr "" #: rpmio/rpmio.c:540 -msgid "Server IO error" +msgid "Server I/O error" msgstr "" #: rpmio/rpmio.c:543 @@ -3886,7 +3887,7 @@ msgid "Failed to establish data connection to server" msgstr "" #: rpmio/rpmio.c:558 -msgid "IO error to local file" +msgid "I/O error to local file" msgstr "" #: rpmio/rpmio.c:561 diff --git a/python/rpmmodule.c b/python/rpmmodule.c index f6778be3e..d904768e5 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -440,7 +440,7 @@ static int pkgCompareVer(void * first, void * second) { if (!(*a)->name) return 1; if (!(*b)->name) return -1; - ret = strcasecmp((*a)->name, (*b)->name); + ret = xstrcasecmp((*a)->name, (*b)->name); if (ret) return ret; score1 = psGetArchScore((*a)->h); if (!score1) return 1; @@ -1091,7 +1091,7 @@ static long tagNumFromPyObject (PyObject *item) } else if (PyString_Check(item)) { str = PyString_AsString(item); for (i = 0; i < rpmTagTableSize; i++) - if (!strcasecmp(rpmTagTable[i].name + 7, str)) break; + if (!xstrcasecmp(rpmTagTable[i].name + 7, str)) break; if (i < rpmTagTableSize) return rpmTagTable[i].val; } return -1; @@ -1118,7 +1118,7 @@ static PyObject * hdrSubscript(hdrObject * s, PyObject * item) { str = PyString_AsString(item); while (extensions->name) { if (extensions->type == HEADER_EXT_TAG - && !strcasecmp(extensions->name + 7, str)) { + && !xstrcasecmp(extensions->name + 7, str)) { (const struct headerSprintfExtension *) ext = extensions; } extensions++; diff --git a/python/upgrade.c b/python/upgrade.c index 29da37d75..57e0a47ba 100644 --- a/python/upgrade.c +++ b/python/upgrade.c @@ -39,7 +39,7 @@ int pkgCompare(void * first, void * second) { if (!(*a)->name) return 1; if (!(*b)->name) return -1; - return strcasecmp((*a)->name, (*b)->name); + return xstrcasecmp((*a)->name, (*b)->name); } diff --git a/rpm.spec b/rpm.spec index 6f75e724c..ce8d88c7c 100644 --- a/rpm.spec +++ b/rpm.spec @@ -13,7 +13,7 @@ Summary: The Red Hat package management system. Name: rpm %define version 4.0.2 Version: %{version} -Release: 0.15 +Release: 0.16 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz Copyright: GPL @@ -309,6 +309,10 @@ fi %{__prefix}/include/popt.h %changelog +* Wed Jan 3 2001 Jeff Johnson +- fix: avoid locale issues with strcasecmp/strncasecmp (#23199). +- remove almost all explicit uses of stderr in rpmlib using rpmError(). + * Tue Jan 2 2001 Jeff Johnson - fix apidocs. diff --git a/rpm.spec.in b/rpm.spec.in index a73975914..b5da6a56f 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -13,7 +13,7 @@ Summary: The Red Hat package management system. Name: rpm %define version @VERSION@ Version: %{version} -Release: 0.15 +Release: 0.16 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz Copyright: GPL @@ -309,6 +309,10 @@ fi %{__prefix}/include/popt.h %changelog +* Wed Jan 3 2001 Jeff Johnson +- fix: avoid locale issues with strcasecmp/strncasecmp (#23199). +- remove almost all explicit uses of stderr in rpmlib using rpmError(). + * Tue Jan 2 2001 Jeff Johnson - fix apidocs. diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index 470bb3217..d0bbf29f4 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -13,7 +13,7 @@ noinst_HEADERS = base64.h rpmio_internal.h lib_LTLIBRARIES = librpmio.la librpmio_la_SOURCES = rpmrpc.c rpmio.c rpmio_api.c url.c macro.c \ - base64.c digest.c stubs.c \ + base64.c digest.c strcasecmp.c stubs.c \ ugid.c rpmmalloc.c rpmlog.c # XXX Add internal libtool dependence diff --git a/rpmio/rpmerr.h b/rpmio/rpmerr.h index b957e4213..dde713c31 100644 --- a/rpmio/rpmerr.h +++ b/rpmio/rpmerr.h @@ -56,28 +56,39 @@ typedef enum rpmerrCode_e { RPMERR_BADRELOCATE = _em(40), /*!< bad relocation was specified */ RPMERR_OLDDB = _em(41), /*!< old format database */ -/* spec.c build.c pack.c */ RPMERR_UNMATCHEDIF = _em(107), /*!< unclosed %ifarch or %ifos */ - RPMERR_BADARG = _em(109), /*!< @todo Document. */ + RPMERR_BADARG = _em(109), /*!< */ RPMERR_SCRIPT = _em(110), /*!< errors related to script exec */ - RPMERR_READ = _em(111), /*!< @todo Document. */ - RPMERR_UNKNOWNOS = _em(112), /*!< @todo Document. */ - RPMERR_UNKNOWNARCH = _em(113), /*!< @todo Document. */ - RPMERR_EXEC = _em(114), /*!< @todo Document. */ - RPMERR_FORK = _em(115), /*!< @todo Document. */ - RPMERR_CPIO = _em(116), /*!< @todo Document. */ - RPMERR_GZIP = _em(117), /*!< @todo Document. */ - RPMERR_BADSPEC = _em(118), /*!< @todo Document. */ + RPMERR_READ = _em(111), /*!< */ + RPMERR_UNKNOWNOS = _em(112), /*!< */ + RPMERR_UNKNOWNARCH = _em(113), /*!< */ + RPMERR_EXEC = _em(114), /*!< */ + RPMERR_FORK = _em(115), /*!< */ + RPMERR_CPIO = _em(116), /*!< */ + RPMERR_GZIP = _em(117), /*!< */ + RPMERR_BADSPEC = _em(118), /*!< */ RPMERR_LDD = _em(119), /*!< couldn't understand ldd output */ - RPMERR_BADFILENAME = _em(120), /*!< @todo Document. */ - RPMERR_OPEN = _em(121), /*!< @todo Document. */ - RPMERR_POPEN = _em(122), /*!< @todo Document. */ + RPMERR_BADFILENAME = _em(120), /*!< */ + RPMERR_OPEN = _em(121), /*!< */ + RPMERR_POPEN = _em(122), /*!< */ RPMERR_NOTREG = _em(123), /*!< File %s is not a regular file */ - RPMERR_QUERY = _em(124), /*!< @todo Document. */ - RPMERR_QFMT = _em(125), /*!< @todo Document. */ + RPMERR_QUERY = _em(124), /*!< */ + RPMERR_QFMT = _em(125), /*!< */ + RPMERR_DBCONFIG = _em(126), /*!< */ + RPMERR_DBERR = _em(127), /*!< */ + RPMERR_BADPACKAGE = _em(128), /*!< */ + RPMERR_FREELIST = _em(129), /*!< */ + RPMERR_DATATYPE = _em(130), /*!< */ + RPMERR_BUILDROOT = _em(131), /*!< */ + RPMERR_MAKETEMP = _em(132), /*!< */ + RPMERR_FWRITE = _em(133), /*!< */ + RPMERR_FREAD = _em(134), /*!< */ + RPMERR_READLEAD = _em(135), /*!< */ + RPMERR_WRITELEAD = _em(136), /*!< */ RPMERR_BADSIGTYPE = _em(200), /*!< Unknown signature type */ - RPMERR_SIGGEN = _em(201) /*!< Error generating signature */ + RPMERR_SIGGEN = _em(201), /*!< Error generating signature */ + RPMERR_SIGVFY = _em(202) /*!< */ } rpmerrCode; /** diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c index d3603e70e..ae601d260 100644 --- a/rpmio/rpmio.c +++ b/rpmio/rpmio.c @@ -537,7 +537,7 @@ const char *const ftpStrerror(int errorNumber) { return _("Bad server response"); case FTPERR_SERVER_IO_ERROR: - return _("Server IO error"); + return _("Server I/O error"); case FTPERR_SERVER_TIMEOUT: return _("Server timeout"); @@ -555,7 +555,7 @@ const char *const ftpStrerror(int errorNumber) { return _("Failed to establish data connection to server"); case FTPERR_FILE_IO_ERROR: - return _("IO error to local file"); + return _("I/O error to local file"); case FTPERR_PASSIVE_ERROR: return _("Error setting remote server to passive mode"); diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h index c9bbb6c03..4efb077b6 100644 --- a/rpmio/rpmio.h +++ b/rpmio/rpmio.h @@ -390,18 +390,18 @@ int fdReadable(FD_t fd, int secs); * FTP and HTTP error codes. */ typedef enum ftperrCode_e { - FTPERR_BAD_SERVER_RESPONSE = -1, /*!< */ - FTPERR_SERVER_IO_ERROR = -2, /*!< */ - FTPERR_SERVER_TIMEOUT = -3, /*!< */ - FTPERR_BAD_HOST_ADDR = -4, /*!< */ - FTPERR_BAD_HOSTNAME = -5, /*!< */ - FTPERR_FAILED_CONNECT = -6, /*!< */ - FTPERR_FILE_IO_ERROR = -7, /*!< */ - FTPERR_PASSIVE_ERROR = -8, /*!< */ - FTPERR_FAILED_DATA_CONNECT = -9, /*!< */ - FTPERR_FILE_NOT_FOUND = -10, /*!< */ - FTPERR_NIC_ABORT_IN_PROGRESS= -11, /*!< */ - FTPERR_UNKNOWN = -100 /*!< */ + FTPERR_BAD_SERVER_RESPONSE = -1, /*!< Bad server response */ + FTPERR_SERVER_IO_ERROR = -2, /*!< Server I/O error */ + FTPERR_SERVER_TIMEOUT = -3, /*!< Server timeout */ + FTPERR_BAD_HOST_ADDR = -4, /*!< Unable to lookup server host address */ + FTPERR_BAD_HOSTNAME = -5, /*!< Unable to lookup server host name */ + FTPERR_FAILED_CONNECT = -6, /*!< Failed to connect to server */ + FTPERR_FILE_IO_ERROR = -7, /*!< Failed to establish data connection to server */ + FTPERR_PASSIVE_ERROR = -8, /*!< I/O error to local file */ + FTPERR_FAILED_DATA_CONNECT = -9, /*!< Error setting remote server to passive mode */ + FTPERR_FILE_NOT_FOUND = -10, /*!< File not found on server */ + FTPERR_NIC_ABORT_IN_PROGRESS= -11, /*!< Abort in progress */ + FTPERR_UNKNOWN = -100 /*!< Unknown or unexpected error */ } ftperrCode; /** \ingroup rpmio @@ -455,6 +455,16 @@ int timedRead(FD_t fd, /*@out@*/ void * bufptr, int length); /*@observer@*/ extern FDIO_t fadio; /*@}*/ +/** \ingroup rpmio + * Locale insensitive strcasecmp(3). + */ +int xstrcasecmp(const char *s1, const char * s2) /*@*/; + +/** \ingroup rpmio + * Locale insensitive strncasecmp(3). + */ +int xstrncasecmp(const char *s1, const char * s2, size_t n) /*@*/; + #ifdef __cplusplus } #endif diff --git a/rpmio/rpmrpc.c b/rpmio/rpmrpc.c index 34081f9cc..abc297530 100644 --- a/rpmio/rpmrpc.c +++ b/rpmio/rpmrpc.c @@ -143,7 +143,7 @@ int Rename (const char *oldpath, const char * newpath) { if (_rpmio_debug) fprintf(stderr, "*** rename old %*s new %*s\n", (int)(oe - oldpath), oldpath, (int)(ne - newpath), newpath); if (!(oldut == newut && oe && ne && (oe - oldpath) == (ne - newpath) && - !strncasecmp(oldpath, newpath, (oe - oldpath)))) + !xstrncasecmp(oldpath, newpath, (oe - oldpath)))) return -2; return ftpRename(oldpath, newpath); /*@notreached@*/ break; @@ -188,7 +188,7 @@ int Link (const char *oldpath, const char * newpath) { if (_rpmio_debug) fprintf(stderr, "*** link old %*s new %*s\n", (int)(oe - oldpath), oldpath, (int)(ne - newpath), newpath); if (!(oldut == newut && oe && ne && (oe - oldpath) == (ne - newpath) && - !strncasecmp(oldpath, newpath, (oe - oldpath)))) + !xstrncasecmp(oldpath, newpath, (oe - oldpath)))) return -2; oldpath = oe; newpath = ne; diff --git a/rpmio/strcasecmp.c b/rpmio/strcasecmp.c new file mode 100644 index 000000000..fa87ea9c7 --- /dev/null +++ b/rpmio/strcasecmp.c @@ -0,0 +1,52 @@ +/** \ingroup rpmio + * \file rpmio/strcasecmp.c + */ + +#include "system.h" +#include "debug.h" + +static inline unsigned char xtolower(unsigned char c) +{ + return ((c >= 'A' && c <= 'Z') ? (c | 0x40) : c); +} + +int xstrcasecmp(const char *s1, const char *s2) +{ + const unsigned char *p1 = (const unsigned char *) s1; + const unsigned char *p2 = (const unsigned char *) s2; + unsigned char c1, c2; + + if (p1 == p2) + return 0; + + do + { + c1 = xtolower (*p1++); + c2 = xtolower (*p2++); + if (c1 == '\0') + break; + } + while (c1 == c2); + + return c1 - c2; +} + +int xstrncasecmp(const char *s1, const char *s2, size_t n) +{ + const unsigned char *p1 = (const unsigned char *) s1; + const unsigned char *p2 = (const unsigned char *) s2; + unsigned char c1, c2; + + if (p1 == p2 || n == 0) + return 0; + + do + { + c1 = xtolower (*p1++); + c2 = xtolower (*p2++); + if (c1 == '\0' || c1 != c2) + return c1 - c2; + } while (--n > 0); + + return c1 - c2; +} diff --git a/rpmio/stubs.c b/rpmio/stubs.c index a921d0a40..40764883e 100644 --- a/rpmio/stubs.c +++ b/rpmio/stubs.c @@ -38,14 +38,6 @@ #include "misc/stpncpy.c" #endif -#if !defined(HAVE_STRCASECMP) -#include "misc/strcasecmp.c" -#endif - -#if !defined(HAVE_STRNCASECMP) -#include "misc/strncasecmp.c" -#endif - #if !defined(HAVE_STRCSPN) #include "misc/strcspn.c" #endif diff --git a/tools/rpminject.c b/tools/rpminject.c index 5a2b391d7..04f7c3959 100644 --- a/tools/rpminject.c +++ b/tools/rpminject.c @@ -60,17 +60,17 @@ static int getTagVal(const char *tname) const struct headerTagTableEntry *t; int tval; - if (strncasecmp("RPMTAG_", tname, sizeof("RPMTAG_"))) { + if (xstrncasecmp("RPMTAG_", tname, sizeof("RPMTAG_"))) { char *tagname = alloca(sizeof("RPMTAG_") + strlen(tname)); sprintf(tagname, "RPMTAG_%s", tname); tname = tagname; } for (t = rpmTagTable; t->name != NULL; t++) { - if (!strncasecmp(tname, t->name, strlen(t->name))) + if (!xstrncasecmp(tname, t->name, strlen(t->name))) return t->val; } - if (!strcasecmp(tname, hdri18ntbl)) + if (!xstrcasecmp(tname, hdri18ntbl)) return HEADER_I18NTABLE; tval = atoi(tname); -- cgit v1.2.3