From 46bbc20b324f456a9ff104f5e7300215950fb6c9 Mon Sep 17 00:00:00 2001 From: jbj Date: Sat, 13 Apr 2002 01:28:20 +0000 Subject: - use rpmdb-redhat to suggest dependency resolution(s). CVS patchset: 5401 CVS date: 2002/04/13 01:28:20 --- CHANGES | 1 + autodeps/linux.req | 3 +- beecrypt/Makefile.am | 1 - beecrypt/Makefile.in | 4 +- build/files.c | 2 +- build/pack.c | 2 + lib/.lclintrc | 2 - lib/cpio.c | 5 + lib/cpio.h | 5 - lib/depends.c | 17 ++- lib/fsm.c | 7 +- lib/package.c | 131 +++------------------ lib/problems.c | 2 - lib/psm.c | 5 + lib/psm.h | 2 - lib/rpmal.c | 34 ++---- lib/rpmal.h | 4 +- lib/rpmds.c | 22 +++- lib/rpmds.h | 20 +++- lib/rpmfi.c | 6 +- lib/rpminstall.c | 20 +++- lib/rpmlead.c | 5 +- lib/rpmlib.h | 70 +++++++---- lib/rpmte.c | 1 + lib/rpmts.c | 169 +++++++++++++++++++++++--- lib/rpmts.h | 20 +++- lib/stringbuf.c | 10 +- lib/transaction.c | 1 + lib/verify.c | 9 +- macros.in | 8 +- po/cs.po | 320 ++++++++++++++++++++++++++------------------------ po/da.po | 324 +++++++++++++++++++++++++------------------------- po/de.po | 322 +++++++++++++++++++++++++------------------------- po/fi.po | 322 +++++++++++++++++++++++++------------------------- po/fr.po | 316 +++++++++++++++++++++++++------------------------ po/gl.po | 315 +++++++++++++++++++++++++------------------------ po/is.po | 316 +++++++++++++++++++++++++------------------------ po/ja.po | 322 +++++++++++++++++++++++++------------------------- po/ko.po | 322 +++++++++++++++++++++++++------------------------- po/no.po | 316 +++++++++++++++++++++++++------------------------ po/pl.po | 324 +++++++++++++++++++++++++------------------------- po/pt_BR.po | 316 +++++++++++++++++++++++++------------------------ po/ro.po | 315 +++++++++++++++++++++++++------------------------ po/rpm.pot | 315 +++++++++++++++++++++++++------------------------ po/ru.po | 320 ++++++++++++++++++++++++++------------------------ po/sk.po | 324 +++++++++++++++++++++++++------------------------- po/sl.po | 326 ++++++++++++++++++++++++++------------------------- po/sr.po | 322 +++++++++++++++++++++++++------------------------- po/sv.po | 320 ++++++++++++++++++++++++++------------------------ po/tr.po | 322 +++++++++++++++++++++++++------------------------- rpm.spec | 7 +- rpm.spec.in | 5 +- rpmqv.c | 6 +- 53 files changed, 3628 insertions(+), 3377 deletions(-) diff --git a/CHANGES b/CHANGES index 0cf43b710..0c1d99604 100644 --- a/CHANGES +++ b/CHANGES @@ -99,6 +99,7 @@ - permit --dbpath and --root with signature (i.e. --import) modes. - beecrypt: add types.h, eliminate need for config.gnu.h. - rescusitate --rebuild. + - use rpmdb-redhat to suggest dependency resolution(s). 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/autodeps/linux.req b/autodeps/linux.req index 00a706dfb..87a4bfba5 100644 --- a/autodeps/linux.req +++ b/autodeps/linux.req @@ -9,9 +9,10 @@ ulimit -c 0 # # --- Set needed to 0 for traditional find-requires behavior. +needed=1 if [ X"$1" = Xldd ]; then needed=0 -else +elif [ X"$1" = Xobjdump ]; then needed=1 fi diff --git a/beecrypt/Makefile.am b/beecrypt/Makefile.am index 591bbd547..b57115cc6 100644 --- a/beecrypt/Makefile.am +++ b/beecrypt/Makefile.am @@ -59,7 +59,6 @@ pkginclude_HEADERS = base64.h beecrypt.h blockmode.h blockpad.h blowfish.h blowf EXTRA_DIST = BENCHMARKS BUGS CONTRIBUTORS Doxyfile.in Doxyheader README.DLL README.WIN32 beecrypt.def beecrypt.mcp beecrypt.rc beecrypt.spec types.h config.gas.h config.win.h javaglue.h noinst_HEADERS = debug.h system.h -BUILT_SOURCES = blowfishopt.S fips180opt.S mp32opt.S .PHONY: beetest beetest: all diff --git a/beecrypt/Makefile.in b/beecrypt/Makefile.in index e9536c1b1..82eee5cf9 100644 --- a/beecrypt/Makefile.in +++ b/beecrypt/Makefile.in @@ -157,7 +157,6 @@ pkginclude_HEADERS = base64.h beecrypt.h blockmode.h blockpad.h blowfish.h blowf EXTRA_DIST = BENCHMARKS BUGS CONTRIBUTORS Doxyfile.in Doxyheader README.DLL README.WIN32 beecrypt.def beecrypt.mcp beecrypt.rc beecrypt.spec types.h config.gas.h config.win.h javaglue.h noinst_HEADERS = debug.h system.h -BUILT_SOURCES = blowfishopt.S fips180opt.S mp32opt.S DOXYGEN = /usr/bin/doxygen subdir = . @@ -207,7 +206,7 @@ DIST_COMMON = README $(noinst_HEADERS) $(pkginclude_HEADERS) \ DIST_SUBDIRS = $(SUBDIRS) SOURCES = $(libbeecrypt_la_SOURCES) -all: $(BUILT_SOURCES) config.h +all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: @@ -529,7 +528,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-recursive clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ diff --git a/build/files.c b/build/files.c index 8110530cd..67fd8e723 100644 --- a/build/files.c +++ b/build/files.c @@ -14,7 +14,7 @@ #include #include -#include "psm.h" +#include "cpio.h" #include "rpmfi.h" #include "rpmte.h" #include "buildio.h" diff --git a/build/pack.c b/build/pack.c index 0aa6d9198..768e0c93d 100644 --- a/build/pack.c +++ b/build/pack.c @@ -8,6 +8,8 @@ #include #include +#include "cpio.h" +#include "fsm.h" #include "psm.h" #include "rpmfi.h" diff --git a/lib/.lclintrc b/lib/.lclintrc index b2dffae92..1e8e2e077 100644 --- a/lib/.lclintrc +++ b/lib/.lclintrc @@ -43,11 +43,9 @@ -compdestroy -mustdefine -shiftimplementation -#-shiftnegative -strictops -strictusereleased --stringliterallen 4096 # redhat*PubKey's are big -whileblock # tedious # --- not-yet at checks level diff --git a/lib/cpio.c b/lib/cpio.c index c090d3a18..eef9e8463 100644 --- a/lib/cpio.c +++ b/lib/cpio.c @@ -9,7 +9,12 @@ #include "system.h" +#include +#include + +#include "cpio.h" #include "fsm.h" + #include "rpmerr.h" #include "debug.h" diff --git a/lib/cpio.h b/lib/cpio.h index b0f2154f2..9e04d0985 100644 --- a/lib/cpio.h +++ b/lib/cpio.h @@ -12,11 +12,6 @@ * */ -#include - -#include -#include - /** \ingroup payload * @note CPIO_CHECK_ERRNO bit is set only if errno is valid. */ diff --git a/lib/depends.c b/lib/depends.c index 6b50e6a65..27d75137d 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -331,6 +331,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key) const char * Name; Header h; int rc; + int xx; if ((Name = dsiGetN(key)) == NULL) return 0; /* XXX can't happen */ @@ -352,7 +353,6 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key) void * datap = NULL; size_t datalen = 0; size_t DNEVRlen = strlen(DNEVR); - int xx; xx = dbiCopen(dbi, &dbcursor, 0); xx = dbiGet(dbi, dbcursor, (void **)&DNEVR, &DNEVRlen, @@ -460,6 +460,12 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key) } + /* + * Search for an unsatisifed dependency. + */ + if (ts->solve) + xx = (*ts->solve) (ts, key); + unsatisfied: rc = 1; /* dependency is unsatisfied */ dsiNotify(key, NULL, rc); @@ -475,7 +481,7 @@ exit: _cacheDependsRC = 0; } else { const char * DNEVR; - int xx = 0; + xx = 0; if ((DNEVR = dsiGetDNEVR(key)) != NULL) { DBC * dbcursor = NULL; size_t DNEVRlen = strlen(DNEVR); @@ -486,13 +492,6 @@ exit: } if (xx) _cacheDependsRC = 0; -#if 0 /* XXX NOISY */ - else - rpmMessage(RPMMESS_DEBUG, - _("%9s: (%s, %s) added to Depends cache.\n"), - key->Type, (key->DNEVR != NULL ? key->DNEVR : "???"), - (rc ? _("NO ") : _("YES"))); -#endif } } return rc; diff --git a/lib/fsm.c b/lib/fsm.c index b98a70e94..7cabb1fe3 100644 --- a/lib/fsm.c +++ b/lib/fsm.c @@ -5,7 +5,12 @@ #include "system.h" -#include "psm.h" +#include +#include + +#include "cpio.h" +#include "fsm.h" +#include "psm.h" /* XXX fiTypeString */ #include "rpmerr.h" #include "rpmfi.h" diff --git a/lib/package.c b/lib/package.c index bed218217..78baa2280 100644 --- a/lib/package.c +++ b/lib/package.c @@ -137,81 +137,6 @@ Header headerRegenSigHeader(const Header h) return sig; } -#ifdef DYING -/** - * Retrieve package components from file handle. - * @param fd file handle - * @param leadPtr address of lead (or NULL) - * @param sigs address of signatures (or NULL) - * @param hdrPtr address of header (or NULL) - * @return rpmRC return code - */ -static rpmRC readPackageHeaders(FD_t fd, - /*@null@*/ /*@out@*/ struct rpmlead * leadPtr, - /*@null@*/ /*@out@*/ Header * sigs, - /*@null@*/ /*@out@*/ Header * hdrPtr) - /*@globals fileSystem@*/ - /*@modifies fd, *leadPtr, *sigs, *hdrPtr, fileSystem @*/ -{ - Header hdrBlock; - struct rpmlead leadBlock; - Header * hdr = NULL; - struct rpmlead * lead; - struct stat sb; - rpmRC rc; - - hdr = hdrPtr ? hdrPtr : &hdrBlock; - lead = leadPtr ? leadPtr : &leadBlock; - - memset(&sb, 0, sizeof(sb)); - (void) fstat(Fileno(fd), &sb); - /* if fd points to a socket, pipe, etc, sb.st_size is *always* zero */ - if (S_ISREG(sb.st_mode) && sb.st_size < sizeof(*lead)) return 1; - - if (readLead(fd, lead)) - return RPMRC_FAIL; - - if (lead->magic[0] != RPMLEAD_MAGIC0 || lead->magic[1] != RPMLEAD_MAGIC1 || - lead->magic[2] != RPMLEAD_MAGIC2 || lead->magic[3] != RPMLEAD_MAGIC3) - return RPMRC_BADMAGIC; - - switch (lead->major) { - case 1: - rpmError(RPMERR_NEWPACKAGE, - _("packaging version 1 is not supported by this version of RPM\n")); - return RPMRC_FAIL; - /*@notreached@*/ break; - case 2: - case 3: - case 4: - rc = rpmReadSignature(fd, sigs, lead->signature_type); - if (rc == RPMRC_FAIL) - return rc; - *hdr = headerRead(fd, (lead->major >= 3) - ? HEADER_MAGIC_YES : HEADER_MAGIC_NO); - if (*hdr == NULL) { - if (sigs != NULL) - *sigs = rpmFreeSignature(*sigs); - return RPMRC_FAIL; - } - - /* Convert legacy headers on the fly ... */ - legacyRetrofit(*hdr, lead); - break; - default: - rpmError(RPMERR_NEWPACKAGE, _("only packaging with major numbers <= 4 " - "is supported by this version of RPM\n")); - return RPMRC_FAIL; - /*@notreached@*/ break; - } - - if (hdrPtr == NULL) - *hdr = headerFree(*hdr, "ReadPackageHeaders exit"); - - return RPMRC_OK; -} -#endif - /*@unchecked@*/ static unsigned char header_magic[8] = { 0x8e, 0xad, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00 @@ -317,10 +242,6 @@ int rpmReadPackageFile(rpmTransactionSet ts, FD_t fd, } } -#if 0 -fprintf(stderr, "*** RPF: legacy %d nodigests %d nosignatures %d sigtag %d\n", ts->verify_legacy, ts->nodigests, ts->nosignatures, ts->sigtag); -#endif - /* Read the metadata, computing digest(s) on the fly. */ hmagic = ((l->major >= 3) ? HEADER_MAGIC_YES : HEADER_MAGIC_NO); h = headerRead(fd, hmagic); @@ -369,16 +290,14 @@ fprintf(stderr, "*** RPF: legacy %d nodigests %d nosignatures %d sigtag %d\n", t int_32 uht; int_32 uhc; - /*@-branchstate@*/ - if (headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc)) { - ts->dig->md5ctx = rpmDigestInit(PGPHASHALGO_MD5, RPMDIGEST_NONE); - (void) rpmDigestUpdate(ts->dig->md5ctx, header_magic, sizeof(header_magic)); - ts->dig->nbytes += sizeof(header_magic); - (void) rpmDigestUpdate(ts->dig->md5ctx, uh, uhc); - ts->dig->nbytes += uhc; - uh = headerFreeData(uh, uht); - } - /*@=branchstate@*/ + if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc)) + break; + ts->dig->md5ctx = rpmDigestInit(PGPHASHALGO_MD5, RPMDIGEST_NONE); + (void) rpmDigestUpdate(ts->dig->md5ctx, header_magic, sizeof(header_magic)); + ts->dig->nbytes += sizeof(header_magic); + (void) rpmDigestUpdate(ts->dig->md5ctx, uh, uhc); + ts->dig->nbytes += uhc; + uh = headerFreeData(uh, uht); } break; case RPMSIGTAG_DSA: /* Parse the parameters from the OpenPGP packets that will be needed. */ @@ -398,16 +317,14 @@ fprintf(stderr, "*** RPF: legacy %d nodigests %d nosignatures %d sigtag %d\n", t int_32 uht; int_32 uhc; - /*@-branchstate@*/ - if (headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc)) { - ts->dig->hdrsha1ctx = rpmDigestInit(PGPHASHALGO_SHA1, RPMDIGEST_NONE); - (void) rpmDigestUpdate(ts->dig->hdrsha1ctx, header_magic, sizeof(header_magic)); - ts->dig->nbytes += sizeof(header_magic); - (void) rpmDigestUpdate(ts->dig->hdrsha1ctx, uh, uhc); - ts->dig->nbytes += uhc; - uh = headerFreeData(uh, uht); - } - /*@=branchstate@*/ + if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc)) + break; + ts->dig->hdrsha1ctx = rpmDigestInit(PGPHASHALGO_SHA1, RPMDIGEST_NONE); + (void) rpmDigestUpdate(ts->dig->hdrsha1ctx, header_magic, sizeof(header_magic)); + ts->dig->nbytes += sizeof(header_magic); + (void) rpmDigestUpdate(ts->dig->hdrsha1ctx, uh, uhc); + ts->dig->nbytes += uhc; + uh = headerFreeData(uh, uht); } break; case RPMSIGTAG_GPG: case RPMSIGTAG_PGP5: /* XXX legacy */ @@ -444,27 +361,11 @@ fprintf(stderr, "*** RPF: legacy %d nodigests %d nosignatures %d sigtag %d\n", t if (fddig->hashctx == NULL) continue; if (fddig->hashalgo == PGPHASHALGO_MD5) { -#ifdef DYING - /*@-branchstate@*/ - if (ts->dig->md5ctx != NULL) - (void) rpmDigestFinal(ts->dig->md5ctx, NULL, NULL, 0); - /*@=branchstate@*/ -#else -assert(ts->dig->md5ctx == NULL); -#endif ts->dig->md5ctx = fddig->hashctx; fddig->hashctx = NULL; continue; } if (fddig->hashalgo == PGPHASHALGO_SHA1) { -#ifdef DYING - /*@-branchstate@*/ - if (ts->dig->sha1ctx != NULL) - (void) rpmDigestFinal(ts->dig->sha1ctx, NULL, NULL, 0); - /*@=branchstate@*/ -#else -assert(ts->dig->sha1ctx == NULL); -#endif ts->dig->sha1ctx = fddig->hashctx; fddig->hashctx = NULL; continue; diff --git a/lib/problems.c b/lib/problems.c index c73f24998..592baaf15 100644 --- a/lib/problems.c +++ b/lib/problems.c @@ -148,7 +148,6 @@ int rpmProblemSetTrim(rpmProblemSet ps, rpmProblemSet filter) t = ps->probs; f = filter->probs; - /*@-branchstate@*/ while ((f - filter->probs) < filter->numProblems) { if (!f->ignoreProblem) { f++; @@ -171,7 +170,6 @@ int rpmProblemSetTrim(rpmProblemSet ps, rpmProblemSet filter) t->ignoreProblem = f->ignoreProblem; t++, f++; } - /*@=branchstate@*/ if ((t - ps->probs) < ps->numProblems) gotProblems = 1; diff --git a/lib/psm.c b/lib/psm.c index cf7ea446b..a8043a62f 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -5,6 +5,11 @@ #include "system.h" +#include +#include + +#include "cpio.h" +#include "fsm.h" /* XXX CPIO_FOO/FSM_FOO constants */ #include "psm.h" #include #include diff --git a/lib/psm.h b/lib/psm.h index 38742da1f..efab8a2a6 100644 --- a/lib/psm.h +++ b/lib/psm.h @@ -6,8 +6,6 @@ * Package state machine to handle a package from a transaction set. */ -#include "fsm.h" - /** */ #define PSM_VERBOSE 0x8000 diff --git a/lib/rpmal.c b/lib/rpmal.c index 41a4dfbb6..4a8a5e59f 100644 --- a/lib/rpmal.c +++ b/lib/rpmal.c @@ -619,7 +619,7 @@ alAllFileSatisfiesDepend(const availableList al, const rpmDepSet ds, alKey * key const char * fileName; if (keyp) *keyp = RPMAL_NOMATCH; - if ((fileName = dsiGetN(ds)) == NULL || *fileName != '/') + if (al == NULL || (fileName = dsiGetN(ds)) == NULL || *fileName != '/') return NULL; /* Solaris 2.6 bsearch sucks down on this. */ @@ -699,34 +699,11 @@ exit: return ret; } -#ifdef DYING -/** - * Check added package file lists for first package that provides a file. - * @param al available list - * @param ds dependency - * @return available package pointer - */ -/*@unused@*/ static /*@dependent@*/ /*@null@*/ fnpyKey -alFileSatisfiesDepend(const availableList al, const rpmDepSet ds, alKey * keyp) - /*@*/ -{ - fnpyKey * tmp = alAllFileSatisfiesDepend(al, ds, keyp); - - if (tmp) { - fnpyKey ret = tmp[0]; - free(tmp); - return ret; - } - return NULL; -} -#endif /* DYING */ - fnpyKey * alAllSatisfiesDepend(const availableList al, const rpmDepSet ds, alKey * keyp) { - availableIndex ai = &al->index; - availableIndexEntry needle = - memset(alloca(sizeof(*needle)), 0, sizeof(*needle)); + availableIndex ai; + availableIndexEntry needle; availableIndexEntry match; fnpyKey * ret = NULL; int found = 0; @@ -735,7 +712,8 @@ alAllSatisfiesDepend(const availableList al, const rpmDepSet ds, alKey * keyp) int rc; if (keyp) *keyp = RPMAL_NOMATCH; - if ((KName = dsiGetN(ds)) == NULL) + + if (al == NULL || ds == NULL || (KName = dsiGetN(ds)) == NULL) return ret; if (*KName == '/') { @@ -745,9 +723,11 @@ alAllSatisfiesDepend(const availableList al, const rpmDepSet ds, alKey * keyp) return ret; } + ai = &al->index; if (ai->index == NULL || ai->size <= 0) return NULL; + needle = memset(alloca(sizeof(*needle)), 0, sizeof(*needle)); /*@-assignexpose -temptrans@*/ needle->entry = KName; /*@=assignexpose =temptrans@*/ diff --git a/lib/rpmal.h b/lib/rpmal.h index e611903e9..e39f45374 100644 --- a/lib/rpmal.h +++ b/lib/rpmal.h @@ -82,8 +82,8 @@ void alMakeIndex(/*@null@*/ availableList al) */ /*@-exportlocal@*/ /*@only@*/ /*@null@*/ -fnpyKey * alAllFileSatisfiesDepend(const availableList al, const rpmDepSet ds, - /*@null@*/ alKey * keyp) +fnpyKey * alAllFileSatisfiesDepend(/*@null@*/ const availableList al, + /*@null@*/ const rpmDepSet ds, /*@null@*/ alKey * keyp) /*@globals fileSystem @*/ /*@modifies al, *keyp, fileSystem @*/; /*@=exportlocal@*/ diff --git a/lib/rpmds.c b/lib/rpmds.c index eece4ea50..bbd5685b7 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -333,12 +333,12 @@ exit: return rpmdsLink(ds, (ds ? ds->Type : NULL)); } -int dsiGetCount(rpmDepSet ds) +int dsiGetCount(const rpmDepSet ds) { return (ds != NULL ? ds->Count : 0); } -int dsiGetIx(rpmDepSet ds) +int dsiGetIx(const rpmDepSet ds) { return (ds != NULL ? ds->i : -1); } @@ -354,7 +354,7 @@ int dsiSetIx(rpmDepSet ds, int ix) return i; } -const char * dsiGetDNEVR(rpmDepSet ds) +const char * dsiGetDNEVR(const rpmDepSet ds) { const char * DNEVR = NULL; @@ -365,7 +365,7 @@ const char * dsiGetDNEVR(rpmDepSet ds) return DNEVR; } -const char * dsiGetN(rpmDepSet ds) +const char * dsiGetN(const rpmDepSet ds) { const char * N = NULL; @@ -376,7 +376,7 @@ const char * dsiGetN(rpmDepSet ds) return N; } -const char * dsiGetEVR(rpmDepSet ds) +const char * dsiGetEVR(const rpmDepSet ds) { const char * EVR = NULL; @@ -387,7 +387,7 @@ const char * dsiGetEVR(rpmDepSet ds) return EVR; } -int_32 dsiGetFlags(rpmDepSet ds) +int_32 dsiGetFlags(const rpmDepSet ds) { int_32 Flags = 0; @@ -398,6 +398,16 @@ int_32 dsiGetFlags(rpmDepSet ds) return Flags; } +rpmTag dsiGetTagN(const rpmDepSet ds) +{ + rpmTag tagN = 0; + + if (ds != NULL && ds->i >= 0 && ds->i < ds->Count) { + tagN = ds->tagN; + } + return tagN; +} + void dsiNotify(rpmDepSet ds, const char * where, int rc) { if (!(ds != NULL && ds->i >= 0 && ds->i < ds->Count)) diff --git a/lib/rpmds.h b/lib/rpmds.h index fb31763cd..16d201892 100644 --- a/lib/rpmds.h +++ b/lib/rpmds.h @@ -129,7 +129,7 @@ rpmDepSet dsSingle(rpmTag tagN, const char * N, const char * EVR, int_32 Flags) * @param ds dependency set * @return current count */ -int dsiGetCount(/*@null@*/ rpmDepSet ds) +int dsiGetCount(/*@null@*/ const rpmDepSet ds) /*@*/; /** @@ -137,7 +137,7 @@ int dsiGetCount(/*@null@*/ rpmDepSet ds) * @param ds dependency set * @return current index */ -int dsiGetIx(/*@null@*/ rpmDepSet ds) +int dsiGetIx(/*@null@*/ const rpmDepSet ds) /*@*/; /** @@ -155,7 +155,7 @@ int dsiSetIx(/*@null@*/ rpmDepSet ds, int ix) * @return current dependency DNEVR, NULL on invalid */ /*@null@*/ -const char * dsiGetDNEVR(/*@null@*/ rpmDepSet ds) +const char * dsiGetDNEVR(/*@null@*/ const rpmDepSet ds) /*@*/; /** @@ -164,7 +164,7 @@ const char * dsiGetDNEVR(/*@null@*/ rpmDepSet ds) * @return current dependency name, NULL on invalid */ /*@null@*/ -const char * dsiGetN(/*@null@*/ rpmDepSet ds) +const char * dsiGetN(/*@null@*/ const rpmDepSet ds) /*@*/; /** @@ -173,7 +173,7 @@ const char * dsiGetN(/*@null@*/ rpmDepSet ds) * @return current dependency EVR, NULL on invalid */ /*@null@*/ -const char * dsiGetEVR(/*@null@*/ rpmDepSet ds) +const char * dsiGetEVR(/*@null@*/ const rpmDepSet ds) /*@*/; /** @@ -181,7 +181,15 @@ const char * dsiGetEVR(/*@null@*/ rpmDepSet ds) * @param ds dependency set * @return current dependency flags, 0 on invalid */ -int_32 dsiGetFlags(/*@null@*/ rpmDepSet ds) +int_32 dsiGetFlags(/*@null@*/ const rpmDepSet ds) + /*@*/; + +/** + * Return current dependency type. + * @param ds dependency set + * @return current dependency type, 0 on invalid + */ +rpmTag dsiGetTagN(/*@null@*/ const rpmDepSet ds) /*@*/; /** diff --git a/lib/rpmfi.c b/lib/rpmfi.c index f2970b013..41df31f04 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -5,7 +5,11 @@ #include "system.h" -#include "fsm.h" /* XXX newFSM and CPIO_MAP_* */ +#include +#include + +#include "cpio.h" /* XXX CPIO_FOO */ +#include "fsm.h" /* XXX newFSM() */ #include "rpmfi.h" #include "rpmte.h" diff --git a/lib/rpminstall.c b/lib/rpminstall.c index 3ee0c732b..57179a244 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -234,6 +234,7 @@ int rpmInstall(rpmTransactionSet ts, probFilter = ia->probFilter; relocations = ia->relocations; + ts->goal = TSM_INSTALL; ts->nodigests = (ia->qva_flags & VERIFY_DIGEST); ts->nosignatures = (ia->qva_flags & VERIFY_SIGNATURE); @@ -536,11 +537,27 @@ restart: /*@-branchstate@*/ if (!stopInstall && conflicts) { - rpmMessage(RPMMESS_ERROR, _("failed dependencies:\n")); + rpmMessage(RPMMESS_ERROR, _("Failed dependencies:\n")); printDepProblems(stderr, conflicts, numConflicts); conflicts = rpmdepFreeConflicts(conflicts, numConflicts); eiu->numFailed = eiu->numPkgs; stopInstall = 1; + + if (ts->suggests != NULL && ts->nsuggests > 0) { + rpmMessage(RPMMESS_NORMAL, _(" Suggested resolutions:\n")); + for (i = 0; i < ts->nsuggests; i++) { + const char * str = ts->suggests[i]; + + if (str == NULL) + break; + + rpmMessage(RPMMESS_NORMAL, "\t%s\n", str); + + ts->suggests[i] = NULL; + str = _free(str); + } + ts->suggests = _free(ts->suggests); + } } /*@=branchstate@*/ } @@ -641,6 +658,7 @@ int rpmErase(rpmTransactionSet ts, } #endif + ts->goal = TSM_ERASE; ts->nodigests = (ia->qva_flags & VERIFY_DIGEST); ts->nosignatures = (ia->qva_flags & VERIFY_SIGNATURE); diff --git a/lib/rpmlead.c b/lib/rpmlead.c index 9a19e8b4b..032ffb484 100644 --- a/lib/rpmlead.c +++ b/lib/rpmlead.c @@ -33,11 +33,8 @@ int writeLead(FD_t fd, const struct rpmlead *lead) l.osnum = htons(l.osnum); l.signature_type = htons(l.signature_type); - /*@-sizeoftype@*/ - if (Fwrite(&l, sizeof(char), sizeof(l), fd) != sizeof(l)) { + if (Fwrite(&l, 1, sizeof(l), fd) != sizeof(l)) return 1; - } - /*@=sizeoftype@*/ return 0; } diff --git a/lib/rpmlib.h b/lib/rpmlib.h index 6a91d22f6..987de956c 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -985,12 +985,16 @@ typedef enum rpmProblemType_e { /** */ struct rpmProblem_s { -/*@only@*/ /*@null@*/ char * pkgNEVR; -/*@only@*/ /*@null@*/ char * altNEVR; -/*@exposed@*/ /*@null@*/ fnpyKey key; +/*@only@*/ /*@null@*/ + char * pkgNEVR; +/*@only@*/ /*@null@*/ + char * altNEVR; +/*@exposed@*/ /*@null@*/ + fnpyKey key; rpmProblemType type; int ignoreProblem; -/*@only@*/ /*@null@*/ char * str1; +/*@only@*/ /*@null@*/ + char * str1; unsigned long ulong1; }; @@ -1000,7 +1004,8 @@ struct rpmProblemSet_s { int numProblems; /*!< Current probs array size. */ int numProblemsAlloced; /*!< Allocated probs array size. */ rpmProblem probs; /*!< Array of specific problems. */ -/*@refs@*/ int nrefs; /*!< Reference count. */ +/*@refs@*/ + int nrefs; /*!< Reference count. */ }; /** @@ -1373,6 +1378,44 @@ rpmdbMatchIterator rpmtsInitIterator(const rpmTransactionSet ts, int rpmtag, /*@globals fileSystem @*/ /*@modifies ts, fileSystem @*/; +/** + * Attempt to solve a needed dependency. + * @param ts transaction set + * @param ds dependency set + * @return 0 if resolved (and added to ts), 1 not found + */ +int rpmtsSolve(rpmTransactionSet ts, rpmDepSet ds) + /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/ + /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/; + +/** + * Attempt to solve a needed dependency. + * @param ts transaction set + * @param ds dependency set + * @return 0 if resolved (and added to ts), 1 not found + */ +/*@unused@*/ +int rpmtsAvailable(rpmTransactionSet ts, const rpmDepSet ds) + /*@globals fileSystem @*/ + /*@modifies ts, fileSystem @*/; + +/** \ingroup rpmtrans + * Re-create an empty transaction set. + * @param ts transaction set + */ +void rpmtransClean(rpmTransactionSet ts) + /*@modifies ts @*/; + +/** \ingroup rpmtrans + * Destroy transaction set, closing the database as well. + * @param ts transaction set + * @return NULL always + */ +/*@null@*/ rpmTransactionSet +rpmtransFree(/*@killref@*/ /*@only@*//*@null@*/ rpmTransactionSet ts) + /*@globals fileSystem @*/ + /*@modifies ts, fileSystem @*/; + /** \ingroup rpmtrans * Create an empty transaction set. * @param db rpm database (may be NULL if database is not accessed) @@ -1429,23 +1472,6 @@ void rpmtransAvailablePackage(rpmTransactionSet ts, Header h, int rpmtransRemovePackage(rpmTransactionSet ts, Header h, int dboffset) /*@modifies ts, h @*/; -/** \ingroup rpmtrans - * Re-create an empty transaction set. - * @param ts transaction set - */ -void rpmtransClean(rpmTransactionSet ts) - /*@modifies ts @*/; - -/** \ingroup rpmtrans - * Destroy transaction set, closing the database as well. - * @param ts transaction set - * @return NULL always - */ -/*@null@*/ rpmTransactionSet -rpmtransFree(/*@killref@*/ /*@only@*//*@null@*/ rpmTransactionSet ts) - /*@globals fileSystem @*/ - /*@modifies ts, fileSystem @*/; - /** \ingroup rpmtrans * Save file handle to be used as stderr when running package scripts. * @param ts transaction set diff --git a/lib/rpmte.c b/lib/rpmte.c index bf98b6375..b98710d17 100644 --- a/lib/rpmte.c +++ b/lib/rpmte.c @@ -3,6 +3,7 @@ * Routine(s) to handle a transactionElement. */ #include "system.h" +#include #include "psm.h" diff --git a/lib/rpmts.c b/lib/rpmts.c index 92e3ec47e..d84e7f70e 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.c @@ -8,6 +8,9 @@ #include /* XXX rpmtsOpenDB() needs rpmGetPath */ #include /* XXX rpmtransFree() needs pgpFreeDig */ +#include "rpmds.h" +#include "rpmfi.h" +#include "rpmal.h" #include "rpmte.h" #include "rpmts.h" @@ -16,10 +19,28 @@ #include "debug.h" /*@access rpmTransactionSet @*/ +/*@access fnpyKey @*/ /*@unchecked@*/ int _ts_debug = 0; +char * hGetNEVR(Header h, const char ** np) +{ + const char * n, * v, * r; + char * NVR, * t; + + (void) headerNVR(h, &n, &v, &r); + NVR = t = xcalloc(1, strlen(n) + strlen(v) + strlen(r) + sizeof("--")); + t = stpcpy(t, n); + t = stpcpy(t, "-"); + t = stpcpy(t, v); + t = stpcpy(t, "-"); + t = stpcpy(t, r); + if (np) + *np = n; + return NVR; +} + rpmTransactionSet XrpmtsUnlink(rpmTransactionSet ts, const char * msg, const char * fn, unsigned ln) { /*@-modfilesystem@*/ @@ -60,7 +81,7 @@ int rpmtsOpenDB(rpmTransactionSet ts, int dbmode) (void) rpmtsCloseDB(ts); - /* XXX there's a lock race here. */ + /* XXX there's a db lock race here. */ ts->dbmode = dbmode; rc = rpmdbOpen(ts->rootDir, &ts->rpmdb, ts->dbmode, 0644); @@ -82,21 +103,126 @@ rpmdbMatchIterator rpmtsInitIterator(const rpmTransactionSet ts, int rpmtag, return rpmdbInitIterator(ts->rpmdb, rpmtag, keyp, keylen); } -char * hGetNEVR(Header h, const char ** np) +static int rpmtsCloseSDB(rpmTransactionSet ts) + /*@globals fileSystem @*/ + /*@modifies ts, fileSystem @*/ { - const char * n, * v, * r; - char * NVR, * t; + int rc = 0; - (void) headerNVR(h, &n, &v, &r); - NVR = t = xcalloc(1, strlen(n) + strlen(v) + strlen(r) + sizeof("--")); - t = stpcpy(t, n); - t = stpcpy(t, "-"); - t = stpcpy(t, v); - t = stpcpy(t, "-"); - t = stpcpy(t, r); - if (np) - *np = n; - return NVR; + if (ts->sdb != NULL) { + rc = rpmdbClose(ts->sdb); + ts->sdb = NULL; + } + return rc; +} + +static int rpmtsOpenSDB(rpmTransactionSet ts) + /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/ + /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/ +{ + int rc = 0; + + if (ts->sdb != NULL) + return 0; + + addMacro(NULL, "_dbpath", NULL, "%{?_sdbpath}", RMIL_DEFAULT); + rc = rpmdbOpen(ts->rootDir, &ts->sdb, O_RDONLY, 0644); + if (rc) { + const char * dn; + /*@-globs -mods@*/ /* FIX: rpmGlobalMacroContext for an error? shrug */ + dn = rpmGetPath(ts->rootDir, "%{_dbpath}", NULL); + /*@=globs =mods@*/ + rpmMessage(RPMMESS_DEBUG, + _("cannot open Packages database in %s\n"), dn); + dn = _free(dn); + } + delMacro(NULL, "_dbpath"); + return rc; +} + +int rpmtsSolve(rpmTransactionSet ts, rpmDepSet ds) +{ + const char * errstr; + const char * str; + const char * qfmt; + rpmdbMatchIterator mi; + Header h; + int rpmtag; + const char * keyp; + size_t keylen; + int rc = 1; /* assume not found */ + int xx; + + if (ts->goal != TSM_INSTALL) + return rc; + + if (dsiGetTagN(ds) != RPMTAG_REQUIRENAME) + return rc; + + keyp = dsiGetN(ds); + if (keyp == NULL) + return rc; + + if (ts->sdb == NULL) { + xx = rpmtsOpenSDB(ts); + if (xx) return rc; + } + + qfmt = rpmExpand("%{?_solve_name_fmt}", NULL); + if (qfmt == NULL || *qfmt == '\0') + goto exit; + + rpmtag = (*keyp == '/' ? RPMTAG_BASENAMES : RPMTAG_PROVIDENAME); + keylen = 0; + mi = rpmdbInitIterator(ts->sdb, rpmtag, keyp, keylen); + while ((h = rpmdbNextIterator(mi)) != NULL) { + + str = headerSprintf(h, qfmt, rpmTagTable, rpmHeaderFormats, &errstr); + if (str == NULL) { + rpmError(RPMERR_QFMT, _("incorrect format: %s\n"), errstr); + break; + } + + ts->suggests = xrealloc(ts->suggests, + sizeof(*ts->suggests) * (ts->nsuggests + 2)); + ts->suggests[ts->nsuggests] = str; + + ts->nsuggests++; + ts->suggests[ts->nsuggests] = NULL; + break; /* XXX no alternatives yet */ + } + mi = rpmdbFreeIterator(mi); + +exit: + qfmt = _free(qfmt); +/*@-nullstate@*/ /* FIX: ts->suggests[] may be NULL */ + return rc; +/*@=nullstate@*/ +} + +int rpmtsAvailable(rpmTransactionSet ts, const rpmDepSet ds) +{ + fnpyKey * sugkey; + int rc = 1; /* assume not found */ + + if (ts->availablePackages == NULL) + return rc; + sugkey = alAllSatisfiesDepend(ts->availablePackages, ds, NULL); + if (sugkey == NULL) + return rc; + /* XXX no alternatives yet */ + if (sugkey[0] != NULL) { + ts->suggests = xrealloc(ts->suggests, + sizeof(*ts->suggests) * (ts->nsuggests + 2)); + ts->suggests[ts->nsuggests] = sugkey[0]; + sugkey[0] = NULL; + ts->nsuggests++; + ts->suggests[ts->nsuggests] = NULL; + } + sugkey = _free(sugkey); +/*@-nullstate@*/ /* FIX: ts->suggests[] may be NULL */ + return rc; +/*@=nullstate@*/ } void rpmtransClean(rpmTransactionSet ts) @@ -113,6 +239,9 @@ void rpmtransClean(rpmTransactionSet ts) ts->addedPackages = alFree(ts->addedPackages); ts->numAddedPackages = 0; + ts->suggests = _free(ts->suggests); + ts->nsuggests = 0; + if (ts->sig != NULL) ts->sig = headerFreeData(ts->sig, ts->sigtype); if (ts->dig != NULL) @@ -134,8 +263,11 @@ rpmTransactionSet rpmtransFree(rpmTransactionSet ts) (void) rpmtsCloseDB(ts); + (void) rpmtsCloseSDB(ts); + ts->availablePackages = alFree(ts->availablePackages); ts->numAvailablePackages = 0; + ts->di = _free(ts->di); ts->removedPackages = _free(ts->removedPackages); if (ts->scriptFd != NULL) { @@ -176,6 +308,7 @@ rpmTransactionSet rpmtransCreateSet(rpmdb db, const char * rootDir) /*@=branchstate@*/ ts = xcalloc(1, sizeof(*ts)); + ts->goal = TSM_UNKNOWN; ts->filesystemCount = 0; ts->filesystems = NULL; ts->di = NULL; @@ -214,9 +347,15 @@ rpmTransactionSet rpmtransCreateSet(rpmdb db, const char * rootDir) ts->numAddedPackages = 0; ts->addedPackages = NULL; + + ts->solve = rpmtsSolve; + ts->nsuggests = 0; + ts->suggests = NULL; + ts->sdb = NULL; + ts->numAvailablePackages = 0; ts->availablePackages = NULL; - ts->numAddedPackages = 0; + ts->orderAlloced = 0; ts->orderCount = 0; ts->order = NULL; diff --git a/lib/rpmts.h b/lib/rpmts.h index fc2f12ce8..74a6bb7e8 100644 --- a/lib/rpmts.h +++ b/lib/rpmts.h @@ -19,6 +19,12 @@ extern int _ts_debug; extern int _cacheDependsRC; /*@=exportlocal@*/ +typedef enum tsStage_e { + TSM_UNKNOWN = 0, + TSM_INSTALL = 7, + TSM_ERASE = 8, +} tsmStage; + /** \ingroup rpmdep * The set of packages to be installed/removed atomically. */ @@ -26,6 +32,18 @@ struct rpmTransactionSet_s { rpmtransFlags transFlags; /*!< Bit(s) to control operation. */ /*@observer@*/ /*@null@*/ rpmCallbackFunction notify; /*!< Callback function. */ + + tsmStage goal; /*!< Transaction goal (i.e. mode) */ + +/*@null@*/ + int (*solve) (rpmTransactionSet ts, const rpmDepSet key) + /*@modifies ts @*/; /*!< Search for NEVR key. */ + int nsuggests; /*!< No. of depCheck suggestions. */ +/*@only@*/ /*@null@*/ + const void ** suggests; /*!< Possible depCheck suggestions. */ +/*@refcounted@*/ /*@null@*/ + rpmdb sdb; /*!< Available universe database handle. */ + /*@observer@*/ /*@null@*/ rpmCallbackData notifyData; /*!< Callback private data. */ /*@refcounted@*/ /*@null@*/ @@ -34,7 +52,7 @@ struct rpmTransactionSet_s { /*!< Bits to filter current problems. */ int filesystemCount; /*!< No. of mounted filesystems. */ -/*@dependent@*/ +/*@dependent@*/ /*@null@*/ const char ** filesystems; /*!< Mounted filesystem names. */ /*@only@*/ /*@null@*/ struct diskspaceInfo * di; /*!< Per filesystem disk/inode usage. */ diff --git a/lib/stringbuf.c b/lib/stringbuf.c index 6cb8169f0..a5fd1a44e 100644 --- a/lib/stringbuf.c +++ b/lib/stringbuf.c @@ -10,8 +10,10 @@ #define BUF_CHUNK 1024 struct StringBufRec { - /*@owned@*/ char *buf; - /*@dependent@*/ char *tail; /* Points to first "free" char */ +/*@owned@*/ + char *buf; +/*@dependent@*/ + char *tail; /* Points to first "free" char */ int allocated; int free; }; @@ -19,7 +21,7 @@ struct StringBufRec { /** * Locale insensitive isspace(3). */ -/*@unused@*/ static inline int xisspace(int c) { +/*@unused@*/ static inline int xisspace(int c) /*@*/ { return (c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '\f' || c == '\v'); } @@ -66,10 +68,8 @@ void truncStringBuf(StringBuf sb) void stripTrailingBlanksStringBuf(StringBuf sb) { while (sb->free != sb->allocated) { - /*@-moduncon@*/ if (! xisspace(*(sb->tail - 1))) break; - /*@=moduncon@*/ sb->free++; sb->tail--; } diff --git a/lib/transaction.c b/lib/transaction.c index 4e5e5aad3..2b2639c5e 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -3,6 +3,7 @@ */ #include "system.h" +#include #include /* XXX for rpmExpand */ diff --git a/lib/verify.c b/lib/verify.c index a4a046119..70afe2b20 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -5,6 +5,9 @@ #include "system.h" +#include /* XXX PGPHASHALGO and RPMDIGEST_NONE */ +#include + #include "psm.h" #include "rpmfi.h" #include "rpmts.h" @@ -110,13 +113,13 @@ int rpmVerifyFile(const rpmTransactionSet ts, const TFI_t fi, flags &= ~(omitMask | RPMVERIFY_LSTATFAIL|RPMVERIFY_READFAIL|RPMVERIFY_READLINKFAIL); if (flags & RPMVERIFY_MD5) { - byte md5sum[16]; + unsigned char md5sum[16]; rc = domd5(filespec, md5sum, 0); if (rc) *result |= (RPMVERIFY_READFAIL|RPMVERIFY_MD5); else { - const byte * md5 = tfiGetMD5(fi); + const unsigned char * md5 = tfiGetMD5(fi); if (md5 == NULL || memcmp(md5sum, md5, sizeof(md5sum))) *result |= RPMVERIFY_MD5; } @@ -253,7 +256,7 @@ int rpmVerifyDigest(Header h) /* Retrieve header digest. */ if (!hge(h, RPMTAG_SHA1HEADER, &hdt, (void **) &hdigest, NULL) - &&!hge(h, RPMTAG_SHA1RHN, &hdt, (void **) &hdigest, NULL)) + && !hge(h, RPMTAG_SHA1RHN, &hdt, (void **) &hdigest, NULL)) { return 0; } diff --git a/macros.in b/macros.in index b9ed8dcaa..4d8987e85 100644 --- a/macros.in +++ b/macros.in @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: /usr/lib/rpm/macros # \verbatim # -# $Id: macros.in,v 1.97 2002/03/06 23:17:32 jbj Exp $ +# $Id: macros.in,v 1.98 2002/04/13 01:28:20 jbj Exp $ # # This is a global RPM configuration file. All changes made here will # be lost when the rpm package is upgraded. Any per-system configuration @@ -502,6 +502,12 @@ # XXX Note: escaped %% for use in headerSprintf() %_build_name_fmt %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm +# The output binary package file name template used when suggesting +# binary packages that solve a dependency. +# +# XXX Note: escaped %% for use in headerSprintf() +%_solve_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm + # The output binary package file name template used when repackaging # erased packages. # diff --git a/po/cs.po b/po/cs.po index 4ea9bce11..fbdb7ce3f 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -438,7 +438,7 @@ msgstr "neo msgid "no arguments given" msgstr "k dotazu nezadány ¾ádné parametry" -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 msgid "Unable to open temp file.\n" msgstr "Nelze otevøít doèasnı soubor.\n" @@ -648,7 +648,7 @@ msgstr "Soubor nenalezen globem: %s\n" msgid "Could not open %%files file %s: %s\n" msgstr "Nemohu otevøít %%files soubor %s: %s\n" -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, c-format msgid "line: %s\n" msgstr "øádek: %s\n" @@ -723,156 +723,156 @@ msgstr "getGidS: p msgid "Could not canonicalize hostname: %s\n" msgstr "Nemohu získat jméno poèítaèe: %s\n" -#: build/pack.c:81 +#: build/pack.c:83 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "vytváøení archívu selhalo na souboru %s: %s\n" -#: build/pack.c:84 +#: build/pack.c:86 #, c-format msgid "create archive failed: %s\n" msgstr "vytváøení archívu selhalo: %s\n" -#: build/pack.c:106 +#: build/pack.c:108 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "zápis cpio_copy selhal: %s\n" -#: build/pack.c:113 +#: build/pack.c:115 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "ètení cpio_copy selhalo: %s\n" -#: build/pack.c:216 +#: build/pack.c:218 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "Nemohu otevøít PreIn soubor: %s\n" -#: build/pack.c:223 +#: build/pack.c:225 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "Nemohu otevøít PreUn soubor: %s\n" -#: build/pack.c:230 +#: build/pack.c:232 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "Nemohu otevøít PostIn soubor: %s\n" -#: build/pack.c:237 +#: build/pack.c:239 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "Nemohu otevøít PostUn soubor: %s\n" -#: build/pack.c:245 +#: build/pack.c:247 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Nemohu otevøít VerifyScript soubor: %s\n" -#: build/pack.c:260 +#: build/pack.c:262 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Nemohu otevøít soubor se spu¹tí (trigger): %s\n" -#: build/pack.c:288 +#: build/pack.c:290 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: otevøení %s: %s\n" -#: build/pack.c:298 +#: build/pack.c:300 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: ètení %s: %s\n" -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: Fseek selhal: %s\n" -#: build/pack.c:335 +#: build/pack.c:337 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s není RPM balíèek\n" -#: build/pack.c:344 +#: build/pack.c:346 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: ètení hlavièky z %s\n" -#: build/pack.c:473 +#: build/pack.c:475 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Nemohu pøeèíst hlavièku z %s: %s\n" -#: build/pack.c:492 +#: build/pack.c:494 #, fuzzy msgid "Unable to write temp header\n" msgstr "Nemohu zapsat hlavièku do %s: %s\n" -#: build/pack.c:502 +#: build/pack.c:504 msgid "Bad CSA data\n" msgstr "©patná CSA data\n" -#: build/pack.c:538 +#: build/pack.c:540 #, fuzzy msgid "Unable to write final header\n" msgstr "Nemohu zapsat hlavièku do %s: %s\n" -#: build/pack.c:558 +#: build/pack.c:560 #, c-format msgid "Generating signature: %d\n" msgstr "Generuji podpis: %d\n" -#: build/pack.c:576 +#: build/pack.c:578 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Nemohu pøeèíst hlavièku z %s: %s\n" -#: build/pack.c:584 +#: build/pack.c:586 #, c-format msgid "Could not open %s: %s\n" msgstr "Nemohu otevøít %s: %s\n" -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, c-format msgid "Unable to write package: %s\n" msgstr "Nemohu zapsat balíèek: %s\n" -#: build/pack.c:635 +#: build/pack.c:637 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Nemohu otevøít cíl pro podepsání %s: %s\n" -#: build/pack.c:646 +#: build/pack.c:648 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "Nemohu pøeèíst hlavièku z %s: %s\n" -#: build/pack.c:660 +#: build/pack.c:662 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "Nemohu zapsat hlavièku do %s: %s\n" -#: build/pack.c:670 +#: build/pack.c:672 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Nemohu pøeèíst payload z %s: %s\n" -#: build/pack.c:676 +#: build/pack.c:678 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Nemohu zapsat payload do %s: %s\n" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "Zapsáno: %s\n" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "Nemohu vygenerovat jméno souboru pro balíèek %s: %s\n" -#: build/pack.c:785 +#: build/pack.c:787 #, c-format msgid "cannot create %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" @@ -1392,44 +1392,44 @@ msgstr " msgid "line %d: Bad %s number: %s\n" msgstr "øádek %d: ©patné èíslo %s: %s\n" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, c-format msgid "(error 0x%x)" msgstr "(chyba: 0x%x)" -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "©patné magické èíslo" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "©patná nebo neèitelná hlavièka" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "Velikost hlavièky je pøili¹ velká" -#: lib/cpio.c:213 +#: lib/cpio.c:218 msgid "Unknown file type" msgstr "Neznámı typ souboru" -#: lib/cpio.c:214 +#: lib/cpio.c:219 msgid "Missing hard link(s)" msgstr "Chybìjící hardlink(y)" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "MD5 souèet nesouhlasí" -#: lib/cpio.c:216 +#: lib/cpio.c:221 msgid "Internal error" msgstr "Interní chyba" -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:228 +#: lib/cpio.c:233 msgid " failed - " msgstr "selhal - " @@ -1467,36 +1467,23 @@ msgstr "%s: %-45s ANO (db poskytuje)\n" msgid "(db package)" msgstr "¾ádné balíèky\n" -#: lib/depends.c:492 -#, fuzzy, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "NO " -msgstr "NE " - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "ANO" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:881 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1504,20 +1491,20 @@ msgid "" msgstr "" "========== tsorting balíèkù (poøadí, #pøedchùdce, #následovník, hloubka)\n" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "SMYÈKA:\n" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "========== pokraèuje tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1566,47 +1553,47 @@ msgstr "nemohu otev msgid "file %s is on an unknown device\n" msgstr "soubor %s je na neznámém zaøízení\n" -#: lib/fsm.c:313 +#: lib/fsm.c:318 #, fuzzy msgid "========== Directories not explictly included in package:\n" msgstr "========= Adresáøe, které nebyly explicitnì zaøazeny do balíèku:\n" -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "vytvoøen adresáø %s s právy %04o.\n" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, c-format msgid "%s saved as %s\n" msgstr "%s ulo¾eno jako %s\n" -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s odstranìní %s selhalo: Adresáø není prázdnı\n" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir %s selhal: %s\n" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s unlink %s selhal: %s\n" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, c-format msgid "%s created as %s\n" msgstr "%s vytvoøen jako %s\n" @@ -1616,46 +1603,46 @@ msgstr "%s vytvo msgid "error creating temporary file %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: lib/package.c:181 lib/package.c:257 -msgid "packaging version 1 is not supported by this version of RPM\n" -msgstr "práce s balíèky verze 1 není podporována touto verzí RPM\n" - -#: lib/package.c:202 lib/package.c:265 -msgid "" -"only packaging with major numbers <= 4 is supported by this version of RPM\n" -msgstr "tato verze RPM podporuje práci s balíèky s verzí <= 4\n" - -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 #, c-format msgid "%s: readLead failed\n" msgstr "%s: readLead selhalo\n" -#: lib/package.c:249 +#: lib/package.c:174 #, fuzzy, c-format msgid "%s: bad magic\n" msgstr "©patné magické èíslo" -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:182 +msgid "packaging version 1 is not supported by this version of RPM\n" +msgstr "práce s balíèky verze 1 není podporována touto verzí RPM\n" + +#: lib/package.c:190 +msgid "" +"only packaging with major numbers <= 4 is supported by this version of RPM\n" +msgstr "tato verze RPM podporuje práci s balíèky s verzí <= 4\n" + +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature selhalo\n" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "%s: Není dostupnı ¾ádnı podpis\n" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead selhalo\n" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread selhalo: %s\n" @@ -2080,164 +2067,164 @@ msgid "generate signature" msgstr "generovat PGP/GPG podpis" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "balíèek %s je pro jinou architekturu" -#: lib/problems.c:241 +#: lib/problems.c:239 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "balíèek %s je pro jinı operaèní systém" -#: lib/problems.c:246 +#: lib/problems.c:244 #, c-format msgid "package %s is already installed" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/problems.c:251 +#: lib/problems.c:249 #, c-format msgid "path %s in package %s is not relocateable" msgstr "cesta %s v balíèku %s není pøemístitelná" -#: lib/problems.c:256 +#: lib/problems.c:254 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "soubor %s zpùsobuje konflikt mezi instalovanım %s a %s" -#: lib/problems.c:261 +#: lib/problems.c:259 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "soubor %s z instalace %s koliduje se souborem z balíèku %s" -#: lib/problems.c:266 +#: lib/problems.c:264 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "balíèek %s (kterı je novìj¹í, ne¾ %s) je ji¾ nainstalován" -#: lib/problems.c:271 +#: lib/problems.c:269 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "instalace balíèku %s potøebuje %ld%cB na systému souborù %s" -#: lib/problems.c:281 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "instalace balíèku %s potøebuje %ld inodù na systému souborù %s" -#: lib/problems.c:286 +#: lib/problems.c:284 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "pøedtransakèní syscall v balíèku %s: %s selhalo: %s" -#: lib/problems.c:290 +#: lib/problems.c:288 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" -#: lib/problems.c:294 +#: lib/problems.c:292 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" -#: lib/problems.c:299 +#: lib/problems.c:297 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "neznámá chyba %d vznikla pøi manipulaci s balíèkem %s" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "conflicts with" msgstr " koliduje s %s-%s-%s\n" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "is needed by" msgstr " je nutné pro %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "Datovı typ %d není podporován\n" -#: lib/psm.c:442 +#: lib/psm.c:447 #, c-format msgid "cannot create %%%s %s\n" msgstr "nemohu vytvoøit %s: %s\n" -#: lib/psm.c:448 +#: lib/psm.c:453 #, c-format msgid "cannot write to %%%s %s\n" msgstr "nemohu zapsat do %%%s %s\n" -#: lib/psm.c:481 +#: lib/psm.c:486 msgid "source package expected, binary found\n" msgstr "oèekávám balíèek se zdrojovımi kódy, nalezen v¹ak binární\n" -#: lib/psm.c:597 +#: lib/psm.c:602 msgid "source package contains no .spec file\n" msgstr "zdrojovı balíèek neobsahuje .spec soubor\n" -#: lib/psm.c:716 +#: lib/psm.c:721 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: spou¹tím %s skript(y) (pokud existují)\n" -#: lib/psm.c:882 +#: lib/psm.c:887 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "provedení skripletu %s z %s-%s-%s selhalo, návratovı kód byl: %s\n" -#: lib/psm.c:889 +#: lib/psm.c:894 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "provedení %s skripletu z %s-%s-%s selhalo, návratovı kód: %d\n" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s obsahuje %d souborù, test = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: scriptlet %s selhal (%d), pøeskakuji %s-%s-%s\n" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, c-format msgid "user %s does not exist - using root\n" msgstr "u¾ivatel %s neexistuje - pou¾it u¾ivatel root\n" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ita skupina root\n" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalování archívu selhalo %s%s: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr " na souboru " -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s selhalo\n" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, c-format msgid "incorrect format: %s\n" msgstr "nesprávnı formát: %s\n" @@ -2280,8 +2267,8 @@ msgstr "bal msgid "can't query %s: %s\n" msgstr "nemohu provést dotaz %s: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, c-format msgid "open of %s failed: %s\n" msgstr "otevøení %s selhalo: %s\n" @@ -2295,7 +2282,7 @@ msgstr "dotaz na %s se nezda msgid "old format source packages cannot be queried\n" msgstr "nelze provést dotaz na zdrojové balíèky starého formátu\n" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Fread selhalo: %s\n" @@ -2364,7 +2351,7 @@ msgstr "z msgid "record %u could not be read\n" msgstr "záznam %d nelze pøeèíst\n" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, c-format msgid "package %s is not installed\n" msgstr "balíèek %s není nainstalován\n" @@ -2374,7 +2361,7 @@ msgstr "bal msgid "(added files)" msgstr "¹patnı db soubor %s\n" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s ANO (db poskytuje)\n" @@ -2447,8 +2434,16 @@ msgstr ")" msgid "OK" msgstr "OK" +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "NO " +msgstr "NE " + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "ANO" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2457,13 +2452,13 @@ msgstr "" "Závislost \"B\" potøebuje období (pøedpokládáno stejné jako \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" @@ -2476,86 +2471,95 @@ msgstr "P msgid "Preparing packages for installation..." msgstr "Pøipravuji balíèky pro instalaci..." -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "Stahuji %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr " ... jako %s\n" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "pøeskakuji %s - pøenos selhal - %s\n" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, c-format msgid "package %s is not relocateable\n" msgstr "balíèek %s není pøemístitelnı\n" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, c-format msgid "error reading from file %s\n" msgstr "chyba pøi ètení ze souboru %s\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, 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:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, c-format msgid "%s cannot be installed\n" msgstr "%s nemù¾e bıt nainstalován\n" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, 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:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +#, fuzzy +msgid "Failed dependencies:\n" msgstr "nevyøe¹ené závislosti:\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" +msgstr "" + +#: lib/rpminstall.c:579 msgid "installing binary packages\n" msgstr "instaluji binární balíèky\n" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, c-format msgid "cannot open file %s: %s\n" msgstr "nemohu otevøít soubor %s: %s\n" -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" urèuje více balíèkù\n" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "odstranìní tìchto balíèkù by poru¹ilo závislosti:\n" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, c-format msgid "cannot open %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "Instaluji %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "nevyøe¹ené závislosti:\n" + +#: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" msgstr "ètení selhalo: %s (%d)\n" @@ -2655,7 +2659,7 @@ msgstr "Nemohu msgid "Unable to open %s for reading: %s.\n" msgstr "Nemohu otevøít %s pro ètení: %s.\n" -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, c-format msgid "cannot open Packages database in %s\n" msgstr "nemohu otevøít databázi balíèkù v %s\n" @@ -2799,32 +2803,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Podpisu: velikost(%d)+vata(%d)\n" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s pøeskoèeno, proto¾e chybí pøíznak\n" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, c-format msgid "excluding directory %s\n" msgstr "vynechávám adresáø %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "získávám seznam pøipojenıch systémù souborù\n" -#: lib/verify.c:326 +#: lib/verify.c:329 #, c-format msgid "missing %s" msgstr "chybí %s" -#: lib/verify.c:421 +#: lib/verify.c:424 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: " -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: kontrola digestu v hlavièce selhala\n" @@ -3415,6 +3419,10 @@ msgstr "url port mus msgid "failed to create %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" +#, fuzzy +#~ msgid "%9s: (%s, %s) added to Depends cache.\n" +#~ msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n" + #~ msgid "(unknown type)" #~ msgstr "(neznámı typ)" diff --git a/po/da.po b/po/da.po index 986f77aed..2b2347819 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -433,7 +433,7 @@ msgstr "uventede parametre til --querytags " msgid "no arguments given" msgstr "ingen parametre angivet ved forespørgsel" -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 msgid "Unable to open temp file.\n" msgstr "Kunne ikke åbne midlertidig fil.\n" @@ -643,7 +643,7 @@ msgstr "Fil ikke fundet med glob: %s\n" msgid "Could not open %%files file %s: %s\n" msgstr "Kunne ikke åbne '%%files'-fil %s: %s\n" -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, c-format msgid "line: %s\n" msgstr "linie: %s\n" @@ -720,156 +720,156 @@ msgstr "getGnameS: for mange gid'er\n" msgid "Could not canonicalize hostname: %s\n" msgstr "Kunne ikke kanonisere værtsnavn: %s\n" -#: build/pack.c:81 +#: build/pack.c:83 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "arkivoprettelse mislykkedes ved fil %s: %s\n" -#: build/pack.c:84 +#: build/pack.c:86 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "arkivoprettelse mislykkedes ved fil %s: %s\n" -#: build/pack.c:106 +#: build/pack.c:108 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "cpio_copy-skrivning mislykkedes: %s\n" -#: build/pack.c:113 +#: build/pack.c:115 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "cpio_copy-læsning mislykkedes: %s\n" -#: build/pack.c:216 +#: build/pack.c:218 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "Kunne ikke åbne 'PreIn'-fil: %s\n" -#: build/pack.c:223 +#: build/pack.c:225 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "Kunne ikke åbne 'PreUn'-fil: %s\n" -#: build/pack.c:230 +#: build/pack.c:232 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "Kunne ikke åbne 'PostIn'-fil: %s\n" -#: build/pack.c:237 +#: build/pack.c:239 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "Kunne ikke åbne 'PostUn'-fil: %s\n" -#: build/pack.c:245 +#: build/pack.c:247 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Kunne ikke åbne 'VerifyScript'-fil: %s\n" -#: build/pack.c:260 +#: build/pack.c:262 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Kunne ikke åbne skriptfilen Trigger: %s\n" -#: build/pack.c:288 +#: build/pack.c:290 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: åbn %s: %s\n" -#: build/pack.c:298 +#: build/pack.c:300 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: læs %s: %s\n" -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: Fread mislykkedes: %s\n" -#: build/pack.c:335 +#: build/pack.c:337 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s er ikke nogen RPM-pakke\n" -#: build/pack.c:344 +#: build/pack.c:346 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: læser hoved fra %s\n" -#: build/pack.c:473 +#: build/pack.c:475 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Kunne ikke læse hoved fra %s: %s\n" -#: build/pack.c:492 +#: build/pack.c:494 #, fuzzy msgid "Unable to write temp header\n" msgstr "Kunne ikke skrive hoved til %s: %s\n" -#: build/pack.c:502 +#: build/pack.c:504 msgid "Bad CSA data\n" msgstr "Ugyldige CSA-data\n" -#: build/pack.c:538 +#: build/pack.c:540 #, fuzzy msgid "Unable to write final header\n" msgstr "Kunne ikke skrive hoved til %s: %s\n" -#: build/pack.c:558 +#: build/pack.c:560 #, c-format msgid "Generating signature: %d\n" msgstr "Genererer signatur: %d\n" -#: build/pack.c:576 +#: build/pack.c:578 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Kunne ikke læse hoved fra %s: %s\n" -#: build/pack.c:584 +#: build/pack.c:586 #, c-format msgid "Could not open %s: %s\n" msgstr "Kunne ikke åbne %s: %s\n" -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" -#: build/pack.c:635 +#: build/pack.c:637 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Kunne ikke åbne sigtarget %s: %s\n" -#: build/pack.c:646 +#: build/pack.c:648 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "Kunne ikke læse hoved fra %s: %s\n" -#: build/pack.c:660 +#: build/pack.c:662 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "Kunne ikke skrive hoved til %s: %s\n" -#: build/pack.c:670 +#: build/pack.c:672 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Kunne ikke læse pakkeindhold fra %s: %s\n" -#: build/pack.c:676 +#: build/pack.c:678 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "Kunne ikke generere filnavn til oprettelse af pakke %s: %s\n" -#: build/pack.c:785 +#: build/pack.c:787 #, c-format msgid "cannot create %s: %s\n" msgstr "kan ikke oprette %s: %s\n" @@ -1392,45 +1392,45 @@ msgstr "linie %d: Ugyldigt 'no%s'-tal: %d\n" msgid "line %d: Bad %s number: %s\n" msgstr "linie %d: Ugyldigt %s-tal: %s\n" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, c-format msgid "(error 0x%x)" msgstr "(fejl 0x%x)" -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "Ugyldigt magisk tal" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "Ugyldigt/ulæseligt hoved" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "Hovedstørrelse er for stor" -#: lib/cpio.c:213 +#: lib/cpio.c:218 msgid "Unknown file type" msgstr "Ukendt filtype" -#: lib/cpio.c:214 +#: lib/cpio.c:219 #, fuzzy msgid "Missing hard link(s)" msgstr "Manglende hård lænke" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "MD5-sum stemmer ikke" -#: lib/cpio.c:216 +#: lib/cpio.c:221 msgid "Internal error" msgstr "Intern fejl" -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:228 +#: lib/cpio.c:233 msgid " failed - " msgstr " mislykkedes - " @@ -1468,56 +1468,42 @@ msgstr "%s: %-45s JA (db tilf msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:492 -#, fuzzy, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -#, fuzzy -msgid "NO " -msgstr "IKKE O.K." - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:881 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "========== gemmer tsort-relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "LØKKE:\n" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "========== fortsætter tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1566,46 +1552,46 @@ msgstr "kunne ikke msgid "file %s is on an unknown device\n" msgstr "fil %s er på en ukendt enhed\n" -#: lib/fsm.c:313 +#: lib/fsm.c:318 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, fuzzy, c-format msgid "%10d %s\n" msgstr "linie %d: %s\n" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, c-format msgid "%s saved as %s\n" msgstr "%s gemt som %s\n" -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "kan ikke fjerne %s - katalog ikke tomt\n" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "fjernelse (rmdir) af %s mislykkedes: %s\n" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "åbning af %s mislykkedes %s\n" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, c-format msgid "%s created as %s\n" msgstr "%s oprettet som %s\n" @@ -1615,47 +1601,47 @@ msgstr "%s oprettet som %s\n" msgid "error creating temporary file %s\n" msgstr "fejl ved oprettelse af midlertidig fil %s\n" -#: lib/package.c:181 lib/package.c:257 -msgid "packaging version 1 is not supported by this version of RPM\n" -msgstr "indpakningsversion 1 understøttes ikke af denne udgave af RPM\n" - -#: lib/package.c:202 lib/package.c:265 -msgid "" -"only packaging with major numbers <= 4 is supported by this version of RPM\n" -msgstr "" -"kun indpakninger med hovedversion <= 4 understøttes af denne udgave af RPM\n" - -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 #, c-format msgid "%s: readLead failed\n" msgstr "%s: readLead mislykkedes\n" -#: lib/package.c:249 +#: lib/package.c:174 #, fuzzy, c-format msgid "%s: bad magic\n" msgstr "Ugyldigt magisk tal" -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:182 +msgid "packaging version 1 is not supported by this version of RPM\n" +msgstr "indpakningsversion 1 understøttes ikke af denne udgave af RPM\n" + +#: lib/package.c:190 +msgid "" +"only packaging with major numbers <= 4 is supported by this version of RPM\n" +msgstr "" +"kun indpakninger med hovedversion <= 4 understøttes af denne udgave af RPM\n" + +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature mislykkedes\n" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ingen tilgængelig signatur\n" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead mislykkedes\n" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread mislykkedes: %s\n" @@ -2095,167 +2081,167 @@ msgid "generate signature" msgstr "generér PGP/GPG-signatur" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "pakken %s hører til en anden arkitektur" -#: lib/problems.c:241 +#: lib/problems.c:239 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "pakken %s hører til et andet operativsystem" -#: lib/problems.c:246 +#: lib/problems.c:244 #, c-format msgid "package %s is already installed" msgstr "pakken %s er allerede installeret" -#: lib/problems.c:251 +#: lib/problems.c:249 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sti %s i pakke %s kan ikke omrokeres" -#: lib/problems.c:256 +#: lib/problems.c:254 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "filen %s skaber konflikt mellem den forsøgte installation af %s og %s" -#: lib/problems.c:261 +#: lib/problems.c:259 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "filen %s fra installationen af %s skaber konflikt med fil fra pakken %s" -#: lib/problems.c:266 +#: lib/problems.c:264 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "pakke %s (som er nyere end %s) er allerede installeret" -#: lib/problems.c:271 +#: lib/problems.c:269 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "installation af pakke %s kræver %ld%cb på %s-filsystemet" -#: lib/problems.c:281 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "installation af pakken %s kræver %ld inode'r på %s-filsystemet" -#: lib/problems.c:286 +#: lib/problems.c:284 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "pakke %s prætransaktion-systemkald: %s mislykkedes: %s" -#: lib/problems.c:290 +#: lib/problems.c:288 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" -#: lib/problems.c:294 +#: lib/problems.c:292 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" -#: lib/problems.c:299 +#: lib/problems.c:297 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ukendt fejl %d under arbejdet med pakken %s" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "conflicts with" msgstr " skaber konflikt med %s-%s-%s\n" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "is needed by" msgstr " kræves af %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "Datatype %d understøttes ikke\n" -#: lib/psm.c:442 +#: lib/psm.c:447 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "kan ikke oprette %s: %s\n" -#: lib/psm.c:448 +#: lib/psm.c:453 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "kunne ikke skrive til %s\n" -#: lib/psm.c:481 +#: lib/psm.c:486 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær fundet\n" -#: lib/psm.c:597 +#: lib/psm.c:602 msgid "source package contains no .spec file\n" msgstr "kildepakke indeholder ingen .spec-fil\n" -#: lib/psm.c:716 +#: lib/psm.c:721 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "kører postinstallations-skript (hvis det findes)\n" -#: lib/psm.c:882 +#: lib/psm.c:887 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" "kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n" -#: lib/psm.c:889 +#: lib/psm.c:894 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" "kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "pakke: %s-%s-%s filer test = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, c-format msgid "user %s does not exist - using root\n" msgstr "bruger %s eksisterer ikke - bruger root\n" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, c-format msgid "group %s does not exist - using root\n" msgstr "gruppe %s eksisterer ikke - bruger root\n" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "udpakning af arkiv mislykkedes%s%s: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr " for fil " -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s mislykkedes\n" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, c-format msgid "incorrect format: %s\n" msgstr "ugyldigt format: %s\n" @@ -2298,8 +2284,8 @@ msgstr "pakke har hverken filejerskabs- eller id-lister\n" msgid "can't query %s: %s\n" msgstr "kunne ikke forespørge %s: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, c-format msgid "open of %s failed: %s\n" msgstr "åbning af %s mislykkedes %s\n" @@ -2313,7 +2299,7 @@ msgstr "foresp msgid "old format source packages cannot be queried\n" msgstr "pakke med gammelt kildeformat kan ikke forespørges\n" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: læs manifest mislykkedes: %s\n" @@ -2382,7 +2368,7 @@ msgstr "pakkens post-nummer: %u\n" msgid "record %u could not be read\n" msgstr "post %d kunne ikke læses\n" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, c-format msgid "package %s is not installed\n" msgstr "pakken %s er ikke installeret\n" @@ -2392,7 +2378,7 @@ msgstr "pakken %s er ikke installeret\n" msgid "(added files)" msgstr "ugyldig db-fil %s\n" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s JA (db tilfører)\n" @@ -2465,8 +2451,17 @@ msgstr ")" msgid "OK" msgstr "O.K." +#: lib/rpmds.c:420 lib/rpmds.c:579 +#, fuzzy +msgid "NO " +msgstr "IKKE O.K." + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2475,13 +2470,13 @@ msgstr "" "\"B\"-afhængighed kræver en epoke (antager samme som \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" @@ -2494,86 +2489,95 @@ msgstr "Forbereder..." msgid "Preparing packages for installation..." msgstr "Forbereder pakker til installation..." -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "Modtager %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr " ... som %s\n" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "overspringer %s - overførsel mislykkedes - %s\n" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, c-format msgid "package %s is not relocateable\n" msgstr "pakke %s kan ikke omrokeres\n" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, c-format msgid "error reading from file %s\n" msgstr "fejl ved læsning fra filen %s\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "filen %s kræver en nyere version af RPM\n" -#: lib/rpminstall.c:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, c-format msgid "%s cannot be installed\n" msgstr "%s kunne ikke installeres\n" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, c-format msgid "found %d source and %d binary packages\n" msgstr "fandt %d kilde- og %d binærpakker\n" -#: lib/rpminstall.c:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +#, fuzzy +msgid "Failed dependencies:\n" msgstr "afhængighedskrav, der ikke kunne imødekommes:\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" +msgstr "" + +#: lib/rpminstall.c:579 msgid "installing binary packages\n" msgstr "installerer binærpakker\n" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, c-format msgid "cannot open file %s: %s\n" msgstr "kunne ikke åbne fil %s: %s\n" -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" angiver flere pakker\n" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "fjernelse af disse pakker ville bryde afhængighederne:\n" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, c-format msgid "cannot open %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "afhængighedskrav, der ikke kunne imødekommes:\n" + +#: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" msgstr "læsning mislykkedes: %s (%d)\n" @@ -2675,7 +2679,7 @@ msgstr "Kunne ikke l msgid "Unable to open %s for reading: %s.\n" msgstr "Kunne ikke åbne %s for læsning: %s.\n" -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kunne ikke åbne Packages-database i %s\n" @@ -2818,32 +2822,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signaturfyld : %d\n" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s oversprunget grundet manglende ok-flag\n" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer kataloget %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "henter liste over monterede filsystemer\n" -#: lib/verify.c:326 +#: lib/verify.c:329 #, c-format msgid "missing %s" msgstr "manglende %s" -#: lib/verify.c:421 +#: lib/verify.c:424 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Ikke-tilfredsstillede afhængighedskrav for %s-%s-%s: " -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3440,6 +3444,10 @@ msgstr "url-port skal v msgid "failed to create %s: %s\n" msgstr "kunne ikke oprette %s: %s\n" +#, fuzzy +#~ msgid "%9s: (%s, %s) added to Depends cache.\n" +#~ msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n" + #~ msgid "(unknown type)" #~ msgstr "(ukendt type)" diff --git a/po/de.po b/po/de.po index 911c9f179..226ad8744 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -500,7 +500,7 @@ msgid "no arguments given" msgstr "Es wurden keine Argumente für die Anfrage angegeben" # , c-format -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 #, fuzzy msgid "Unable to open temp file.\n" msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s." @@ -723,7 +723,7 @@ msgid "Could not open %%files file %s: %s\n" msgstr "Fehler: kann Datei %s nicht öffnen\n" # , c-format -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, fuzzy, c-format msgid "line: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -803,170 +803,170 @@ msgid "Could not canonicalize hostname: %s\n" msgstr "" # , c-format -#: build/pack.c:81 +#: build/pack.c:83 #, fuzzy, c-format msgid "create archive failed on file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: build/pack.c:84 +#: build/pack.c:86 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/pack.c:106 +#: build/pack.c:108 #, fuzzy, c-format msgid "cpio_copy write failed: %s\n" msgstr "lesen fehlgeschlagen: %s (%d)" -#: build/pack.c:113 +#: build/pack.c:115 #, fuzzy, c-format msgid "cpio_copy read failed: %s\n" msgstr "lesen fehlgeschlagen: %s (%d)" -#: build/pack.c:216 +#: build/pack.c:218 #, fuzzy, c-format msgid "Could not open PreIn file: %s\n" msgstr "Fehler: kann Datei %s nicht öffnen\n" -#: build/pack.c:223 +#: build/pack.c:225 #, fuzzy, c-format msgid "Could not open PreUn file: %s\n" msgstr "Fehler: kann Datei %s nicht öffnen\n" -#: build/pack.c:230 +#: build/pack.c:232 #, fuzzy, c-format msgid "Could not open PostIn file: %s\n" msgstr "Fehler: kann Datei %s nicht öffnen\n" -#: build/pack.c:237 +#: build/pack.c:239 #, fuzzy, c-format msgid "Could not open PostUn file: %s\n" msgstr "Fehler: kann Datei %s nicht öffnen\n" -#: build/pack.c:245 +#: build/pack.c:247 #, fuzzy, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Fehler: kann Datei %s nicht öffnen\n" -#: build/pack.c:260 +#: build/pack.c:262 #, fuzzy, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Fehler: kann Datei %s nicht öffnen\n" # , c-format -#: build/pack.c:288 +#: build/pack.c:290 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: build/pack.c:298 +#: build/pack.c:300 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "Lesen von %s fehlgeschlagen: %s." -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: build/pack.c:335 +#: build/pack.c:337 #, fuzzy, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "Fehler: %s scheint zu keinem RPM-Paket zu gehören\n" -#: build/pack.c:344 +#: build/pack.c:346 #, fuzzy, c-format msgid "readRPM: reading header from %s\n" msgstr "Fehler beim Eintrag %s von %s" # , c-format -#: build/pack.c:473 +#: build/pack.c:475 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Nicht möglich %s zu schreiben" # , c-format -#: build/pack.c:492 +#: build/pack.c:494 #, fuzzy msgid "Unable to write temp header\n" msgstr "Nicht möglich %s zu schreiben" -#: build/pack.c:502 +#: build/pack.c:504 msgid "Bad CSA data\n" msgstr "" # , c-format -#: build/pack.c:538 +#: build/pack.c:540 #, fuzzy msgid "Unable to write final header\n" msgstr "Nicht möglich %s zu schreiben" -#: build/pack.c:558 +#: build/pack.c:560 #, fuzzy, c-format msgid "Generating signature: %d\n" msgstr "PGP-Signatur generieren" # , c-format -#: build/pack.c:576 +#: build/pack.c:578 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Nicht möglich %s zu schreiben" # , c-format -#: build/pack.c:584 +#: build/pack.c:586 #, fuzzy, c-format msgid "Could not open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen\n" # , c-format -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nicht möglich %s zu schreiben" # , c-format -#: build/pack.c:635 +#: build/pack.c:637 #, fuzzy, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Nicht möglich %s zu schreiben" # , c-format -#: build/pack.c:646 +#: build/pack.c:648 #, fuzzy, c-format msgid "Unable to read header from %s: %s\n" msgstr "Nicht möglich %s zu schreiben" # , c-format -#: build/pack.c:660 +#: build/pack.c:662 #, fuzzy, c-format msgid "Unable to write header to %s: %s\n" msgstr "Nicht möglich %s zu schreiben" # , c-format -#: build/pack.c:670 +#: build/pack.c:672 #, fuzzy, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Nicht möglich %s zu schreiben" # , c-format -#: build/pack.c:676 +#: build/pack.c:678 #, fuzzy, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Nicht möglich %s zu schreiben" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:785 +#: build/pack.c:787 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "kann Datei %s nicht öffnen: " @@ -1523,47 +1523,47 @@ msgstr "ung msgid "line %d: Bad %s number: %s\n" msgstr "ungültige Paket-Nummer: %s\n" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "Fehler: " -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "" -#: lib/cpio.c:213 +#: lib/cpio.c:218 #, fuzzy msgid "Unknown file type" msgstr "(unbekannter Typ)" -#: lib/cpio.c:214 +#: lib/cpio.c:219 #, fuzzy msgid "Missing hard link(s)" msgstr "fehlender ':' bei %s:%d" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:216 +#: lib/cpio.c:221 #, fuzzy msgid "Internal error" msgstr "Fataler Fehler: " -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:228 +#: lib/cpio.c:233 #, fuzzy msgid " failed - " msgstr "pgp fehlgeschlagen" @@ -1603,56 +1603,43 @@ msgstr "die Datei msgid "(db package)" msgstr "Anfrage an alle Pakete" -#: lib/depends.c:492 -#, fuzzy, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "die Datei »%s« gehört zu keinem Paket\n" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "NO " -msgstr "" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" # FIXME -#: lib/depends.c:882 +#: lib/depends.c:881 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1704,47 +1691,47 @@ msgstr " msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:313 +#: lib/fsm.c:318 msgid "========== Directories not explictly included in package:\n" msgstr "" # , c-format -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, fuzzy, c-format msgid "%10d %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "kann %s nicht entfernen - Verzeichnis ist nicht leer" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "Entfernen von %s fehlgeschlagen: %s" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "kann Datei %s nicht öffnen: " @@ -1754,50 +1741,50 @@ msgstr "kann Datei %s nicht msgid "error creating temporary file %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/package.c:181 lib/package.c:257 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#, c-format +msgid "%s: readLead failed\n" +msgstr "%s: »readLead« fehlgeschlagen\n" + +#: lib/package.c:174 +#, c-format +msgid "%s: bad magic\n" +msgstr "" + +#: lib/package.c:182 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt" -#: lib/package.c:202 lib/package.c:265 +#: lib/package.c:190 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt" -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 -#, c-format -msgid "%s: readLead failed\n" -msgstr "%s: »readLead« fehlgeschlagen\n" - -#: lib/package.c:249 -#, c-format -msgid "%s: bad magic\n" -msgstr "" - -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: »rpmReadSignature« fehlgeschlagen\n" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "%s: Keine Signatur verfügbar\n" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" @@ -2259,171 +2246,171 @@ msgid "generate signature" msgstr "PGP-Signatur generieren" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:236 +#: lib/problems.c:234 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:241 +#: lib/problems.c:239 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/problems.c:246 +#: lib/problems.c:244 #, fuzzy, c-format msgid "package %s is already installed" msgstr "Paket %s ist nicht installiert\n" -#: lib/problems.c:251 +#: lib/problems.c:249 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "Paket %s ist nicht installiert\n" -#: lib/problems.c:256 +#: lib/problems.c:254 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:261 +#: lib/problems.c:259 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr " steht im Konflikt mit %s-%s-%s\n" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:266 +#: lib/problems.c:264 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/problems.c:271 +#: lib/problems.c:269 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:281 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:286 +#: lib/problems.c:284 #, fuzzy, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/problems.c:290 +#: lib/problems.c:288 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" -#: lib/problems.c:294 +#: lib/problems.c:292 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" -#: lib/problems.c:299 +#: lib/problems.c:297 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "conflicts with" msgstr " steht im Konflikt mit %s-%s-%s\n" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "is needed by" msgstr " wird von %s-%s-%s gebraucht\n" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:442 +#: lib/psm.c:447 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/psm.c:448 +#: lib/psm.c:453 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/psm.c:481 +#: lib/psm.c:486 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:597 +#: lib/psm.c:602 #, fuzzy msgid "source package contains no .spec file\n" msgstr "Anfrage nach Paket, das die Datei besitzt" -#: lib/psm.c:716 +#: lib/psm.c:721 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "Keine Stufen ausführen" -#: lib/psm.c:882 +#: lib/psm.c:887 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "Ausführung des Skripts fehlgeschlagen" -#: lib/psm.c:889 +#: lib/psm.c:894 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "Ausführung des Skripts fehlgeschlagen" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp fehlgeschlagen" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "Fehler beim Format %s\n" @@ -2468,8 +2455,8 @@ msgstr "Paket hat keinen Namen" msgid "can't query %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" @@ -2483,7 +2470,7 @@ msgstr "Anfrage von %s fehlgeschlagen\n" msgid "old format source packages cannot be queried\n" msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" @@ -2556,7 +2543,7 @@ msgstr "ung msgid "record %u could not be read\n" msgstr "Eintrag %d konnte nicht gelesen werden\n" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, c-format msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" @@ -2567,7 +2554,7 @@ msgstr "Paket %s ist nicht installiert\n" msgid "(added files)" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 #, fuzzy msgid "(added provide)" msgstr "die Datei »%s« gehört zu keinem Paket\n" @@ -2642,21 +2629,29 @@ msgstr "" msgid "OK" msgstr "" +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "NO " +msgstr "" + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" @@ -2671,88 +2666,97 @@ msgid "Preparing packages for installation..." msgstr "Es wurden keine Pakete für die Installation angegeben" # , c-format -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "Hole %s heraus\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "Fehler: %s kann nicht installiert werden\n" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/rpminstall.c:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +#, fuzzy +msgid "Failed dependencies:\n" msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" +msgstr "" + +#: lib/rpminstall.c:579 #, fuzzy msgid "installing binary packages\n" msgstr "Paket installieren" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" bezeichnet mehrere Pakete\n" # oder besser: "... verletzen" ? -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "Installiere %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "Es wurden keine Pakete für die Deinstallation angegeben" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" + +#: lib/rpmlead.c:47 #, fuzzy, c-format msgid "read failed: %s (%d)\n" msgstr "lesen fehlgeschlagen: %s (%d)" @@ -2855,7 +2859,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s." -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" @@ -3005,32 +3009,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:326 +#: lib/verify.c:329 #, fuzzy, c-format msgid "missing %s" msgstr "fehlende { nach %{" -#: lib/verify.c:421 +#: lib/verify.c:424 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: " -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3640,6 +3644,10 @@ msgstr "Fehler: der FTP-Port muss eine Zahl sein\n" msgid "failed to create %s: %s\n" msgstr "anlegen von %s fehlgeschlagen\n" +#, fuzzy +#~ msgid "%9s: (%s, %s) added to Depends cache.\n" +#~ msgstr "die Datei »%s« gehört zu keinem Paket\n" + #~ msgid "(unknown type)" #~ msgstr "(unbekannter Typ)" diff --git a/po/fi.po b/po/fi.po index b822b77bd..2d3410a30 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -447,7 +447,7 @@ msgstr "--querytags: odottamattomia parametrej msgid "no arguments given" msgstr "kyselylle ei annettu parametrejä" -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 #, fuzzy msgid "Unable to open temp file.\n" msgstr "En voi avata %s luettavaksi: %s." @@ -660,7 +660,7 @@ msgstr "Tiedostoa ei l msgid "Could not open %%files file %s: %s\n" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, fuzzy, c-format msgid "line: %s\n" msgstr "en voinut avata %s: %s" @@ -735,156 +735,156 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:83 #, fuzzy, c-format msgid "create archive failed on file %s: %s\n" msgstr "en voinut avata %s: %s" -#: build/pack.c:84 +#: build/pack.c:86 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "en voinut avata %s: %s" -#: build/pack.c:106 +#: build/pack.c:108 #, fuzzy, c-format msgid "cpio_copy write failed: %s\n" msgstr "luku epäonnistui: %s (%d)" -#: build/pack.c:113 +#: build/pack.c:115 #, fuzzy, c-format msgid "cpio_copy read failed: %s\n" msgstr "luku epäonnistui: %s (%d)" -#: build/pack.c:216 +#: build/pack.c:218 #, fuzzy, c-format msgid "Could not open PreIn file: %s\n" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/pack.c:223 +#: build/pack.c:225 #, fuzzy, c-format msgid "Could not open PreUn file: %s\n" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/pack.c:230 +#: build/pack.c:232 #, fuzzy, c-format msgid "Could not open PostIn file: %s\n" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/pack.c:237 +#: build/pack.c:239 #, fuzzy, c-format msgid "Could not open PostUn file: %s\n" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/pack.c:245 +#: build/pack.c:247 #, fuzzy, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/pack.c:260 +#: build/pack.c:262 #, fuzzy, c-format msgid "Could not open Trigger script file: %s\n" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/pack.c:288 +#: build/pack.c:290 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "en voinut avata %s: %s" -#: build/pack.c:298 +#: build/pack.c:300 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "En voi lukea %s: %s." -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: readLead epäonnistui\n" -#: build/pack.c:335 +#: build/pack.c:337 #, fuzzy, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "virhe: %s ei vaikuta RPM paketilta\n" -#: build/pack.c:344 +#: build/pack.c:346 #, fuzzy, c-format msgid "readRPM: reading header from %s\n" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: build/pack.c:473 +#: build/pack.c:475 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:492 +#: build/pack.c:494 #, fuzzy msgid "Unable to write temp header\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:502 +#: build/pack.c:504 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:538 +#: build/pack.c:540 #, fuzzy msgid "Unable to write final header\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:558 +#: build/pack.c:560 #, fuzzy, c-format msgid "Generating signature: %d\n" msgstr "generoi PGP-allekirjoitus" -#: build/pack.c:576 +#: build/pack.c:578 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:584 +#: build/pack.c:586 #, fuzzy, c-format msgid "Could not open %s: %s\n" msgstr "%s:n avaus epäonnistui\n" -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:635 +#: build/pack.c:637 #, fuzzy, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:646 +#: build/pack.c:648 #, fuzzy, c-format msgid "Unable to read header from %s: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:660 +#: build/pack.c:662 #, fuzzy, c-format msgid "Unable to write header to %s: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:670 +#: build/pack.c:672 #, fuzzy, c-format msgid "Unable to read payload from %s: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:676 +#: build/pack.c:678 #, fuzzy, c-format msgid "Unable to write payload to %s: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:785 +#: build/pack.c:787 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "en voinut avata tiedostoa %s: " @@ -1415,47 +1415,47 @@ msgstr "virheellinen paketin numero: %s\n" msgid "line %d: Bad %s number: %s\n" msgstr "virheellinen paketin numero: %s\n" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "virhe: " -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "" -#: lib/cpio.c:213 +#: lib/cpio.c:218 #, fuzzy msgid "Unknown file type" msgstr "(tuntematon tyyppi)" -#: lib/cpio.c:214 +#: lib/cpio.c:219 #, fuzzy msgid "Missing hard link(s)" msgstr "puuttuva ':', %s:%d" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:216 +#: lib/cpio.c:221 #, fuzzy msgid "Internal error" msgstr "vakava virhe: " -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:228 +#: lib/cpio.c:233 #, fuzzy msgid " failed - " msgstr "pgp epäonnistui" @@ -1494,55 +1494,42 @@ msgstr "tiedostoa %s ei omista mik msgid "(db package)" msgstr "kysele kaikki paketit" -#: lib/depends.c:492 -#, fuzzy, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "tiedostoa %s ei omista mikään paketti\n" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "NO " -msgstr "" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:881 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1591,46 +1578,46 @@ msgstr "en voinut avata %s: %s" msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:313 +#: lib/fsm.c:318 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, fuzzy, c-format msgid "%10d %s\n" msgstr "en voinut avata %s: %s" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "en voi poistaa %s -hakemisto ei ole tyhjä" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s:n rmdir epäonnistui: %s" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "en voinut avata tiedostoa %s: " @@ -1640,50 +1627,50 @@ msgstr "en voinut avata tiedostoa %s: " msgid "error creating temporary file %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/package.c:181 lib/package.c:257 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#, c-format +msgid "%s: readLead failed\n" +msgstr "%s: readLead epäonnistui\n" + +#: lib/package.c:174 +#, c-format +msgid "%s: bad magic\n" +msgstr "" + +#: lib/package.c:182 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja" -#: lib/package.c:202 lib/package.c:265 +#: lib/package.c:190 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja" -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 -#, c-format -msgid "%s: readLead failed\n" -msgstr "%s: readLead epäonnistui\n" - -#: lib/package.c:249 -#, c-format -msgid "%s: bad magic\n" -msgstr "" - -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature epäonnistui\n" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ei allekirjoitusta saatavilla\n" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead epäonnistui\n" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: readLead epäonnistui\n" @@ -2142,165 +2129,165 @@ msgid "generate signature" msgstr "generoi PGP-allekirjoitus" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/problems.c:241 +#: lib/problems.c:239 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/problems.c:246 +#: lib/problems.c:244 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paketti %s ei ole asennettu\n" -#: lib/problems.c:251 +#: lib/problems.c:249 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paketti %s ei ole asennettu\n" -#: lib/problems.c:256 +#: lib/problems.c:254 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:261 +#: lib/problems.c:259 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr " on ristiriidassa %s-%s-%s:n kanssa\n" -#: lib/problems.c:266 +#: lib/problems.c:264 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/problems.c:271 +#: lib/problems.c:269 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:281 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:286 +#: lib/problems.c:284 #, fuzzy, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/problems.c:290 +#: lib/problems.c:288 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: lib/problems.c:294 +#: lib/problems.c:292 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: lib/problems.c:299 +#: lib/problems.c:297 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "conflicts with" msgstr " on ristiriidassa %s-%s-%s:n kanssa\n" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "is needed by" msgstr "vaatii %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:442 +#: lib/psm.c:447 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/psm.c:448 +#: lib/psm.c:453 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/psm.c:481 +#: lib/psm.c:486 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:597 +#: lib/psm.c:602 #, fuzzy msgid "source package contains no .spec file\n" msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/psm.c:716 +#: lib/psm.c:721 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "älä suorita mitään vaiheita" -#: lib/psm.c:882 +#: lib/psm.c:887 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "skriptin ajo epäonnistui" -#: lib/psm.c:889 +#: lib/psm.c:894 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "skriptin ajo epäonnistui" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr "" -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp epäonnistui" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "virhe formaatissa: %s\n" @@ -2345,8 +2332,8 @@ msgstr "paketilla ei ole nime msgid "can't query %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" @@ -2360,7 +2347,7 @@ msgstr "%s:n kysely ei onnistunut\n" msgid "old format source packages cannot be queried\n" msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: readLead epäonnistui\n" @@ -2430,7 +2417,7 @@ msgstr "virheellinen paketin numero: %s\n" msgid "record %u could not be read\n" msgstr "tietuetta %d ei voitu lukea\n" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, c-format msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" @@ -2440,7 +2427,7 @@ msgstr "paketti %s ei ole asennettu\n" msgid "(added files)" msgstr "en voinut avata %s: %s" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 #, fuzzy msgid "(added provide)" msgstr "tiedostoa %s ei omista mikään paketti\n" @@ -2515,21 +2502,29 @@ msgstr "" msgid "OK" msgstr "" +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "NO " +msgstr "" + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paketti %s ei ole %s:ssä" @@ -2543,87 +2538,96 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "asennukselle ei määritelty paketteja" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "Haen: %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "virhe: %s ei voida asentaa\n" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/rpminstall.c:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +#, fuzzy +msgid "Failed dependencies:\n" msgstr "puuttuvat riippuvuudet:\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" +msgstr "" + +#: lib/rpminstall.c:579 #, fuzzy msgid "installing binary packages\n" msgstr "asenna paketti" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" määrittää useita paketteja\n" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "Asennan: %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "poistolle ei määritelty paketteja" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "puuttuvat riippuvuudet:\n" + +#: lib/rpmlead.c:47 #, fuzzy, c-format msgid "read failed: %s (%d)\n" msgstr "luku epäonnistui: %s (%d)" @@ -2723,7 +2727,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "En voi avata %s luettavaksi: %s." -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "virhe: en voi avata %s%s/packages.rpm\n" @@ -2873,32 +2877,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:326 +#: lib/verify.c:329 #, fuzzy, c-format msgid "missing %s" msgstr "puuttuva '{' '%':n jälkeen" -#: lib/verify.c:421 +#: lib/verify.c:424 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:" -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3498,6 +3502,10 @@ msgstr "virhe: ftpport pit msgid "failed to create %s: %s\n" msgstr "%s:n luonti epäonnistui\n" +#, fuzzy +#~ msgid "%9s: (%s, %s) added to Depends cache.\n" +#~ msgstr "tiedostoa %s ei omista mikään paketti\n" + #~ msgid "(unknown type)" #~ msgstr "(tuntematon tyyppi)" diff --git a/po/fr.po b/po/fr.po index b9cca0517..e28115daa 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -478,7 +478,7 @@ msgstr "" msgid "no arguments given" msgstr "aucun argument n'a t fourni pour la requte" -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 #, fuzzy msgid "Unable to open temp file.\n" msgstr "impossible d'ouvrir: %s\n" @@ -686,7 +686,7 @@ msgstr "aucun package n'a t spcifi pour la dsinstallation" msgid "Could not open %%files file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, fuzzy, c-format msgid "line: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -761,156 +761,156 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:83 #, fuzzy, c-format msgid "create archive failed on file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:84 +#: build/pack.c:86 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:106 +#: build/pack.c:108 #, fuzzy, c-format msgid "cpio_copy write failed: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:113 +#: build/pack.c:115 #, fuzzy, c-format msgid "cpio_copy read failed: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:216 +#: build/pack.c:218 #, fuzzy, c-format msgid "Could not open PreIn file: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:223 +#: build/pack.c:225 #, fuzzy, c-format msgid "Could not open PreUn file: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:230 +#: build/pack.c:232 #, fuzzy, c-format msgid "Could not open PostIn file: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:237 +#: build/pack.c:239 #, fuzzy, c-format msgid "Could not open PostUn file: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:245 +#: build/pack.c:247 #, fuzzy, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:260 +#: build/pack.c:262 #, fuzzy, c-format msgid "Could not open Trigger script file: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:288 +#: build/pack.c:290 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:298 +#: build/pack.c:300 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:335 +#: build/pack.c:337 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:344 +#: build/pack.c:346 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:473 +#: build/pack.c:475 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:492 +#: build/pack.c:494 #, fuzzy msgid "Unable to write temp header\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:502 +#: build/pack.c:504 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:538 +#: build/pack.c:540 #, fuzzy msgid "Unable to write final header\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:558 +#: build/pack.c:560 #, fuzzy, c-format msgid "Generating signature: %d\n" msgstr " --sign - genre une signature PGP" -#: build/pack.c:576 +#: build/pack.c:578 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:584 +#: build/pack.c:586 #, fuzzy, c-format msgid "Could not open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:635 +#: build/pack.c:637 #, fuzzy, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:646 +#: build/pack.c:648 #, fuzzy, c-format msgid "Unable to read header from %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:660 +#: build/pack.c:662 #, fuzzy, c-format msgid "Unable to write header to %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:670 +#: build/pack.c:672 #, fuzzy, c-format msgid "Unable to read payload from %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:676 +#: build/pack.c:678 #, fuzzy, c-format msgid "Unable to write payload to %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:785 +#: build/pack.c:787 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -1449,44 +1449,44 @@ msgstr "impossible d'ouvrir: %s\n" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "" -#: lib/cpio.c:213 +#: lib/cpio.c:218 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:214 +#: lib/cpio.c:219 msgid "Missing hard link(s)" msgstr "" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:216 +#: lib/cpio.c:221 msgid "Internal error" msgstr "" -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:228 +#: lib/cpio.c:233 #, fuzzy msgid " failed - " msgstr "La construction a chou.\n" @@ -1522,55 +1522,42 @@ msgstr "" msgid "(db package)" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:492 -#, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "NO " -msgstr "" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:881 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "impossible d'ouvrir: %s\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1617,46 +1604,46 @@ msgstr "impossible d'ouvrir: %s\n" msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:313 +#: lib/fsm.c:318 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, fuzzy, c-format msgid "%10d %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "La construction a chou.\n" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "La construction a chou.\n" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -1666,46 +1653,46 @@ msgstr "impossible d'ouvrir: %s\n" msgid "error creating temporary file %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/package.c:181 lib/package.c:257 -msgid "packaging version 1 is not supported by this version of RPM\n" -msgstr "" - -#: lib/package.c:202 lib/package.c:265 -msgid "" -"only packaging with major numbers <= 4 is supported by this version of RPM\n" -msgstr "" - -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 #, c-format msgid "%s: readLead failed\n" msgstr "" -#: lib/package.c:249 +#: lib/package.c:174 #, c-format msgid "%s: bad magic\n" msgstr "" -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:182 +msgid "packaging version 1 is not supported by this version of RPM\n" +msgstr "" + +#: lib/package.c:190 +msgid "" +"only packaging with major numbers <= 4 is supported by this version of RPM\n" +msgstr "" + +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -2180,164 +2167,164 @@ msgid "generate signature" msgstr " --sign - genre une signature PGP" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:241 +#: lib/problems.c:239 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:246 +#: lib/problems.c:244 #, fuzzy, c-format msgid "package %s is already installed" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:251 +#: lib/problems.c:249 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:256 +#: lib/problems.c:254 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:261 +#: lib/problems.c:259 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:266 +#: lib/problems.c:264 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:271 +#: lib/problems.c:269 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:281 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:286 +#: lib/problems.c:284 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:288 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:294 +#: lib/problems.c:292 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:299 +#: lib/problems.c:297 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:379 +#: lib/problems.c:377 msgid "conflicts with" msgstr "" -#: lib/problems.c:379 +#: lib/problems.c:377 msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:442 +#: lib/psm.c:447 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:448 +#: lib/psm.c:453 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:481 +#: lib/psm.c:486 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:597 +#: lib/psm.c:602 #, fuzzy msgid "source package contains no .spec file\n" msgstr "" " -f + - interroge le package qui appartient " -#: lib/psm.c:716 +#: lib/psm.c:721 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:882 +#: lib/psm.c:887 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:889 +#: lib/psm.c:894 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "La construction a chou.\n" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr "" -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "La construction a chou.\n" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2382,8 +2369,8 @@ msgstr "aucun package n'a t spcifi pour l'installation" msgid "can't query %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "La construction a chou.\n" @@ -2397,7 +2384,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -2467,7 +2454,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2477,7 +2464,7 @@ msgstr "aucun package n'a t spcifi pour l'installation" msgid "(added files)" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 msgid "(added provide)" msgstr "" @@ -2550,21 +2537,29 @@ msgstr "" msgid "OK" msgstr "" +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "NO " +msgstr "" + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2578,86 +2573,95 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +#, fuzzy +msgid "Failed dependencies:\n" +msgstr "impossible d'ouvrir: %s\n" + +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:579 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "" + +#: lib/rpmlead.c:47 #, fuzzy, c-format msgid "read failed: %s (%d)\n" msgstr "impossible d'ouvrir: %s\n" @@ -2757,7 +2761,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -2904,32 +2908,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:326 +#: lib/verify.c:329 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:421 +#: lib/verify.c:424 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "impossible d'ouvrir: %s\n" -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/gl.po b/po/gl.po index 25b7eabb1..5905e0b73 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -423,7 +423,7 @@ msgstr "" msgid "no arguments given" msgstr "" -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 msgid "Unable to open temp file.\n" msgstr "" @@ -630,7 +630,7 @@ msgstr "" msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, c-format msgid "line: %s\n" msgstr "" @@ -705,152 +705,152 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:83 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "" -#: build/pack.c:84 +#: build/pack.c:86 #, c-format msgid "create archive failed: %s\n" msgstr "" -#: build/pack.c:106 +#: build/pack.c:108 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:113 +#: build/pack.c:115 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:216 +#: build/pack.c:218 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "" -#: build/pack.c:223 +#: build/pack.c:225 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "" -#: build/pack.c:230 +#: build/pack.c:232 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "" -#: build/pack.c:237 +#: build/pack.c:239 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "" -#: build/pack.c:245 +#: build/pack.c:247 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "" -#: build/pack.c:260 +#: build/pack.c:262 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:290 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:300 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "" -#: build/pack.c:335 +#: build/pack.c:337 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:344 +#: build/pack.c:346 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:473 +#: build/pack.c:475 msgid "Unable to create immutable header region.\n" msgstr "" -#: build/pack.c:492 +#: build/pack.c:494 msgid "Unable to write temp header\n" msgstr "" -#: build/pack.c:502 +#: build/pack.c:504 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:538 +#: build/pack.c:540 msgid "Unable to write final header\n" msgstr "" -#: build/pack.c:558 +#: build/pack.c:560 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:576 +#: build/pack.c:578 msgid "Unable to reload signature header.\n" msgstr "" -#: build/pack.c:584 +#: build/pack.c:586 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, c-format msgid "Unable to write package: %s\n" msgstr "" -#: build/pack.c:635 +#: build/pack.c:637 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "" -#: build/pack.c:646 +#: build/pack.c:648 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "" -#: build/pack.c:660 +#: build/pack.c:662 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "" -#: build/pack.c:670 +#: build/pack.c:672 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "" -#: build/pack.c:676 +#: build/pack.c:678 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:785 +#: build/pack.c:787 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1363,44 +1363,44 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "" -#: lib/cpio.c:213 +#: lib/cpio.c:218 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:214 +#: lib/cpio.c:219 msgid "Missing hard link(s)" msgstr "" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:216 +#: lib/cpio.c:221 msgid "Internal error" msgstr "" -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:228 +#: lib/cpio.c:233 msgid " failed - " msgstr "" @@ -1433,55 +1433,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:492 -#, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "NO " -msgstr "" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:881 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1528,46 +1515,46 @@ msgstr "" msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:313 +#: lib/fsm.c:318 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, c-format msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1577,46 +1564,46 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:181 lib/package.c:257 -msgid "packaging version 1 is not supported by this version of RPM\n" -msgstr "" - -#: lib/package.c:202 lib/package.c:265 -msgid "" -"only packaging with major numbers <= 4 is supported by this version of RPM\n" -msgstr "" - -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 #, c-format msgid "%s: readLead failed\n" msgstr "" -#: lib/package.c:249 +#: lib/package.c:174 #, c-format msgid "%s: bad magic\n" msgstr "" -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:182 +msgid "packaging version 1 is not supported by this version of RPM\n" +msgstr "" + +#: lib/package.c:190 +msgid "" +"only packaging with major numbers <= 4 is supported by this version of RPM\n" +msgstr "" + +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2021,162 +2008,162 @@ msgid "generate signature" msgstr "" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:241 +#: lib/problems.c:239 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:246 +#: lib/problems.c:244 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:251 +#: lib/problems.c:249 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:256 +#: lib/problems.c:254 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:261 +#: lib/problems.c:259 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:266 +#: lib/problems.c:264 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:271 +#: lib/problems.c:269 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:281 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:286 +#: lib/problems.c:284 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:288 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:292 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:299 +#: lib/problems.c:297 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:379 +#: lib/problems.c:377 msgid "conflicts with" msgstr "" -#: lib/problems.c:379 +#: lib/problems.c:377 msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:442 +#: lib/psm.c:447 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:448 +#: lib/psm.c:453 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:481 +#: lib/psm.c:486 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:597 +#: lib/psm.c:602 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:716 +#: lib/psm.c:721 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:882 +#: lib/psm.c:887 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:889 +#: lib/psm.c:894 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr "" -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, c-format msgid "%s failed: %s\n" msgstr "" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2219,8 +2206,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2234,7 +2221,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2303,7 +2290,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2312,7 +2299,7 @@ msgstr "" msgid "(added files)" msgstr "" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 msgid "(added provide)" msgstr "" @@ -2384,21 +2371,29 @@ msgstr "" msgid "OK" msgstr "" +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "NO " +msgstr "" + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2411,86 +2406,94 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" +msgstr "" + +#: lib/rpminstall.c:579 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "" + +#: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" msgstr "" @@ -2590,7 +2593,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "" -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" @@ -2730,32 +2733,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:326 +#: lib/verify.c:329 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:421 +#: lib/verify.c:424 #, c-format msgid "Unsatisifed dependencies for %s: " msgstr "" -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/is.po b/po/is.po index 62a593186..15795cf02 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -424,7 +424,7 @@ msgstr "" msgid "no arguments given" msgstr "" -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 msgid "Unable to open temp file.\n" msgstr "Get ekki opnağ tempi skrá.\n" @@ -631,7 +631,7 @@ msgstr "Skr msgid "Could not open %%files file %s: %s\n" msgstr "Gat ekki opnağ %%files skrána %s: %s\n" -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, c-format msgid "line: %s\n" msgstr "lína: %s\n" @@ -706,156 +706,156 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:83 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "safnskráarsmíğ brást á skrá %s: %s\n" -#: build/pack.c:84 +#: build/pack.c:86 #, c-format msgid "create archive failed: %s\n" msgstr "safnskráarsmíğ brást: %s\n" -#: build/pack.c:106 +#: build/pack.c:108 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:113 +#: build/pack.c:115 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:216 +#: build/pack.c:218 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "Gat ekki opnağ PreIn skrá: %s\n" -#: build/pack.c:223 +#: build/pack.c:225 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "Gat ekki opnağ PreUn skrá: %s\n" -#: build/pack.c:230 +#: build/pack.c:232 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "Gat ekki opnağ PostIn skrá: %s\n" -#: build/pack.c:237 +#: build/pack.c:239 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "Gat ekki opnağ PostUn skrá: %s\n" -#: build/pack.c:245 +#: build/pack.c:247 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Get ekki opnağ VerifyScript skrá: %s\n" -#: build/pack.c:260 +#: build/pack.c:262 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:290 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:300 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: Fseek brást: %s\n" -#: build/pack.c:335 +#: build/pack.c:337 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:344 +#: build/pack.c:346 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:473 +#: build/pack.c:475 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Get ekki lesiğ haus úr %s: %s\n" -#: build/pack.c:492 +#: build/pack.c:494 #, fuzzy msgid "Unable to write temp header\n" msgstr "Gat ekki ritağ haus í %s: %s\n" -#: build/pack.c:502 +#: build/pack.c:504 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:538 +#: build/pack.c:540 #, fuzzy msgid "Unable to write final header\n" msgstr "Gat ekki ritağ haus í %s: %s\n" -#: build/pack.c:558 +#: build/pack.c:560 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:576 +#: build/pack.c:578 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Get ekki lesiğ haus úr %s: %s\n" -#: build/pack.c:584 +#: build/pack.c:586 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, c-format msgid "Unable to write package: %s\n" msgstr "Get ekki ritağ í pakka: %s\n" -#: build/pack.c:635 +#: build/pack.c:637 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Get ekki opnağ sigtarget %s: %s\n" -#: build/pack.c:646 +#: build/pack.c:648 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "Get ekki lesiğ haus úr %s: %s\n" -#: build/pack.c:660 +#: build/pack.c:662 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "Gat ekki ritağ haus í %s: %s\n" -#: build/pack.c:670 +#: build/pack.c:672 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Get ekki lesiğ innihald %s: %s\n" -#: build/pack.c:676 +#: build/pack.c:678 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Get ekki ritağ innihald í %s: %s\n" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "Skrifaği: %s\n" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:785 +#: build/pack.c:787 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1369,44 +1369,44 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "" -#: lib/cpio.c:213 +#: lib/cpio.c:218 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:214 +#: lib/cpio.c:219 msgid "Missing hard link(s)" msgstr "Harğar tengingar vantar" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:216 +#: lib/cpio.c:221 msgid "Internal error" msgstr "" -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:228 +#: lib/cpio.c:233 msgid " failed - " msgstr "" @@ -1440,55 +1440,42 @@ msgstr "" msgid "(db package)" msgstr "uppfæra pakka" -#: lib/depends.c:492 -#, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "NO " -msgstr "" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:881 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1535,46 +1522,46 @@ msgstr "gat ekki opna msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:313 +#: lib/fsm.c:318 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, c-format msgid "%s saved as %s\n" msgstr "%s vistağ sem %s\n" -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir %s brást: %s\n" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s gat ekki eytt %s: %s\n" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, c-format msgid "%s created as %s\n" msgstr "%s búiğ til sem %s\n" @@ -1584,46 +1571,46 @@ msgstr "%s b msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:181 lib/package.c:257 -msgid "packaging version 1 is not supported by this version of RPM\n" -msgstr "" - -#: lib/package.c:202 lib/package.c:265 -msgid "" -"only packaging with major numbers <= 4 is supported by this version of RPM\n" -msgstr "" - -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 #, c-format msgid "%s: readLead failed\n" msgstr "" -#: lib/package.c:249 +#: lib/package.c:174 #, c-format msgid "%s: bad magic\n" msgstr "" -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:182 +msgid "packaging version 1 is not supported by this version of RPM\n" +msgstr "" + +#: lib/package.c:190 +msgid "" +"only packaging with major numbers <= 4 is supported by this version of RPM\n" +msgstr "" + +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: Fseek brást: %s\n" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2037,162 +2024,162 @@ msgid "generate signature" msgstr "búa til undirskrift" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:241 +#: lib/problems.c:239 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:246 +#: lib/problems.c:244 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:251 +#: lib/problems.c:249 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:256 +#: lib/problems.c:254 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:261 +#: lib/problems.c:259 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:266 +#: lib/problems.c:264 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:271 +#: lib/problems.c:269 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:281 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:286 +#: lib/problems.c:284 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:288 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:292 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:299 +#: lib/problems.c:297 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:379 +#: lib/problems.c:377 msgid "conflicts with" msgstr "" -#: lib/problems.c:379 +#: lib/problems.c:377 msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:442 +#: lib/psm.c:447 #, c-format msgid "cannot create %%%s %s\n" msgstr "gat ekki búiğ til %%%s %s\n" -#: lib/psm.c:448 +#: lib/psm.c:453 #, c-format msgid "cannot write to %%%s %s\n" msgstr "get ekki ritağ í %%%s %s\n" -#: lib/psm.c:481 +#: lib/psm.c:486 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:597 +#: lib/psm.c:602 msgid "source package contains no .spec file\n" msgstr "pakkinn inniheldur enga .spec skrá\n" -#: lib/psm.c:716 +#: lib/psm.c:721 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:882 +#: lib/psm.c:887 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:889 +#: lib/psm.c:894 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr "" -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "gat ekki opnağ %s: %s\n" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s brást\n" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2235,8 +2222,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2250,7 +2237,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: gat ekki lesiğ manifest: %s\n" @@ -2319,7 +2306,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2328,7 +2315,7 @@ msgstr "" msgid "(added files)" msgstr "" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 msgid "(added provide)" msgstr "" @@ -2400,21 +2387,29 @@ msgstr "" msgid "OK" msgstr "" +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "NO " +msgstr "" + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2427,86 +2422,95 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +#, fuzzy +msgid "Failed dependencies:\n" +msgstr "gat ekki útbúiğ pakkaskilyrği:\n" + +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:579 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "" + +#: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" msgstr "" @@ -2606,7 +2610,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Get ekki opnağ %s til lesturs: %s.\n" -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, c-format msgid "cannot open Packages database in %s\n" msgstr "get ekki opnağ pakka gagnagrunn í\n" @@ -2746,32 +2750,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:326 +#: lib/verify.c:329 #, c-format msgid "missing %s" msgstr "vantar %s" -#: lib/verify.c:421 +#: lib/verify.c:424 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Óuppfyllt pakkaskilyrği fyrir %s-%s-%s: " -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index 607687b63..20185bf2b 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -457,7 +457,7 @@ msgstr "--querytags msgid "no arguments given" msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Ş¤»¤ó" -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 #, fuzzy msgid "Unable to open temp file.\n" msgstr "°ì»ş¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó" @@ -677,7 +677,7 @@ msgstr " msgid "Could not open %%files file %s: %s\n" msgstr "%%files ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó: %s" -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, fuzzy, c-format msgid "line: %s\n" msgstr "¹ÔÌÜ: %s" @@ -752,157 +752,157 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "¥Û¥¹¥È̾¤òÀµ¼°¤Ê¤â¤Î¤Ë¤Ç¤­¤Ş¤»¤ó: %s\n" -#: build/pack.c:81 +#: build/pack.c:83 #, fuzzy, c-format msgid "create archive failed on file %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ç¥¢¡¼¥«¥¤¥Ö¤ÎºîÀ®¤Ë¼ºÇÔ: %s" -#: build/pack.c:84 +#: build/pack.c:86 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ç¥¢¡¼¥«¥¤¥Ö¤ÎºîÀ®¤Ë¼ºÇÔ: %s" -#: build/pack.c:106 +#: build/pack.c:108 #, fuzzy, c-format msgid "cpio_copy write failed: %s\n" msgstr "cpio_copy ¤Ç½ñ¤­¹ş¤ß¼ºÇÔ: %s" -#: build/pack.c:113 +#: build/pack.c:115 #, fuzzy, c-format msgid "cpio_copy read failed: %s\n" msgstr "cpio_copy ¤ÇÆɤ߹ş¤ß¼ºÇÔ: %s" -#: build/pack.c:216 +#: build/pack.c:218 #, fuzzy, c-format msgid "Could not open PreIn file: %s\n" msgstr "PreIn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s" -#: build/pack.c:223 +#: build/pack.c:225 #, fuzzy, c-format msgid "Could not open PreUn file: %s\n" msgstr "PreUn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s" -#: build/pack.c:230 +#: build/pack.c:232 #, fuzzy, c-format msgid "Could not open PostIn file: %s\n" msgstr "PostIn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s" -#: build/pack.c:237 +#: build/pack.c:239 #, fuzzy, c-format msgid "Could not open PostUn file: %s\n" msgstr "PostUn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s" -#: build/pack.c:245 +#: build/pack.c:247 #, fuzzy, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "VerifyScript ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s" -#: build/pack.c:260 +#: build/pack.c:262 #, fuzzy, c-format msgid "Could not open Trigger script file: %s\n" msgstr "¥È¥ê¥¬¡¼¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s" -#: build/pack.c:288 +#: build/pack.c:290 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: %s ¤Î¥ª¡¼¥×¥ó: %s\n" -#: build/pack.c:298 +#: build/pack.c:300 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: %s ¤ÎÆɤ߹ş¤ß: %s\n" -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n" -#: build/pack.c:335 +#: build/pack.c:337 #, fuzzy, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s ¤Ï RPM ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Ş¤»¤ó\n" -#: build/pack.c:344 +#: build/pack.c:346 #, fuzzy, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: %s ¤«¤é¤Î¥Ø¥Ã¥À¤ÎÆɤ߹ş¤ß\n" -#: build/pack.c:473 +#: build/pack.c:475 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó: %s" -#: build/pack.c:492 +#: build/pack.c:494 #, fuzzy msgid "Unable to write temp header\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s" -#: build/pack.c:502 +#: build/pack.c:504 #, fuzzy msgid "Bad CSA data\n" msgstr "ÉÔÀµ¤Ê CSA ¥Ç¡¼¥¿" -#: build/pack.c:538 +#: build/pack.c:540 #, fuzzy msgid "Unable to write final header\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s" -#: build/pack.c:558 +#: build/pack.c:560 #, c-format msgid "Generating signature: %d\n" msgstr "½ğ̾¤ÎÀ¸À®Ãæ: %d\n" -#: build/pack.c:576 +#: build/pack.c:578 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó: %s" -#: build/pack.c:584 +#: build/pack.c:586 #, fuzzy, c-format msgid "Could not open %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n" -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s" -#: build/pack.c:635 +#: build/pack.c:637 #, fuzzy, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "sigtarget ¤ÎÆɤ߹ş¤ß¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s" -#: build/pack.c:646 +#: build/pack.c:648 #, fuzzy, c-format msgid "Unable to read header from %s: %s\n" msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó: %s" -#: build/pack.c:660 +#: build/pack.c:662 #, fuzzy, c-format msgid "Unable to write header to %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s" -#: build/pack.c:670 +#: build/pack.c:672 #, fuzzy, c-format msgid "Unable to read payload from %s: %s\n" msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó: %s" -#: build/pack.c:676 +#: build/pack.c:678 #, fuzzy, c-format msgid "Unable to write payload to %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "½ñ¤­¹ş¤ßÃæ: %s\n" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î ½ĞÎÏ¥Õ¥¡¥¤¥ë̾¤òÀ¸À®¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s\n" -#: build/pack.c:785 +#: build/pack.c:787 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "%s ¤òºîÀ®¤Ç¤­¤Ş¤»¤ó: %s\n" @@ -1438,47 +1438,47 @@ msgstr "%d msgid "line %d: Bad %s number: %s\n" msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê %s ÈÖ¹æ: %s\n" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "(¥¨¥é¡¼ 0x%x)" -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "ÉÔÀµ¤Ê¥Ş¥¸¥Ã¥¯" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "ÉÔÀµ¤Ê/ÉÔ²ÄÆɤʥإåÀ" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "¥Ø¥Ã¥À¥µ¥¤¥º¤¬Â礭¤¹¤®¤Ş¤¹" -#: lib/cpio.c:213 +#: lib/cpio.c:218 #, fuzzy msgid "Unknown file type" msgstr "ÉÔÌÀ¤Ê¥Õ¥¡¥¤¥ë¥¿¥¤¥×" -#: lib/cpio.c:214 +#: lib/cpio.c:219 #, fuzzy msgid "Missing hard link(s)" msgstr "¥Ï¡¼¥É¥ê¥ó¥¯¤¬¸«¤Ä¤«¤ê¤Ş¤»¤ó" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:216 +#: lib/cpio.c:221 #, fuzzy msgid "Internal error" msgstr "ÆâÉô¥¨¥é¡¼" -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:228 +#: lib/cpio.c:233 #, fuzzy msgid " failed - " msgstr "¼ºÇÔ - " @@ -1517,55 +1517,42 @@ msgstr "%s: %s msgid "(db package)" msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Ş¤·¤¿\n" -#: lib/depends.c:492 -#, fuzzy, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "NO " -msgstr "" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:881 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Ş¤¹\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1614,46 +1601,46 @@ msgstr "%s msgid "file %s is on an unknown device\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤ÏÉÔÌÀ¤Ê¥Ç¥Ğ¥¤¥¹¤Ç¤¹" -#: lib/fsm.c:313 +#: lib/fsm.c:318 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%d ¹ÔÌÜ: %s" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "·Ù¹ğ: %s ¤Ï %s ¤È¤·¤ÆÊݸ¤µ¤ì¤Ş¤¹" -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s ¤òºï½ü¤Ç¤­¤Ş¤»¤ó - ¥Ç¥£¥ì¥¯¥È¥ê¤¬¶õ¤Ç¤¢¤ê¤Ş¤»¤ó" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s ¤Î rmdir ¤Ë¼ºÇÔ: %s" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "·Ù¹ğ: %s ¤Ï %s ¤È¤·¤ÆºîÀ®¤µ¤ì¤Ş¤¹" @@ -1663,50 +1650,50 @@ msgstr " msgid "error creating temporary file %s\n" msgstr "°ì»ş¥Õ¥¡¥¤¥ë %s ¤ÎºîÀ®¥¨¥é¡¼" -#: lib/package.c:181 lib/package.c:257 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#, c-format +msgid "%s: readLead failed\n" +msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n" + +#: lib/package.c:174 +#, fuzzy, c-format +msgid "%s: bad magic\n" +msgstr "ÉÔÀµ¤Ê¥Ş¥¸¥Ã¥¯" + +#: lib/package.c:182 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ğ¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤¹" -#: lib/package.c:202 lib/package.c:265 +#: lib/package.c:190 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ğ¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤¹" -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 -#, c-format -msgid "%s: readLead failed\n" -msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n" - -#: lib/package.c:249 -#, fuzzy, c-format -msgid "%s: bad magic\n" -msgstr "ÉÔÀµ¤Ê¥Ş¥¸¥Ã¥¯" - -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "%s: Í­¸ú¤Ê½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó\n" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n" @@ -2176,176 +2163,176 @@ msgid "generate signature" msgstr "PGP/GPG ½ğ̾¤òÀ¸À®¤·¤Ş¤¹" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¸ş¤±¤Ç¤¹" -#: lib/problems.c:241 +#: lib/problems.c:239 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë OS ¸ş¤±¤Ç¤¹" -#: lib/problems.c:246 +#: lib/problems.c:244 #, fuzzy, c-format msgid "package %s is already installed" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤¹" -#: lib/problems.c:251 +#: lib/problems.c:249 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Ş¤»¤ó" -#: lib/problems.c:256 +#: lib/problems.c:254 #, fuzzy, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" "¥Õ¥¡¥¤¥ë %s ¤Ï %s-%s-%s ¤È %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Î¥Õ¥¡¥¤¥ë¤È¶¥¹ç¤·¤Æ¤¤¤Ş¤¹" -#: lib/problems.c:261 +#: lib/problems.c:259 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "%s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤«¤é¤Î¥Õ¥¡¥¤¥ë %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤«¤é¤Î¥Õ¥¡¥¤¥ë" "¤È¶¥¹ç¤·¤Æ¤¤¤Ş¤¹" -#: lib/problems.c:266 +#: lib/problems.c:264 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s (%s-%s-%s¤è¤ê¤â¿·¤·¤¤¤â¤Î) ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş" "¤¹" -#: lib/problems.c:271 +#: lib/problems.c:269 #, fuzzy, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å" "¤Ç)" -#: lib/problems.c:281 +#: lib/problems.c:279 #, fuzzy, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å" "¤Ç)" -#: lib/problems.c:286 +#: lib/problems.c:284 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:288 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëş¤¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s\n" -#: lib/problems.c:294 +#: lib/problems.c:292 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëş¤¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s\n" -#: lib/problems.c:299 +#: lib/problems.c:297 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼ %d ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ÎÁàºîÃæ¤Ë¤ª¤­¤Ş¤·¤¿" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "conflicts with" msgstr " %s-%s-%s ¤È¶¥¹ç¤·¤Ş¤¹\n" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "is needed by" msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Ş¤¹\n" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "¥Ç¡¼¥¿¥¿¥¤¥× %d ¤Ï¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤»¤ó\n" -#: lib/psm.c:442 +#: lib/psm.c:447 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "%s ¤òºîÀ®¤Ç¤­¤Ş¤»¤ó: %s\n" -#: lib/psm.c:448 +#: lib/psm.c:453 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "%s ¤Ø½ñ¤­¹ş¤á¤Ş¤»¤ó" -#: lib/psm.c:481 +#: lib/psm.c:486 #, fuzzy msgid "source package expected, binary found\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Ş¤¹¡¢¥Ğ¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Ş¤·¤¿" -#: lib/psm.c:597 +#: lib/psm.c:602 #, fuzzy msgid "source package contains no .spec file\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Ş¤ó¤Ç¤¤¤Ş¤»¤ó" -#: lib/psm.c:716 +#: lib/psm.c:721 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "¥İ¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ğ)¤ò¼Â¹Ô¤·¤Ş¤¹\n" -#: lib/psm.c:882 +#: lib/psm.c:887 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:889 +#: lib/psm.c:894 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Ş¤»¤ó - root ¤ò»ÈÍѤ·¤Ş¤¹" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Ş¤»¤ó - root ¤ò»ÈÍѤ·¤Ş¤¹" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s" -#: lib/psm.c:1545 +#: lib/psm.c:1550 #, fuzzy msgid " on file " msgstr "¥Õ¥¡¥¤¥ë¾å" -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s ¼ºÇÔ" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "¥Õ¥©¡¼¥Ş¥Ã¥ÈÃæ¤Î¥¨¥é¡¼: %s\n" @@ -2389,8 +2376,8 @@ msgstr " msgid "can't query %s: %s\n" msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Ş¤»¤ó: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, c-format msgid "open of %s failed: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" @@ -2404,7 +2391,7 @@ msgstr "%s msgid "old format source packages cannot be queried\n" msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤­¤Ş¤»¤ó\n" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n" @@ -2474,7 +2461,7 @@ msgstr " msgid "record %u could not be read\n" msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿\n" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, c-format msgid "package %s is not installed\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤»¤ó\n" @@ -2484,7 +2471,7 @@ msgstr " msgid "(added files)" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 #, fuzzy msgid "(added provide)" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n" @@ -2559,8 +2546,16 @@ msgstr "" msgid "OK" msgstr "" +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "NO " +msgstr "" + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2569,13 +2564,13 @@ msgstr "" "\"B\" ¤Î°Í¸À­¤Ï epoch ¤òɬÍפȤ·¤Ş¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëş¤¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s\n" @@ -2589,86 +2584,95 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Ş¤»¤ó" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "%s ¤ò¼èÆÀ¤·¤Æ¤¤¤Ş¤¹\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr "%s ¤È¤·¤Æ...\n" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s ¤ò¥¹¥­¥Ã¥×¤·¤Ş¤¹ - žÁ÷¼ºÇÔ - %s\n" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Ş¤»¤ó" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤«¤é¤ÎÆɤ߹ş¤ß¥¨¥é¡¼ " -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¤è¤ê¿·¤·¤¤ RPM ¤Î¥Ğ¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹\n" -#: lib/rpminstall.c:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Ş¤»¤ó\n" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ğ¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Ş¤·¤¿\n" -#: lib/rpminstall.c:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +#, fuzzy +msgid "Failed dependencies:\n" msgstr "°Í¸À­¤Î·çÇ¡:\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" +msgstr "" + +#: lib/rpminstall.c:579 msgid "installing binary packages\n" msgstr "¥Ğ¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó: %s" -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¤ÏÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤¤¤Ş¤¹\n" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤È°Í¸À­¤òÇ˲õ¤·¤Ş¤¹:\n" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó\n" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "°Í¸À­¤Î·çÇ¡:\n" + +#: lib/rpmlead.c:47 #, fuzzy, c-format msgid "read failed: %s (%d)\n" msgstr "Æɤ߹ş¤ß¤Î¼ºÇÔ: %s (%d)" @@ -2768,7 +2772,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Æɤ߹ş¤à¤¿¤á¤Ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó: %s¡£" -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó\n" @@ -2918,32 +2922,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "½ğ̾¥Ñ¥Ã¥É: %d\n" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Ş¤¹\n" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "¥Ş¥¦¥ó¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ê¥¹¥È¤ò¼èÆÀ¤·¤Æ¤¤¤Ş¤¹\n" -#: lib/verify.c:326 +#: lib/verify.c:329 #, fuzzy, c-format msgid "missing %s" msgstr "%s ¤¬¸«¤Ä¤«¤ê¤Ş¤»¤ó\n" -#: lib/verify.c:421 +#: lib/verify.c:424 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À­¤òËş¤¿¤·¤Æ¤¤¤Ş¤»¤ó:" -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3550,6 +3554,10 @@ msgstr "url msgid "failed to create %s: %s\n" msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n" +#, fuzzy +#~ msgid "%9s: (%s, %s) added to Depends cache.\n" +#~ msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n" + #~ msgid "(unknown type)" #~ msgstr "(ÉÔÌÀ¤Ê¥¿¥¤¥×)" diff --git a/po/ko.po b/po/ko.po index 3429f8223..dd6b10df9 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "PO-Revision-Date: 2001-09-07 22:03+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -433,7 +433,7 @@ msgstr "--querytags msgid "no arguments given" msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù" -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 msgid "Unable to open temp file.\n" msgstr "Àӽà ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù.\n" @@ -643,7 +643,7 @@ msgstr "glob msgid "Could not open %%files file %s: %s\n" msgstr "%s ÆÄÀÏÀÇ %%files¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, c-format msgid "line: %s\n" msgstr "ÁÙ(line): %s\n" @@ -718,152 +718,152 @@ msgstr " msgid "Could not canonicalize hostname: %s\n" msgstr "È£½ºÆ® ¸íÀ» Á¤±ÔÈ­(canonicalize) ÇÒ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:81 +#: build/pack.c:83 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "%s ÆÄÀÏ¿¡ ¾ÆÄ«À̺긦 »ı¼ºÇϴµ¥ ½ÇÆĞÇÔ: %s\n" -#: build/pack.c:84 +#: build/pack.c:86 #, c-format msgid "create archive failed: %s\n" msgstr "¾ÆÄ«ÀÌºê »ı¼º¿¡ ½ÇÆĞÇÔ: %s\n" -#: build/pack.c:106 +#: build/pack.c:108 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "cpio_copy ÀÛ¼º¿¡ ½ÇÆĞÇÔ: %s\n" -#: build/pack.c:113 +#: build/pack.c:115 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "cpio_copy Àб⿡ ½ÇÆĞÇÔ: %s\n" -#: build/pack.c:216 +#: build/pack.c:218 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "PreIn ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:223 +#: build/pack.c:225 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "PreUn ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:230 +#: build/pack.c:232 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "PostIn ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:237 +#: build/pack.c:239 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "PostUn ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:245 +#: build/pack.c:247 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "VerifyScript ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:260 +#: build/pack.c:262 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Æ®¸®°Å ½ºÅ©¸³Æ® ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:288 +#: build/pack.c:290 #, c-format msgid "readRPM: open %s: %s\n" msgstr "RPM Àбâ(readRPM): %s (À»)¸¦ ¿±´Ï´Ù: %s\n" -#: build/pack.c:298 +#: build/pack.c:300 #, c-format msgid "readRPM: read %s: %s\n" msgstr "RPM Àбâ(readRPM): %s (À»)¸¦ ÀнÀ´Ï´Ù: %s\n" -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: Fseek¿¡ ½ÇÆĞÇß½À´Ï´Ù: %s\n" -#: build/pack.c:335 +#: build/pack.c:337 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "RPM Àбâ(readRPM): %s (Àº)´Â RPM ÆĞÅ°Áö°¡ ¾Æ´Õ´Ï´Ù\n" -#: build/pack.c:344 +#: build/pack.c:346 #, c-format msgid "readRPM: reading header from %s\n" msgstr "RPM Àбâ(readRPM): %s ¿¡¼­ Çì´õ¸¦ ÀĞ°í ÀÖ½À´Ï´Ù\n" -#: build/pack.c:473 +#: build/pack.c:475 msgid "Unable to create immutable header region.\n" msgstr "°íÁ¤ Çì´õ ¿µ¿ª(immutable header region)À» »ı¼ºÇÒ ¼ö ¾ø½À´Ï´Ù.\n" -#: build/pack.c:492 +#: build/pack.c:494 msgid "Unable to write temp header\n" msgstr "ÀÓ½Ã(temp) Çì´õ¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: build/pack.c:502 +#: build/pack.c:504 msgid "Bad CSA data\n" msgstr "À߸øµÈ CSA µ¥ÀÌÅÍ\n" -#: build/pack.c:538 +#: build/pack.c:540 msgid "Unable to write final header\n" msgstr "¸¶Áö¸·(final) Çì´õ¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: build/pack.c:558 +#: build/pack.c:560 #, c-format msgid "Generating signature: %d\n" msgstr "¼­¸í »ı¼º Áß: %d\n" -#: build/pack.c:576 +#: build/pack.c:578 msgid "Unable to reload signature header.\n" msgstr "¼­¸í(signature) Çì´õ¸¦ ´Ù½Ã Àоî¿Ã ¼ö ¾ø½À´Ï´Ù.\n" -#: build/pack.c:584 +#: build/pack.c:586 #, c-format msgid "Could not open %s: %s\n" msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, c-format msgid "Unable to write package: %s\n" msgstr "ÆĞÅ°Áö¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:635 +#: build/pack.c:637 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "¼­¸íÇÒ ´ë»ó %s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:646 +#: build/pack.c:648 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "%s ÀÇ Çì´õ¸¦ ÀĞÀ» ¼ö ¾øÀ½: %s\n" -#: build/pack.c:660 +#: build/pack.c:662 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "%s ¿¡ Çì´õ¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:670 +#: build/pack.c:672 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "%s ÀÇ payload¸¦ ÀĞÀ» ¼ö ¾øÀ½: %s\n" -#: build/pack.c:676 +#: build/pack.c:678 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "%s ¿¡ payload¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "ÀÛ¼º: %s\n" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "%s ÆĞÅ°ÁöÀÇ Ãâ·Â ÆÄÀϸíÀ» »ı¼ºÇÒ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:785 +#: build/pack.c:787 #, c-format msgid "cannot create %s: %s\n" msgstr "%s (À»)¸¦ »ı¼ºÇÒ ¼ö ¾øÀ½: %s\n" @@ -1383,44 +1383,44 @@ msgstr "%d msgid "line %d: Bad %s number: %s\n" msgstr "%d ¹ø° ÁÙ: À߸øµÈ %s ¼ıÀÚÀÔ´Ï´Ù: %s\n" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, c-format msgid "(error 0x%x)" msgstr "(¿À·ù 0x%x)" -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "À߸øµÈ magic ÀÔ´Ï´Ù" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "À߸øµÈ/ÀĞÀ» ¼ö ¾ø´Â Çì´õÀÔ´Ï´Ù" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "Çì´õÀÇ Å©±â°¡ ³Ê¹« Å®´Ï´Ù" -#: lib/cpio.c:213 +#: lib/cpio.c:218 msgid "Unknown file type" msgstr "¾Ë ¼ö ¾ø´Â ÆÄÀÏ À¯ÇüÀÔ´Ï´Ù" -#: lib/cpio.c:214 +#: lib/cpio.c:219 msgid "Missing hard link(s)" msgstr "ÇÏµå ¸µÅ©¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "MD5 ÇÕ°è°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/cpio.c:216 +#: lib/cpio.c:221 msgid "Internal error" msgstr "³»ºÎ ¿À·ù ¹ß»ı" -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "Çì´õ¿¡ ¾ÆÄ«À̺ê ÆÄÀÏÀÌ ¾ø½À´Ï´Ù" -#: lib/cpio.c:228 +#: lib/cpio.c:233 msgid " failed - " msgstr " ½ÇÆĞÇÔ - " @@ -1458,36 +1458,23 @@ msgstr "%s: %-45s msgid "(db package)" msgstr "ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/depends.c:492 -#, fuzzy, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "NO " -msgstr "¾Æ´Ï¿À" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "¿¹" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:881 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1495,20 +1482,20 @@ msgid "" msgstr "" "========== ÆĞÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "·çÇÁ(LOOP):\n" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1557,47 +1544,47 @@ msgstr "%s ( msgid "file %s is on an unknown device\n" msgstr "%s ÆÄÀÏÀÌ ¾Ë ¼ö ¾ø´Â ÀåÄ¡ »ó¿¡ Á¸ÀçÇÕ´Ï´Ù\n" -#: lib/fsm.c:313 +#: lib/fsm.c:318 #, fuzzy msgid "========== Directories not explictly included in package:\n" msgstr "========= ÆĞÅ°Áö¿¡ µğ·ºÅ丮°¡ Æ÷ÇԵǾî ÀÖÁö ¾ÊÀ½:\n" -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "%04o Çã°¡±Ç(perms)ÀÇ %s µğ·ºÅ丮°¡ »ı¼ºµÇ¾ú½À´Ï´Ù.\n" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "Çì´õ ÆÄÀÏ ¸ñ·Ï¿¡¼­ ¾ÆÄ«À̺ê ÆÄÀÏ %s (À»)¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, c-format msgid "%s saved as %s\n" msgstr "%s (ÀÌ)°¡ %s (À¸)·Î ÀúÀåµÇ¾ú½À´Ï´Ù\n" -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s %s µğ·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆĞÇÔ: ºó µğ·ºÅ丮°¡ ¾Æ´Õ´Ï´Ù\n" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s %s µğ·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆĞÇÔ: %s\n" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s %s ¸µÅ©¸¦ ÇØÁ¦Çϴµ¥ ½ÇÆĞÇÔ: %s\n" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, c-format msgid "%s created as %s\n" msgstr "%s (ÀÌ)°¡ %s (À¸)·Î »ı¼ºµÇ¾ú½À´Ï´Ù\n" @@ -1607,47 +1594,47 @@ msgstr "%s ( msgid "error creating temporary file %s\n" msgstr "Àӽà ÆÄÀÏ %s (À»)¸¦ »ı¼ºÇÏ´Â µµÁß ¿À·ù°¡ ¹ß»ıÇß½À´Ï´Ù\n" -#: lib/package.c:181 lib/package.c:257 -msgid "packaging version 1 is not supported by this version of RPM\n" -msgstr "ÀÌ RPM ¹öÀü¿¡¼­´Â ÆĞŰ¡ ¹öÀü '1' ÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù\n" - -#: lib/package.c:202 lib/package.c:265 -msgid "" -"only packaging with major numbers <= 4 is supported by this version of RPM\n" -msgstr "" -"ÀÌ RPM ¹öÀü¿¡¼­´Â ÁÖ¿ä ¹øÈ£(major number) <= 4 ÀÇ ÆĞŰ¡ ¸¸À» Áö¿øÇÕ´Ï´Ù\n" - -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 #, c-format msgid "%s: readLead failed\n" msgstr "%s: readLead¿¡ ½ÇÆĞÇß½À´Ï´Ù\n" -#: lib/package.c:249 +#: lib/package.c:174 #, fuzzy, c-format msgid "%s: bad magic\n" msgstr "À߸øµÈ magic ÀÔ´Ï´Ù" -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:182 +msgid "packaging version 1 is not supported by this version of RPM\n" +msgstr "ÀÌ RPM ¹öÀü¿¡¼­´Â ÆĞŰ¡ ¹öÀü '1' ÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù\n" + +#: lib/package.c:190 +msgid "" +"only packaging with major numbers <= 4 is supported by this version of RPM\n" +msgstr "" +"ÀÌ RPM ¹öÀü¿¡¼­´Â ÁÖ¿ä ¹øÈ£(major number) <= 4 ÀÇ ÆĞŰ¡ ¸¸À» Áö¿øÇÕ´Ï´Ù\n" + +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature¿¡ ½ÇÆĞÇß½À´Ï´Ù\n" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù\n" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead¿¡ ½ÇÆĞÇß½À´Ï´Ù\n" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread¿¡ ½ÇÆĞÇß½À´Ï´Ù: %s\n" @@ -2074,176 +2061,176 @@ msgid "generate signature" msgstr "¼­¸íÀ» ÀÛ¼ºÇÕ´Ï´Ù" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "%s (Àº)´Â ´Ù¸¥ ¾ÆÅ°ÅØÃĸ¦ À§ÇÑ ÆĞÅ°ÁöÀÔ´Ï´Ù" -#: lib/problems.c:241 +#: lib/problems.c:239 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "%s (Àº)´Â ´Ù¸¥ ¿î¿µÃ¼Á¦¸¦ À§ÇÑ ÆĞÅ°ÁöÀÔ´Ï´Ù" -#: lib/problems.c:246 +#: lib/problems.c:244 #, c-format msgid "package %s is already installed" msgstr "%s ÆĞÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/problems.c:251 +#: lib/problems.c:249 #, c-format msgid "path %s in package %s is not relocateable" msgstr "%2$s ÆĞÅ°Áö ¾ÈÀÇ %1$s °æ·Î´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: lib/problems.c:256 +#: lib/problems.c:254 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "%2$s (¿Í)°ú %3$s ÀÇ ¼³Ä¡ °úÁ¤¿¡¼­ %1$s ÆÄÀÏÀÌ ¼­·Î Ãæµ¹ÇÕ´Ï´Ù" -#: lib/problems.c:261 +#: lib/problems.c:259 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "%2$s ¿¡¼­ ¼³Ä¡µÇ´Â %1$s ÆÄÀÏÀº %3$s ÆĞÅ°ÁöÀÇ ÆÄÀÏ°ú Ãæµ¹ÇÕ´Ï´Ù" -#: lib/problems.c:266 +#: lib/problems.c:264 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "%s ÆĞÅ°Áö (%s º¸´Ù ÃÖ½ÅÀÇ ÆĞÅ°Áö)´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/problems.c:271 +#: lib/problems.c:269 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" "%4$s ÆÄÀϽýºÅÛ »ó¿¡¼­ %1$s ÆĞÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld%3$cb (ÀÌ)°¡ ÇÊ¿äÇÕ" "´Ï´Ù" -#: lib/problems.c:281 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" "%3$s ÆÄÀϽýºÅÛ »ó¿¡¼­ %1$s ÆĞÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld ÀÇ ¾ÆÀ̳ëµå(inode)" "°¡ ÇÊ¿äÇÕ´Ï´Ù" -#: lib/problems.c:286 +#: lib/problems.c:284 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" "%s ÆĞÅ°ÁöÀÇ ¼±(pre)-Æ®·£Àè¼Ç ½Ã½ºÅÛÄİ(syscall): %s (ÀÌ)°¡ ½ÇÆĞÇß½À´Ï´Ù: %s" -#: lib/problems.c:290 +#: lib/problems.c:288 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "%s-%s-%s ÆĞÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n" -#: lib/problems.c:294 +#: lib/problems.c:292 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "%s-%s-%s ÆĞÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n" -#: lib/problems.c:299 +#: lib/problems.c:297 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" "%2$s ÆĞÅ°Áö¸¦ ó¸®ÇÏ´Â °úÁ¤¿¡¼­ ¾Ë ¼ö ¾ø´Â ¿À·ù %1$d (ÀÌ)°¡ ¹ß»ıÇß½À´Ï´Ù" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "conflicts with" msgstr " %s-%s-%s (¿Í)°ú Ãæµ¹ÇÕ´Ï´Ù\n" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "is needed by" msgstr " (Àº)´Â %s-%s-%s ¿¡¼­ ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "%d µ¥ÀÌÅÍ À¯ÇüÀº »ç¿ëÇÏ½Ç ¼ö ¾ø½À´Ï´Ù\n" -#: lib/psm.c:442 +#: lib/psm.c:447 #, c-format msgid "cannot create %%%s %s\n" msgstr "%%%s %s (À»)¸¦ »ı¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/psm.c:448 +#: lib/psm.c:453 #, c-format msgid "cannot write to %%%s %s\n" msgstr "%%%s %s (À»)¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/psm.c:481 +#: lib/psm.c:486 msgid "source package expected, binary found\n" msgstr "¼Ò½º ÆĞÅ°Áö°¡ ¿ä±¸µË´Ï´Ù, ¹ÙÀ̳ʸ®¸¦ ã¾Ò½À´Ï´Ù\n" -#: lib/psm.c:597 +#: lib/psm.c:602 msgid "source package contains no .spec file\n" msgstr "¼Ò½º ÆĞÅ°Áö¿¡ .spec ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/psm.c:716 +#: lib/psm.c:721 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÕ´Ï´Ù (ÀÖÀ» °æ¿ì)\n" -#: lib/psm.c:882 +#: lib/psm.c:887 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" "%2$s-%3$s-%4$s ÀÇ %1$s ½ºÅ©¸³Æ®¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆĞÇß½À´Ï´Ù, waitpid°¡ %" "5$s (À»)¸¦ ¹İȯÇÏ¿´½À´Ï´Ù \n" -#: lib/psm.c:889 +#: lib/psm.c:894 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" "%2$s-%3$s-%4$s ÀÇ %1$s ½ºÅ©¸³Æ®¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆĞÇß½À´Ï´Ù, Á¾·á »óȲ %" "5$d\n" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s (ÀÌ)°¡ %d ÀÇ ÆÄÀÏÀ» °®°í ÀÖ½À´Ï´Ù, Å×½ºÆ® = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" "%s: %s ½ºÅ©¸³Æ®¸´(scriptlet)°¡ ½ÇÆĞÇß½À´Ï´Ù (%d), %s-%s-%s (À»)¸¦ »ı·«ÇÕ´Ï" "´Ù\n" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, c-format msgid "user %s does not exist - using root\n" msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, c-format msgid "group %s does not exist - using root\n" msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆĞÇÔ%s%s: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr " ´ÙÀ½ ÆÄÀÏ¿¡ " -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%2$s ÆÄÀÏÀÇ %1$s (ÀÌ)°¡ ½ÇÆĞÇÔ: %3$s\n" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, c-format msgid "%s failed: %s\n" msgstr "%s (ÀÌ)°¡ ½ÇÆĞÇÔ: %s\n" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, c-format msgid "incorrect format: %s\n" msgstr "¿Ã¹Ù¸£Áö ¸øÇÑ Çü½Ä: %s\n" @@ -2286,8 +2273,8 @@ msgstr " msgid "can't query %s: %s\n" msgstr "%s (À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, c-format msgid "open of %s failed: %s\n" msgstr "%s (À»)¸¦ ¿©´Âµ¥ ½ÇÆĞÇÔ: %s\n" @@ -2301,7 +2288,7 @@ msgstr "%s ( msgid "old format source packages cannot be queried\n" msgstr "ÀÌÀü Çü½ÄÀÇ ¼Ò½º ÆĞÅ°Áö´Â ÁúÀÇÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Àдµ¥ ½ÇÆĞÇß½À´Ï´Ù: %s\n" @@ -2370,7 +2357,7 @@ msgstr " msgid "record %u could not be read\n" msgstr "±â·Ï(record) ¹øÈ£ %u (Àº)´Â ÀĞÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, c-format msgid "package %s is not installed\n" msgstr "%s ÆĞÅ°Áö´Â ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" @@ -2380,7 +2367,7 @@ msgstr "%s msgid "(added files)" msgstr "À߸øµÈ db ÆÄÀÏ %s\n" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" @@ -2453,8 +2440,16 @@ msgstr ")" msgid "OK" msgstr "È®ÀÎ" +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "NO " +msgstr "¾Æ´Ï¿À" + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "¿¹" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2463,13 +2458,13 @@ msgstr "" "\"B\" ÀÇÁ¸¼ºÀº Áß¿ä½Ã µÇ´Â °Í(epoch)À» ÇÊ¿ä·Î ÇÕ´Ï´Ù (\"A\" ·Î °¡Á¤ÇÕ´Ï´Ù)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "%s-%s-%s ÆĞÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n" @@ -2482,86 +2477,95 @@ msgstr " msgid "Preparing packages for installation..." msgstr "¼³Ä¡ÇÒ ÆĞÅ°Áö¸¦ ÁغñÇÏ°í ÀÖ½À´Ï´Ù..." -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "%s (À»)¸¦ º¹±¸ÇÕ´Ï´Ù\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr " ... %s (À¸)·Î\n" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s (À»)¸¦ »ı·«ÇÕ´Ï´Ù - Àü¼Û(transfer)¿¡ ½ÇÆĞÇÔ - %s\n" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, c-format msgid "package %s is not relocateable\n" msgstr "%s ÆĞÅ°Áö´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, c-format msgid "error reading from file %s\n" msgstr "%s ÆÄÀÏÀ» ÀĞ´Â µµÁß ¿À·ù°¡ ¹ß»ıÇß½À´Ï´Ù\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "%s ÆÄÀÏÀÌ ÃֽŠ¹öÀüÀÇ RPMÀ» ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, c-format msgid "%s cannot be installed\n" msgstr "%s (Àº)´Â ¼³Ä¡µÉ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%d ÀÇ ¼Ò½º¿Í %d ÀÇ ¹ÙÀ̳ʸ® ÆĞÅ°Áö¸¦ ã¾Ò½À´Ï´Ù\n" -#: lib/rpminstall.c:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +#, fuzzy +msgid "Failed dependencies:\n" msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆĞÇÔ:\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" +msgstr "" + +#: lib/rpminstall.c:579 msgid "installing binary packages\n" msgstr "¹ÙÀ̳ʸ® ÆĞÅ°Áö¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, c-format msgid "cannot open file %s: %s\n" msgstr "%s ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n" -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¿©·¯°³ÀÇ ÆĞÅ°Áö¸¦ ÁöÁ¤ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "ÀÌ ÆĞÅ°ÁöµéÀ» Á¦°ÅÇϸé ÀÇÁ¸¼ºÀÌ ±úÁú ¼ö ÀÖÀ½:\n" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, c-format msgid "cannot open %s: %s\n" msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "%s (À»)¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆĞÇÔ:\n" + +#: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" msgstr "Àдµ¥ ½ÇÆĞÇÔ: %s (%d)\n" @@ -2661,7 +2665,7 @@ msgstr "%s ( msgid "Unable to open %s for reading: %s.\n" msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s.\n" -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, c-format msgid "cannot open Packages database in %s\n" msgstr "%s ¾ÈÀÇ ÆĞÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n" @@ -2804,32 +2808,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "¼­¸í: size(%d)+pad(%d)\n" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s (À»)¸¦ »ı·«ÇÕ´Ï´Ù\n" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, c-format msgid "excluding directory %s\n" msgstr "%s µğ·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "¸¶¿îÆ®µÈ ÆÄÀϽýºÅÛÀÇ ¸ñ·ÏÀ» ¼öÁıÇÏ°í ÀÖ½À´Ï´Ù\n" -#: lib/verify.c:326 +#: lib/verify.c:329 #, c-format msgid "missing %s" msgstr "´ÙÀ½À» ãÀ» ¼ö ¾ø½À´Ï´Ù %s" -#: lib/verify.c:421 +#: lib/verify.c:424 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s ¿¡ ÀÇÁ¸¼º ¹®Á¦ ¹ß»ı: " -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3429,6 +3433,10 @@ msgstr "URL msgid "failed to create %s: %s\n" msgstr "%s (À»)¸¦ »ı¼ºÇϴµ¥ ½ÇÆĞÇÔ: %s\n" +#, fuzzy +#~ msgid "%9s: (%s, %s) added to Depends cache.\n" +#~ msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n" + #~ msgid "(unknown type)" #~ msgstr "(¾Ë ¼ö ¾ø´Â À¯Çü)" diff --git a/po/no.po b/po/no.po index 7ca1ae869..bcf5a0745 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -432,7 +432,7 @@ msgstr "uventede argumenter til --querytags " msgid "no arguments given" msgstr "ingen argumenter oppgitt for spørring" -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 msgid "Unable to open temp file.\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" @@ -642,7 +642,7 @@ msgstr "" msgid "Could not open %%files file %s: %s\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, c-format msgid "line: %s\n" msgstr "Installerer %s\n" @@ -717,156 +717,156 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:83 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: build/pack.c:84 +#: build/pack.c:86 #, c-format msgid "create archive failed: %s\n" msgstr "feil under oppretting av arkiv %s\n" -#: build/pack.c:106 +#: build/pack.c:108 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "cpio_copy skriving feilet: %s\n" -#: build/pack.c:113 +#: build/pack.c:115 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "cpio_copy: feil under lesing: %s\n" -#: build/pack.c:216 +#: build/pack.c:218 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "Kunne ikke åpne PreIn-fil: %s\n" -#: build/pack.c:223 +#: build/pack.c:225 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "Kunne ikke åpne PreUn-fil: %s\n" -#: build/pack.c:230 +#: build/pack.c:232 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "Kunne ikke åpne PostIn-fil: %s\n" -#: build/pack.c:237 +#: build/pack.c:239 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "Kunne ikke åpne PostUn-fil: %s\n" -#: build/pack.c:245 +#: build/pack.c:247 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Kunne ikke åpne VerifyScript-fil: %s\n" -#: build/pack.c:260 +#: build/pack.c:262 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:290 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:300 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: Fseek feilet: %s\n" -#: build/pack.c:335 +#: build/pack.c:337 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s er ikke en RPM-pakke\n" -#: build/pack.c:344 +#: build/pack.c:346 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: leser header fra %s\n" -#: build/pack.c:473 +#: build/pack.c:475 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: build/pack.c:492 +#: build/pack.c:494 #, fuzzy msgid "Unable to write temp header\n" msgstr "Kunne ikke skrive header til %s: %s\n" -#: build/pack.c:502 +#: build/pack.c:504 msgid "Bad CSA data\n" msgstr "Ugyldige CSA-data\n" -#: build/pack.c:538 +#: build/pack.c:540 #, fuzzy msgid "Unable to write final header\n" msgstr "Kunne ikke skrive header til %s: %s\n" -#: build/pack.c:558 +#: build/pack.c:560 #, c-format msgid "Generating signature: %d\n" msgstr "Genererer signatur: %d\n" -#: build/pack.c:576 +#: build/pack.c:578 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: build/pack.c:584 +#: build/pack.c:586 #, c-format msgid "Could not open %s: %s\n" msgstr "Kunne ikke åpne %s: %s\n" -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" -#: build/pack.c:635 +#: build/pack.c:637 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Kunne ikke åpne sigmål %s: %s\n" -#: build/pack.c:646 +#: build/pack.c:648 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: build/pack.c:660 +#: build/pack.c:662 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "Kunne ikke skrive header til %s: %s\n" -#: build/pack.c:670 +#: build/pack.c:672 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Kunne ikke lese \"payload\" fra %s: %s\n" -#: build/pack.c:676 +#: build/pack.c:678 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Kunne ikke skrive \"payload\" til %s: %s\n" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:785 +#: build/pack.c:787 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1384,44 +1384,44 @@ msgstr "linje %d: Ugyldig no%s nummer: %d\n" msgid "line %d: Bad %s number: %s\n" msgstr "linje %d: Ugyldig %s-nummer: %s\n" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, c-format msgid "(error 0x%x)" msgstr "(feil 0x%x)" -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "Ugyldig magi" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "Ugyldig/ulesbar header" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "For stor header" -#: lib/cpio.c:213 +#: lib/cpio.c:218 msgid "Unknown file type" msgstr "Ukjent filtype" -#: lib/cpio.c:214 +#: lib/cpio.c:219 msgid "Missing hard link(s)" msgstr "Mangler hard(e) lenke(er)" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "MD5-sum stemmer ikke" -#: lib/cpio.c:216 +#: lib/cpio.c:221 msgid "Internal error" msgstr "Intern feil" -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:228 +#: lib/cpio.c:233 msgid " failed - " msgstr " feilet - " @@ -1455,55 +1455,42 @@ msgstr "" msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:492 -#, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "NO " -msgstr "NEI" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "JA" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:881 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1550,46 +1537,46 @@ msgstr "klarte ikke msgid "file %s is on an unknown device\n" msgstr "fil %s er på en ukjent enhet\n" -#: lib/fsm.c:313 +#: lib/fsm.c:318 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, c-format msgid "%s saved as %s\n" msgstr "%s lagret som %s\n" -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s rmdir av %s feilet: Katalogen er ikke tom\n" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir av %s feilet: %s\n" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s unlink av %s feilet: %s\n" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, c-format msgid "%s created as %s\n" msgstr "%s opprettet som %s\n" @@ -1599,46 +1586,46 @@ msgstr "%s opprettet som %s\n" msgid "error creating temporary file %s\n" msgstr "feil under oppretting av midlertidig fil %s\n" -#: lib/package.c:181 lib/package.c:257 -msgid "packaging version 1 is not supported by this version of RPM\n" -msgstr "" - -#: lib/package.c:202 lib/package.c:265 -msgid "" -"only packaging with major numbers <= 4 is supported by this version of RPM\n" -msgstr "" - -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 #, c-format msgid "%s: readLead failed\n" msgstr "%s: readLead feilet\n" -#: lib/package.c:249 +#: lib/package.c:174 #, fuzzy, c-format msgid "%s: bad magic\n" msgstr "Ugyldig magi" -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:182 +msgid "packaging version 1 is not supported by this version of RPM\n" +msgstr "" + +#: lib/package.c:190 +msgid "" +"only packaging with major numbers <= 4 is supported by this version of RPM\n" +msgstr "" + +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature feilet\n" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ingen signatur tilgjengelig\n" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead feilet\n" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread feilet: %s\n" @@ -2060,164 +2047,164 @@ msgid "generate signature" msgstr "generer signatur" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "pakke %s er for en annen arkitektur" -#: lib/problems.c:241 +#: lib/problems.c:239 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "pakke %s er for et annet operativsystem" -#: lib/problems.c:246 +#: lib/problems.c:244 #, c-format msgid "package %s is already installed" msgstr "pakke %s er allerede installert" -#: lib/problems.c:251 +#: lib/problems.c:249 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sti %s i pakke %s kan ikke relokeres" -#: lib/problems.c:256 +#: lib/problems.c:254 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:261 +#: lib/problems.c:259 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:266 +#: lib/problems.c:264 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:271 +#: lib/problems.c:269 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:281 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:286 +#: lib/problems.c:284 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:288 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "pakke %s er i konflikt: %s\n" -#: lib/problems.c:294 +#: lib/problems.c:292 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "pakke %s er i konflikt: %s\n" -#: lib/problems.c:299 +#: lib/problems.c:297 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "conflicts with" msgstr " er i konflikt med %s-%s-%s\n" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "is needed by" msgstr " kreves av %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "Datatype %d ikke støttet\n" -#: lib/psm.c:442 +#: lib/psm.c:447 #, c-format msgid "cannot create %%%s %s\n" msgstr "kan ikke opprette %%%s %s\n" -#: lib/psm.c:448 +#: lib/psm.c:453 #, c-format msgid "cannot write to %%%s %s\n" msgstr "kan ikke skrive til %%%s %s\n" -#: lib/psm.c:481 +#: lib/psm.c:486 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær funnet\n" -#: lib/psm.c:597 +#: lib/psm.c:602 msgid "source package contains no .spec file\n" msgstr "kildepakke inneholder ikke en .spec-fil\n" -#: lib/psm.c:716 +#: lib/psm.c:721 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kjører %s-skript (hvis noen)\n" -#: lib/psm.c:882 +#: lib/psm.c:887 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:889 +#: lib/psm.c:894 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr "" -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s feilet\n" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, c-format msgid "incorrect format: %s\n" msgstr "ukorrekt format: %s\n" @@ -2260,8 +2247,8 @@ msgstr "pakken har verken fileier eller id-lister\n" msgid "can't query %s: %s\n" msgstr "kan ikke spørre på %s: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, c-format msgid "open of %s failed: %s\n" msgstr "feil under åpning av %s: %s\n" @@ -2275,7 +2262,7 @@ msgstr "sp msgid "old format source packages cannot be queried\n" msgstr "kildepakker i gammelt format kan ikke spørres\n" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: lesing av manifest feilet: %s\n" @@ -2344,7 +2331,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, c-format msgid "package %s is not installed\n" msgstr "pakke %s er ikke installert\n" @@ -2353,7 +2340,7 @@ msgstr "pakke %s er ikke installert\n" msgid "(added files)" msgstr "" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 msgid "(added provide)" msgstr "" @@ -2425,21 +2412,29 @@ msgstr "" msgid "OK" msgstr "OK" +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "NO " +msgstr "NEI" + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "JA" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s er i konflikt: %s\n" @@ -2452,86 +2447,95 @@ msgstr "Forbereder..." msgid "Preparing packages for installation..." msgstr "Forbereder pakker for installasjon..." -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "Henter %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr " ... som %s\n" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "hopper over %s - overføring feilet - %s\n" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, c-format msgid "package %s is not relocateable\n" msgstr "pakke %s kan ikke relokeres\n" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, c-format msgid "error reading from file %s\n" msgstr "feil under lesing fra fil %s\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, 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:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, c-format msgid "found %d source and %d binary packages\n" msgstr "fant %d kilde- og %d binærpakker\n" -#: lib/rpminstall.c:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +#, fuzzy +msgid "Failed dependencies:\n" msgstr "feilede avhengigheter:\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" +msgstr "" + +#: lib/rpminstall.c:579 msgid "installing binary packages\n" msgstr "installerer binærpakker\n" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" spesifiserer flere pakker\n" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "fjerning av disse pakkene vil ødelegge avhengigheter:\n" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, c-format msgid "cannot open %s: %s\n" msgstr "kan ikke åpne %s: %s\n" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "feilede avhengigheter:\n" + +#: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" msgstr "lesing feilet: %s (%d)\n" @@ -2631,7 +2635,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kan ikke åpne pakkedatabase i %s\n" @@ -2773,32 +2777,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer katalog %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "henter liste over monterte filsystemer\n" -#: lib/verify.c:326 +#: lib/verify.c:329 #, c-format msgid "missing %s" msgstr "mangler %s" -#: lib/verify.c:421 +#: lib/verify.c:424 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "feilede avhengigheter:\n" -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index c03711372..ad3d8ade8 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -447,7 +447,7 @@ msgstr "nieoczekiwane argumenty dla --querytags " msgid "no arguments given" msgstr "nie podano argumentów dla trybu zapytañ" -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 #, fuzzy msgid "Unable to open temp file.\n" msgstr "Nie mo¿na otworzyæ pliku tymczasowego" @@ -667,7 +667,7 @@ msgstr "Nie znaleziono pliku: %s" msgid "Could not open %%files file %s: %s\n" msgstr "Nie mo¿na otworzyæ %%files pliku: %s" -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, fuzzy, c-format msgid "line: %s\n" msgstr "linia: %s" @@ -742,157 +742,157 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "Nie mo¿na rozwi±zaæ nazwy systemu: %s\n" -#: build/pack.c:81 +#: build/pack.c:83 #, fuzzy, c-format msgid "create archive failed on file %s: %s\n" msgstr "utworzenie archiwum pliku %s nie powiod³o siê: %s" -#: build/pack.c:84 +#: build/pack.c:86 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "utworzenie archiwum pliku %s nie powiod³o siê: %s" -#: build/pack.c:106 +#: build/pack.c:108 #, fuzzy, c-format msgid "cpio_copy write failed: %s\n" msgstr "zapis w trybie cpio_copy nie powiód³ siê: %s" -#: build/pack.c:113 +#: build/pack.c:115 #, fuzzy, c-format msgid "cpio_copy read failed: %s\n" msgstr "odczyt w trybie cpio_copy nie powiód³ siê: %s" -#: build/pack.c:216 +#: build/pack.c:218 #, fuzzy, c-format msgid "Could not open PreIn file: %s\n" msgstr "Nie mo¿na otworzyæ pliku PreIn: %s" -#: build/pack.c:223 +#: build/pack.c:225 #, fuzzy, c-format msgid "Could not open PreUn file: %s\n" msgstr "Nie mo¿na otworzyæ pliku PreUn: %s" -#: build/pack.c:230 +#: build/pack.c:232 #, fuzzy, c-format msgid "Could not open PostIn file: %s\n" msgstr "Nie mo¿na otworzyæ pliku PostIn: %s" -#: build/pack.c:237 +#: build/pack.c:239 #, fuzzy, c-format msgid "Could not open PostUn file: %s\n" msgstr "Nie mo¿na otworzyæ pliku PostUn: %s" -#: build/pack.c:245 +#: build/pack.c:247 #, fuzzy, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Nie mo¿na otworzyæ pliku VerifyScript: %s" -#: build/pack.c:260 +#: build/pack.c:262 #, fuzzy, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Nie mo¿na otworzyæ skryptu Trigger: %s" -#: build/pack.c:288 +#: build/pack.c:290 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: otwieranie %s: %s\n" -#: build/pack.c:298 +#: build/pack.c:300 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: czytanie %s: %s\n" -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: readLead nie powiod³o siê\n" -#: build/pack.c:335 +#: build/pack.c:337 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s nie jest pakietem RPM\n" -#: build/pack.c:344 +#: build/pack.c:346 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: czytanie nag³ówka z %s\n" -#: build/pack.c:473 +#: build/pack.c:475 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Nie mo¿na odczytaæ ikony: %s" -#: build/pack.c:492 +#: build/pack.c:494 #, fuzzy msgid "Unable to write temp header\n" msgstr "Nie mo¿na zapisaæ %s" -#: build/pack.c:502 +#: build/pack.c:504 #, fuzzy msgid "Bad CSA data\n" msgstr "B³êdne dane CSA" -#: build/pack.c:538 +#: build/pack.c:540 #, fuzzy msgid "Unable to write final header\n" msgstr "Nie mo¿na zapisaæ %s" -#: build/pack.c:558 +#: build/pack.c:560 #, c-format msgid "Generating signature: %d\n" msgstr "Generowanie sygnatury: %d\n" -#: build/pack.c:576 +#: build/pack.c:578 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Nie mo¿na odczytaæ ikony: %s" -#: build/pack.c:584 +#: build/pack.c:586 #, fuzzy, c-format msgid "Could not open %s: %s\n" msgstr "Nie mo¿na otworzyæ %s\n" -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie mo¿na zapisaæ pakietu: %s" -#: build/pack.c:635 +#: build/pack.c:637 #, fuzzy, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Nie mo¿na odczytaæ sigtarget: %s" -#: build/pack.c:646 +#: build/pack.c:648 #, fuzzy, c-format msgid "Unable to read header from %s: %s\n" msgstr "Nie mo¿na odczytaæ ikony: %s" -#: build/pack.c:660 +#: build/pack.c:662 #, fuzzy, c-format msgid "Unable to write header to %s: %s\n" msgstr "Nie mo¿na zapisaæ pakietu: %s" -#: build/pack.c:670 +#: build/pack.c:672 #, fuzzy, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Nie mo¿na odczytaæ ikony: %s" -#: build/pack.c:676 +#: build/pack.c:678 #, fuzzy, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Nie mo¿na zapisaæ pakietu: %s" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "Nie mo¿na wygenerowaæ wyj¶ciowej nazwy dla pakietu %s: %s\n" -#: build/pack.c:785 +#: build/pack.c:787 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "nie mo¿na utworzyæ %s" @@ -1423,45 +1423,45 @@ msgstr "linia %d: b msgid "line %d: Bad %s number: %s\n" msgstr "linia %d: B³êdny numer %s: %s\n" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, c-format msgid "(error 0x%x)" msgstr "(b³±d 0x%x)" -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "B³êdny magic" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "B³êdny/nieczytelny nag³ówek" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "Rozmiar nag³ówka jest zbyt du¿y" -#: lib/cpio.c:213 +#: lib/cpio.c:218 msgid "Unknown file type" msgstr "Nieznany typ pliku" -#: lib/cpio.c:214 +#: lib/cpio.c:219 #, fuzzy msgid "Missing hard link(s)" msgstr "Brak twardego dowi±zania" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:216 +#: lib/cpio.c:221 msgid "Internal error" msgstr "B³±d wewnêtrzny" -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:228 +#: lib/cpio.c:233 msgid " failed - " msgstr " nie powiod³o siê -" @@ -1499,56 +1499,42 @@ msgstr "Udost msgid "(db package)" msgstr "znaleziono %d pakietów\n" -#: lib/depends.c:492 -#, fuzzy, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -#, fuzzy -msgid "NO " -msgstr "NIE DOBRZE" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:881 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1597,46 +1583,46 @@ msgstr "nie mo msgid "file %s is on an unknown device\n" msgstr "plik %s jest na nieznanym urz±dzeniu" -#: lib/fsm.c:313 +#: lib/fsm.c:318 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, fuzzy, c-format msgid "%10d %s\n" msgstr "linia %d: %s" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "ostrze¿enie: %s zapisany jako %s" -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "nie mo¿na usun±æ %s - katalog nie jest pusty" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "skasowanie katalogu %s nie powiod³o siê" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "otwarcie %s nie powiod³o siê\n" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "ostrze¿enie: %s utworzony jako %s" @@ -1646,50 +1632,50 @@ msgstr "ostrze msgid "error creating temporary file %s\n" msgstr "b³±d w tworzeniu pliku tymczasowego %s" -#: lib/package.c:181 lib/package.c:257 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#, c-format +msgid "%s: readLead failed\n" +msgstr "%s: readLead nie powiod³o siê\n" + +#: lib/package.c:174 +#, fuzzy, c-format +msgid "%s: bad magic\n" +msgstr "B³êdny magic" + +#: lib/package.c:182 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" "tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a" -#: lib/package.c:202 lib/package.c:265 +#: lib/package.c:190 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" "tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a" -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 -#, c-format -msgid "%s: readLead failed\n" -msgstr "%s: readLead nie powiod³o siê\n" - -#: lib/package.c:249 -#, fuzzy, c-format -msgid "%s: bad magic\n" -msgstr "B³êdny magic" - -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature nie powiod³o siê\n" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "%s: Sygnatura nie jest dostêpna\n" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead nie powiod³o siê\n" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: readLead nie powiod³o siê\n" @@ -2141,168 +2127,168 @@ msgid "generate signature" msgstr "generuj sygnaturê PGP/GPG" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "pakiet %s-%s-%s zbudowano dla innej architektury" -#: lib/problems.c:241 +#: lib/problems.c:239 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "pakiet %s-%s-%s zbudowano dla innego systemu operacyjnego" -#: lib/problems.c:246 +#: lib/problems.c:244 #, fuzzy, c-format msgid "package %s is already installed" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/problems.c:251 +#: lib/problems.c:249 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "pakiet %s nie jest przesuwalny\n" -#: lib/problems.c:256 +#: lib/problems.c:254 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:261 +#: lib/problems.c:259 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "plik %s z pakietu %s-%s-%s jest w konflikcie z plikiem z pakietu %s-%s-%s" -#: lib/problems.c:266 +#: lib/problems.c:264 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" "pakiet %s-%s-%s (który jest nowszy ni¿ %s-%s-%s) jest ju¿ zainstalowany" -#: lib/problems.c:271 +#: lib/problems.c:269 #, fuzzy, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s" -#: lib/problems.c:281 +#: lib/problems.c:279 #, fuzzy, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s" -#: lib/problems.c:286 +#: lib/problems.c:284 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:288 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" -#: lib/problems.c:294 +#: lib/problems.c:292 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" -#: lib/problems.c:299 +#: lib/problems.c:297 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "wyst±pi³ nieznany b³±d %d w trakcie manipulowania pakietem %s-%s-%s" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "conflicts with" msgstr " jest w konflikcie z %s-%s-%s\n" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "is needed by" msgstr " jest wymagany przez %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "Typ danych %d nie jest obs³ugiwany\n" -#: lib/psm.c:442 +#: lib/psm.c:447 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "nie mo¿na utworzyæ %s" -#: lib/psm.c:448 +#: lib/psm.c:453 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "nie mo¿na zapisaæ do %s" -#: lib/psm.c:481 +#: lib/psm.c:486 #, fuzzy msgid "source package expected, binary found\n" msgstr "spodziewany pakiet ¼ród³owy a nie binarny" -#: lib/psm.c:597 +#: lib/psm.c:602 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pakiet ¼ród³owy nie zawiera pliku .spec" -#: lib/psm.c:716 +#: lib/psm.c:721 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n" -#: lib/psm.c:882 +#: lib/psm.c:887 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "wykonanie skryptu nie powiod³o siê" -#: lib/psm.c:889 +#: lib/psm.c:894 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "wykonanie skryptu nie powiod³o siê" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "pakiet: %s-%s-%s test plików = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "u¿ytkownik %s nie istnieje - u¿yto konta root" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s nie istnieje - u¿yto grupy root" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozpakowanie archiwum nie powiod³o siê %s%s: %s" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr " na pliku " -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s nie powiod³o siê" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "b³±d w formacie: %s\n" @@ -2346,8 +2332,8 @@ msgstr "pakiet nie ma ani w msgid "can't query %s: %s\n" msgstr "nie mo¿na odwi±zaæ %s: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, c-format msgid "open of %s failed: %s\n" msgstr "otwarcie %s nie powiod³o siê\n" @@ -2361,7 +2347,7 @@ msgstr "odpytywanie %s nie powiod msgid "old format source packages cannot be queried\n" msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: readLead nie powiod³o siê\n" @@ -2431,7 +2417,7 @@ msgstr "numer rekordu pakietu: %d\n" msgid "record %u could not be read\n" msgstr "nie mo¿na odczytaæ rekordu %d\n" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, c-format msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" @@ -2441,7 +2427,7 @@ msgstr "pakiet %s nie jest zainstalowany\n" msgid "(added files)" msgstr "b³êdny status pliku: %s" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 #, fuzzy msgid "(added provide)" msgstr "Udostêpniane zasoby:" @@ -2515,21 +2501,30 @@ msgstr ")" msgid "OK" msgstr "OK" +#: lib/rpmds.c:420 lib/rpmds.c:579 +#, fuzzy +msgid "NO " +msgstr "NIE DOBRZE" + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, fuzzy, c-format msgid " %s A %s\tB %s\n" msgstr " rpm {--version}" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" @@ -2543,86 +2538,95 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "nie podano nazw plików do zainstalowania" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "¦ci±ganie %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr "... jako %s\n" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s pomijany - transmisja %s nie powiod³a siê\n" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, c-format msgid "package %s is not relocateable\n" msgstr "pakiet %s nie jest przesuwalny\n" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, c-format msgid "error reading from file %s\n" msgstr "b³±d czytania z pliku %s\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "plik %s wymaga nowszej wersji RPM\n" -#: lib/rpminstall.c:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie mo¿e byæ zainstalowany\n" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, 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:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +#, fuzzy +msgid "Failed dependencies:\n" msgstr "niespe³nione zale¿no¶ci:\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" +msgstr "" + +#: lib/rpminstall.c:579 msgid "installing binary packages\n" msgstr "instalacja pakietów binarnych\n" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie mo¿na otworzyæ pliku %s: %s" -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" okre¶la wiele pakietów\n" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "usuniêcie tych pakietów zerwie zale¿no¶ci:\n" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie mo¿na otworzyæ %s\n" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "Instalacja %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "niespe³nione zale¿no¶ci:\n" + +#: lib/rpmlead.c:47 #, fuzzy, c-format msgid "read failed: %s (%d)\n" msgstr "odczyt nie powiód³ siê: %s (%d)" @@ -2722,7 +2726,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Nie mo¿na otworzyæ %s do odczytu: %s." -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" @@ -2871,32 +2875,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Blok sygnatury: %d\n" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s pominiêty z powodu flagi missingok\n" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:326 +#: lib/verify.c:329 #, fuzzy, c-format msgid "missing %s" msgstr "brak %s\n" -#: lib/verify.c:421 +#: lib/verify.c:424 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: " -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3492,6 +3496,10 @@ msgstr "port musi by msgid "failed to create %s: %s\n" msgstr "utworzenie %s nie powiod³o siê\n" +#, fuzzy +#~ msgid "%9s: (%s, %s) added to Depends cache.\n" +#~ msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" + #~ msgid "(unknown type)" #~ msgstr "(nieznany typ)" diff --git a/po/pt_BR.po b/po/pt_BR.po index cd16643d0..069f3bf0b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" #: build.c:39 #, fuzzy @@ -476,7 +476,7 @@ msgid "no arguments given" msgstr "no foi passado argumento para pesquisa" # , c-format -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 #, fuzzy msgid "Unable to open temp file.\n" msgstr "No consegui abrir: %s\n" @@ -704,7 +704,7 @@ msgid "Could not open %%files file %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, fuzzy, c-format msgid "line: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" @@ -785,180 +785,180 @@ msgid "Could not canonicalize hostname: %s\n" msgstr "" # , c-format -#: build/pack.c:81 +#: build/pack.c:83 #, fuzzy, c-format msgid "create archive failed on file %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:84 +#: build/pack.c:86 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:106 +#: build/pack.c:108 #, fuzzy, c-format msgid "cpio_copy write failed: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:113 +#: build/pack.c:115 #, fuzzy, c-format msgid "cpio_copy read failed: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:216 +#: build/pack.c:218 #, fuzzy, c-format msgid "Could not open PreIn file: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:223 +#: build/pack.c:225 #, fuzzy, c-format msgid "Could not open PreUn file: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:230 +#: build/pack.c:232 #, fuzzy, c-format msgid "Could not open PostIn file: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:237 +#: build/pack.c:239 #, fuzzy, c-format msgid "Could not open PostUn file: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:245 +#: build/pack.c:247 #, fuzzy, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:260 +#: build/pack.c:262 #, fuzzy, c-format msgid "Could not open Trigger script file: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:288 +#: build/pack.c:290 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:298 +#: build/pack.c:300 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "No consegui abrir: %s\n" -#: build/pack.c:335 +#: build/pack.c:337 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:344 +#: build/pack.c:346 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" # , c-format -#: build/pack.c:473 +#: build/pack.c:475 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:492 +#: build/pack.c:494 #, fuzzy msgid "Unable to write temp header\n" msgstr "No consegui abrir: %s\n" -#: build/pack.c:502 +#: build/pack.c:504 msgid "Bad CSA data\n" msgstr "" # , c-format -#: build/pack.c:538 +#: build/pack.c:540 #, fuzzy msgid "Unable to write final header\n" msgstr "No consegui abrir: %s\n" -#: build/pack.c:558 +#: build/pack.c:560 #, fuzzy, c-format msgid "Generating signature: %d\n" msgstr "gere assinatura PGP" # , c-format -#: build/pack.c:576 +#: build/pack.c:578 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:584 +#: build/pack.c:586 #, fuzzy, c-format msgid "Could not open %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:635 +#: build/pack.c:637 #, fuzzy, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:646 +#: build/pack.c:648 #, fuzzy, c-format msgid "Unable to read header from %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:660 +#: build/pack.c:662 #, fuzzy, c-format msgid "Unable to write header to %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:670 +#: build/pack.c:672 #, fuzzy, c-format msgid "Unable to read payload from %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:676 +#: build/pack.c:678 #, fuzzy, c-format msgid "Unable to write payload to %s: %s\n" msgstr "No consegui abrir: %s\n" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" # , c-format -#: build/pack.c:785 +#: build/pack.c:787 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "No consegui abrir: %s\n" @@ -1536,44 +1536,44 @@ msgstr "No consegui abrir: %s\n" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "" -#: lib/cpio.c:213 +#: lib/cpio.c:218 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:214 +#: lib/cpio.c:219 msgid "Missing hard link(s)" msgstr "" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:216 +#: lib/cpio.c:221 msgid "Internal error" msgstr "" -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:228 +#: lib/cpio.c:233 #, fuzzy msgid " failed - " msgstr "Construo falhou.\n" @@ -1610,56 +1610,43 @@ msgstr "" msgid "(db package)" msgstr "pesquise todos os pacotes" -#: lib/depends.c:492 -#, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "NO " -msgstr "" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" # , c-format -#: lib/depends.c:882 +#: lib/depends.c:881 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "No consegui abrir: %s\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1709,50 +1696,50 @@ msgstr "No consegui abrir: %s\n" msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:313 +#: lib/fsm.c:318 msgid "========== Directories not explictly included in package:\n" msgstr "" # , c-format -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, fuzzy, c-format msgid "%10d %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" # , c-format -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "No consegui abrir: %s\n" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "Construo falhou.\n" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "Construo falhou.\n" # , c-format -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "No consegui abrir: %s\n" @@ -1763,48 +1750,48 @@ msgstr "No consegui abrir: %s\n" msgid "error creating temporary file %s\n" msgstr "No consegui abrir: %s\n" -#: lib/package.c:181 lib/package.c:257 -msgid "packaging version 1 is not supported by this version of RPM\n" -msgstr "" - -#: lib/package.c:202 lib/package.c:265 -msgid "" -"only packaging with major numbers <= 4 is supported by this version of RPM\n" -msgstr "" - -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 #, c-format msgid "%s: readLead failed\n" msgstr "" -#: lib/package.c:249 +#: lib/package.c:174 #, c-format msgid "%s: bad magic\n" msgstr "" -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:182 +msgid "packaging version 1 is not supported by this version of RPM\n" +msgstr "" + +#: lib/package.c:190 +msgid "" +"only packaging with major numbers <= 4 is supported by this version of RPM\n" +msgstr "" + +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "" # , c-format -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "No consegui abrir: %s\n" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" # , c-format -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "No consegui abrir: %s\n" @@ -2265,166 +2252,166 @@ msgid "generate signature" msgstr "gere assinatura PGP" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:241 +#: lib/problems.c:239 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:246 +#: lib/problems.c:244 #, fuzzy, c-format msgid "package %s is already installed" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:251 +#: lib/problems.c:249 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:256 +#: lib/problems.c:254 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:261 +#: lib/problems.c:259 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:266 +#: lib/problems.c:264 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:271 +#: lib/problems.c:269 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:281 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:286 +#: lib/problems.c:284 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:288 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:294 +#: lib/problems.c:292 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:299 +#: lib/problems.c:297 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:379 +#: lib/problems.c:377 msgid "conflicts with" msgstr "" -#: lib/problems.c:379 +#: lib/problems.c:377 msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" # , c-format -#: lib/psm.c:442 +#: lib/psm.c:447 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/psm.c:448 +#: lib/psm.c:453 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:481 +#: lib/psm.c:486 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:597 +#: lib/psm.c:602 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pesquise o pacote ao qual pertence" -#: lib/psm.c:716 +#: lib/psm.c:721 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "no execute nenhum estgio" -#: lib/psm.c:882 +#: lib/psm.c:887 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:889 +#: lib/psm.c:894 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "no foi passado pacote para instalao" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "Construo falhou.\n" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "Construo falhou.\n" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2470,8 +2457,8 @@ msgstr "no foi passado pacote para instalao" msgid "can't query %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "Construo falhou.\n" @@ -2486,7 +2473,7 @@ msgid "old format source packages cannot be queried\n" msgstr "" # , c-format -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "No consegui abrir: %s\n" @@ -2557,7 +2544,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "no foi passado pacote para instalao" @@ -2568,7 +2555,7 @@ msgstr "no foi passado pacote para instalao" msgid "(added files)" msgstr "No consegui abrir: %s\n" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 msgid "(added provide)" msgstr "" @@ -2645,21 +2632,29 @@ msgstr "" msgid "OK" msgstr "" +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "NO " +msgstr "" + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "no foi passado pacote para instalao" @@ -2681,92 +2676,101 @@ msgstr "no foi passado pacote para instalao" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, fuzzy, c-format msgid "Retrieving %s\n" msgstr "RPM verso %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "no foi passado pacote para instalao" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "no foi passado pacote para instalao" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:539 lib/rpminstall.c:1062 +#: lib/rpminstall.c:540 #, fuzzy -msgid "failed dependencies:\n" +msgid "Failed dependencies:\n" msgstr "lista dependncias do pacote" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" +msgstr "" + +#: lib/rpminstall.c:579 #, fuzzy msgid "installing binary packages\n" msgstr "instale pacote" # , c-format -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 #, fuzzy msgid "removing these packages would break dependencies:\n" msgstr "lista dependncias do pacote" # , c-format -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "no foi passado pacote para desinstalao" +#: lib/rpminstall.c:1080 +#, fuzzy +msgid "failed dependencies:\n" +msgstr "lista dependncias do pacote" + # , c-format -#: lib/rpmlead.c:50 +#: lib/rpmlead.c:47 #, fuzzy, c-format msgid "read failed: %s (%d)\n" msgstr "No consegui abrir: %s\n" @@ -2873,7 +2877,7 @@ msgid "Unable to open %s for reading: %s.\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "No consegui abrir: %s\n" @@ -3022,7 +3026,7 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3036,26 +3040,26 @@ msgstr "" # "Content-Transfer-Encoding: 8-bit\n" # , c-format #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "RPM verso %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:326 +#: lib/verify.c:329 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:421 +#: lib/verify.c:424 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "lista dependncias do pacote" -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/ro.po b/po/ro.po index 325374954..f001c2754 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -423,7 +423,7 @@ msgstr "" msgid "no arguments given" msgstr "" -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 msgid "Unable to open temp file.\n" msgstr "" @@ -630,7 +630,7 @@ msgstr "" msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, c-format msgid "line: %s\n" msgstr "" @@ -705,152 +705,152 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:83 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "" -#: build/pack.c:84 +#: build/pack.c:86 #, c-format msgid "create archive failed: %s\n" msgstr "" -#: build/pack.c:106 +#: build/pack.c:108 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:113 +#: build/pack.c:115 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:216 +#: build/pack.c:218 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "" -#: build/pack.c:223 +#: build/pack.c:225 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "" -#: build/pack.c:230 +#: build/pack.c:232 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "" -#: build/pack.c:237 +#: build/pack.c:239 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "" -#: build/pack.c:245 +#: build/pack.c:247 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "" -#: build/pack.c:260 +#: build/pack.c:262 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:290 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:300 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "" -#: build/pack.c:335 +#: build/pack.c:337 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:344 +#: build/pack.c:346 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:473 +#: build/pack.c:475 msgid "Unable to create immutable header region.\n" msgstr "" -#: build/pack.c:492 +#: build/pack.c:494 msgid "Unable to write temp header\n" msgstr "" -#: build/pack.c:502 +#: build/pack.c:504 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:538 +#: build/pack.c:540 msgid "Unable to write final header\n" msgstr "" -#: build/pack.c:558 +#: build/pack.c:560 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:576 +#: build/pack.c:578 msgid "Unable to reload signature header.\n" msgstr "" -#: build/pack.c:584 +#: build/pack.c:586 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, c-format msgid "Unable to write package: %s\n" msgstr "" -#: build/pack.c:635 +#: build/pack.c:637 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "" -#: build/pack.c:646 +#: build/pack.c:648 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "" -#: build/pack.c:660 +#: build/pack.c:662 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "" -#: build/pack.c:670 +#: build/pack.c:672 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "" -#: build/pack.c:676 +#: build/pack.c:678 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:785 +#: build/pack.c:787 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1363,44 +1363,44 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "" -#: lib/cpio.c:213 +#: lib/cpio.c:218 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:214 +#: lib/cpio.c:219 msgid "Missing hard link(s)" msgstr "" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:216 +#: lib/cpio.c:221 msgid "Internal error" msgstr "" -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:228 +#: lib/cpio.c:233 msgid " failed - " msgstr "" @@ -1433,55 +1433,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:492 -#, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "NO " -msgstr "" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:881 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1528,46 +1515,46 @@ msgstr "" msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:313 +#: lib/fsm.c:318 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, c-format msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1577,46 +1564,46 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:181 lib/package.c:257 -msgid "packaging version 1 is not supported by this version of RPM\n" -msgstr "" - -#: lib/package.c:202 lib/package.c:265 -msgid "" -"only packaging with major numbers <= 4 is supported by this version of RPM\n" -msgstr "" - -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 #, c-format msgid "%s: readLead failed\n" msgstr "" -#: lib/package.c:249 +#: lib/package.c:174 #, c-format msgid "%s: bad magic\n" msgstr "" -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:182 +msgid "packaging version 1 is not supported by this version of RPM\n" +msgstr "" + +#: lib/package.c:190 +msgid "" +"only packaging with major numbers <= 4 is supported by this version of RPM\n" +msgstr "" + +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2021,162 +2008,162 @@ msgid "generate signature" msgstr "" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:241 +#: lib/problems.c:239 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:246 +#: lib/problems.c:244 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:251 +#: lib/problems.c:249 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:256 +#: lib/problems.c:254 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:261 +#: lib/problems.c:259 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:266 +#: lib/problems.c:264 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:271 +#: lib/problems.c:269 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:281 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:286 +#: lib/problems.c:284 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:288 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:292 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:299 +#: lib/problems.c:297 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:379 +#: lib/problems.c:377 msgid "conflicts with" msgstr "" -#: lib/problems.c:379 +#: lib/problems.c:377 msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:442 +#: lib/psm.c:447 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:448 +#: lib/psm.c:453 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:481 +#: lib/psm.c:486 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:597 +#: lib/psm.c:602 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:716 +#: lib/psm.c:721 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:882 +#: lib/psm.c:887 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:889 +#: lib/psm.c:894 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr "" -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, c-format msgid "%s failed: %s\n" msgstr "" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2219,8 +2206,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2234,7 +2221,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2303,7 +2290,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2312,7 +2299,7 @@ msgstr "" msgid "(added files)" msgstr "" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 msgid "(added provide)" msgstr "" @@ -2384,21 +2371,29 @@ msgstr "" msgid "OK" msgstr "" +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "NO " +msgstr "" + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2411,86 +2406,94 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" +msgstr "" + +#: lib/rpminstall.c:579 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "" + +#: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" msgstr "" @@ -2590,7 +2593,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "" -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" @@ -2730,32 +2733,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:326 +#: lib/verify.c:329 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:421 +#: lib/verify.c:424 #, c-format msgid "Unsatisifed dependencies for %s: " msgstr "" -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index a61d46321..ddaa5eed7 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -429,7 +429,7 @@ msgstr "" msgid "no arguments given" msgstr "" -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 msgid "Unable to open temp file.\n" msgstr "" @@ -636,7 +636,7 @@ msgstr "" msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, c-format msgid "line: %s\n" msgstr "" @@ -711,152 +711,152 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:83 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "" -#: build/pack.c:84 +#: build/pack.c:86 #, c-format msgid "create archive failed: %s\n" msgstr "" -#: build/pack.c:106 +#: build/pack.c:108 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:113 +#: build/pack.c:115 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:216 +#: build/pack.c:218 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "" -#: build/pack.c:223 +#: build/pack.c:225 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "" -#: build/pack.c:230 +#: build/pack.c:232 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "" -#: build/pack.c:237 +#: build/pack.c:239 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "" -#: build/pack.c:245 +#: build/pack.c:247 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "" -#: build/pack.c:260 +#: build/pack.c:262 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:290 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:300 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "" -#: build/pack.c:335 +#: build/pack.c:337 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:344 +#: build/pack.c:346 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:473 +#: build/pack.c:475 msgid "Unable to create immutable header region.\n" msgstr "" -#: build/pack.c:492 +#: build/pack.c:494 msgid "Unable to write temp header\n" msgstr "" -#: build/pack.c:502 +#: build/pack.c:504 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:538 +#: build/pack.c:540 msgid "Unable to write final header\n" msgstr "" -#: build/pack.c:558 +#: build/pack.c:560 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:576 +#: build/pack.c:578 msgid "Unable to reload signature header.\n" msgstr "" -#: build/pack.c:584 +#: build/pack.c:586 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, c-format msgid "Unable to write package: %s\n" msgstr "" -#: build/pack.c:635 +#: build/pack.c:637 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "" -#: build/pack.c:646 +#: build/pack.c:648 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "" -#: build/pack.c:660 +#: build/pack.c:662 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "" -#: build/pack.c:670 +#: build/pack.c:672 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "" -#: build/pack.c:676 +#: build/pack.c:678 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:785 +#: build/pack.c:787 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1369,44 +1369,44 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "" -#: lib/cpio.c:213 +#: lib/cpio.c:218 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:214 +#: lib/cpio.c:219 msgid "Missing hard link(s)" msgstr "" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:216 +#: lib/cpio.c:221 msgid "Internal error" msgstr "" -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:228 +#: lib/cpio.c:233 msgid " failed - " msgstr "" @@ -1439,55 +1439,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:492 -#, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "NO " -msgstr "" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:881 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1534,46 +1521,46 @@ msgstr "" msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:313 +#: lib/fsm.c:318 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, c-format msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1583,46 +1570,46 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:181 lib/package.c:257 -msgid "packaging version 1 is not supported by this version of RPM\n" -msgstr "" - -#: lib/package.c:202 lib/package.c:265 -msgid "" -"only packaging with major numbers <= 4 is supported by this version of RPM\n" -msgstr "" - -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 #, c-format msgid "%s: readLead failed\n" msgstr "" -#: lib/package.c:249 +#: lib/package.c:174 #, c-format msgid "%s: bad magic\n" msgstr "" -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:182 +msgid "packaging version 1 is not supported by this version of RPM\n" +msgstr "" + +#: lib/package.c:190 +msgid "" +"only packaging with major numbers <= 4 is supported by this version of RPM\n" +msgstr "" + +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2027,162 +2014,162 @@ msgid "generate signature" msgstr "" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:241 +#: lib/problems.c:239 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:246 +#: lib/problems.c:244 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:251 +#: lib/problems.c:249 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:256 +#: lib/problems.c:254 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:261 +#: lib/problems.c:259 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:266 +#: lib/problems.c:264 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:271 +#: lib/problems.c:269 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:281 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:286 +#: lib/problems.c:284 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:288 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:292 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:299 +#: lib/problems.c:297 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:379 +#: lib/problems.c:377 msgid "conflicts with" msgstr "" -#: lib/problems.c:379 +#: lib/problems.c:377 msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:442 +#: lib/psm.c:447 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:448 +#: lib/psm.c:453 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:481 +#: lib/psm.c:486 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:597 +#: lib/psm.c:602 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:716 +#: lib/psm.c:721 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:882 +#: lib/psm.c:887 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:889 +#: lib/psm.c:894 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr "" -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, c-format msgid "%s failed: %s\n" msgstr "" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2225,8 +2212,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2240,7 +2227,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2309,7 +2296,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2318,7 +2305,7 @@ msgstr "" msgid "(added files)" msgstr "" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 msgid "(added provide)" msgstr "" @@ -2390,21 +2377,29 @@ msgstr "" msgid "OK" msgstr "" +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "NO " +msgstr "" + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2417,86 +2412,94 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" +msgstr "" + +#: lib/rpminstall.c:579 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "" + +#: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" msgstr "" @@ -2596,7 +2599,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "" -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" @@ -2736,32 +2739,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:326 +#: lib/verify.c:329 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:421 +#: lib/verify.c:424 #, c-format msgid "Unsatisifed dependencies for %s: " msgstr "" -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index d5961b28a..9ecec88f4 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "PO-Revision-Date: 2001-08-29 13:55-0400\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -445,7 +445,7 @@ msgstr " msgid "no arguments given" msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁĞÒÏÓÁ" -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 msgid "Unable to open temp file.\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ.\n" @@ -655,7 +655,7 @@ msgstr " msgid "Could not open %%files file %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %%files %s: %s\n" -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, c-format msgid "line: %s\n" msgstr "ÓÔÒÏËÁ: %s\n" @@ -730,152 +730,152 @@ msgstr "getGidS: msgid "Could not canonicalize hostname: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ËÁÎÏÎÉÚÉÒÏ×ÁÔØ ÉÍÑ ËÏÍĞØÀÔÅÒÁ: %s\n" -#: build/pack.c:81 +#: build/pack.c:83 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÁÒÈÉ×Á ÎÁ ÆÁÊÌÅ %s: %s\n" -#: build/pack.c:84 +#: build/pack.c:86 #, c-format msgid "create archive failed: %s\n" msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÁÒÈÉ×Á: %s\n" -#: build/pack.c:106 +#: build/pack.c:108 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "cpio_copy: ÏÛÉÂËÁ ÚÁĞÉÓÉ: %s\n" -#: build/pack.c:113 +#: build/pack.c:115 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "cpio_copy: ÏÛÉÂËÁ ŞÔÅÎÉÑ: %s\n" -#: build/pack.c:216 +#: build/pack.c:218 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PreIn: %s\n" -#: build/pack.c:223 +#: build/pack.c:225 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PreUn: %s\n" -#: build/pack.c:230 +#: build/pack.c:232 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PostIn: %s\n" -#: build/pack.c:237 +#: build/pack.c:239 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PostUn: %s\n" -#: build/pack.c:245 +#: build/pack.c:247 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ VerifyScript: %s\n" -#: build/pack.c:260 +#: build/pack.c:262 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ Trigger script: %s\n" -#: build/pack.c:288 +#: build/pack.c:290 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: ÏÔËÒÙÔÉÅ %s: %s\n" -#: build/pack.c:298 +#: build/pack.c:300 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: ŞÔÅÎÉÅ %s: %s\n" -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: ÏÛÉÂËÁ Fseek: %s\n" -#: build/pack.c:335 +#: build/pack.c:337 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s ÎÅ Ñ×ÌÑÅÔÓÑ ĞÁËÅÔÏÍ RPM\n" -#: build/pack.c:344 +#: build/pack.c:346 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: ŞÉÔÁÅÔÓÑ ÚÁÇÏÌÏ×ÏË ÉÚ %s\n" -#: build/pack.c:473 +#: build/pack.c:475 msgid "Unable to create immutable header region.\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÏÍÅÓÔÉÔØ ÚÁÇÏÌÏ×ÏË × ÎÅÒĞÅÒÙ×ÎÕÀ ÏÂÌÁÓÔØ ĞÁÍÑÔÉ.\n" -#: build/pack.c:492 +#: build/pack.c:494 msgid "Unable to write temp header\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ×ÒÅÍÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË\n" -#: build/pack.c:502 +#: build/pack.c:504 msgid "Bad CSA data\n" msgstr "îÅ×ÅÒÎÙÅ ÄÁÎÎÙÅ CSA\n" -#: build/pack.c:538 +#: build/pack.c:540 msgid "Unable to write final header\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ÏËÏÎŞÁÔÅÌØÎÙÊ ÚÁÇÏÌÏ×ÏË\n" -#: build/pack.c:558 +#: build/pack.c:560 #, c-format msgid "Generating signature: %d\n" msgstr "çÅÎÅÒÉÒÕÅÔÓÑ ĞÏÄĞÉÓØ: %d\n" -#: build/pack.c:576 +#: build/pack.c:578 msgid "Unable to reload signature header.\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÅÒÅÚÁÇÒÕÚÉÔØ ÚÁÇÏÌÏ×ÏË ĞÏÄĞÉÓÉ.\n" -#: build/pack.c:584 +#: build/pack.c:586 #, c-format msgid "Could not open %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, c-format msgid "Unable to write package: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ĞÁËÅÔ: %s\n" -#: build/pack.c:635 +#: build/pack.c:637 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÃÅÌØ ĞÏÄĞÉÓÉ %s: %s\n" -#: build/pack.c:646 +#: build/pack.c:648 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ÚÁÇÏÌÏ×ÏË ÉÚ %s: %s\n" -#: build/pack.c:660 +#: build/pack.c:662 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ÚÁÇÏÌÏ×ÏË × %s: %s\n" -#: build/pack.c:670 +#: build/pack.c:672 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ÓÏÄÅÒÖÉÍÏÅ ÉÚ %s: %s\n" -#: build/pack.c:676 +#: build/pack.c:678 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ÓÏÄÅÒÖÉÍÏÅ × %s: %s\n" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "úÁĞÉÓÁÎ: %s\n" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÉÍÑ ÆÁÊÌÁ ÄÌÑ ĞÁËÅÔÁ %s: %s\n" -#: build/pack.c:785 +#: build/pack.c:787 #, c-format msgid "cannot create %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n" @@ -1401,44 +1401,44 @@ msgstr " msgid "line %d: Bad %s number: %s\n" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÏÅ ŞÉÓÌÏ %s: %s\n" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, c-format msgid "(error 0x%x)" msgstr "(ÏÛÉÂËÁ 0x%x)" -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "îÅ×ÅÒÎÙÊ magic" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "îÅ×ÅÒÎÙÊ/ÎÅŞÉÔÁÅÍÙÊ ÚÁÇÏÌÏ×ÏË" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "úÁÇÏÌÏ×ÏË ÓÌÉÛËÏÍ ×ÅÌÉË" -#: lib/cpio.c:213 +#: lib/cpio.c:218 msgid "Unknown file type" msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÔÉĞ ÆÁÊÌÁ" -#: lib/cpio.c:214 +#: lib/cpio.c:219 msgid "Missing hard link(s)" msgstr "ïÔÓÕÔÓÔ×ÕÅÔ ÖÅÓÔËÁÑ ÓÓÙÌËÁ" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "ËÏÎÔÒÏÌØÎÙÅ MD5-ÓÕÍÍÙ ÎÅ ÓÏ×ĞÁÄÁÀÔ" -#: lib/cpio.c:216 +#: lib/cpio.c:221 msgid "Internal error" msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ" -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "æÁÊÌ ÁÒÈÉ×Á ÎÅ ÎÁÊÄÅÎ × ÚÁÇÏÌÏ×ËÅ ĞÁËÅÔÁ" -#: lib/cpio.c:228 +#: lib/cpio.c:233 msgid " failed - " msgstr "ÎÅ ÕÄÁÌÏÓØ - " @@ -1476,36 +1476,23 @@ msgstr "%s: %-45s YES (db provides)\n" msgid "(db package)" msgstr "ÎÅÔ ĞÁËÅÔÏ×\n" -#: lib/depends.c:492 -#, fuzzy, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "NO " -msgstr "îåT" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "äá" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:881 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕĞÏÒÑÄÏŞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "========== ÚÁĞÉÓØ ÕĞÏÒÑÄÏŞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1514,20 +1501,20 @@ msgstr "" "========== ÓÏÒÔÉÒÏ×ËÁ ĞÁËÅÔÏ× (ÏŞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, " "ÇÌÕÂÉÎÁ)\n" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "========== ÔÏÌØËÏ ĞÏÓÌÅÄÏ×ÁÔÅÌÉ (× ĞÏÒÑÄËÅ ĞÒÅÄÓÔÁ×ÌÅÎÉÑ)\n" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "ãéëì:\n" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "========== ĞÒÏÄÏÌÖÅÎÉÅ ÕĞÏÒÑÄÏŞÅÎÉÑ ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1576,47 +1563,47 @@ msgstr " msgid "file %s is on an unknown device\n" msgstr "ÆÁÊÌ %s - ÎÁ ÎÅÉÚ×ÅÓÔÎÏÍ ÕÓÔÒÏÊÓÔ×Å\n" -#: lib/fsm.c:313 +#: lib/fsm.c:318 #, fuzzy msgid "========== Directories not explictly included in package:\n" msgstr "========= ëÁÔÁÌÏÇÉ, ËÏÔÏÒÙÅ ÎÅ ×ËÌÀŞÅÎÙ × ĞÁËÅÔ Ñ×ÎÏ:\n" -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "ËÁÔÁÌÏÇ %s ÓÏÚÄÁÎ Ó ĞÒÁ×ÁÍÉ ÄÏÓÔÕĞÁ %04o.\n" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "ÆÁÊÌ ÁÒÈÉ×Á %s ÎÅ ÎÁÊÄÅÎ × ÓĞÉÓËÅ ÆÁÊÌÏ× ÚÁÇÏÌÏ×ËÁ\n" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, c-format msgid "%s saved as %s\n" msgstr "%s ÓÏÈÒÁÎÅÎ ËÁË %s\n" -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ %s: ËÁÔÁÌÏÇ ÎÅ ĞÕÓÔ\n" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ %s: %s\n" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, c-format msgid "%s created as %s\n" msgstr "%s ÓÏÚÄÁÎ ËÁË %s\n" @@ -1626,46 +1613,46 @@ msgstr "%s msgid "error creating temporary file %s\n" msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ %s\n" -#: lib/package.c:181 lib/package.c:257 -msgid "packaging version 1 is not supported by this version of RPM\n" -msgstr "ĞÁËÅÔÙ ×ÅÒÓÉÉ 1 ÎÅ ĞÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÜÔÏÊ ×ÅÒÓÉÅÊ RPM\n" - -#: lib/package.c:202 lib/package.c:265 -msgid "" -"only packaging with major numbers <= 4 is supported by this version of RPM\n" -msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ĞÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ĞÁËÅÔÙ ×ÅÒÓÉÉ <= 4\n" - -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 #, c-format msgid "%s: readLead failed\n" msgstr "%s: ÏÛÉÂËÁ readLead\n" -#: lib/package.c:249 +#: lib/package.c:174 #, fuzzy, c-format msgid "%s: bad magic\n" msgstr "îÅ×ÅÒÎÙÊ magic" -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:182 +msgid "packaging version 1 is not supported by this version of RPM\n" +msgstr "ĞÁËÅÔÙ ×ÅÒÓÉÉ 1 ÎÅ ĞÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÜÔÏÊ ×ÅÒÓÉÅÊ RPM\n" + +#: lib/package.c:190 +msgid "" +"only packaging with major numbers <= 4 is supported by this version of RPM\n" +msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ĞÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ĞÁËÅÔÙ ×ÅÒÓÉÉ <= 4\n" + +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: ÏÛÉÂËÁ rpmReadSignature\n" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "%s: ğÏÄĞÉÓØ ÎÅÄÏÓÔÕĞÎÁ\n" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: ÏÛÉÂËÁ readLead\n" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: ÏÛÉÂËÁ Fread: %s\n" @@ -2093,164 +2080,164 @@ msgid "generate signature" msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ ĞÏÄĞÉÓØ" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "ĞÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÁÒÈÉÔÅËÔÕÒÙ" -#: lib/problems.c:241 +#: lib/problems.c:239 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "ĞÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÏĞÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ" -#: lib/problems.c:246 +#: lib/problems.c:244 #, c-format msgid "package %s is already installed" msgstr "ĞÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/problems.c:251 +#: lib/problems.c:249 #, c-format msgid "path %s in package %s is not relocateable" msgstr "ĞÕÔØ %s × ĞÁËÅÔÅ %s - ÎÅ ĞÅÒÅÍÅİÁÅÍÙÊ" -#: lib/problems.c:256 +#: lib/problems.c:254 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "ËÏÎÆÌÉËÔ ÆÁÊÌÁ %s ĞÒÉ ĞÏĞÙÔËÁÈ ÕÓÔÁÎÏ×ËÉ %s É %s" -#: lib/problems.c:261 +#: lib/problems.c:259 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "ÆÁÊÌ %s ÉÚ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ ĞÁËÅÔÁ %s ËÏÎÆÌÉËÔÕÅÔ Ó ÆÁÊÌÏÍ ÉÚ ĞÁËÅÔÁ %s" -#: lib/problems.c:266 +#: lib/problems.c:264 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "ĞÁËÅÔ %s (ËÏÔÏÒÙÊ ÎÏ×ÅÅ, ŞÅÍ %s) ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/problems.c:271 +#: lib/problems.c:269 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ĞÁËÅÔÁ %s ÎÕÖÎÏ %ld%cb ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s" -#: lib/problems.c:281 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ĞÁËÅÔÁ %s ÎÕÖÎÏ %ld inodes ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s" -#: lib/problems.c:286 +#: lib/problems.c:284 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "ĞÁËÅÔ %s pre-transaction syscall(s): %s: ÏÛÉÂËÁ: %s" -#: lib/problems.c:290 +#: lib/problems.c:288 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" -#: lib/problems.c:294 +#: lib/problems.c:292 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" -#: lib/problems.c:299 +#: lib/problems.c:297 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ %d ĞÒÉ ÒÁÂÏÔÅ Ó ĞÁËÅÔÏÍ %s" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "conflicts with" msgstr " ËÏÎÆÌÉËÔÕÅÔ Ó %s-%s-%s\n" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "is needed by" msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "ôÉĞ ÄÁÎÎÙÈ %d ÎÅ ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n" -#: lib/psm.c:442 +#: lib/psm.c:447 #, c-format msgid "cannot create %%%s %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %%%s %s\n" -#: lib/psm.c:448 +#: lib/psm.c:453 #, c-format msgid "cannot write to %%%s %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÉÓÁÔØ × %%%s %s\n" -#: lib/psm.c:481 +#: lib/psm.c:486 msgid "source package expected, binary found\n" msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉŞÎÙÊ ĞÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ\n" -#: lib/psm.c:597 +#: lib/psm.c:602 msgid "source package contains no .spec file\n" msgstr "ÉÓÈÏÄÎÙÊ ĞÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ ÓĞÅÃÉÆÉËÁÃÉÉ\n" -#: lib/psm.c:716 +#: lib/psm.c:721 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: ×ÙĞÏÌÎÑÅÔÓÑ ÓÃÅÎÁÒÉÊ %s (ÅÓÌÉ ÅÓÔØ)\n" -#: lib/psm.c:882 +#: lib/psm.c:887 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "ÏÛÉÂËÁ ×ÙĞÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, waitpid() ×ÏÚ×ÒÁÔÉÌ %s\n" -#: lib/psm.c:889 +#: lib/psm.c:894 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "ÏÛÉÂËÁ ×ÙĞÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, ËÏÄ ×ÏÚ×ÒÁÔÁ %d\n" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s ÓÏÄÅÒÖÉÔ %d ÆÁÊÌÏ×, test = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ %s (%d), %s-%s-%s ĞÒÏĞÕÓËÁÅÔÓÑ\n" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, c-format msgid "user %s does not exist - using root\n" msgstr "ĞÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕİÅÓÔ×ÕÅÔ - ÉÓĞÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, c-format msgid "group %s does not exist - using root\n" msgstr "ÇÒÕĞĞÁ %s ÎÅ ÓÕİÅÓÔ×ÕÅÔ - ÉÓĞÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "ÒÁÓĞÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr " ÎÁ ÆÁÊÌÅ " -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, c-format msgid "%s failed: %s\n" msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, c-format msgid "incorrect format: %s\n" msgstr "ÏÛÉÂËÁ × ÆÏÒÍÁÔÅ: %s\n" @@ -2293,8 +2280,8 @@ msgstr " msgid "can't query %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁĞÒÏÓÉÔØ %s: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, c-format msgid "open of %s failed: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" @@ -2308,7 +2295,7 @@ msgstr " msgid "old format source packages cannot be queried\n" msgstr "ÚÁĞÒÏÓÙ Ë ÉÓÈÏÄÎÙÍ ĞÁËÅÔÁÍ × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ĞÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: ÏÛÉÂËÁ ŞÔÅÎÉÑ ÓĞÉÓËÁ ÆÁÊÌÏ×: %s\n" @@ -2377,7 +2364,7 @@ msgstr " msgid "record %u could not be read\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ÚÁĞÉÓØ %u\n" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, c-format msgid "package %s is not installed\n" msgstr "ĞÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" @@ -2387,7 +2374,7 @@ msgstr " msgid "(added files)" msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s YES (db provides)\n" @@ -2460,8 +2447,16 @@ msgstr ")" msgid "OK" msgstr "Oë" +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "NO " +msgstr "îåT" + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "äá" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2470,13 +2465,13 @@ msgstr "" "ÄÌÑ ÚÁ×ÉÓÉÍÏÓÔÉ \"B\" ÎÕÖÎÏ ÕËÁÚÁÔØ \"epoch\" (ÔÁË ÖÅ ËÁË ÄÌÑ \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" @@ -2489,86 +2484,95 @@ msgstr " msgid "Preparing packages for installation..." msgstr "ğÏÄÇÏÔÏ×ËÁ ĞÁËÅÔÏ× ÄÌÑ ÕÓÔÁÎÏ×ËÉ..." -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "úÁÇÒÕÖÁÅÔÓÑ %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr " ... ËÁË %s\n" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s ĞÒÏĞÕÓËÁÅÔÓÑ - ÏÛÉÂËÁ ĞÅÒÅÄÁŞÉ - %s\n" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, c-format msgid "package %s is not relocateable\n" msgstr "ĞÁËÅÔ %s - ÎÅ ĞÅÒÅÍÅİÁÅÍÙÊ\n" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, c-format msgid "error reading from file %s\n" msgstr "ÏÛÉÂËÁ ŞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "ÄÌÑ ÆÁÊÌÁ %s ÎÅÏÂÈÏÄÉÍÁ ÂÏÌÅÅ ÎÏ×ÁÑ ×ÅÒÓÉÑ RPM\n" -#: lib/rpminstall.c:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, c-format msgid "%s cannot be installed\n" msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, c-format msgid "found %d source and %d binary packages\n" msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ĞÁËÅÔÏ×\n" -#: lib/rpminstall.c:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +#, fuzzy +msgid "Failed dependencies:\n" msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" +msgstr "" + +#: lib/rpminstall.c:579 msgid "installing binary packages\n" msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÂÉÎÁÒÎÙÅ ĞÁËÅÔÙ\n" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, c-format msgid "cannot open file %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s: %s\n" -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ĞÁËÅÔÏ×\n" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "ÕÄÁÌÅÎÉÅ ÜÔÉÈ ĞÁËÅÔÏ× ÎÁÒÕÛÉÔ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, c-format msgid "cannot open %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" + +#: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" msgstr "ÏÛÉÂËÁ ŞÔÅÎÉÑ: %s (%d)\n" @@ -2668,7 +2672,7 @@ msgstr " msgid "Unable to open %s for reading: %s.\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ŞÔÅÎÉÑ: %s.\n" -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, c-format msgid "cannot open Packages database in %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n" @@ -2812,32 +2816,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "ğÏÄĞÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁĞÏÌÎÅÎÉÅ(%d)\n" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ĞÒÏĞÕİÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, c-format msgid "excluding directory %s\n" msgstr "ÉÓËÌÀŞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "ĞÏÌÕŞÅÎÉÅ ÓĞÉÓËÁ ÓÍÏÎÔÉÒÏ×ÁÎÎÙÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ\n" -#: lib/verify.c:326 +#: lib/verify.c:329 #, c-format msgid "missing %s" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ %s" -#: lib/verify.c:421 +#: lib/verify.c:424 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: " -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: ÎÅĞÒÁ×ÉÌØÎÁÑ ĞÏÄĞÉÓØ ÏÂÌÁÓÔÉ ÚÁÇÏÌÏ×ËÁ ĞÁËÅÔÁ\n" @@ -3432,6 +3436,10 @@ msgstr "url msgid "failed to create %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n" +#, fuzzy +#~ msgid "%9s: (%s, %s) added to Depends cache.\n" +#~ msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" + #~ msgid "(unknown type)" #~ msgstr "(ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉĞ)" diff --git a/po/sk.po b/po/sk.po index c77b30ee1..06402e7a5 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -445,7 +445,7 @@ msgstr "neo msgid "no arguments given" msgstr "neboli zadané ¾iadne argumenty pre otázku" -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 #, fuzzy msgid "Unable to open temp file.\n" msgstr "Nie je mo¾né otvori» doèasnı súbor" @@ -665,7 +665,7 @@ msgstr "S msgid "Could not open %%files file %s: %s\n" msgstr "chybe: nie je mo¾né otvori» %%files súbor: %s" -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, fuzzy, c-format msgid "line: %s\n" msgstr "riadok: %s" @@ -740,157 +740,157 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "Nie je mo¾né kanonizova» názov poèítaèa: %s\n" -#: build/pack.c:81 +#: build/pack.c:83 #, fuzzy, c-format msgid "create archive failed on file %s: %s\n" msgstr "vytvorenie archívu zlyhalo pri súbore %s: %s" -#: build/pack.c:84 +#: build/pack.c:86 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "vytvorenie archívu zlyhalo pri súbore %s: %s" -#: build/pack.c:106 +#: build/pack.c:108 #, fuzzy, c-format msgid "cpio_copy write failed: %s\n" msgstr "cpio_copy zápis zlyhal: %s" -#: build/pack.c:113 +#: build/pack.c:115 #, fuzzy, c-format msgid "cpio_copy read failed: %s\n" msgstr "cpio_copy èítanie zlyhalo: %s" -#: build/pack.c:216 +#: build/pack.c:218 #, fuzzy, c-format msgid "Could not open PreIn file: %s\n" msgstr "Nie je mo¾né otvori» PreIn súbor: %s" -#: build/pack.c:223 +#: build/pack.c:225 #, fuzzy, c-format msgid "Could not open PreUn file: %s\n" msgstr "Nie je mo¾né otvori» PreUn súbor: %s" -#: build/pack.c:230 +#: build/pack.c:232 #, fuzzy, c-format msgid "Could not open PostIn file: %s\n" msgstr "Nie je mo¾né otvori» PostIn súbor: %s" -#: build/pack.c:237 +#: build/pack.c:239 #, fuzzy, c-format msgid "Could not open PostUn file: %s\n" msgstr "Nie je mo¾né otvori» PostUn súbor: %s" -#: build/pack.c:245 +#: build/pack.c:247 #, fuzzy, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Nie je mo¾né otvori» VerifyScript súbor: %s" -#: build/pack.c:260 +#: build/pack.c:262 #, fuzzy, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Nie je mo¾né otvori» Trigger skriptovı súbor: %s" -#: build/pack.c:288 +#: build/pack.c:290 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: otvorenie %s: %s\n" -#: build/pack.c:298 +#: build/pack.c:300 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: èítanie %s: %s\n" -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: readLead zlyhalo\n" -#: build/pack.c:335 +#: build/pack.c:337 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s nie je RPM balík\n" -#: build/pack.c:344 +#: build/pack.c:346 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: èítanie hlavièky %s\n" -#: build/pack.c:473 +#: build/pack.c:475 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Nie je mo¾né preèíta» ikonu: %s" -#: build/pack.c:492 +#: build/pack.c:494 #, fuzzy msgid "Unable to write temp header\n" msgstr "Nie je mo¾né zapísa» %s" -#: build/pack.c:502 +#: build/pack.c:504 #, fuzzy msgid "Bad CSA data\n" msgstr "Chybné CSA dáta" -#: build/pack.c:538 +#: build/pack.c:540 #, fuzzy msgid "Unable to write final header\n" msgstr "Nie je mo¾né zapísa» %s" -#: build/pack.c:558 +#: build/pack.c:560 #, c-format msgid "Generating signature: %d\n" msgstr "Vytvára sa PGP podpis: %d\n" -#: build/pack.c:576 +#: build/pack.c:578 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Nie je mo¾né preèíta» ikonu: %s" -#: build/pack.c:584 +#: build/pack.c:586 #, fuzzy, c-format msgid "Could not open %s: %s\n" msgstr "Otvorenie %s zlyhalo\n" -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" -#: build/pack.c:635 +#: build/pack.c:637 #, fuzzy, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Nie je preèíta» sigtarget: %s" -#: build/pack.c:646 +#: build/pack.c:648 #, fuzzy, c-format msgid "Unable to read header from %s: %s\n" msgstr "Nie je mo¾né preèíta» ikonu: %s" -#: build/pack.c:660 +#: build/pack.c:662 #, fuzzy, c-format msgid "Unable to write header to %s: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" -#: build/pack.c:670 +#: build/pack.c:672 #, fuzzy, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Nie je mo¾né preèíta» ikonu: %s" -#: build/pack.c:676 +#: build/pack.c:678 #, fuzzy, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "Zapísané: %s\n" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "Nie je mo¾né vytvori» meno vıstupného súboru pre balík %s: %s\n" -#: build/pack.c:785 +#: build/pack.c:787 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "nie je mo¾né zapísa» do %s: " @@ -1422,45 +1422,45 @@ msgstr "riadok %d: Chybn msgid "line %d: Bad %s number: %s\n" msgstr "riadok %d: Chybné %s èíslo: %s\n" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, c-format msgid "(error 0x%x)" msgstr "(chyba 0x%x)" -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "Chybné magické èíslo" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "Chybná/neèitateµná hlavièka" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "Priveµká hlavièka" -#: lib/cpio.c:213 +#: lib/cpio.c:218 msgid "Unknown file type" msgstr "Neznámy typ súboru" -#: lib/cpio.c:214 +#: lib/cpio.c:219 #, fuzzy msgid "Missing hard link(s)" msgstr "chıbajúca ':' na %s:%d" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:216 +#: lib/cpio.c:221 msgid "Internal error" msgstr "Interná chyba" -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:228 +#: lib/cpio.c:233 msgid " failed - " msgstr " zlyhalo - " @@ -1498,56 +1498,42 @@ msgstr "Poskytuje:" msgid "(db package)" msgstr "nájdenıch %d balíkov\n" -#: lib/depends.c:492 -#, fuzzy, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -#, fuzzy -msgid "NO " -msgstr "NIE JE V PORIADKU" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:881 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstraòuje sa index skupín\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1596,46 +1582,46 @@ msgstr "nepodarilo sa otvori msgid "file %s is on an unknown device\n" msgstr "súbor %s sa nachádza na neznámom zariadení" -#: lib/fsm.c:313 +#: lib/fsm.c:318 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, fuzzy, c-format msgid "%10d %s\n" msgstr "riadok %d: %s" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "varovanie: %s uchovanı ako %s" -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "nie je mo¾né odstráni» %s - adresár nie je prázdny" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "rmdir %s zlyhalo: %s" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "varovanie: %s vytvorené ako %s" @@ -1645,48 +1631,48 @@ msgstr "varovanie: %s vytvoren msgid "error creating temporary file %s\n" msgstr "chyba pri vytváraní doèasného súboru %s" -#: lib/package.c:181 lib/package.c:257 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#, c-format +msgid "%s: readLead failed\n" +msgstr "%s: readLead zlyhalo\n" + +#: lib/package.c:174 +#, fuzzy, c-format +msgid "%s: bad magic\n" +msgstr "Chybné magické èíslo" + +#: lib/package.c:182 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "táto verzia RPM podporuje iba balíky s hlavnım èíslom <= 3" -#: lib/package.c:202 lib/package.c:265 +#: lib/package.c:190 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "táto verzia RPM podporuje iba balíky s hlavnım èíslom <= 3" -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 -#, c-format -msgid "%s: readLead failed\n" -msgstr "%s: readLead zlyhalo\n" - -#: lib/package.c:249 -#, fuzzy, c-format -msgid "%s: bad magic\n" -msgstr "Chybné magické èíslo" - -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature zlyhalo\n" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "%s: Podpis nie je k dispozícii\n" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead zlyhalo\n" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: readLead zlyhalo\n" @@ -2140,166 +2126,166 @@ msgid "generate signature" msgstr "vytvori» PGP/GPG podpis" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "balík %s nie je nain¹talovanı\n" -#: lib/problems.c:241 +#: lib/problems.c:239 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:246 +#: lib/problems.c:244 #, fuzzy, c-format msgid "package %s is already installed" msgstr "balík %s nie je nain¹talovanı\n" -#: lib/problems.c:251 +#: lib/problems.c:249 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "balík %s nie je nain¹talovanı\n" -#: lib/problems.c:256 +#: lib/problems.c:254 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:261 +#: lib/problems.c:259 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:266 +#: lib/problems.c:264 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "balík %s nie je nain¹talovanı\n" -#: lib/problems.c:271 +#: lib/problems.c:269 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:281 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:286 +#: lib/problems.c:284 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:288 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" -#: lib/problems.c:294 +#: lib/problems.c:292 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" -#: lib/problems.c:299 +#: lib/problems.c:297 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "conflicts with" msgstr " koliduje s %s-%s-%s\n" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "is needed by" msgstr " je vy¾adované %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "Typ údajov %d nie je podorovanı\n" -#: lib/psm.c:442 +#: lib/psm.c:447 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/psm.c:448 +#: lib/psm.c:453 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/psm.c:481 +#: lib/psm.c:486 #, fuzzy msgid "source package expected, binary found\n" msgstr "oèakávanı zdrojovı balík, nájdenı binárny" -#: lib/psm.c:597 +#: lib/psm.c:602 #, fuzzy msgid "source package contains no .spec file\n" msgstr "zdrojovı balík neobsahuje ¾iadny .spec súbor" -#: lib/psm.c:716 +#: lib/psm.c:721 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n" -#: lib/psm.c:882 +#: lib/psm.c:887 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:889 +#: lib/psm.c:894 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "balík: %s-%s-%s test súborov = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ije sa root" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalenie archívu zlyhalo%s%s: %s" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr " pre súbor " -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s zlyhalo" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "chyba formátu: %s\n" @@ -2343,8 +2329,8 @@ msgstr "bal msgid "can't query %s: %s\n" msgstr "zmazanie %s zlyhalo: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" @@ -2358,7 +2344,7 @@ msgstr "ot msgid "old format source packages cannot be queried\n" msgstr "nie je mo¾né pıta» sa zdrojovıch balíkov v starom formáte\n" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: readLead zlyhalo\n" @@ -2428,7 +2414,7 @@ msgstr "po msgid "record %u could not be read\n" msgstr "záznam %d nie je mo¾né preèíta»\n" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, c-format msgid "package %s is not installed\n" msgstr "balík %s nie je nain¹talovanı\n" @@ -2438,7 +2424,7 @@ msgstr "bal msgid "(added files)" msgstr "chybnı stav súboru: %s" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 #, fuzzy msgid "(added provide)" msgstr "Poskytuje:" @@ -2512,21 +2498,30 @@ msgstr ")" msgid "OK" msgstr "V PORIADKU" +#: lib/rpmds.c:420 lib/rpmds.c:579 +#, fuzzy +msgid "NO " +msgstr "NIE JE V PORIADKU" + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, fuzzy, c-format msgid " %s A %s\tB %s\n" msgstr " rpm {--version}" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" @@ -2540,86 +2535,95 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "neboli zadané ¾iadne balíky pre in¹taláciu" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "Prená¹a sa %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr "... ako %s\n" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s vynechané - prenos zlyhal - %s\n" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "balík %s nie je nain¹talovanı\n" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "chyba pri vytváraní doèasného súboru %s" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie je mo¾né nain¹talova»\n" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, 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:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +#, fuzzy +msgid "Failed dependencies:\n" msgstr "nevyrie¹ené závislosti:\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" +msgstr "" + +#: lib/rpminstall.c:579 msgid "installing binary packages\n" msgstr "in¹talujú sa binárne balíky\n" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie je mo¾né otvori» súbor %s: %s" -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¹pecifikuje viac balíkov\n" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "odstránenie tıchto balíkov by poru¹ilo závislosti:\n" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie je mo¾né otvori» %s\n" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "In¹taluje sa %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "nevyrie¹ené závislosti:\n" + +#: lib/rpmlead.c:47 #, fuzzy, c-format msgid "read failed: %s (%d)\n" msgstr "èítanie zlyhalo: %s (%d)" @@ -2719,7 +2723,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Nie je mo¾né otvori» %s pre èítanie: %s." -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "nie je mo¾né otvori» %s/packages.rpm\n" @@ -2868,32 +2872,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Doplnenie podpisu: %d\n" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s vynechané kvôli príznaku missingok\n" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "vytvára sa adresár %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:326 +#: lib/verify.c:329 #, fuzzy, c-format msgid "missing %s" msgstr "chıbajúce %s\n" -#: lib/verify.c:421 +#: lib/verify.c:424 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: " -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3489,6 +3493,10 @@ msgstr "url port mus msgid "failed to create %s: %s\n" msgstr "nepodarilo sa vytvori» %s\n" +#, fuzzy +#~ msgid "%9s: (%s, %s) added to Depends cache.\n" +#~ msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n" + #~ msgid "(unknown type)" #~ msgstr "(neznámy typ)" diff --git a/po/sl.po b/po/sl.po index e21b451e2..03ace9218 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.236 2002/04/11 16:55:27 jbj Exp $ +# $Id: sl.po,v 1.237 2002/04/13 01:28:52 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -443,7 +443,7 @@ msgstr "nepri msgid "no arguments given" msgstr "argumenti za poizvedbo niso podani" -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 #, fuzzy msgid "Unable to open temp file.\n" msgstr "Zaèasne datoteke ni mo¾no odpreti" @@ -663,7 +663,7 @@ msgstr "Datoteke ni mo msgid "Could not open %%files file %s: %s\n" msgstr "Datoteke %s iz %%files ni mo¾no odpreti: %s" -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, fuzzy, c-format msgid "line: %s\n" msgstr "vrstica: %s" @@ -738,157 +738,157 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "Iskanje kanoniènega imena gostitelja je bilo neuspe¹no: %s\n" -#: build/pack.c:81 +#: build/pack.c:83 #, fuzzy, c-format msgid "create archive failed on file %s: %s\n" msgstr "ustvarjanje arhiva je bilo za datoteko %s neuspe¹no: %s" -#: build/pack.c:84 +#: build/pack.c:86 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "ustvarjanje arhiva je bilo za datoteko %s neuspe¹no: %s" -#: build/pack.c:106 +#: build/pack.c:108 #, fuzzy, c-format msgid "cpio_copy write failed: %s\n" msgstr "pisanje cpio_copy neuspe¹no: %s" -#: build/pack.c:113 +#: build/pack.c:115 #, fuzzy, c-format msgid "cpio_copy read failed: %s\n" msgstr "branje cpio_copy neuspe¹no: %s" -#: build/pack.c:216 +#: build/pack.c:218 #, fuzzy, c-format msgid "Could not open PreIn file: %s\n" msgstr "Datoteke PreIn ni mo¾no odpreti: %s" -#: build/pack.c:223 +#: build/pack.c:225 #, fuzzy, c-format msgid "Could not open PreUn file: %s\n" msgstr "Datoteke PreUn ni mo¾no odpreti: %s" -#: build/pack.c:230 +#: build/pack.c:232 #, fuzzy, c-format msgid "Could not open PostIn file: %s\n" msgstr "Datoteke PostIn ni mo¾no odpreti: %s" -#: build/pack.c:237 +#: build/pack.c:239 #, fuzzy, c-format msgid "Could not open PostUn file: %s\n" msgstr "Datoteke PostUn ni mo¾no odpreti: %s" -#: build/pack.c:245 +#: build/pack.c:247 #, fuzzy, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Datoteke VerifyScript ni mo¾no odpreti: %s" -#: build/pack.c:260 +#: build/pack.c:262 #, fuzzy, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Skriptne datoteke Trigger ni mo¾no odpreti: %s" -#: build/pack.c:288 +#: build/pack.c:290 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: odpiranje %s: %s\n" -#: build/pack.c:298 +#: build/pack.c:300 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: branje %s: %s\n" -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: branje Fread je bilo neuspe¹no: %s\n" -#: build/pack.c:335 +#: build/pack.c:337 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s ni paket tipa RPM\n" -#: build/pack.c:344 +#: build/pack.c:346 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: branje glave %s\n" -#: build/pack.c:473 +#: build/pack.c:475 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Ikone %s ni mo¾no prebrati: %s" -#: build/pack.c:492 +#: build/pack.c:494 #, fuzzy msgid "Unable to write temp header\n" msgstr "Ni mo¾no zapisati paketa %s: %s" -#: build/pack.c:502 +#: build/pack.c:504 #, fuzzy msgid "Bad CSA data\n" msgstr "Po¹kodovani podatki CSA" -#: build/pack.c:538 +#: build/pack.c:540 #, fuzzy msgid "Unable to write final header\n" msgstr "Ni mo¾no zapisati paketa %s: %s" -#: build/pack.c:558 +#: build/pack.c:560 #, c-format msgid "Generating signature: %d\n" msgstr "Izdelujemo podpis: %d\n" -#: build/pack.c:576 +#: build/pack.c:578 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Ikone %s ni mo¾no prebrati: %s" -#: build/pack.c:584 +#: build/pack.c:586 #, c-format msgid "Could not open %s: %s\n" msgstr "Ni mo¾no odpreti %s: %s\n" -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ni mo¾no zapisati paketa: %s" -#: build/pack.c:635 +#: build/pack.c:637 #, fuzzy, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Ciljnega podpisa %s ni mo¾no odpreti: %s" -#: build/pack.c:646 +#: build/pack.c:648 #, fuzzy, c-format msgid "Unable to read header from %s: %s\n" msgstr "Ikone %s ni mo¾no prebrati: %s" -#: build/pack.c:660 +#: build/pack.c:662 #, fuzzy, c-format msgid "Unable to write header to %s: %s\n" msgstr "Ni mo¾no zapisati paketa %s: %s" -#: build/pack.c:670 +#: build/pack.c:672 #, fuzzy, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Ikone %s ni mo¾no prebrati: %s" -#: build/pack.c:676 +#: build/pack.c:678 #, fuzzy, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Ni mo¾no zapisati paketa %s: %s" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "Neuspe¹no ustvarjanje izhodne datoteke za paket %s: %s\n" -#: build/pack.c:785 +#: build/pack.c:787 #, c-format msgid "cannot create %s: %s\n" msgstr "ni mo¾no ustvariti %s: %s\n" @@ -1423,45 +1423,45 @@ msgstr "vrstica %d: Napa msgid "line %d: Bad %s number: %s\n" msgstr "vrstica %d: Napaèno ¹tevilo %s: %s\n" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, c-format msgid "(error 0x%x)" msgstr "(napaka 0x%x)" -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "Napaèno magièno ¹tevilo" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "Po¹kodovana/neberljiva glava" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "Glava je predolga" -#: lib/cpio.c:213 +#: lib/cpio.c:218 msgid "Unknown file type" msgstr "Neznan tip datoteke" -#: lib/cpio.c:214 +#: lib/cpio.c:219 #, fuzzy msgid "Missing hard link(s)" msgstr "Trda povezava manjka" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:216 +#: lib/cpio.c:221 msgid "Internal error" msgstr "Notranja napaka" -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:228 +#: lib/cpio.c:233 msgid " failed - " msgstr " neuspe¹no - " @@ -1499,56 +1499,42 @@ msgstr "%s: %-45s DA (db ponudbe)\n" msgid "(db package)" msgstr "ni paketov\n" -#: lib/depends.c:492 -#, fuzzy, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -#, fuzzy -msgid "NO " -msgstr "NI DOBRO" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:881 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1597,46 +1583,46 @@ msgstr "neuspe msgid "file %s is on an unknown device\n" msgstr "datoteka %s se nahaja na neznani napravi" -#: lib/fsm.c:313 +#: lib/fsm.c:318 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, fuzzy, c-format msgid "%10d %s\n" msgstr "vrstica %d: %s" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "opozorilo: %s shranjen kot %s" -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "ni mo¾no odstraniti %s - imenik ni prazen" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "odstranitev imenika %s je bila neuspe¹na: %s" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "odpiranje %s je bilo neuspe¹no: %s\n" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "opozorilo: %s ustvarjen kot %s" @@ -1646,48 +1632,48 @@ msgstr "opozorilo: %s ustvarjen kot %s" msgid "error creating temporary file %s\n" msgstr "napaka pri ustvarjanju zaèasne datoteke %s" -#: lib/package.c:181 lib/package.c:257 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#, c-format +msgid "%s: readLead failed\n" +msgstr "%s: readLead je bil neuspe¹en\n" + +#: lib/package.c:174 +#, fuzzy, c-format +msgid "%s: bad magic\n" +msgstr "Napaèno magièno ¹tevilo" + +#: lib/package.c:182 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <= 3" -#: lib/package.c:202 lib/package.c:265 +#: lib/package.c:190 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <=4" -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 -#, c-format -msgid "%s: readLead failed\n" -msgstr "%s: readLead je bil neuspe¹en\n" - -#: lib/package.c:249 -#, fuzzy, c-format -msgid "%s: bad magic\n" -msgstr "Napaèno magièno ¹tevilo" - -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature je bil neuspe¹en\n" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "%s: Podpis ni na voljo\n" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead je bil neuspe¹en\n" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: branje Fread je bilo neuspe¹no: %s\n" @@ -2138,167 +2124,167 @@ msgid "generate signature" msgstr "izdelava podpisa PGP/GPG" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "paket %s-%s-%s je za drug tip arhitekture" -#: lib/problems.c:241 +#: lib/problems.c:239 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "paket %s-%s-%s je za drug operacijski sistem" -#: lib/problems.c:246 +#: lib/problems.c:244 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/problems.c:251 +#: lib/problems.c:249 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paketa %s ni mo¾no prestaviti\n" -#: lib/problems.c:256 +#: lib/problems.c:254 #, fuzzy, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "datoteka %s je v sporu med poskusom namestitve %s in %s" -#: lib/problems.c:261 +#: lib/problems.c:259 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "datoteka %s name¹èena z %s-%s-%s je v sporu z datoteko iz paketa %s-%s-%s" -#: lib/problems.c:266 +#: lib/problems.c:264 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "paket %s-%s-%s (ki je novej¹i kot %s-%s-%s) je ¾e name¹èen" -#: lib/problems.c:271 +#: lib/problems.c:269 #, fuzzy, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "namestitev paketa %s-%s-%s zahteva %ld%cb na datoteènem sistemu %s" -#: lib/problems.c:281 +#: lib/problems.c:279 #, fuzzy, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "paket %s pred-prenosljivih sistemskih klicov: %s ni uspelo: %s" -#: lib/problems.c:286 +#: lib/problems.c:284 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:288 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" -#: lib/problems.c:294 +#: lib/problems.c:292 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" -#: lib/problems.c:299 +#: lib/problems.c:297 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "conflicts with" msgstr " je v sporu z %s-%s-%s\n" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "is needed by" msgstr " potrebuje %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "Tip podatkov %d ni podprt\n" -#: lib/psm.c:442 +#: lib/psm.c:447 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "ni mo¾no ustvariti %s: %s\n" -#: lib/psm.c:448 +#: lib/psm.c:453 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "pisanje na %s ni mo¾no" -#: lib/psm.c:481 +#: lib/psm.c:486 #, fuzzy msgid "source package expected, binary found\n" msgstr "prièakovan je bil izvorni paket, najden binarni" -#: lib/psm.c:597 +#: lib/psm.c:602 #, fuzzy msgid "source package contains no .spec file\n" msgstr "izvorni paket ne vsebuje datoteke .spec" -#: lib/psm.c:716 +#: lib/psm.c:721 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n" -#: lib/psm.c:882 +#: lib/psm.c:887 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "skript se ni uspe¹no izvedel" -#: lib/psm.c:889 +#: lib/psm.c:894 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "skript se ni uspe¹no izvedel" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "paket: %s-%s-%s datoteke test = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "uporabnik %s ne obstaja - uporabljam root" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s ne obstaja - uporabljam root" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "raz¹iritev arhiva je bilo neuspe¹no%s%s: %s" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr " za datoteko " -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s neuspe¹en" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "napaka v obliki: %s\n" @@ -2342,8 +2328,8 @@ msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id" msgid "can't query %s: %s\n" msgstr "ni mo¾no poizvedeti o %s: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, c-format msgid "open of %s failed: %s\n" msgstr "odpiranje %s je bilo neuspe¹no: %s\n" @@ -2357,7 +2343,7 @@ msgstr "poizvedba po %s je bila neuspe msgid "old format source packages cannot be queried\n" msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: branje Fread je bilo neuspe¹no: %s\n" @@ -2427,7 +2413,7 @@ msgstr " msgid "record %u could not be read\n" msgstr "zapisa %d ni mo¾no prebrati\n" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, c-format msgid "package %s is not installed\n" msgstr "paket %s ni name¹èen\n" @@ -2437,7 +2423,7 @@ msgstr "paket %s ni name msgid "(added files)" msgstr "po¹kodovana zbirka podatkov %s" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s DA (db ponudbe)\n" @@ -2510,8 +2496,17 @@ msgstr ")" msgid "OK" msgstr "V REDU" +#: lib/rpmds.c:420 lib/rpmds.c:579 +#, fuzzy +msgid "NO " +msgstr "NI DOBRO" + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2520,13 +2515,13 @@ msgstr "" "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" @@ -2540,86 +2535,95 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "paketi za namestitev niso navedeni" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "Prena¹anje %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr " ... kot %s\n" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "preskoèeno - %s - prenos neuspe¹en - %s\n" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, c-format msgid "package %s is not relocateable\n" msgstr "paketa %s ni mo¾no premakniti\n" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, c-format msgid "error reading from file %s\n" msgstr "napaka pri branju iz datoteke %s\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, 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:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, c-format msgid "%s cannot be installed\n" msgstr "%s ni mo¾no namestiti\n" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, c-format msgid "found %d source and %d binary packages\n" msgstr "najdeno %d izvornih in %d binarnih paketov\n" -#: lib/rpminstall.c:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +#, fuzzy +msgid "Failed dependencies:\n" msgstr "neuspe¹ne soodvisnosti:\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" +msgstr "" + +#: lib/rpminstall.c:579 msgid "installing binary packages\n" msgstr "name¹èanje binarnih paketov\n" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, c-format msgid "cannot open file %s: %s\n" msgstr "ni mo¾no odpreti datoteke %s: %s\n" -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" doloèa veè paketov\n" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, c-format msgid "cannot open %s: %s\n" msgstr "ni mo¾no odpreti %s: %s\n" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "Name¹èanje %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "neuspe¹ne soodvisnosti:\n" + +#: lib/rpmlead.c:47 #, fuzzy, c-format msgid "read failed: %s (%d)\n" msgstr "branje je bilo neuspe¹no: %s (%d)" @@ -2719,7 +2723,7 @@ msgstr "Ni mo msgid "Unable to open %s for reading: %s.\n" msgstr "%s ni mo¾no odpreti za branje: %s." -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n" @@ -2868,32 +2872,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Dol¾. polnila : %d\n" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, c-format msgid "excluding directory %s\n" msgstr "izkljuèevanje imenika %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "zbiranje seznama priklopljenih datoteènih sistemov.\n" -#: lib/verify.c:326 +#: lib/verify.c:329 #, fuzzy, c-format msgid "missing %s" msgstr "manjka %s\n" -#: lib/verify.c:421 +#: lib/verify.c:424 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: " -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3496,6 +3500,10 @@ msgstr "vrata URL morajo biti msgid "failed to create %s: %s\n" msgstr "neuspe¹no ustvarjanje %s: %s\n" +#, fuzzy +#~ msgid "%9s: (%s, %s) added to Depends cache.\n" +#~ msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n" + #~ msgid "(unknown type)" #~ msgstr "(neznan tip)" diff --git a/po/sr.po b/po/sr.po index 7bd9145ea..612bde8fa 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -440,7 +440,7 @@ msgstr "neo msgid "no arguments given" msgstr "nedostaju argumenti za upit" -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 #, fuzzy msgid "Unable to open temp file.\n" msgstr "Ne mogu da otvorim %s za èitanje: %s" @@ -653,7 +653,7 @@ msgstr "Datoteka nije prona msgid "Could not open %%files file %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, fuzzy, c-format msgid "line: %s\n" msgstr "neuspelo otvaranje %s: %s" @@ -728,156 +728,156 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:83 #, fuzzy, c-format msgid "create archive failed on file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/pack.c:84 +#: build/pack.c:86 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/pack.c:106 +#: build/pack.c:108 #, fuzzy, c-format msgid "cpio_copy write failed: %s\n" msgstr "neuspelo èitanje: %s (%d)" -#: build/pack.c:113 +#: build/pack.c:115 #, fuzzy, c-format msgid "cpio_copy read failed: %s\n" msgstr "neuspelo èitanje: %s (%d)" -#: build/pack.c:216 +#: build/pack.c:218 #, fuzzy, c-format msgid "Could not open PreIn file: %s\n" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/pack.c:223 +#: build/pack.c:225 #, fuzzy, c-format msgid "Could not open PreUn file: %s\n" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/pack.c:230 +#: build/pack.c:232 #, fuzzy, c-format msgid "Could not open PostIn file: %s\n" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/pack.c:237 +#: build/pack.c:239 #, fuzzy, c-format msgid "Could not open PostUn file: %s\n" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/pack.c:245 +#: build/pack.c:247 #, fuzzy, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/pack.c:260 +#: build/pack.c:262 #, fuzzy, c-format msgid "Could not open Trigger script file: %s\n" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/pack.c:288 +#: build/pack.c:290 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/pack.c:298 +#: build/pack.c:300 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "Neuspelo èitanje %s: %s." -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" -#: build/pack.c:335 +#: build/pack.c:337 #, fuzzy, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "gre¹ka: èini se da %s nije RPM paket\n" -#: build/pack.c:344 +#: build/pack.c:346 #, fuzzy, c-format msgid "readRPM: reading header from %s\n" msgstr "gre¹ka kod uzimanja sloga %s iz %s" -#: build/pack.c:473 +#: build/pack.c:475 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:492 +#: build/pack.c:494 #, fuzzy msgid "Unable to write temp header\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:502 +#: build/pack.c:504 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:538 +#: build/pack.c:540 #, fuzzy msgid "Unable to write final header\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:558 +#: build/pack.c:560 #, fuzzy, c-format msgid "Generating signature: %d\n" msgstr "napravi PGP potpis" -#: build/pack.c:576 +#: build/pack.c:578 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:584 +#: build/pack.c:586 #, fuzzy, c-format msgid "Could not open %s: %s\n" msgstr "neuspelo otvaranje %s\n" -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:635 +#: build/pack.c:637 #, fuzzy, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:646 +#: build/pack.c:648 #, fuzzy, c-format msgid "Unable to read header from %s: %s\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:660 +#: build/pack.c:662 #, fuzzy, c-format msgid "Unable to write header to %s: %s\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:670 +#: build/pack.c:672 #, fuzzy, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:676 +#: build/pack.c:678 #, fuzzy, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:785 +#: build/pack.c:787 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " @@ -1408,47 +1408,47 @@ msgstr "pogre msgid "line %d: Bad %s number: %s\n" msgstr "pogre¹an broj paketa: %s\n" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "gre¹ka: " -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "" -#: lib/cpio.c:213 +#: lib/cpio.c:218 #, fuzzy msgid "Unknown file type" msgstr "(nepoznat tip)" -#: lib/cpio.c:214 +#: lib/cpio.c:219 #, fuzzy msgid "Missing hard link(s)" msgstr "nedostaje ':' na %s:%d" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "" -#: lib/cpio.c:216 +#: lib/cpio.c:221 #, fuzzy msgid "Internal error" msgstr "fatalna gre¹ka: " -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:228 +#: lib/cpio.c:233 #, fuzzy msgid " failed - " msgstr "PGP omanuo" @@ -1487,55 +1487,42 @@ msgstr "datoteka %s ne pripada nijednom paketu\n" msgid "(db package)" msgstr "upit nad svim paketima" -#: lib/depends.c:492 -#, fuzzy, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "datoteka %s ne pripada nijednom paketu\n" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "NO " -msgstr "" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:881 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1584,46 +1571,46 @@ msgstr "neuspelo otvaranje %s: %s" msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:313 +#: lib/fsm.c:318 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, fuzzy, c-format msgid "%10d %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "ne mogu da uklonim %s - direktorijum nije prazan" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "neuspela komanda rmdir %s: %s" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "Ne mogu da otvorim datoteku %s: " @@ -1633,48 +1620,48 @@ msgstr "Ne mogu da otvorim datoteku %s: " msgid "error creating temporary file %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/package.c:181 lib/package.c:257 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#, c-format +msgid "%s: readLead failed\n" +msgstr "%s: Neuspeo 'readLead'\n" + +#: lib/package.c:174 +#, c-format +msgid "%s: bad magic\n" +msgstr "" + +#: lib/package.c:182 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a" -#: lib/package.c:202 lib/package.c:265 +#: lib/package.c:190 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a" -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 -#, c-format -msgid "%s: readLead failed\n" -msgstr "%s: Neuspeo 'readLead'\n" - -#: lib/package.c:249 -#, c-format -msgid "%s: bad magic\n" -msgstr "" - -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: Neuspelo 'rpmReadSignature'\n" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "%s: Potpis nije na raspolaganju\n" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" @@ -2133,165 +2120,165 @@ msgid "generate signature" msgstr "napravi PGP potpis" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/problems.c:241 +#: lib/problems.c:239 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/problems.c:246 +#: lib/problems.c:244 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paket %s nije instaliran\n" -#: lib/problems.c:251 +#: lib/problems.c:249 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paket %s nije instaliran\n" -#: lib/problems.c:256 +#: lib/problems.c:254 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:261 +#: lib/problems.c:259 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr " se sudara sa %s-%s-%s\n" -#: lib/problems.c:266 +#: lib/problems.c:264 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/problems.c:271 +#: lib/problems.c:269 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:281 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:286 +#: lib/problems.c:284 #, fuzzy, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/problems.c:290 +#: lib/problems.c:288 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "paket %s nije naveden u %s" -#: lib/problems.c:294 +#: lib/problems.c:292 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "paket %s nije naveden u %s" -#: lib/problems.c:299 +#: lib/problems.c:297 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "conflicts with" msgstr " se sudara sa %s-%s-%s\n" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "is needed by" msgstr " je potreban paketu %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:442 +#: lib/psm.c:447 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/psm.c:448 +#: lib/psm.c:453 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/psm.c:481 +#: lib/psm.c:486 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:597 +#: lib/psm.c:602 #, fuzzy msgid "source package contains no .spec file\n" msgstr "upit nad paketom koji ima " -#: lib/psm.c:716 +#: lib/psm.c:721 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/psm.c:882 +#: lib/psm.c:887 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "neuspelo izvr¹avanje skripta" -#: lib/psm.c:889 +#: lib/psm.c:894 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "neuspelo izvr¹avanje skripta" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr "" -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "PGP omanuo" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "gre¹ka u formatu: %s\n" @@ -2336,8 +2323,8 @@ msgstr "paket nema imena" msgid "can't query %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" @@ -2351,7 +2338,7 @@ msgstr "upit nad %s neuspeo\n" msgid "old format source packages cannot be queried\n" msgstr "Upit se ne mo¾e izvesti nad izvorni paketima u starom formatu\n" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" @@ -2421,7 +2408,7 @@ msgstr "pogre msgid "record %u could not be read\n" msgstr "ne mogu da proèitam slog %d\n" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, c-format msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" @@ -2431,7 +2418,7 @@ msgstr "paket %s nije instaliran\n" msgid "(added files)" msgstr "neuspelo otvaranje %s: %s" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 #, fuzzy msgid "(added provide)" msgstr "datoteka %s ne pripada nijednom paketu\n" @@ -2506,21 +2493,29 @@ msgstr "" msgid "OK" msgstr "" +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "NO " +msgstr "" + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s nije naveden u %s" @@ -2534,87 +2529,96 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "nedostaje paket za instalaciju" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "Pribavljam %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "paket %s nije instaliran\n" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "gre¹ka: %s se ne mo¾e instalirati\n" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/rpminstall.c:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +#, fuzzy +msgid "Failed dependencies:\n" msgstr "lo¹e meğuzavisnosti:\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" +msgstr "" + +#: lib/rpminstall.c:579 #, fuzzy msgid "installing binary packages\n" msgstr "instaliraj paket" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" odreğuje vi¹e paketa\n" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "uklanjanje oviha paketa æe naru¹iti zavisnosti:\n" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "Instaliram %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "neodstaje paket za deinstalaciju" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "lo¹e meğuzavisnosti:\n" + +#: lib/rpmlead.c:47 #, fuzzy, c-format msgid "read failed: %s (%d)\n" msgstr "neuspelo èitanje: %s (%d)" @@ -2714,7 +2718,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Ne mogu da otvorim %s za èitanje: %s" -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" @@ -2864,32 +2868,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:326 +#: lib/verify.c:329 #, fuzzy, c-format msgid "missing %s" msgstr "nedostaje { posle %" -#: lib/verify.c:421 +#: lib/verify.c:424 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Nezadovoljene meğuzavisnosti za %s-%s-%s: " -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3489,6 +3493,10 @@ msgstr "gre msgid "failed to create %s: %s\n" msgstr "neuspelo kreiranje %s\n" +#, fuzzy +#~ msgid "%9s: (%s, %s) added to Depends cache.\n" +#~ msgstr "datoteka %s ne pripada nijednom paketu\n" + #~ msgid "(unknown type)" #~ msgstr "(nepoznat tip)" diff --git a/po/sv.po b/po/sv.po index 2b0cdf0cb..cc5e7379d 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "PO-Revision-Date: 2001-09-12 14:18+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -436,7 +436,7 @@ msgstr "ov msgid "no arguments given" msgstr "inga parametrar angivna för fråga" -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 msgid "Unable to open temp file.\n" msgstr "Kan inte öppna temporär fil.\n" @@ -646,7 +646,7 @@ msgstr "Hittade ingen fil vid matchningen: %s\n" msgid "Could not open %%files file %s: %s\n" msgstr "Kunde inte öppna %%files-fil %s: %s\n" -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, c-format msgid "line: %s\n" msgstr "rad: %s\n" @@ -721,152 +721,152 @@ msgstr "getGidS: f msgid "Could not canonicalize hostname: %s\n" msgstr "Kunde inte kanonisera värdnamn: %s\n" -#: build/pack.c:81 +#: build/pack.c:83 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "skapande av arkiv misslyckades vid fil %s: %s\n" -#: build/pack.c:84 +#: build/pack.c:86 #, c-format msgid "create archive failed: %s\n" msgstr "skapande av arkiv misslyckades: %s\n" -#: build/pack.c:106 +#: build/pack.c:108 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "cpio_copy kunde inte skriva: %s\n" -#: build/pack.c:113 +#: build/pack.c:115 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "cpio_copy kunde inte läsa: %s\n" -#: build/pack.c:216 +#: build/pack.c:218 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "Kunde inte öppna PreIn-fil: %s\n" -#: build/pack.c:223 +#: build/pack.c:225 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "Kunde inte öppna PreUn-fil: %s\n" -#: build/pack.c:230 +#: build/pack.c:232 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "Kunde inte öppna PostIn-fil: %s\n" -#: build/pack.c:237 +#: build/pack.c:239 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "Kunde inte öppna PostUn-fil: %s\n" -#: build/pack.c:245 +#: build/pack.c:247 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Kunde inte öppna VerifyScript-fil: %s\n" -#: build/pack.c:260 +#: build/pack.c:262 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Kunde inte öppna Trigger-skriptfil: %s\n" -#: build/pack.c:288 +#: build/pack.c:290 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: öppna %s: %s\n" -#: build/pack.c:298 +#: build/pack.c:300 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: läs %s: %s\n" -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: Fseek misslyckades: %s\n" -#: build/pack.c:335 +#: build/pack.c:337 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s är inte ett RPM-paket\n" -#: build/pack.c:344 +#: build/pack.c:346 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: läser huvud från %s\n" -#: build/pack.c:473 +#: build/pack.c:475 msgid "Unable to create immutable header region.\n" msgstr "Kan inte skapa oföränderlig huvudregion.\n" -#: build/pack.c:492 +#: build/pack.c:494 msgid "Unable to write temp header\n" msgstr "Kan inte skriva temporärhuvud\n" -#: build/pack.c:502 +#: build/pack.c:504 msgid "Bad CSA data\n" msgstr "Felaktig CSA-data\n" -#: build/pack.c:538 +#: build/pack.c:540 msgid "Unable to write final header\n" msgstr "Kan inte skriva slutligt huvud\n" -#: build/pack.c:558 +#: build/pack.c:560 #, c-format msgid "Generating signature: %d\n" msgstr "Genererar signatur: %d\n" -#: build/pack.c:576 +#: build/pack.c:578 msgid "Unable to reload signature header.\n" msgstr "Kan inte läsa om signaturhuvud.\n" -#: build/pack.c:584 +#: build/pack.c:586 #, c-format msgid "Could not open %s: %s\n" msgstr "Kunde inte öppna %s: %s\n" -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunde inte skriva paket: %s\n" -#: build/pack.c:635 +#: build/pack.c:637 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Kan inte läsa signaturen %s: %s\n" -#: build/pack.c:646 +#: build/pack.c:648 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "Kan inte läsa huvud från %s: %s\n" -#: build/pack.c:660 +#: build/pack.c:662 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "Kan inte skriva huvud till %s: %s\n" -#: build/pack.c:670 +#: build/pack.c:672 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Kan inte läsa last från %s: %s\n" -#: build/pack.c:676 +#: build/pack.c:678 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Kan inte skriva last till %s: %s\n" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "Kunde inte generera utfilnamn för paketet %s: %s\n" -#: build/pack.c:785 +#: build/pack.c:787 #, c-format msgid "cannot create %s: %s\n" msgstr "kan inte skapa %s: %s\n" @@ -1386,44 +1386,44 @@ msgstr "rad %d: Felaktigt no%s-tal: %d\n" msgid "line %d: Bad %s number: %s\n" msgstr "rad %d: Felaktigt %s-tal: %s\n" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, c-format msgid "(error 0x%x)" msgstr "(fel 0x%x)" -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "Felaktigt magiskt tal" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "Felaktigt/oläsbart huvud" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "Huvudstorleken för stor" -#: lib/cpio.c:213 +#: lib/cpio.c:218 msgid "Unknown file type" msgstr "Okänd filtyp" -#: lib/cpio.c:214 +#: lib/cpio.c:219 msgid "Missing hard link(s)" msgstr "Saknad(e) hårdlänk(ar)" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "MD5-summan stämmer inte" -#: lib/cpio.c:216 +#: lib/cpio.c:221 msgid "Internal error" msgstr "Internt fel" -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "Ingen arkivfilen i huvud" -#: lib/cpio.c:228 +#: lib/cpio.c:233 msgid " failed - " msgstr " misslyckades - " @@ -1461,36 +1461,23 @@ msgstr "%s: %-45s JA (db-tillhandah msgid "(db package)" msgstr "inga paket\n" -#: lib/depends.c:492 -#, fuzzy, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "%s: (%s, %s) tillagt till beroendecachen.\n" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "NO " -msgstr "NEJ " - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "JA" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:881 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tar bort %s-%s-%s \"%s\" från tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1498,20 +1485,20 @@ msgid "" msgstr "" "========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "========== endast efterföljare (presentationsordning)\n" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "========== fortsätter med tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1560,47 +1547,47 @@ msgstr "kunde inte msgid "file %s is on an unknown device\n" msgstr "filen %s är på en okänd enhet\n" -#: lib/fsm.c:313 +#: lib/fsm.c:318 #, fuzzy msgid "========== Directories not explictly included in package:\n" msgstr "========= Kataloger ej uttryckligen inkluderade i paketet:\n" -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "katalog %s skapad med rättigheter %04o.\n" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "arkivfil %s fanns inte i huvudets fillista\n" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, c-format msgid "%s saved as %s\n" msgstr "%s sparades som %s\n" -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s rmdir av %s misslyckades: Katalogen är inte tom\n" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir av %s misslyckades: %s\n" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s unlink av %s misslyckades: %s\n" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, c-format msgid "%s created as %s\n" msgstr "%s skapades som %s\n" @@ -1610,46 +1597,46 @@ msgstr "%s skapades som %s\n" msgid "error creating temporary file %s\n" msgstr "fel när tämporärfil %s skapades\n" -#: lib/package.c:181 lib/package.c:257 -msgid "packaging version 1 is not supported by this version of RPM\n" -msgstr "paket med versionsnummer 1 stöds inte av denna version av RPM\n" - -#: lib/package.c:202 lib/package.c:265 -msgid "" -"only packaging with major numbers <= 4 is supported by this version of RPM\n" -msgstr "endast paket med huvudnummer <= 4 stöds av denna version av RPM\n" - -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 #, c-format msgid "%s: readLead failed\n" msgstr "%s: readLead misslyckades\n" -#: lib/package.c:249 +#: lib/package.c:174 #, fuzzy, c-format msgid "%s: bad magic\n" msgstr "Felaktigt magiskt tal" -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:182 +msgid "packaging version 1 is not supported by this version of RPM\n" +msgstr "paket med versionsnummer 1 stöds inte av denna version av RPM\n" + +#: lib/package.c:190 +msgid "" +"only packaging with major numbers <= 4 is supported by this version of RPM\n" +msgstr "endast paket med huvudnummer <= 4 stöds av denna version av RPM\n" + +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature misslyckades\n" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ingen signatur tillgänglig\n" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead misslyckades\n" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread misslyckades: %s\n" @@ -2076,165 +2063,165 @@ msgid "generate signature" msgstr "generera signatur" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "paket %s är för en annan arkitektur" -#: lib/problems.c:241 +#: lib/problems.c:239 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "paket %s är för ett annat operativsystem" -#: lib/problems.c:246 +#: lib/problems.c:244 #, c-format msgid "package %s is already installed" msgstr "paket %s är redan installerat" -#: lib/problems.c:251 +#: lib/problems.c:249 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sökväg %s i paket %s är inte relokerbar" -#: lib/problems.c:256 +#: lib/problems.c:254 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "fil %s är en konflikt mellan installationsförsök av %s och %s" -#: lib/problems.c:261 +#: lib/problems.c:259 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "fil %s från installation av %s står i konflikt med filen från paket %s" -#: lib/problems.c:266 +#: lib/problems.c:264 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "paket %s (som är nyare än %s) är redan installerat" -#: lib/problems.c:271 +#: lib/problems.c:269 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "installation av paket %s kräver %ld%cB på filsystem %s" -#: lib/problems.c:281 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "installation av paket %s kräver %ld inoder på filsystem %s" -#: lib/problems.c:286 +#: lib/problems.c:284 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "paket %s systemanrop före transaktion: %s misslyckades: %s" -#: lib/problems.c:290 +#: lib/problems.c:288 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" -#: lib/problems.c:294 +#: lib/problems.c:292 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" -#: lib/problems.c:299 +#: lib/problems.c:297 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "okänt fel %d uppträdde under behandling av paket %s" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "conflicts with" msgstr " står i konflikt med %s-%s-%s\n" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "is needed by" msgstr " behövs av %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "Datatyp %d stöds inte\n" -#: lib/psm.c:442 +#: lib/psm.c:447 #, c-format msgid "cannot create %%%s %s\n" msgstr "kan inte skapa %%%s %s\n" -#: lib/psm.c:448 +#: lib/psm.c:453 #, c-format msgid "cannot write to %%%s %s\n" msgstr "kan inte skriva till %%%s %s\n" -#: lib/psm.c:481 +#: lib/psm.c:486 msgid "source package expected, binary found\n" msgstr "källpaket förväntades, fann binärpaket\n" -#: lib/psm.c:597 +#: lib/psm.c:602 msgid "source package contains no .spec file\n" msgstr "källpaket innehåller ingen .spec-fil\n" -#: lib/psm.c:716 +#: lib/psm.c:721 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kör (eventuellt) %s-skript\n" -#: lib/psm.c:882 +#: lib/psm.c:887 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" "körning av %s-skript från %s-%s-%s misslyckades, waitpid returnerade %s\n" -#: lib/psm.c:889 +#: lib/psm.c:894 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "körning av %s-skript från %s-%s-%s misslyckades, slutstatus %d\n" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s har %d filer, test = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: %s-skript misslyckades (%d), hoppar över %s-%s-%s\n" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, c-format msgid "user %s does not exist - using root\n" msgstr "användare %s finns inte - använder root\n" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, c-format msgid "group %s does not exist - using root\n" msgstr "grupp %s finns inte - använder root\n" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "uppackning av arkiv misslyckades%s%s: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr " vid fil " -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s misslyckades på fil %s: %s\n" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, c-format msgid "%s failed: %s\n" msgstr "%s misslyckades: %s\n" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, c-format msgid "incorrect format: %s\n" msgstr "fel format: %s\n" @@ -2277,8 +2264,8 @@ msgstr "paketet har varken fil msgid "can't query %s: %s\n" msgstr "kan inte fråga %s: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, c-format msgid "open of %s failed: %s\n" msgstr "misslyckades med att öppna %s: %s\n" @@ -2292,7 +2279,7 @@ msgstr "fr msgid "old format source packages cannot be queried\n" msgstr "källpaket i gammalt format går inte att fråga om\n" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: läsning av paketlista misslyckades: %s\n" @@ -2361,7 +2348,7 @@ msgstr "paketpost nummer: %u\n" msgid "record %u could not be read\n" msgstr "post %u kunde inte läsas\n" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, c-format msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" @@ -2371,7 +2358,7 @@ msgstr "paket %s msgid "(added files)" msgstr "felaktig db-fil %s\n" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s JA (db-tillhandahållande)\n" @@ -2444,8 +2431,16 @@ msgstr ")" msgid "OK" msgstr "OK" +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "NO " +msgstr "NEJ " + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "JA" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2454,13 +2449,13 @@ msgstr "" "\"B\"-beroendet behöver en epok (antar samma som \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" @@ -2473,86 +2468,95 @@ msgstr "F msgid "Preparing packages for installation..." msgstr "Förbereder paket för installation ..." -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "Hämtar %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr " ... som %s\n" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "hoppar över %s - överföring misslyckades - %s\n" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, c-format msgid "package %s is not relocateable\n" msgstr "paket %s är inte relokerbart\n" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, c-format msgid "error reading from file %s\n" msgstr "fel vid läsning från fil %s\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, 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:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, c-format msgid "%s cannot be installed\n" msgstr "%s kan inte installeras\n" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, c-format msgid "found %d source and %d binary packages\n" msgstr "hittade %d käll- och %d binärpaket\n" -#: lib/rpminstall.c:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +#, fuzzy +msgid "Failed dependencies:\n" msgstr "ouppfyllda beroenden:\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" +msgstr "" + +#: lib/rpminstall.c:579 msgid "installing binary packages\n" msgstr "installerar binärpaket\n" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, c-format msgid "cannot open file %s: %s\n" msgstr "kan inte öppna filen %s: %s\n" -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" anger flera paket\n" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "Installerar %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "ouppfyllda beroenden:\n" + +#: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" msgstr "läsning misslyckades: %s (%d)\n" @@ -2652,7 +2656,7 @@ msgstr "Kan inte l msgid "Unable to open %s for reading: %s.\n" msgstr "Kan inte öppna %s för läsning: %s.\n" -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kan inte öppna paketdatabas i %s\n" @@ -2797,32 +2801,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s överhoppad på grund av missingok-flagga\n" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, c-format msgid "excluding directory %s\n" msgstr "hoppar över katalogen %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "hämtar lista över monterade filsystem\n" -#: lib/verify.c:326 +#: lib/verify.c:329 #, c-format msgid "missing %s" msgstr "saknas %s" -#: lib/verify.c:421 +#: lib/verify.c:424 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Ouppfyllda beroenden för %s-%s-%s: " -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: kontrollsumma för oföränderlig huvudregion misslyckades\n" @@ -3413,6 +3417,10 @@ msgstr "url-port m msgid "failed to create %s: %s\n" msgstr "kunde inte skapa %s: %s\n" +#, fuzzy +#~ msgid "%9s: (%s, %s) added to Depends cache.\n" +#~ msgstr "%s: (%s, %s) tillagt till beroendecachen.\n" + #~ msgid "(unknown type)" #~ msgstr "(okänd typ)" diff --git a/po/tr.po b/po/tr.po index 9e47a009d..02d095cb5 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-11 12:12-0400\n" +"POT-Creation-Date: 2002-04-12 21:24-0400\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -443,7 +443,7 @@ msgstr "--querytags ile beklenmeyen girdiler" msgid "no arguments given" msgstr "sorgulama için hiç argüman belirtilmedi" -#: build/build.c:125 build/pack.c:485 +#: build/build.c:125 build/pack.c:487 msgid "Unable to open temp file.\n" msgstr "Geçici dosya açılamadı.\n" @@ -653,7 +653,7 @@ msgstr "Dosya glob taraf msgid "Could not open %%files file %s: %s\n" msgstr "%%files dosya %s dosyasında açılamadı: %s\n" -#: build/files.c:1826 build/pack.c:148 +#: build/files.c:1826 build/pack.c:150 #, c-format msgid "line: %s\n" msgstr "satır: %s\n" @@ -728,156 +728,156 @@ msgstr "getGidS: msgid "Could not canonicalize hostname: %s\n" msgstr "Böyle bir makina yok: %s\n" -#: build/pack.c:81 +#: build/pack.c:83 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "%s dosyasında arşiv oluşturulamadı: %s\n" -#: build/pack.c:84 +#: build/pack.c:86 #, c-format msgid "create archive failed: %s\n" msgstr "arşiv oluşturulamadı: %s\n" -#: build/pack.c:106 +#: build/pack.c:108 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "cpio_copy yazma hatası:%s\n" -#: build/pack.c:113 +#: build/pack.c:115 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "cpio_copy okuma hatası: %s\n" -#: build/pack.c:216 +#: build/pack.c:218 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "PreIn dosyası açılamadı: %s\n" -#: build/pack.c:223 +#: build/pack.c:225 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "PreUn dosyası açılamadı: %s\n" -#: build/pack.c:230 +#: build/pack.c:232 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "PostIn dosyası açılamadı: %s\n" -#: build/pack.c:237 +#: build/pack.c:239 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "PostUn dosyası açılamadı: %s\n" -#: build/pack.c:245 +#: build/pack.c:247 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "VerifyScript dosyası açılamadı: %s\n" -#: build/pack.c:260 +#: build/pack.c:262 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Trigger betik dosyası açılamadı: %s\n" -#: build/pack.c:288 +#: build/pack.c:290 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: %s açılırken: %s\n" -#: build/pack.c:298 +#: build/pack.c:300 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: %s okunurken: %s\n" -#: build/pack.c:307 build/pack.c:531 +#: build/pack.c:309 build/pack.c:533 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: Fseek başarısız: %s\n" -#: build/pack.c:335 +#: build/pack.c:337 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s bir RPM paketi değil\n" -#: build/pack.c:344 +#: build/pack.c:346 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: %s başlığı okunuyor\n" -#: build/pack.c:473 +#: build/pack.c:475 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "%s'den başlık okunamadı: %s\n" -#: build/pack.c:492 +#: build/pack.c:494 #, fuzzy msgid "Unable to write temp header\n" msgstr "%s'e başlık yazılamadı: %s\n" -#: build/pack.c:502 +#: build/pack.c:504 msgid "Bad CSA data\n" msgstr "CSA verisi geçersiz\n" -#: build/pack.c:538 +#: build/pack.c:540 #, fuzzy msgid "Unable to write final header\n" msgstr "%s'e başlık yazılamadı: %s\n" -#: build/pack.c:558 +#: build/pack.c:560 #, c-format msgid "Generating signature: %d\n" msgstr "İmza üretiliyor: %d\n" -#: build/pack.c:576 +#: build/pack.c:578 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "%s'den başlık okunamadı: %s\n" -#: build/pack.c:584 +#: build/pack.c:586 #, c-format msgid "Could not open %s: %s\n" msgstr "%s açılamadı: %s\n" -#: build/pack.c:620 lib/psm.c:1444 +#: build/pack.c:622 lib/psm.c:1449 #, c-format msgid "Unable to write package: %s\n" msgstr "paket yazılamadı: %s\n" -#: build/pack.c:635 +#: build/pack.c:637 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "sigtarget %s açılamadı: %s\n" -#: build/pack.c:646 +#: build/pack.c:648 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "%s'den başlık okunamadı: %s\n" -#: build/pack.c:660 +#: build/pack.c:662 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "%s'e başlık yazılamadı: %s\n" -#: build/pack.c:670 +#: build/pack.c:672 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "%s'den payload okunamadı: %s\n" -#: build/pack.c:676 +#: build/pack.c:678 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "%s'e payload yazılamadı: %s\n" -#: build/pack.c:701 lib/psm.c:1732 +#: build/pack.c:703 lib/psm.c:1737 #, c-format msgid "Wrote: %s\n" msgstr "Yazıldı: %s\n" -#: build/pack.c:768 +#: build/pack.c:770 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "%s paket dosyası için çıktı dosya adı üretilemedi: %s\n" -#: build/pack.c:785 +#: build/pack.c:787 #, c-format msgid "cannot create %s: %s\n" msgstr "%s dosyası oluşturulamıyor: %s\n" @@ -1406,44 +1406,44 @@ msgstr "sat msgid "line %d: Bad %s number: %s\n" msgstr "satır %d: Hatalı %s numarası: %s\n" -#: lib/cpio.c:187 +#: lib/cpio.c:192 #, c-format msgid "(error 0x%x)" msgstr "(hata 0x%x)" -#: lib/cpio.c:190 +#: lib/cpio.c:195 msgid "Bad magic" msgstr "Magic hatalı" -#: lib/cpio.c:191 +#: lib/cpio.c:196 msgid "Bad/unreadable header" msgstr "Hatalı/okunamayan başlık" -#: lib/cpio.c:212 +#: lib/cpio.c:217 msgid "Header size too big" msgstr "Başlık çok uzun" -#: lib/cpio.c:213 +#: lib/cpio.c:218 msgid "Unknown file type" msgstr "Bilinmeyen dosya türü" -#: lib/cpio.c:214 +#: lib/cpio.c:219 msgid "Missing hard link(s)" msgstr "Sabit bağ(lar) eksik" -#: lib/cpio.c:215 +#: lib/cpio.c:220 msgid "MD5 sum mismatch" msgstr "MD5 toplamı çelişkili" -#: lib/cpio.c:216 +#: lib/cpio.c:221 msgid "Internal error" msgstr "İç hata" -#: lib/cpio.c:217 +#: lib/cpio.c:222 msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:228 +#: lib/cpio.c:233 msgid " failed - " msgstr " başarısız - " @@ -1481,36 +1481,23 @@ msgstr "%s: %-45s EVET (db sa msgid "(db package)" msgstr "paket yok\n" -#: lib/depends.c:492 -#, fuzzy, c-format -msgid "%9s: (%s, %s) added to Depends cache.\n" -msgstr "%s: (%s, %s) Bağımlılar alanına eklendi.\n" - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "NO " -msgstr "HAYIR " - -#: lib/depends.c:494 lib/rpmds.c:410 lib/rpmds.c:569 -msgid "YES" -msgstr "EVET" - -#: lib/depends.c:762 +#: lib/depends.c:761 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:881 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort bağıntılarından %s-%s-%s \"%s\" kaldırılıyor\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1149 msgid "========== recording tsort relations\n" msgstr "========== tsort bağıntıları kaydediliyor\n" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1255 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1518,20 +1505,20 @@ msgid "" msgstr "" "========== paketler tsort'lanıyor (sıra, #öncüller, #ardıllar, derinlik)\n" -#: lib/depends.c:1349 +#: lib/depends.c:1348 msgid "========== successors only (presentation order)\n" msgstr "========== sadece ardıllar (sunum sırası)\n" -#: lib/depends.c:1419 +#: lib/depends.c:1418 msgid "LOOP:\n" msgstr "ÇEVRİM:\n" -#: lib/depends.c:1454 +#: lib/depends.c:1453 msgid "========== continuing tsort ...\n" msgstr "========== tsort sürüyor ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1458 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1580,47 +1567,47 @@ msgstr "%s a msgid "file %s is on an unknown device\n" msgstr "%s dosyasının bulunduğu aygıt anlaşılamadı\n" -#: lib/fsm.c:313 +#: lib/fsm.c:318 #, fuzzy msgid "========== Directories not explictly included in package:\n" msgstr "========= Pakette bulunmayan dizinler:\n" -#: lib/fsm.c:315 +#: lib/fsm.c:320 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1201 +#: lib/fsm.c:1206 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "%s dizin %04o izinleriyle oluşturuldu.\n" -#: lib/fsm.c:1492 +#: lib/fsm.c:1497 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1615 lib/fsm.c:1747 +#: lib/fsm.c:1620 lib/fsm.c:1752 #, c-format msgid "%s saved as %s\n" msgstr "%s %s olarak kaydedildi\n" -#: lib/fsm.c:1773 +#: lib/fsm.c:1778 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s / %s dizin silinemedi - Dizin boş değil\n" -#: lib/fsm.c:1779 +#: lib/fsm.c:1784 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s / %s dizinin silinmesi başarısız: %s\n" -#: lib/fsm.c:1789 +#: lib/fsm.c:1794 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s / %s bağ kaldırılamadı: %s\n" -#: lib/fsm.c:1809 +#: lib/fsm.c:1814 #, c-format msgid "%s created as %s\n" msgstr "%s %s olarak oluşturuldu\n" @@ -1630,48 +1617,48 @@ msgstr "%s %s olarak olu msgid "error creating temporary file %s\n" msgstr "%s geçici dosyası oluşturulurken hata\n" -#: lib/package.c:181 lib/package.c:257 +#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 +#, c-format +msgid "%s: readLead failed\n" +msgstr "%s: readLead başarısız\n" + +#: lib/package.c:174 +#, fuzzy, c-format +msgid "%s: bad magic\n" +msgstr "Magic hatalı" + +#: lib/package.c:182 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "RPM'nin bu sürümünde paket sürümü 1 desteklenmiyor\n" -#: lib/package.c:202 lib/package.c:265 +#: lib/package.c:190 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" "RPM'nin bu sürümünde sadece ilk sürüm rakamı <= 4 olan paketler " "destekleniyor\n" -#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573 -#, c-format -msgid "%s: readLead failed\n" -msgstr "%s: readLead başarısız\n" - -#: lib/package.c:249 -#, fuzzy, c-format -msgid "%s: bad magic\n" -msgstr "Magic hatalı" - -#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 +#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature başarısız\n" -#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 +#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594 #, c-format msgid "%s: No signature available\n" msgstr "%s: İmza bulundurmuyor\n" -#: lib/package.c:328 lib/rpmchecksig.c:494 +#: lib/package.c:249 lib/rpmchecksig.c:494 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead başarısız\n" -#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:665 +#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 +#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread başarısız: %s\n" @@ -2100,164 +2087,164 @@ msgid "generate signature" msgstr "imza üretir" #. @observer@ -#: lib/problems.c:228 +#: lib/problems.c:226 msgid "different" msgstr "" -#: lib/problems.c:236 +#: lib/problems.c:234 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "%s farklı bir mimari için" -#: lib/problems.c:241 +#: lib/problems.c:239 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "%s farklı bir işletim sistemi için" -#: lib/problems.c:246 +#: lib/problems.c:244 #, c-format msgid "package %s is already installed" msgstr "%s zaten kurulu" -#: lib/problems.c:251 +#: lib/problems.c:249 #, c-format msgid "path %s in package %s is not relocateable" msgstr "%s dosya yolu %s paketinde yeniden konumlandırılamaz" -#: lib/problems.c:256 +#: lib/problems.c:254 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "%s dosyası kalkışılan %s ve %s kurulumları arasında çelişiyor" -#: lib/problems.c:261 +#: lib/problems.c:259 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "%s dosyasının %s kurulumu %s kurulumundaki dosya ile çelişiyor" -#: lib/problems.c:266 +#: lib/problems.c:264 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "%s paketi zaten yüklü (%s sürümünden daha yeni)" -#: lib/problems.c:271 +#: lib/problems.c:269 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "%s kurulumu %ld%cb gerektiriyor (%s dosya sisteminde)" -#: lib/problems.c:281 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "%s kurulumu %ld i-düğüm gerektiriyor (%s dosya sisteminde)" -#: lib/problems.c:286 +#: lib/problems.c:284 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "%s işlem öncesi sistem çağrı(sı/ları): %s başarısız: %s" -#: lib/problems.c:290 +#: lib/problems.c:288 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "paket %s-%s-%s gereksinimi tatmin edici değil: %s\n" -#: lib/problems.c:294 +#: lib/problems.c:292 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "paket %s-%s-%s gereksinimi tatmin edici değil: %s\n" -#: lib/problems.c:299 +#: lib/problems.c:297 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "anlaşılamayan %d hatası, %s paketi işlenirken saptandı" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "conflicts with" msgstr " %s-%s-%s ile çelişiyor\n" -#: lib/problems.c:379 +#: lib/problems.c:377 #, fuzzy msgid "is needed by" msgstr " %s-%s-%s için gerekli\n" #. @-modfilesys@ -#: lib/psm.c:245 rpmdb/header.c:383 rpmdb/header_internal.c:161 +#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "%d veri türü desteklenmiyor\n" -#: lib/psm.c:442 +#: lib/psm.c:447 #, c-format msgid "cannot create %%%s %s\n" msgstr "%%%s dosyası oluşturulamıyor: %s\n" -#: lib/psm.c:448 +#: lib/psm.c:453 #, c-format msgid "cannot write to %%%s %s\n" msgstr "%%%s dosyasına yazılamaz %s\n" -#: lib/psm.c:481 +#: lib/psm.c:486 msgid "source package expected, binary found\n" msgstr "kaynak paketi gerekirken çalıştırılabilir paketi bulundu\n" -#: lib/psm.c:597 +#: lib/psm.c:602 msgid "source package contains no .spec file\n" msgstr "kaynak paketi .spec dosyası içermiyor\n" -#: lib/psm.c:716 +#: lib/psm.c:721 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s betiği çalıştırılıyor (varsa)\n" -#: lib/psm.c:882 +#: lib/psm.c:887 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "%s betiğinin %s-%s-%s'den icrası başarısız, waitpid sonucu %s\n" -#: lib/psm.c:889 +#: lib/psm.c:894 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "%s betiğinin %s-%s-%s'den icrası başarısız, çıkışta durum %d\n" -#: lib/psm.c:1231 +#: lib/psm.c:1236 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s %d dosya içeriyor, test = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1356 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: %s betiği başarısız (%d), %s-%s-%s atlanıyor\n" -#: lib/psm.c:1493 +#: lib/psm.c:1498 #, c-format msgid "user %s does not exist - using root\n" msgstr "kullanıcı %s yok - root kullanılacak\n" -#: lib/psm.c:1502 +#: lib/psm.c:1507 #, c-format msgid "group %s does not exist - using root\n" msgstr "grup %s yok - root kullanılacak\n" -#: lib/psm.c:1544 +#: lib/psm.c:1549 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "arşiv paketi açılırken başarısız%s%s: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1550 msgid " on file " msgstr " dosyada " -#: lib/psm.c:1740 +#: lib/psm.c:1745 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s açılamadı: %s\n" -#: lib/psm.c:1743 +#: lib/psm.c:1748 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s başarısız\n" -#: lib/query.c:125 +#: lib/query.c:125 lib/rpmts.c:182 #, c-format msgid "incorrect format: %s\n" msgstr "biçem yanlış: %s\n" @@ -2300,8 +2287,8 @@ msgstr "paket ne dosya sahibi ne de kimlik listesi i msgid "can't query %s: %s\n" msgstr "%s sorgulanamıyor: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:351 lib/rpminstall.c:493 -#: lib/rpminstall.c:870 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/rpminstall.c:888 #, c-format msgid "open of %s failed: %s\n" msgstr "%s açılamadı: %s\n" @@ -2315,7 +2302,7 @@ msgstr "%s 'nin sorgulamas msgid "old format source packages cannot be queried\n" msgstr "eski biçem kaynak paketleri sorgulanamaz\n" -#: lib/query.c:665 lib/rpminstall.c:506 +#: lib/query.c:665 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: bildirge okuma başarısız: %s\n" @@ -2384,7 +2371,7 @@ msgstr "paket kay msgid "record %u could not be read\n" msgstr "%u. kayıt okunamadı\n" -#: lib/query.c:963 lib/rpminstall.c:660 +#: lib/query.c:963 lib/rpminstall.c:678 #, c-format msgid "package %s is not installed\n" msgstr "%s paketi kurulu değil\n" @@ -2394,7 +2381,7 @@ msgstr "%s paketi kurulu de msgid "(added files)" msgstr "db dosyası %s hatalı\n" -#: lib/rpmal.c:781 +#: lib/rpmal.c:761 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s EVET (db sağlar)\n" @@ -2467,8 +2454,16 @@ msgstr ")" msgid "OK" msgstr "Tamam" +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "NO " +msgstr "HAYIR " + +#: lib/rpmds.c:420 lib/rpmds.c:579 +msgid "YES" +msgstr "EVET" + #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:538 +#: lib/rpmds.c:548 #, fuzzy, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2477,13 +2472,13 @@ msgstr "" "\"B\" bağımlılığı bir dönemsellik gerektirir (tabii ki \"A\" da)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:568 +#: lib/rpmds.c:578 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:592 +#: lib/rpmds.c:602 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s-%s-%s gereksinimi tatmin edici değil: %s\n" @@ -2496,86 +2491,95 @@ msgstr "Haz msgid "Preparing packages for installation..." msgstr "Kurulacak paketler hazırlanıyor..." -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:300 #, c-format msgid "Retrieving %s\n" msgstr "%s alınıyor\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:311 +#: lib/rpminstall.c:312 #, c-format msgid " ... as %s\n" msgstr "... %s olarak\n" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:316 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s atlanıyor - aktarım başarısız - %s\n" -#: lib/rpminstall.c:413 +#: lib/rpminstall.c:414 #, c-format msgid "package %s is not relocateable\n" msgstr "%s paketi yeniden konumlandırılamaz\n" -#: lib/rpminstall.c:467 +#: lib/rpminstall.c:468 #, c-format msgid "error reading from file %s\n" msgstr "%s dosyasından okuma hatalı\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:474 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "%s dosyası RPM'nin daha yeni bir sürümünü gerektiriyor\n" -#: lib/rpminstall.c:485 lib/rpminstall.c:726 +#: lib/rpminstall.c:486 lib/rpminstall.c:744 #, c-format msgid "%s cannot be installed\n" msgstr "%s yüklenemedi\n" -#: lib/rpminstall.c:521 +#: lib/rpminstall.c:522 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n" -#: lib/rpminstall.c:539 lib/rpminstall.c:1062 -msgid "failed dependencies:\n" +#: lib/rpminstall.c:540 +#, fuzzy +msgid "Failed dependencies:\n" msgstr "bağımlılıklarda hata; gerekli paketler:\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:547 +msgid " Suggested resolutions:\n" +msgstr "" + +#: lib/rpminstall.c:579 msgid "installing binary packages\n" msgstr "icra edilebilir paketleri kuruluyor\n" -#: lib/rpminstall.c:583 +#: lib/rpminstall.c:600 #, c-format msgid "cannot open file %s: %s\n" msgstr "%s dosyası açılamadı: %s\n" -#: lib/rpminstall.c:663 +#: lib/rpminstall.c:681 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" birden fazla paketi tanımlıyor\n" -#: lib/rpminstall.c:687 +#: lib/rpminstall.c:705 msgid "removing these packages would break dependencies:\n" msgstr "bu paketin silinmesi aşağıdakilerin bağımlılıklarını etkileyecektir:\n" -#: lib/rpminstall.c:713 +#: lib/rpminstall.c:731 #, c-format msgid "cannot open %s: %s\n" msgstr "%s açılamadı: %s\n" -#: lib/rpminstall.c:719 +#: lib/rpminstall.c:737 #, c-format msgid "Installing %s\n" msgstr "%s kuruluyor\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1073 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpmlead.c:50 +#: lib/rpminstall.c:1080 +msgid "failed dependencies:\n" +msgstr "bağımlılıklarda hata; gerekli paketler:\n" + +#: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" msgstr "okuma başarısız: %s (%d)\n" @@ -2675,7 +2679,7 @@ msgstr "%s okunam msgid "Unable to open %s for reading: %s.\n" msgstr "%s okuma erişimi için açılamadı: %s.\n" -#: lib/rpmts.c:73 +#: lib/rpmts.c:94 lib/rpmts.c:136 #, c-format msgid "cannot open Packages database in %s\n" msgstr "%s de Paket veritabanı açılamadı\n" @@ -2818,32 +2822,32 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "İmza: boyut(%d)+iz(%d)\n" -#: lib/transaction.c:177 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok flamasından dolayı %s atlandı\n" #. @innercontinue@ -#: lib/transaction.c:989 +#: lib/transaction.c:990 #, c-format msgid "excluding directory %s\n" msgstr "%s dizini dışlanıyor\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1081 msgid "getting list of mounted filesystems\n" msgstr "bağlı dosya sistemlerinin listesi alınıyor\n" -#: lib/verify.c:326 +#: lib/verify.c:329 #, c-format msgid "missing %s" msgstr "eksik %s" -#: lib/verify.c:421 +#: lib/verify.c:424 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s için tatmin edici olmayan bağımlılıklar: " -#: lib/verify.c:461 +#: lib/verify.c:464 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: değişmez başlık alanı özet denetimi başarısız\n" @@ -3437,6 +3441,10 @@ msgstr "url portu bir say msgid "failed to create %s: %s\n" msgstr "%s oluşturulamadı: %s\n" +#, fuzzy +#~ msgid "%9s: (%s, %s) added to Depends cache.\n" +#~ msgstr "%s: (%s, %s) Bağımlılar alanına eklendi.\n" + #~ msgid "(unknown type)" #~ msgstr "(bilinmeyen tür)" diff --git a/rpm.spec b/rpm.spec index 4a4d4f832..ad07a38ca 100644 --- a/rpm.spec +++ b/rpm.spec @@ -20,7 +20,7 @@ Name: rpm %define version 4.1 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 0.05 +Release: 0.06 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Copyright: GPL @@ -170,7 +170,7 @@ make %if %{with_perl_subpackage} { cd Perl-RPM - CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL + CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL RPM_BUILD=1 export SUBDIR="%{_builddir}/%{buildsubdir}" make INC="-I. -I$SUBDIR/lib -I$SUBDIR/rpmdb -I$SUBDIR/rpmio -I$SUBDIR/popt" \ LDDLFLAGS="-shared -L$SUBDIR/lib/.libs -L$SUBDIR/rpmdb/.libs -L$SUBDIR/rpmio/.libs -L$SUBDIR/popt/.libs" %{?_smp_mflags} @@ -521,6 +521,9 @@ fi %{__prefix}/include/popt.h %changelog +* Fri Apr 12 2002 Jeff Johnson 4.1-0.06 +- use rpmdb-redhat to suggest dependency resolution(s). + * Thu Apr 11 2002 Jeff Johnson 4.1-0.05 - rescusitate --rebuild. diff --git a/rpm.spec.in b/rpm.spec.in index 6df6b2680..4e6f67682 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -20,7 +20,7 @@ Name: rpm %define version @VERSION@ Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 0.05 +Release: 0.06 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Copyright: GPL @@ -521,6 +521,9 @@ fi %{__prefix}/include/popt.h %changelog +* Fri Apr 12 2002 Jeff Johnson 4.1-0.06 +- use rpmdb-redhat to suggest dependency resolution(s). + * Thu Apr 11 2002 Jeff Johnson 4.1-0.05 - rescusitate --rebuild. diff --git a/rpmqv.c b/rpmqv.c index 66967a51f..3a2e516c8 100755 --- a/rpmqv.c +++ b/rpmqv.c @@ -278,10 +278,10 @@ static void printUsage(void) } /*@-mods@*/ /* FIX: shrug */ -#if defined(__GLIBC__) || defined(__LCLINT__) -int main(int argc, const char ** argv) -#else +#if !defined(__GLIBC__) && !defined(__LCLINT__) int main(int argc, const char ** argv, /*@unused@*/ char ** envp) +#else +int main(int argc, const char ** argv) #endif /*@globals __assert_program_name, rpmEVR, RPMVERSION, rpmGlobalMacroContext, rpmCLIMacroContext, -- cgit v1.2.3