From b463db44dced1a5dd6bab2cb04e8f1a55aa72c67 Mon Sep 17 00:00:00 2001 From: jbj Date: Sun, 14 Apr 2002 21:48:44 +0000 Subject: [PATCH] - use build time to choose one of multiple alternative suggestions. - add --nosuggests to disable suggested resolutions. - splint fiddles. CVS patchset: 5406 CVS date: 2002/04/14 21:48:44 --- CHANGES | 2 + Makefile.am | 2 - configure.in | 50 +++++-------- lib/depends.c | 7 +- lib/poptI.c | 12 ++- lib/poptQV.c | 12 +-- lib/psm.c | 1 + lib/rpmds.c | 3 +- lib/rpminstall.c | 2 +- lib/rpmlib.h | 7 +- lib/rpmts.c | 81 +++++++++++++++----- lib/transaction.c | 16 +++- po/cs.po | 189 ++++++++++++++++++++++++---------------------- po/da.po | 189 ++++++++++++++++++++++++---------------------- po/de.po | 189 ++++++++++++++++++++++++---------------------- po/fi.po | 189 ++++++++++++++++++++++++---------------------- po/fr.po | 198 +++++++++++++++++++++++++------------------------ po/gl.po | 182 +++++++++++++++++++++++---------------------- po/is.po | 189 ++++++++++++++++++++++++---------------------- po/ja.po | 189 ++++++++++++++++++++++++---------------------- po/ko.po | 189 ++++++++++++++++++++++++---------------------- po/no.po | 189 ++++++++++++++++++++++++---------------------- po/pl.po | 189 ++++++++++++++++++++++++---------------------- po/pt_BR.po | 189 ++++++++++++++++++++++++---------------------- po/ro.po | 182 +++++++++++++++++++++++---------------------- po/rpm.pot | 182 +++++++++++++++++++++++---------------------- po/ru.po | 189 ++++++++++++++++++++++++---------------------- po/sk.po | 189 ++++++++++++++++++++++++---------------------- po/sl.po | 191 ++++++++++++++++++++++++----------------------- po/sr.po | 189 ++++++++++++++++++++++++---------------------- po/sv.po | 189 ++++++++++++++++++++++++---------------------- po/tr.po | 189 ++++++++++++++++++++++++---------------------- python/Makefile.in | 16 ++-- rpm.spec | 6 +- rpm.spec.in | 6 +- rpmio/.lclintrc | 7 +- rpmio/Makefile.am | 3 - rpmio/rpmio.c | 6 -- rpmio/rpmio.h | 130 ++++++++++++++++---------------- rpmio/rpmio_internal.h | 5 ++ rpmio/rpmrpc.c | 6 +- rpmio/url.c | 16 ++-- system.h | 2 +- tools/Makefile.am | 3 - 44 files changed, 2197 insertions(+), 1974 deletions(-) diff --git a/CHANGES b/CHANGES index f9f4518..71a7886 100644 --- a/CHANGES +++ b/CHANGES @@ -101,6 +101,8 @@ - rescusitate --rebuild. - use rpmdb-redhat to suggest dependency resolution(s). - merge conflicts into problems, handle as transaction set variable. + - use build time to choose one of multiple alternative suggestions. + - add --nosuggests to disable suggested resolutions. 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/Makefile.am b/Makefile.am index 156592b..83987aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,8 +21,6 @@ INCLUDES = \ @WITH_ZLIB_INCLUDE@ \ @INCPATH@ -LIBS = -lrt -lpthread - myLDFLAGS = @LDFLAGS_STATIC@ # XXX libtool can/should generate dependent libs. diff --git a/configure.in b/configure.in index e5234f5..38f827b 100644 --- a/configure.in +++ b/configure.in @@ -366,16 +366,28 @@ AC_CHECK_FUNC(setreuid, [], [ ]) AC_CHECK_FUNC(rand, [], [ - AC_CHECK_LIB(rand, rand, [LIBS="$LIBS -lm"]) + AC_CHECK_LIB(rand, rand, []) ]) AC_CHECK_FUNC(getdomainname, [], [ - AC_CHECK_LIB(nsl, getdomainname, [LIBS="$LIBS -lnsl"]) + AC_CHECK_LIB(nsl, getdomainname) ]) AC_CHECK_FUNC(socket, [], [ - AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"]) + AC_CHECK_LIB(socket, socket) ]) +AC_CHECK_HEADERS(thread.h pthread.h synch.h semaphore.h) + +AC_CHECK_LIB(pthread, pthread_mutex_trylock, [], [ + dnl OSF 5.0 has the the symbols prefixed with __ in libpthread. + AC_CHECK_LIB(pthread, __pthread_mutex_trylock, [], [ + AC_CHECK_LIB(thread, mutex_lock) + ]) +]) + +AC_CHECK_HEADERS(aio.h) +AC_SEARCH_LIBS(aio_read, [c rt aio posix4]) + dnl Better not use fchmod at all. AC_CHECK_FUNC(fchmod) @@ -388,17 +400,6 @@ dnl for this macro (not LIBS=...), otherwise the check for dbopen dnl will fail. AC_CHECK_LIB(port, writev) -libthread="" -AC_CHECK_LIB(pthread, pthread_mutex_trylock, [libthread="-lpthread"], [ - dnl OSF 5.0 has the the symbols prefixed with __ in libpthread. - AC_CHECK_LIB(pthread, __pthread_mutex_trylock, [libthread="-lpthread"]) -]) - -if test "x$libthread" = "x"; then - # Try in libthread too. - AC_CHECK_LIB(thread, mutex_lock, [libthread="-lthread"]) -fi - WITH_DB_SUBDIR= WITH_INTERNAL_DB=0 DBLIBSRCS="" @@ -422,10 +423,10 @@ AC_CHECK_FUNC(db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"], AC_CHECK_LIB(db-3.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.1"], AC_CHECK_LIB(db-3.0, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.0"], AC_CHECK_LIB(db, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb"], - ,$libthread) - ,$libthread) - ,$libthread) - ,$libthread) + ) + ) + ) + ) ) if test X"$DBLIBSRCS" = X; then @@ -545,17 +546,6 @@ AC_CHECK_HEADERS(pthread.h) dnl popt w float/double needs. AC_CHECK_HEADERS(float.h) -dnl whether or not we should try to build rpmgettext/rpmputtext. -if test X"$USE_NLS" = Xyes; then - BUILD_RPMNLSTOOLS="rpmgettext rpmputtext" - if test X"$USE_INCLUDED_LIBINTL" = Xyes; then - INCPATH="-I\$(top_builddir)/intl $INCPATH" - fi -else - BUILD_RPMNLSTOOLS= -fi -AC_SUBST(BUILD_RPMNLSTOOLS) - AC_CHECK_HEADERS(glob.h) dnl statfs portability fiddles. @@ -1175,8 +1165,6 @@ if test -n "$LIBOBJS"; then fi AC_SUBST(INCPATH) -AC_SUBST(LIBS) - AC_SUBST(RPM) AC_SUBST(OBJDUMP) diff --git a/lib/depends.c b/lib/depends.c index d9f4c9d..5cf50c4 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -95,7 +95,8 @@ static int removePackage(rpmTransactionSet ts, Header h, int dboffset, if (ts->removedPackages != NULL) { /* XXX can't happen. */ ts->removedPackages[ts->numRemovedPackages] = dboffset; ts->numRemovedPackages++; - qsort(ts->removedPackages, ts->numRemovedPackages, + if (ts->numRemovedPackages > 1) + qsort(ts->removedPackages, ts->numRemovedPackages, sizeof(*ts->removedPackages), intcmp); } @@ -461,9 +462,9 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key) } /* - * Search for an unsatisifed dependency. + * Search for an unsatisfied dependency. */ - if (ts->solve) + if (!(ts->transFlags & RPMTRANS_FLAG_NOSUGGESTS) && ts->solve != NULL) xx = (*ts->solve) (ts, key); unsatisfied: diff --git a/lib/poptI.c b/lib/poptI.c index 058b99a..ae14b6c 100644 --- a/lib/poptI.c +++ b/lib/poptI.c @@ -152,11 +152,11 @@ struct poptOption rpmInstallPoptTable[] = { { "ignoresize", '\0', POPT_BIT_SET, &rpmIArgs.probFilter, (RPMPROB_FILTER_DISKSPACE|RPMPROB_FILTER_DISKNODES), N_("don't check disk space before installing"), NULL}, - { "includedocs", '\0', 0, &rpmIArgs.incldocs, 0, + { "includedocs", '\0', POPT_ARGFLAG_DOC_HIDDEN, &rpmIArgs.incldocs, 0, N_("install documentation"), NULL}, { "install", '\0', POPT_BIT_SET, &rpmIArgs.installInterfaceFlags, INSTALL_INSTALL, - N_("install package"), N_("+") }, + N_("install package(s)"), N_("+") }, { "justdb", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, RPMTRANS_FLAG_JUSTDB, N_("update the database, but do not modify the filesystem"), NULL}, { "nodeps", '\0', 0, &rpmIArgs.noDeps, 0, @@ -166,6 +166,10 @@ struct poptOption rpmInstallPoptTable[] = { N_("do not reorder package installation to satisfy dependencies"), NULL}, + { "nosuggests", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, + RPMTRANS_FLAG_NOSUGGESTS, + N_("do not suggest missing dependency resolution(s)"), NULL}, + { "noscripts", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, (_noTransScripts|_noTransTriggers), N_("do not execute package scriptlet(s)"), NULL }, @@ -183,9 +187,9 @@ struct poptOption rpmInstallPoptTable[] = { N_("do not execute %%postun scriptlet (if any)"), NULL }, { "nodigest", '\0', POPT_BIT_SET, &rpmIArgs.qva_flags, VERIFY_DIGEST, - N_("don't verify digest(s)"), NULL }, + N_("don't verify package digest(s)"), NULL }, { "nosignature", '\0', POPT_BIT_SET, &rpmIArgs.qva_flags, VERIFY_SIGNATURE, - N_("don't verify signature(s)"), NULL }, + N_("don't verify package signature(s)"), NULL }, { "notriggers", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, _noTransTriggers, diff --git a/lib/poptQV.c b/lib/poptQV.c index 51206b6..6eabc87 100644 --- a/lib/poptQV.c +++ b/lib/poptQV.c @@ -269,10 +269,10 @@ struct poptOption rpmVerifyPoptTable[] = { N_("don't execute verify script(s)"), NULL }, { "nodigest", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_DIGEST, - N_("don't verify digest(s)"), NULL }, + N_("don't verify package digest(s)"), NULL }, { "nosignature", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_SIGNATURE, - N_("don't verify signature(s)"), NULL }, + N_("don't verify package signature(s)"), NULL }, /** @todo Add --nogpg/--nopgp aliases to rpmpopt, eliminate. */ { "nogpg", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, @@ -295,20 +295,20 @@ struct poptOption rpmSignPoptTable[] = { rpmQVSourceArgCallback, 0, NULL, NULL }, /*@=type@*/ { "addsign", '\0', 0, NULL, 'A', - N_("sign a packagei (identical to --resign)"), NULL }, + N_("sign package(s) (identical to --resign)"), NULL }, { "checksig", 'K', 0, NULL, 'K', N_("verify package signature(s)"), NULL }, { "import", '\0', 0, NULL, 'I', N_("import an armored public key"), NULL }, { "resign", '\0', 0, NULL, 'R', - N_("sign a packagei (identical to --addsign)"), NULL }, + N_("sign package(s) (identical to --addsign)"), NULL }, { "sign", '\0', POPT_ARGFLAG_DOC_HIDDEN, &rpmQVKArgs.sign, 0, N_("generate signature"), NULL }, { "nodigest", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_DIGEST, - N_("don't verify digest(s)"), NULL }, + N_("don't verify package digest(s)"), NULL }, { "nosignature", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_SIGNATURE, - N_("don't verify signature(s)"), NULL }, + N_("don't verify package signature(s)"), NULL }, POPT_TABLEEND }; diff --git a/lib/psm.c b/lib/psm.c index a8043a6..c9a3aaa 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -370,6 +370,7 @@ static int markReplacedFiles(const PSM_t psm) return 0; offsets = alloca(num * sizeof(*offsets)); + offsets[0] = 0; num = prev = 0; for (sfi = replaced; sfi->otherPkg; sfi++) { if (prev && prev == sfi->otherPkg) diff --git a/lib/rpmds.c b/lib/rpmds.c index bbd5685..4275640 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -671,7 +671,8 @@ int headerMatchesDepFlags(const Header h, const rpmDepSet req) /* Get package information from header */ (void) headerNVR(h, &pkgN, &v, &r); - pkgEVR = t = alloca(21 + strlen(v) + 1 + strlen(r) + 1); + t = alloca(21 + strlen(v) + 1 + strlen(r) + 1); + pkgEVR = t; *t = '\0'; if (hge(h, RPMTAG_EPOCH, NULL, (void **) &epoch, NULL)) { sprintf(t, "%d:", *epoch); diff --git a/lib/rpminstall.c b/lib/rpminstall.c index 8389f2c..2878e61 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -583,7 +583,7 @@ restart: if (rc < 0) { eiu->numFailed += eiu->numRPMS; - } else if (rc > 0 || ps) { + } else if (rc > 0) { eiu->numFailed += rc; rpmProblemSetPrint(stderr, ps); } diff --git a/lib/rpmlib.h b/lib/rpmlib.h index 26f029c..a8c3f87 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -1097,9 +1097,9 @@ void rpmProblemPrint(FILE *fp, rpmProblem prob) * @param fp file handle * @param ps problem set */ -void rpmProblemSetPrint(FILE *fp, rpmProblemSet ps) +void rpmProblemSetPrint(FILE *fp, /*@null@*/ rpmProblemSet ps) /*@globals fileSystem @*/ - /*@modifies ps, *fp, fileSystem @*/; + /*@modifies *fp, ps, fileSystem @*/; /** * Append a problem to set. @@ -1580,7 +1580,8 @@ typedef enum rpmtransFlags_e { /*@-enummemuse@*/ RPMTRANS_FLAG_CHAINSAW = (1 << 26), /*@=enummemuse@*/ - RPMTRANS_FLAG_NOMD5 = (1 << 27) /*!< from --nomd5 */ + RPMTRANS_FLAG_NOMD5 = (1 << 27), /*!< from --nomd5 */ + RPMTRANS_FLAG_NOSUGGESTS = (1 << 28) /*!< from --nosuggests */ } rpmtransFlags; #define _noTransScripts \ diff --git a/lib/rpmts.c b/lib/rpmts.c index 11b2ee9..1856acf 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.c @@ -141,19 +141,35 @@ static int rpmtsOpenSDB(rpmTransactionSet ts) return rc; } +/** + * Compare suggested package resolutions (qsort/bsearch). + * @param a 1st instance address + * @param b 2nd instance address + * @return result of comparison + */ +static int sugcmp(const void * a, const void * b) /*@*/ +{ + const char * astr = *(const char **)a; + const char * bstr = *(const char **)b; + return strcmp(astr, bstr); +} + int rpmtsSolve(rpmTransactionSet ts, rpmDepSet ds) { const char * errstr; const char * str; const char * qfmt; rpmdbMatchIterator mi; + Header bh; Header h; + time_t bhtime; int rpmtag; const char * keyp; size_t keylen; int rc = 1; /* assume not found */ int xx; + /* Make suggestions only for install Requires: */ if (ts->goal != TSM_INSTALL) return rc; @@ -169,36 +185,67 @@ int rpmtsSolve(rpmTransactionSet ts, rpmDepSet ds) if (xx) return rc; } - qfmt = rpmExpand("%{?_solve_name_fmt}", NULL); - if (qfmt == NULL || *qfmt == '\0') - goto exit; - + /* Look for a matching Provides: in suggested universe. */ rpmtag = (*keyp == '/' ? RPMTAG_BASENAMES : RPMTAG_PROVIDENAME); keylen = 0; mi = rpmdbInitIterator(ts->sdb, rpmtag, keyp, keylen); + bhtime = 0; + bh = NULL; while ((h = rpmdbNextIterator(mi)) != NULL) { + time_t htime; + int_32 * ip; if (rpmtag == RPMTAG_PROVIDENAME && !rangeMatchesDepFlags(h, ds)) continue; - 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; + htime = 0; + if (headerGetEntry(h, RPMTAG_BUILDTIME, NULL, (void **)&ip, NULL)) + htime = (time_t)*ip; - ts->nsuggests++; - ts->suggests[ts->nsuggests] = NULL; - break; /* XXX no alternatives yet */ + /* XXX Prefer the newest build if given alternatives. */ + if (htime <= bhtime) + continue; + if (bh) + bh = headerFree(bh, NULL); + bh = headerLink(h, NULL); + bhtime = htime; } mi = rpmdbFreeIterator(mi); -exit: + /* Is there a suggested resolution? */ + if (bh == NULL) + goto exit; + + /* Format the suggestion. */ + qfmt = rpmExpand("%{?_solve_name_fmt}", NULL); + if (qfmt == NULL || *qfmt == '\0') + goto exit; + str = headerSprintf(bh, qfmt, rpmTagTable, rpmHeaderFormats, &errstr); + bh = headerFree(bh, NULL); qfmt = _free(qfmt); + if (str == NULL) { + rpmError(RPMERR_QFMT, _("incorrect format: %s\n"), errstr); + goto exit; + } + + /* If suggestion is already present, don't bother. */ + if (ts->suggests != NULL && ts->nsuggests > 0) { + if (bsearch(&str, ts->suggests, ts->nsuggests, + sizeof(*ts->suggests), sugcmp)) + goto exit; + } + + /* Add a new (unique) suggestion. */ + ts->suggests = xrealloc(ts->suggests, + sizeof(*ts->suggests) * (ts->nsuggests + 2)); + ts->suggests[ts->nsuggests] = str; + ts->nsuggests++; + ts->suggests[ts->nsuggests] = NULL; + + if (ts->nsuggests > 1) + qsort(ts->suggests, ts->nsuggests, sizeof(*ts->suggests), sugcmp); + +exit: /*@-nullstate@*/ /* FIX: ts->suggests[] may be NULL */ return rc; /*@=nullstate@*/ diff --git a/lib/transaction.c b/lib/transaction.c index 72e14af..69c6f05 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -208,7 +208,9 @@ static fileAction decideFileFate(const rpmTransactionSet ts, * possible in case something else (like the timestamp) has changed. */ if (dbWhat == REG) { +#ifdef DYING if (ofi->md5s != NULL && nfi->md5s != NULL) { +#endif const unsigned char * omd5 = ofi->md5s + (16 * ofi->i); const unsigned char * nmd5 = nfi->md5s + (16 * nfi->i); if (domd5(fn, buffer, 0)) @@ -217,6 +219,7 @@ static fileAction decideFileFate(const rpmTransactionSet ts, return FA_CREATE; /* unmodified config file, replace. */ if (!memcmp(omd5, nmd5, 16)) return FA_SKIP; /* identical file, don't bother. */ +#ifdef DYING } else { const char * omd5 = ofi->fmd5s[ofi->i]; const char * nmd5 = nfi->fmd5s[nfi->i]; @@ -227,6 +230,7 @@ static fileAction decideFileFate(const rpmTransactionSet ts, if (!strcmp(omd5, nmd5)) return FA_SKIP; /* identical file, don't bother. */ } +#endif } else /* dbWhat == LINK */ { memset(buffer, 0, sizeof(buffer)); if (readlink(fn, buffer, sizeof(buffer) - 1) == -1) @@ -261,15 +265,19 @@ static int filecmp(TFI_t afi, TFI_t bfi) const char * blink = bfi->flinks[bfi->i]; return strcmp(alink, blink); } else if (awhat == REG) { +#ifdef DYING if (afi->md5s != NULL && bfi->md5s != NULL) { +#endif const unsigned char * amd5 = afi->md5s + (16 * afi->i); const unsigned char * bmd5 = bfi->md5s + (16 * bfi->i); return memcmp(amd5, bmd5, 16); +#ifdef DYING } else { const char * amd5 = afi->fmd5s[afi->i]; const char * bmd5 = bfi->fmd5s[bfi->i]; return strcmp(amd5, bmd5); } +#endif } return 0; @@ -703,12 +711,15 @@ assert(otherFi != NULL); /* Here is a pre-existing modified config file that needs saving. */ { char md5sum[50]; +#ifdef DYING if (fi->md5s != NULL) { - const unsigned char * fmd5 = fi->md5s + (16 * i); - if (!domd5(fn, md5sum, 0) && memcmp(fmd5, md5sum, 16)) { +#endif + const unsigned char * md5 = fi->md5s + (16 * i); + if (!domd5(fn, md5sum, 0) && memcmp(md5, md5sum, 16)) { fi->actions[i] = FA_BACKUP; /*@switchbreak@*/ break; } +#ifdef DYING } else { const char * fmd5 = fi->fmd5s[i]; if (!domd5(fn, md5sum, 1) && strcmp(fmd5, md5sum)) { @@ -716,6 +727,7 @@ assert(otherFi != NULL); /*@switchbreak@*/ break; } } +#endif } fi->actions[i] = FA_ERASE; /*@switchbreak@*/ break; diff --git a/po/cs.po b/po/cs.po index ee2469a..c8dd41e 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -114,7 +114,7 @@ msgstr "

as the top level directory" msgstr "pou¾ít jako adresáø nejvy¹¹í úrovnì" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "

" msgstr "" @@ -833,7 +833,7 @@ msgstr "Nemohu p msgid "Could not open %s: %s\n" msgstr "Nemohu otevøít %s: %s\n" -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, c-format msgid "Unable to write package: %s\n" msgstr "Nemohu zapsat balíèek: %s\n" @@ -863,7 +863,7 @@ msgstr "Nemohu p msgid "Unable to write payload to %s: %s\n" msgstr "Nemohu zapsat payload do %s: %s\n" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "Zapsáno: %s\n" @@ -1434,57 +1434,57 @@ msgstr "" msgid " failed - " msgstr "selhal - " -#: lib/depends.c:152 +#: lib/depends.c:153 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ANO (rpmrc poskytuje)\n" -#: lib/depends.c:407 +#: lib/depends.c:408 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ANO (rpmlib poskytuje)\n" -#: lib/depends.c:428 +#: lib/depends.c:429 #, fuzzy msgid "(db files)" msgstr "¹patný db soubor %s\n" -#: lib/depends.c:440 +#: lib/depends.c:441 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ANO (db poskytuje)\n" -#: lib/depends.c:453 +#: lib/depends.c:454 #, fuzzy msgid "(db package)" msgstr "¾ádné balíèky\n" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:881 +#: lib/depends.c:882 #, 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:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1492,20 +1492,20 @@ msgid "" msgstr "" "========== tsorting balíèkù (poøadí, #pøedchùdce, #následovník, hloubka)\n" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "SMYÈKA:\n" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "========== pokraèuje tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1544,7 +1544,7 @@ msgstr "mntctl() nevr msgid "failed to stat %s: %s\n" msgstr "nemohu zjistit stav %s: %s\n" -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, c-format msgid "failed to open %s: %s\n" msgstr "nemohu otevøít %s: %s\n" @@ -1686,7 +1686,7 @@ msgstr "" "odstranit v¹echny balíèky odpovídající (obvykle se generuje chyba, " "specifikuje-li více balíèkù)" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 msgid "do not execute package scriptlet(s)" msgstr "nespou¹tìt ¾ádné skripty urèené pro balíèky" @@ -1726,7 +1726,7 @@ msgstr "zkratka pro --replacepkgs --replacefiles" msgid "upgrade package(s) if already installed" msgstr "aktualizace balíèku jestli¾e je ji¾ nainstalován" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 msgid "+" msgstr "+" @@ -1751,7 +1751,8 @@ msgid "install documentation" msgstr "nainstalovat dokumentaci" #: lib/poptI.c:159 -msgid "install package" +#, fuzzy +msgid "install package(s)" msgstr "nainstalovat balíèek" #: lib/poptI.c:161 @@ -1766,61 +1767,65 @@ msgstr "nekontrolovat z msgid "do not reorder package installation to satisfy dependencies" msgstr "pro vyøe¹ení závislostí nemìnit poøadí instalace balíèkù" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "nespou¹tìt ¾ádné skripty (jsou-li nìjaké)" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "nespou¹tìt ¾ádné skripty (jsou-li nìjaké)" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "nespou¹tìt ¾ádné skripty (jsou-li nìjaké)" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "nespou¹tìt ¾ádné skripty (jsou-li nìjaké)" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy -msgid "don't verify digest(s)" +msgid "don't verify package digest(s)" msgstr "nekontrolovat MD5 souborù v balíèku" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy -msgid "don't verify signature(s)" -msgstr "nekontrolovat cesty symbolických linek" +msgid "don't verify package signature(s)" +msgstr "ovìøit podpis v balíèku" -#: lib/poptI.c:192 +#: lib/poptI.c:196 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "nespou¹tìt ¾ádné skripty aktivované tímto balíèkem" -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "nespou¹tìt ¾ádné skripty urèené pro balíèky" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "nespou¹tìt ¾ádné instalaèní skripty" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "nespou¹tìt ¾ádné instalaèní skripty" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "nespou¹tìt ¾ádné instalaèní skripty" -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1828,48 +1833,48 @@ msgstr "" "aktualizovat na starou verzi balíèku (--force to dìlá pøi aktualizacích " "automaticky)" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "bìhem instalace balíèku zobrazit procenta" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "pøemístit soubory do , jsou-li pøemístitelné" -#: lib/poptI.c:217 +#: lib/poptI.c:221 msgid "relocate files from path to " msgstr "pøemístit soubory ze do " -#: lib/poptI.c:218 +#: lib/poptI.c:222 msgid "=" msgstr "=" -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "uchovat smazané soubory pomocí pøebalení" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "instalovat, i kdy¾ balíèek pøepí¹e existující soubory" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "pøeinstalovat, i kdy¾ je ji¾ balíèek pøítomen" -#: lib/poptI.c:229 +#: lib/poptI.c:233 #, fuzzy msgid "deinstall new, reinstall old, package(s), back to " msgstr "odinstalovat nové balíèky, reinstalovat staré balíèky zpìt do data" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "neinstalovat ale sdìlit, zda-li by to fungovalo èi nikoli" -#: lib/poptI.c:235 +#: lib/poptI.c:239 msgid "upgrade package(s)" msgstr "aktualizace balíèku" @@ -2046,7 +2051,7 @@ msgstr "nekontrolovat MD5 soubor #: lib/poptQV.c:298 #, fuzzy -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "podepsat balíèek (zahodit aktuální podpis)" #: lib/poptQV.c:300 @@ -2060,7 +2065,7 @@ msgstr "" #: lib/poptQV.c:304 #, fuzzy -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "podepsat balíèek (zahodit aktuální podpis)" #: lib/poptQV.c:306 @@ -2153,79 +2158,79 @@ msgstr " je nutn msgid "Data type %d not supported\n" msgstr "Datový typ %d není podporován\n" -#: lib/psm.c:447 +#: lib/psm.c:448 #, c-format msgid "cannot create %%%s %s\n" msgstr "nemohu vytvoøit %s: %s\n" -#: lib/psm.c:453 +#: lib/psm.c:454 #, c-format msgid "cannot write to %%%s %s\n" msgstr "nemohu zapsat do %%%s %s\n" -#: lib/psm.c:486 +#: lib/psm.c:487 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:602 +#: lib/psm.c:603 msgid "source package contains no .spec file\n" msgstr "zdrojový balíèek neobsahuje .spec soubor\n" -#: lib/psm.c:721 +#: lib/psm.c:722 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: spou¹tím %s skript(y) (pokud existují)\n" -#: lib/psm.c:887 +#: lib/psm.c:888 #, 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:894 +#: lib/psm.c:895 #, 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:1236 +#: lib/psm.c:1237 #, 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:1356 +#: lib/psm.c:1357 #, 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:1498 +#: lib/psm.c:1499 #, 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:1507 +#: lib/psm.c:1508 #, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ita skupina root\n" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalování archívu selhalo %s%s: %s\n" -#: lib/psm.c:1550 +#: lib/psm.c:1551 msgid " on file " msgstr " na souboru " -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s selhalo\n" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, c-format msgid "incorrect format: %s\n" msgstr "nesprávný formát: %s\n" @@ -2806,12 +2811,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "%s pøeskoèeno, proto¾e chybí pøíznak\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, c-format msgid "excluding directory %s\n" msgstr "vynechávám adresáø %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "získávám seznam pøipojených systémù souborù\n" @@ -3300,59 +3305,59 @@ msgstr "Soubor %s: %s\n" msgid "File %s is smaller than %u bytes\n" msgstr "Soubor %s je men¹í, ne¾ %d bajtù\n" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "Úspìch" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 msgid "Bad server response" msgstr "Chybná odezva FTP serveru" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 msgid "Server I/O error" msgstr "I/O chyba serveru" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 msgid "Server timeout" msgstr "Timeout serveru" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 msgid "Unable to lookup server host address" msgstr "Nelze pøevést jméno na IP adresu poèítaèe" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 msgid "Unable to lookup server host name" msgstr "Nelze pøevést IP na jméno poèítaèe" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 msgid "Failed to connect to server" msgstr "Pøipojení k serveru selhalo" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 msgid "Failed to establish data connection to server" msgstr "Selhalo navázání datového spojení se serverem" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 msgid "I/O error to local file" msgstr "I/O chyba pøi lokálním souboru" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "Chyba pøi nastavení vzdáleného serveru do pasivního re¾imu" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "Soubor nebyl na serveru nalezen" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "Probíhá pøeru¹ení" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 msgid "Unknown or unexpected error" msgstr "Neznámá nebo neoèekávaná chyba" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "pøihla¹ování na %s jako %s, heslo %s\n" @@ -3381,41 +3386,45 @@ msgstr "varov msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "alokace pamìti (%u bajtù) vrátila NULL.\n" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "varování: u %p ctrl %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "varování: u %p data %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, fuzzy, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "varování: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "Heslo pro %s@%s: " -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, c-format msgid "error: %sport must be a number\n" msgstr "chyba: %sport musí být èíslo\n" -#: rpmio/url.c:463 +#: rpmio/url.c:462 msgid "url port must be a number\n" msgstr "url port musí být èíslo\n" #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, c-format msgid "failed to create %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" +#, fuzzy +#~ msgid "don't verify signature(s)" +#~ msgstr "nekontrolovat cesty symbolických linek" + #~ msgid "failed dependencies:\n" #~ msgstr "nevyøe¹ené závislosti:\n" diff --git a/po/da.po b/po/da.po index 4e16add..4b49306 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -115,7 +115,7 @@ msgstr "" msgid "use as the top level directory" msgstr "brug som topniveau-katalog" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "" @@ -830,7 +830,7 @@ msgstr "Kunne ikke l msgid "Could not open %s: %s\n" msgstr "Kunne ikke åbne %s: %s\n" -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" @@ -860,7 +860,7 @@ msgstr "Kunne ikke l msgid "Unable to write payload to %s: %s\n" msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1435,76 +1435,76 @@ msgstr "" msgid " failed - " msgstr " mislykkedes - " -#: lib/depends.c:152 +#: lib/depends.c:153 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "pakken %s er allerede installeret" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s JA (rpmrc tilfører)\n" -#: lib/depends.c:407 +#: lib/depends.c:408 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s JA (rpmlib tilfører)\n" -#: lib/depends.c:428 +#: lib/depends.c:429 #, fuzzy msgid "(db files)" msgstr "ugyldig db-fil %s\n" -#: lib/depends.c:440 +#: lib/depends.c:441 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s JA (db tilfører)\n" -#: lib/depends.c:453 +#: lib/depends.c:454 #, fuzzy msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:881 +#: lib/depends.c:882 #, 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:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "========== gemmer tsort-relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "LØKKE:\n" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "========== fortsætter tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1543,7 +1543,7 @@ msgstr "mntctl() returnerede ingen monteringspunkter: %s\n" msgid "failed to stat %s: %s\n" msgstr "kunne ikke finde %s: %s\n" -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, c-format msgid "failed to open %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" @@ -1685,7 +1685,7 @@ msgstr "" "fjern alle pakker, som passer med (normalt ville det medføre en " "fejl, hvis angav flere pakker)" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 #, fuzzy msgid "do not execute package scriptlet(s)" msgstr "udfør ingen pakkespecifikke skripter" @@ -1728,7 +1728,7 @@ msgstr "forkortelse for --replacepkgs --replacefiles" msgid "upgrade package(s) if already installed" msgstr "opgradér pakke, hvis den allerede er installeret" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 msgid "+" msgstr "+" @@ -1753,7 +1753,8 @@ msgid "install documentation" msgstr "installér dokumentation" #: lib/poptI.c:159 -msgid "install package" +#, fuzzy +msgid "install package(s)" msgstr "installér pakke" #: lib/poptI.c:161 @@ -1769,62 +1770,66 @@ msgid "do not reorder package installation to satisfy dependencies" msgstr "" "ændr ikke pakkernes installationsrækkefølge for at opfylde afhængigheder" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, fuzzy, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "udfør ikke eventuelle skripter" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, fuzzy, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "udfør ikke eventuelle skripter" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, fuzzy, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "udfør ikke eventuelle skripter" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, fuzzy, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "udfør ikke eventuelle skripter" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy -msgid "don't verify digest(s)" +msgid "don't verify package digest(s)" msgstr "verificér ikke filerne i pakke" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy -msgid "don't verify signature(s)" -msgstr "verificér ikke filerne i pakke" +msgid "don't verify package signature(s)" +msgstr "verificér pakkesignatur" -#: lib/poptI.c:192 +#: lib/poptI.c:196 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "udfør ikke småskripter, der måtte udløses af denne pakke" -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, fuzzy, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "udfør ingen pakkespecifikke skripter" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "udfør ingen installations-småskripter" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "udfør ingen installations-småskripter" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, fuzzy, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "udfør ingen installations-småskripter" -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1832,49 +1837,49 @@ msgstr "" "opgradér til en ældre version af pakken (--force gør ikke dette automatisk " "ved opgraderinger)" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "vis procenter efterhånden som pakken installeres" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "omdirigér pakken til , hvis omdirigérbar" -#: lib/poptI.c:217 +#: lib/poptI.c:221 #, fuzzy msgid "relocate files from path to " msgstr "omdirigér filer fra til " -#: lib/poptI.c:218 +#: lib/poptI.c:222 #, fuzzy msgid "=" msgstr "=" -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "intallér selvom pakken erstatter installerede filer" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "geninstallér hvis pakken allerede er installeret" -#: lib/poptI.c:229 +#: lib/poptI.c:233 msgid "deinstall new, reinstall old, package(s), back to " msgstr "" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "installér ikke, men fortæl om det ville lykkes eller ej" -#: lib/poptI.c:235 +#: lib/poptI.c:239 #, fuzzy msgid "upgrade package(s)" msgstr "opgradér pakke" @@ -2059,7 +2064,7 @@ msgstr "verific #: lib/poptQV.c:298 #, fuzzy -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "underskriv en pakke (slet nuværende signatur)" #: lib/poptQV.c:300 @@ -2073,7 +2078,7 @@ msgstr "" #: lib/poptQV.c:304 #, fuzzy -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "underskriv en pakke (slet nuværende signatur)" #: lib/poptQV.c:306 @@ -2168,81 +2173,81 @@ msgstr " kr msgid "Data type %d not supported\n" msgstr "Datatype %d understøttes ikke\n" -#: lib/psm.c:447 +#: lib/psm.c:448 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "kan ikke oprette %s: %s\n" -#: lib/psm.c:453 +#: lib/psm.c:454 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "kunne ikke skrive til %s\n" -#: lib/psm.c:486 +#: lib/psm.c:487 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær fundet\n" -#: lib/psm.c:602 +#: lib/psm.c:603 msgid "source package contains no .spec file\n" msgstr "kildepakke indeholder ingen .spec-fil\n" -#: lib/psm.c:721 +#: lib/psm.c:722 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "kører postinstallations-skript (hvis det findes)\n" -#: lib/psm.c:887 +#: lib/psm.c:888 #, 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:894 +#: lib/psm.c:895 #, 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:1236 +#: lib/psm.c:1237 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "pakke: %s-%s-%s filer test = %d\n" -#: lib/psm.c:1356 +#: lib/psm.c:1357 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1498 +#: lib/psm.c:1499 #, c-format msgid "user %s does not exist - using root\n" msgstr "bruger %s eksisterer ikke - bruger root\n" -#: lib/psm.c:1507 +#: lib/psm.c:1508 #, c-format msgid "group %s does not exist - using root\n" msgstr "gruppe %s eksisterer ikke - bruger root\n" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "udpakning af arkiv mislykkedes%s%s: %s\n" -#: lib/psm.c:1550 +#: lib/psm.c:1551 msgid " on file " msgstr " for fil " -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s mislykkedes\n" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, c-format msgid "incorrect format: %s\n" msgstr "ugyldigt format: %s\n" @@ -2825,12 +2830,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "%s oversprunget grundet manglende ok-flag\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer kataloget %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "henter liste over monterede filsystemer\n" @@ -3325,59 +3330,59 @@ msgstr "Fil %s: %s\n" msgid "File %s is smaller than %u bytes\n" msgstr "Filen %s er mindre end %u byte\n" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "Succes" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 msgid "Bad server response" msgstr "Ugyldigt svar fra server" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 msgid "Server I/O error" msgstr "I/O-fejl for server" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 msgid "Server timeout" msgstr "Tidsudløb for server" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 msgid "Unable to lookup server host address" msgstr "Kunne ikke skaffe serverens IP-addresse" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 msgid "Unable to lookup server host name" msgstr "Kunne ikke slå serverens navn op" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 msgid "Failed to connect to server" msgstr "Kunne ikke etablere en forbindelse til serveren" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 msgid "Failed to establish data connection to server" msgstr "Kunne ikke etablere en data-forbindelse til serveren" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 msgid "I/O error to local file" msgstr "I/O-fejl i lokal fil" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "Kunne ikke sætte fjernserveren i passiv tilstand" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "Fil ikke fundet på server" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "Afbryder programmet" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 msgid "Unknown or unexpected error" msgstr "Ukendt eller uventet fejl" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "logger på %s som %s, adgangskode %s\n" @@ -3406,41 +3411,45 @@ msgstr "advarsel: " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "hukommelsesallokering (%u byte) returnerede NULL.\n" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "advarsel: u %p ctrl %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "advarsel: u %p data %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, fuzzy, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "advarsel: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "Adgangskode for %s@%s: " -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, c-format msgid "error: %sport must be a number\n" msgstr "Fejl: %sport skal være et tal\n" -#: rpmio/url.c:463 +#: rpmio/url.c:462 msgid "url port must be a number\n" msgstr "url-port skal være et tal\n" #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, c-format msgid "failed to create %s: %s\n" msgstr "kunne ikke oprette %s: %s\n" +#, fuzzy +#~ msgid "don't verify signature(s)" +#~ msgstr "verificér ikke filerne i pakke" + #~ msgid "failed dependencies:\n" #~ msgstr "afhængighedskrav, der ikke kunne imødekommes:\n" diff --git a/po/de.po b/po/de.po index 24a4a86..eef4576 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -157,7 +157,7 @@ msgstr "" msgid "use as the top level directory" msgstr " als Stammverzeichnis benutzen" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "" @@ -921,7 +921,7 @@ msgid "Could not open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen\n" # , c-format -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nicht möglich %s zu schreiben" @@ -956,7 +956,7 @@ msgstr "Nicht m msgid "Unable to write payload to %s: %s\n" msgstr "Nicht möglich %s zu schreiben" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1568,78 +1568,78 @@ msgstr "" msgid " failed - " msgstr "pgp fehlgeschlagen" -#: lib/depends.c:152 +#: lib/depends.c:153 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 #, fuzzy msgid "(rpmrc provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:407 +#: lib/depends.c:408 #, fuzzy msgid "(rpmlib provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" # , c-format -#: lib/depends.c:428 +#: lib/depends.c:429 #, fuzzy msgid "(db files)" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/depends.c:440 +#: lib/depends.c:441 #, fuzzy msgid "(db provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:453 +#: lib/depends.c:454 #, fuzzy msgid "(db package)" msgstr "Anfrage an alle Pakete" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" # FIXME -#: lib/depends.c:881 +#: lib/depends.c:882 #, 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:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1681,7 +1681,7 @@ msgid "failed to stat %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -1828,7 +1828,7 @@ msgstr "" "Alle Pakete entfernen, die mit übereinstimmen (normalerweise wird " "ein Fehler angezeigt, wenn mehrere Pakete bezeichnet)" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 #, fuzzy msgid "do not execute package scriptlet(s)" msgstr "Keine paketspezifischen Skripte ausführen" @@ -1872,7 +1872,7 @@ msgstr "Abk msgid "upgrade package(s) if already installed" msgstr "Paket %s ist nicht installiert\n" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 #, fuzzy msgid "+" msgstr " -b " @@ -1898,7 +1898,8 @@ msgid "install documentation" msgstr "Dokumentation installieren" #: lib/poptI.c:159 -msgid "install package" +#, fuzzy +msgid "install package(s)" msgstr "Paket installieren" #: lib/poptI.c:161 @@ -1914,62 +1915,66 @@ msgid "do not reorder package installation to satisfy dependencies" msgstr "" "Paket-Installation nicht neu sortieren, um den Abhängigkeiten zu genügen" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, fuzzy, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "Keine Stufen ausführen" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, fuzzy, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "Keine Stufen ausführen" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, fuzzy, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "Keine Stufen ausführen" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, fuzzy, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "Keine Stufen ausführen" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy -msgid "don't verify digest(s)" +msgid "don't verify package digest(s)" msgstr "Paket installieren" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy -msgid "don't verify signature(s)" -msgstr "Paket installieren" +msgid "don't verify package signature(s)" +msgstr "Paketsignatur überprüfen" -#: lib/poptI.c:192 +#: lib/poptI.c:196 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "kein Skript ausführen, das durch dieses Paket veranlasst wurde" -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, fuzzy, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "Keine paketspezifischen Skripte ausführen" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "Keine Installations-Skripte ausführen" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "Keine Installations-Skripte ausführen" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, fuzzy, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "Keine Installations-Skripte ausführen" -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1977,50 +1982,50 @@ msgstr "" "Aktualisierung auf eine alte Version des Pakets (--force macht das bei " "Aktualisierungen automatisch)" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "Prozentangabe bei der Paketinstallation ausgeben" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "" "Verschiebe das Paket, wenn es verschiebbar ist, in das Verzeichnis " -#: lib/poptI.c:217 +#: lib/poptI.c:221 #, fuzzy msgid "relocate files from path to " msgstr "verschiebe Dateien von nach " -#: lib/poptI.c:218 +#: lib/poptI.c:222 #, fuzzy msgid "=" msgstr "verschiebe Dateien von nach " -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "Auch dann installieren, wenn das Paket installierte Dateien ersetzt" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "Neuinstallation, wenn das Paket schon vorhanden ist" -#: lib/poptI.c:229 +#: lib/poptI.c:233 msgid "deinstall new, reinstall old, package(s), back to " msgstr "" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "Nicht installieren - nur anzeigen, ob es funktionieren würde" -#: lib/poptI.c:235 +#: lib/poptI.c:239 #, fuzzy msgid "upgrade package(s)" msgstr "Paket installieren" @@ -2223,7 +2228,7 @@ msgstr "Paket installieren" #: lib/poptQV.c:298 #, fuzzy -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)" #: lib/poptQV.c:300 @@ -2237,7 +2242,7 @@ msgstr "" #: lib/poptQV.c:304 #, fuzzy -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)" #: lib/poptQV.c:306 @@ -2335,82 +2340,82 @@ msgstr " wird von %s-%s-%s gebraucht\n" msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:447 +#: lib/psm.c:448 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/psm.c:453 +#: lib/psm.c:454 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/psm.c:486 +#: lib/psm.c:487 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:602 +#: lib/psm.c:603 #, fuzzy msgid "source package contains no .spec file\n" msgstr "Anfrage nach Paket, das die Datei besitzt" -#: lib/psm.c:721 +#: lib/psm.c:722 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "Keine Stufen ausführen" -#: lib/psm.c:887 +#: lib/psm.c:888 #, 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:894 +#: lib/psm.c:895 #, 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:1236 +#: lib/psm.c:1237 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/psm.c:1356 +#: lib/psm.c:1357 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1498 +#: lib/psm.c:1499 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1507 +#: lib/psm.c:1508 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/psm.c:1550 +#: lib/psm.c:1551 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp fehlgeschlagen" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "Fehler beim Format %s\n" @@ -3011,12 +3016,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "" @@ -3512,68 +3517,68 @@ msgstr " msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 #, fuzzy msgid "Bad server response" msgstr "Nicht passende Antwort des FTP-Servers" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 #, fuzzy msgid "Server I/O error" msgstr "FTP IO-Fehler" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 #, fuzzy msgid "Server timeout" msgstr "Timeout des FTP-Servers" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 #, fuzzy msgid "Unable to lookup server host address" msgstr "Unmöglich die Hostadresse des FTP-Servers zu bestimmen" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 #, fuzzy msgid "Unable to lookup server host name" msgstr "Unmöglich den Hostnamen des FTP-Servers zu bestimmen" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 #, fuzzy msgid "Failed to connect to server" msgstr "Verbindung zum FTP-Server fehlgeschlagen" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 #, fuzzy msgid "Failed to establish data connection to server" msgstr "Aufbau einer Datenverbindung zum FTP-Server fehlgeschlagen" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 #, fuzzy msgid "I/O error to local file" msgstr "IO-Fehler bei lokaler Datei" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "Fehler beim Setzen des FTP-Servers in den passiven Modus" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "Datei auf dem Server nicht gefunden" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 #, fuzzy msgid "Unknown or unexpected error" msgstr "FTP Unbekannter oder nicht erwarteter Fehler" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -3603,43 +3608,47 @@ msgstr "Warnung: " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "Passworf für %s@%s: " -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, fuzzy, c-format msgid "error: %sport must be a number\n" msgstr "Fehler: der FTP-Port muss eine Zahl sein\n" -#: rpmio/url.c:463 +#: rpmio/url.c:462 #, fuzzy msgid "url port must be a number\n" msgstr "Fehler: der FTP-Port muss eine Zahl sein\n" # , c-format #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "anlegen von %s fehlgeschlagen\n" +#, fuzzy +#~ msgid "don't verify signature(s)" +#~ msgstr "Paket installieren" + #~ msgid "failed dependencies:\n" #~ msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" diff --git a/po/fi.po b/po/fi.po index a2ea4df..2232226 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -114,7 +114,7 @@ msgstr "" msgid "use as the top level directory" msgstr "käytä ylimpänä hakemistona" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "" @@ -844,7 +844,7 @@ msgstr "%s:n kirjoitus ei onnistu" msgid "Could not open %s: %s\n" msgstr "%s:n avaus epäonnistui\n" -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "%s:n kirjoitus ei onnistu" @@ -874,7 +874,7 @@ msgstr "%s:n kirjoitus ei onnistu" msgid "Unable to write payload to %s: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1460,76 +1460,76 @@ msgstr "" msgid " failed - " msgstr "pgp epäonnistui" -#: lib/depends.c:152 +#: lib/depends.c:153 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 #, fuzzy msgid "(rpmrc provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:407 +#: lib/depends.c:408 #, fuzzy msgid "(rpmlib provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:428 +#: lib/depends.c:429 #, fuzzy msgid "(db files)" msgstr "en voinut avata %s: %s" -#: lib/depends.c:440 +#: lib/depends.c:441 #, fuzzy msgid "(db provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:453 +#: lib/depends.c:454 #, fuzzy msgid "(db package)" msgstr "kysele kaikki paketit" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:881 +#: lib/depends.c:882 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1568,7 +1568,7 @@ msgstr "" msgid "failed to stat %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "en voinut avata %s: %s" @@ -1713,7 +1713,7 @@ msgstr "" "poista kaikki paketit, joiden nimeä vastaa (tavallisesti, jos " " määrittää useita paketteja, tulee virhe)" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 #, fuzzy msgid "do not execute package scriptlet(s)" msgstr "älä aja mitään pakettikohtaisia skriptejä" @@ -1757,7 +1757,7 @@ msgstr "lyhenne parametreille --replacepkgs --replacefiles" msgid "upgrade package(s) if already installed" msgstr "paketti %s ei ole asennettu\n" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 #, fuzzy msgid "+" msgstr " -b " @@ -1783,7 +1783,8 @@ msgid "install documentation" msgstr "asenna dokumentaatio" #: lib/poptI.c:159 -msgid "install package" +#, fuzzy +msgid "install package(s)" msgstr "asenna paketti" #: lib/poptI.c:161 @@ -1798,62 +1799,66 @@ msgstr " msgid "do not reorder package installation to satisfy dependencies" msgstr "älä muuta asennusjärjestystä riippuvuuksien tyydyttämiseksi" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, fuzzy, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "älä suorita mitään vaiheita" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, fuzzy, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "älä suorita mitään vaiheita" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, fuzzy, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "älä suorita mitään vaiheita" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, fuzzy, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "älä suorita mitään vaiheita" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy -msgid "don't verify digest(s)" +msgid "don't verify package digest(s)" msgstr "asenna paketti" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy -msgid "don't verify signature(s)" -msgstr "asenna paketti" +msgid "don't verify package signature(s)" +msgstr "tarkista paketin allekirjoitus" -#: lib/poptI.c:192 +#: lib/poptI.c:196 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, fuzzy, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "älä aja mitään pakettikohtaisia skriptejä" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "älä suorita asennusskriptejä" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "älä suorita asennusskriptejä" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, fuzzy, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "älä suorita asennusskriptejä" -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1861,49 +1866,49 @@ msgstr "" "päivitä vanhempaan versioon (--force päivitettäessä tekee tämän " "automaattisesti)" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "tulosta asennuksen eteneminen prosentteina" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "siirrä paketti hakemistoon , jos siirrettävissä" -#: lib/poptI.c:217 +#: lib/poptI.c:221 #, fuzzy msgid "relocate files from path to " msgstr "siirrä tiedostot hakemistosta hakemistoon " -#: lib/poptI.c:218 +#: lib/poptI.c:222 #, fuzzy msgid "=" msgstr "siirrä tiedostot hakemistosta hakemistoon " -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "asenna vaikka paketti korvaisi asennettuja tiedostoja" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "asenna uudelleen, jos paketti on jo asennettu" -#: lib/poptI.c:229 +#: lib/poptI.c:233 msgid "deinstall new, reinstall old, package(s), back to " msgstr "" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "älä asenna, mutta kerro onnistuisiko se" -#: lib/poptI.c:235 +#: lib/poptI.c:239 #, fuzzy msgid "upgrade package(s)" msgstr "asenna paketti" @@ -2106,7 +2111,7 @@ msgstr "asenna paketti" #: lib/poptQV.c:298 #, fuzzy -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)" #: lib/poptQV.c:300 @@ -2120,7 +2125,7 @@ msgstr "" #: lib/poptQV.c:304 #, fuzzy -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)" #: lib/poptQV.c:306 @@ -2214,80 +2219,80 @@ msgstr "vaatii %s-%s-%s\n" msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:447 +#: lib/psm.c:448 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/psm.c:453 +#: lib/psm.c:454 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/psm.c:486 +#: lib/psm.c:487 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:602 +#: lib/psm.c:603 #, fuzzy msgid "source package contains no .spec file\n" msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/psm.c:721 +#: lib/psm.c:722 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "älä suorita mitään vaiheita" -#: lib/psm.c:887 +#: lib/psm.c:888 #, 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:894 +#: lib/psm.c:895 #, 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:1236 +#: lib/psm.c:1237 #, 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:1356 +#: lib/psm.c:1357 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1498 +#: lib/psm.c:1499 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1507 +#: lib/psm.c:1508 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/psm.c:1550 +#: lib/psm.c:1551 msgid " on file " msgstr "" -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp epäonnistui" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "virhe formaatissa: %s\n" @@ -2879,12 +2884,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "" @@ -3371,68 +3376,68 @@ msgstr "en voinut avata %s: %s" msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 #, fuzzy msgid "Bad server response" msgstr "Virheellinen FTP-palvelijan vastaus" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 #, fuzzy msgid "Server I/O error" msgstr "FTP:n IO-virhe" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 #, fuzzy msgid "Server timeout" msgstr "FTP-palvelimen timeout" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 #, fuzzy msgid "Unable to lookup server host address" msgstr "FTP-palvelimen osoitetta ei löytynyt" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 #, fuzzy msgid "Unable to lookup server host name" msgstr "FTP-palvelimen nimeä ei löytynyt" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 #, fuzzy msgid "Failed to connect to server" msgstr "En saanut yhteyttä FTP-palvelijaan" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 #, fuzzy msgid "Failed to establish data connection to server" msgstr "En saanut data-yhteyttä FTP-palvelijaan" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 #, fuzzy msgid "I/O error to local file" msgstr "Paikallisen tiedoston IO-virhe" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "Virhe asetettaessa palvelinta passiiviin moodiin" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "Tiedostoa ei löytynyt palvelimelta" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 #, fuzzy msgid "Unknown or unexpected error" msgstr "FTP:n tuntematon tai odottamaton virhe" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -3462,42 +3467,46 @@ msgstr "varoitus: " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "%s@%s:n salasana: " -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, fuzzy, c-format msgid "error: %sport must be a number\n" msgstr "virhe: ftpport pitää olla luku\n" -#: rpmio/url.c:463 +#: rpmio/url.c:462 #, fuzzy msgid "url port must be a number\n" msgstr "virhe: ftpport pitää olla luku\n" #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "%s:n luonti epäonnistui\n" +#, fuzzy +#~ msgid "don't verify signature(s)" +#~ msgstr "asenna paketti" + #~ msgid "failed dependencies:\n" #~ msgstr "puuttuvat riippuvuudet:\n" diff --git a/po/fr.po b/po/fr.po index b3b19bc..e4df690 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -122,7 +122,7 @@ msgstr "" msgid "use as the top level directory" msgstr " --root \t- utilise comme rpertoire racine" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "" @@ -870,7 +870,7 @@ msgstr "impossible d'ouvrir: %s\n" msgid "Could not open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -900,7 +900,7 @@ msgstr "impossible d'ouvrir: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1491,73 +1491,73 @@ msgstr "" msgid " failed - " msgstr "La construction a chou.\n" -#: lib/depends.c:152 +#: lib/depends.c:153 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:407 +#: lib/depends.c:408 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:428 +#: lib/depends.c:429 #, fuzzy msgid "(db files)" msgstr "impossible d'ouvrir: %s\n" -#: lib/depends.c:440 +#: lib/depends.c:441 msgid "(db provides)" msgstr "" -#: lib/depends.c:453 +#: lib/depends.c:454 #, fuzzy msgid "(db package)" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:881 +#: lib/depends.c:882 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "impossible d'ouvrir: %s\n" #. Record all relations. -#: lib/depends.c:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1594,7 +1594,7 @@ msgstr "" msgid "failed to stat %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -1733,7 +1733,7 @@ msgid "" " specified multiple packages)" msgstr "" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 msgid "do not execute package scriptlet(s)" msgstr "" @@ -1777,7 +1777,7 @@ msgstr " --force - raccourci pour --replacepkgs --replacefiles" msgid "upgrade package(s) if already installed" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 #, fuzzy msgid "+" msgstr " -i \t- installe le package" @@ -1806,8 +1806,10 @@ msgid "install documentation" msgstr "" #: lib/poptI.c:159 -msgid "install package" +#, fuzzy +msgid "install package(s)" msgstr "" +" -p + - interroge le package (non install) " #: lib/poptI.c:161 msgid "update the database, but do not modify the filesystem" @@ -1821,65 +1823,68 @@ msgstr "" msgid "do not reorder package installation to satisfy dependencies" msgstr "" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy -msgid "don't verify digest(s)" +msgid "don't verify package digest(s)" msgstr "" " -f + - interroge le package qui appartient " -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy -msgid "don't verify signature(s)" -msgstr "" -" -f + - interroge le package qui appartient " +msgid "don't verify package signature(s)" +msgstr " --sign - genre une signature PGP" -#: lib/poptI.c:192 +#: lib/poptI.c:196 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "" " -f + - interroge le package qui appartient " -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "impossible d'ouvrir: %s\n" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "impossible d'ouvrir: %s\n" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "" -#: lib/poptI.c:208 +#: lib/poptI.c:212 #, fuzzy msgid "" "upgrade to an old version of the package (--force on upgrades does this " @@ -1888,56 +1893,56 @@ msgstr "" " --oldpackage - mise jour par une ancienne version du package (--" "force" -#: lib/poptI.c:212 +#: lib/poptI.c:216 #, fuzzy msgid "print percentages as package installs" msgstr "" " --percent - affiche des '%' pendant l'installation du package" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "" -#: lib/poptI.c:217 +#: lib/poptI.c:221 msgid "relocate files from path to " msgstr "" -#: lib/poptI.c:218 +#: lib/poptI.c:222 msgid "=" msgstr "" -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:224 +#: lib/poptI.c:228 #, fuzzy msgid "install even if the package replaces installed files" msgstr "" " --replacefiles - installe mme si le package remplace des fichiers " "dj prsents" -#: lib/poptI.c:227 +#: lib/poptI.c:231 #, fuzzy msgid "reinstall if the package is already present" msgstr " --replacepkgs - rinstalle si le package est dj prsent" -#: lib/poptI.c:229 +#: lib/poptI.c:233 msgid "deinstall new, reinstall old, package(s), back to " msgstr "" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "" -#: lib/poptI.c:232 +#: lib/poptI.c:236 #, fuzzy msgid "don't install, but tell if it would work or not" msgstr "" " --test - n'installe pas, mais indique si ca fonctionnerait " "ou pas" -#: lib/poptI.c:235 +#: lib/poptI.c:239 #, fuzzy msgid "upgrade package(s)" msgstr "" @@ -2145,7 +2150,7 @@ msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" #: lib/poptQV.c:298 -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "" #: lib/poptQV.c:300 @@ -2158,7 +2163,7 @@ msgid "import an armored public key" msgstr "" #: lib/poptQV.c:304 -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "" #: lib/poptQV.c:306 @@ -2250,81 +2255,81 @@ msgstr "" msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:447 +#: lib/psm.c:448 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:453 +#: lib/psm.c:454 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:486 +#: lib/psm.c:487 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:602 +#: lib/psm.c:603 #, fuzzy msgid "source package contains no .spec file\n" msgstr "" " -f + - interroge le package qui appartient " -#: lib/psm.c:721 +#: lib/psm.c:722 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:887 +#: lib/psm.c:888 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:894 +#: lib/psm.c:895 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1236 +#: lib/psm.c:1237 #, 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:1356 +#: lib/psm.c:1357 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1498 +#: lib/psm.c:1499 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1507 +#: lib/psm.c:1508 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "La construction a chou.\n" -#: lib/psm.c:1550 +#: lib/psm.c:1551 msgid " on file " msgstr "" -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "La construction a chou.\n" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2910,12 +2915,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "" @@ -3401,59 +3406,59 @@ msgstr "impossible d'ouvrir: %s\n" msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -3482,42 +3487,47 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:463 +#: rpmio/url.c:462 msgid "url port must be a number\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "impossible d'ouvrir: %s\n" #, fuzzy +#~ msgid "don't verify signature(s)" +#~ msgstr "" +#~ " -f + - interroge le package qui appartient " + +#, fuzzy #~ msgid "========== Header RSA signature\n" #~ msgstr " --sign - genre une signature PGP" @@ -3958,12 +3968,6 @@ msgstr "impossible d'ouvrir: %s\n" #~ msgstr " Options de slection d'information:" #, fuzzy -#~ msgid " --install " -#~ msgstr "" -#~ " -p + - interroge le package (non install) " -#~ "" - -#, fuzzy #~ msgid " -i " #~ msgstr " -i \t- installe le package" diff --git a/po/gl.po b/po/gl.po index 32ccc00..22c1fc8 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -113,7 +113,7 @@ msgstr "" msgid "use as the top level directory" msgstr "" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "" @@ -810,7 +810,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -840,7 +840,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1404,71 +1404,71 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:152 +#: lib/depends.c:153 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:407 +#: lib/depends.c:408 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:428 +#: lib/depends.c:429 msgid "(db files)" msgstr "" -#: lib/depends.c:440 +#: lib/depends.c:441 msgid "(db provides)" msgstr "" -#: lib/depends.c:453 +#: lib/depends.c:454 msgid "(db package)" msgstr "" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:881 +#: lib/depends.c:882 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1505,7 +1505,7 @@ msgstr "" msgid "failed to stat %s: %s\n" msgstr "" -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, c-format msgid "failed to open %s: %s\n" msgstr "" @@ -1642,7 +1642,7 @@ msgid "" " specified multiple packages)" msgstr "" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 msgid "do not execute package scriptlet(s)" msgstr "" @@ -1682,7 +1682,7 @@ msgstr "" msgid "upgrade package(s) if already installed" msgstr "" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 msgid "+" msgstr "" @@ -1707,7 +1707,7 @@ msgid "install documentation" msgstr "" #: lib/poptI.c:159 -msgid "install package" +msgid "install package(s)" msgstr "" #: lib/poptI.c:161 @@ -1722,105 +1722,109 @@ msgstr "" msgid "do not reorder package installation to satisfy dependencies" msgstr "" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 -msgid "don't verify digest(s)" +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +msgid "don't verify package digest(s)" msgstr "" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 -msgid "don't verify signature(s)" +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +msgid "don't verify package signature(s)" msgstr "" -#: lib/poptI.c:192 +#: lib/poptI.c:196 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "" -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "" -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" msgstr "" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "" -#: lib/poptI.c:217 +#: lib/poptI.c:221 msgid "relocate files from path to " msgstr "" -#: lib/poptI.c:218 +#: lib/poptI.c:222 msgid "=" msgstr "" -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "" -#: lib/poptI.c:229 +#: lib/poptI.c:233 msgid "deinstall new, reinstall old, package(s), back to " msgstr "" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "" -#: lib/poptI.c:235 +#: lib/poptI.c:239 msgid "upgrade package(s)" msgstr "" @@ -1988,7 +1992,7 @@ msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" #: lib/poptQV.c:298 -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "" #: lib/poptQV.c:300 @@ -2000,7 +2004,7 @@ msgid "import an armored public key" msgstr "" #: lib/poptQV.c:304 -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "" #: lib/poptQV.c:306 @@ -2091,79 +2095,79 @@ msgstr "" msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:447 +#: lib/psm.c:448 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:453 +#: lib/psm.c:454 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:486 +#: lib/psm.c:487 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:602 +#: lib/psm.c:603 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:721 +#: lib/psm.c:722 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:887 +#: lib/psm.c:888 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:894 +#: lib/psm.c:895 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1236 +#: lib/psm.c:1237 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1356 +#: lib/psm.c:1357 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1498 +#: lib/psm.c:1499 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1507 +#: lib/psm.c:1508 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1550 +#: lib/psm.c:1551 msgid " on file " msgstr "" -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, c-format msgid "%s failed: %s\n" msgstr "" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2735,12 +2739,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "" @@ -3222,59 +3226,59 @@ msgstr "" msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -3303,37 +3307,37 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:463 +#: rpmio/url.c:462 msgid "url port must be a number\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/po/is.po b/po/is.po index 8a2d62b..5da3056 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -114,7 +114,7 @@ msgstr "" msgid "use as the top level directory" msgstr "" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "" @@ -816,7 +816,7 @@ msgstr "Get ekki lesi msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, c-format msgid "Unable to write package: %s\n" msgstr "Get ekki ritað í pakka: %s\n" @@ -846,7 +846,7 @@ msgstr "Get ekki lesi msgid "Unable to write payload to %s: %s\n" msgstr "Get ekki ritað innihald í %s: %s\n" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "Skrifaði: %s\n" @@ -1411,72 +1411,72 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:152 +#: lib/depends.c:153 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:407 +#: lib/depends.c:408 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:428 +#: lib/depends.c:429 msgid "(db files)" msgstr "" -#: lib/depends.c:440 +#: lib/depends.c:441 msgid "(db provides)" msgstr "" -#: lib/depends.c:453 +#: lib/depends.c:454 #, fuzzy msgid "(db package)" msgstr "uppfæra pakka" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:881 +#: lib/depends.c:882 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1513,7 +1513,7 @@ msgstr "" msgid "failed to stat %s: %s\n" msgstr "gat ekki skoðað %s: %s\n" -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, c-format msgid "failed to open %s: %s\n" msgstr "gat ekki opnað %s: %s\n" @@ -1650,7 +1650,7 @@ msgid "" " specified multiple packages)" msgstr "" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 msgid "do not execute package scriptlet(s)" msgstr "" @@ -1690,7 +1690,7 @@ msgstr "" msgid "upgrade package(s) if already installed" msgstr "" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 msgid "+" msgstr "+" @@ -1715,7 +1715,8 @@ msgid "install documentation" msgstr "" #: lib/poptI.c:159 -msgid "install package" +#, fuzzy +msgid "install package(s)" msgstr "setja inn pakka" #: lib/poptI.c:161 @@ -1730,107 +1731,111 @@ msgstr "" msgid "do not reorder package installation to satisfy dependencies" msgstr "" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy -msgid "don't verify digest(s)" +msgid "don't verify package digest(s)" msgstr "ekki yfirfara MD5 undirritun skráa" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy -msgid "don't verify signature(s)" -msgstr "ekki yfirfara symlink slóð skráa" +msgid "don't verify package signature(s)" +msgstr "búa til undirskrift" -#: lib/poptI.c:192 +#: lib/poptI.c:196 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "" -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "" -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" msgstr "" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "" -#: lib/poptI.c:217 +#: lib/poptI.c:221 msgid "relocate files from path to " msgstr "" -#: lib/poptI.c:218 +#: lib/poptI.c:222 msgid "=" msgstr "=" -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "" -#: lib/poptI.c:229 +#: lib/poptI.c:233 msgid "deinstall new, reinstall old, package(s), back to " msgstr "" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "" -#: lib/poptI.c:235 +#: lib/poptI.c:239 msgid "upgrade package(s)" msgstr "uppfæra pakka" @@ -2004,7 +2009,7 @@ msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "ekki yfirfara MD5 undirritun skráa" #: lib/poptQV.c:298 -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "" #: lib/poptQV.c:300 @@ -2017,7 +2022,7 @@ msgid "import an armored public key" msgstr "" #: lib/poptQV.c:304 -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "" #: lib/poptQV.c:306 @@ -2108,79 +2113,79 @@ msgstr "" msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:447 +#: lib/psm.c:448 #, c-format msgid "cannot create %%%s %s\n" msgstr "gat ekki búið til %%%s %s\n" -#: lib/psm.c:453 +#: lib/psm.c:454 #, c-format msgid "cannot write to %%%s %s\n" msgstr "get ekki ritað í %%%s %s\n" -#: lib/psm.c:486 +#: lib/psm.c:487 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:602 +#: lib/psm.c:603 msgid "source package contains no .spec file\n" msgstr "pakkinn inniheldur enga .spec skrá\n" -#: lib/psm.c:721 +#: lib/psm.c:722 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:887 +#: lib/psm.c:888 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:894 +#: lib/psm.c:895 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1236 +#: lib/psm.c:1237 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1356 +#: lib/psm.c:1357 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1498 +#: lib/psm.c:1499 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1507 +#: lib/psm.c:1508 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1550 +#: lib/psm.c:1551 msgid " on file " msgstr "" -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "gat ekki opnað %s: %s\n" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s brást\n" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2753,12 +2758,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "" @@ -3240,59 +3245,59 @@ msgstr "Skr msgid "File %s is smaller than %u bytes\n" msgstr "Skráin %s er minni en %u bæti\n" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "Tókst" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 msgid "Bad server response" msgstr "Þjónninn svaraði rangt" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 msgid "Server I/O error" msgstr "Les/ritvilla á þjóninum" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 msgid "Server timeout" msgstr "Þjónninn tímaði út" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 msgid "Unable to lookup server host address" msgstr "Gat ekki flett upp vistfangi þjónsins" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 msgid "Unable to lookup server host name" msgstr "Gat ekki flett upp heiti þjónsins" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 msgid "Failed to connect to server" msgstr "Gat ekki tengst þjóninum" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 msgid "Failed to establish data connection to server" msgstr "Gat ekki opnað gagnatengingu við þjóninn" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 msgid "I/O error to local file" msgstr "Les/ritvilla í skrána" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "Ekki tókst að fá þjóninn í \"passive\" ham" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "Skráin fannst ekki á þjóninum" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "Er að hætta við" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 msgid "Unknown or unexpected error" msgstr "Óþekkt eða óvænt villa" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "tengist %s sem %s með aðgangsorði %s\n" @@ -3321,41 +3326,45 @@ msgstr "a msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "minnisfrátekt (%u bæta) skilaði NULL.\n" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "aðvörun: u %p ctrl %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "aðvörun: u %p data %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, fuzzy, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "aðvörun: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "Lykilorð fyrir %s@%s: " -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, c-format msgid "error: %sport must be a number\n" msgstr "villa: %sport verður að vera tala\n" -#: rpmio/url.c:463 +#: rpmio/url.c:462 msgid "url port must be a number\n" msgstr "gátt slóðar verður að vera tala\n" #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, c-format msgid "failed to create %s: %s\n" msgstr "gat ekki búið til %s: %s\n" +#, fuzzy +#~ msgid "don't verify signature(s)" +#~ msgstr "ekki yfirfara symlink slóð skráa" + #~ msgid "" #~ "package lacks both user name and id lists (this should never happen)\n" #~ msgstr "" diff --git a/po/ja.po b/po/ja.po index 2fe197e..8ce1db1 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -122,7 +122,7 @@ msgstr "" msgid "use as the top level directory" msgstr "¥È¥Ã¥×¥Ç¥£¥ì¥¯¥È¥ê¤È¤·¤Æ ¤ò»ÈÍѤ·¤Þ¤¹" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "" @@ -862,7 +862,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" @@ -892,7 +892,7 @@ msgstr " msgid "Unable to write payload to %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "½ñ¤­¹þ¤ßÃæ: %s\n" @@ -1483,76 +1483,76 @@ msgstr "" msgid " failed - " msgstr "¼ºÇÔ - " -#: lib/depends.c:152 +#: lib/depends.c:153 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:407 +#: lib/depends.c:408 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:428 +#: lib/depends.c:429 #, fuzzy msgid "(db files)" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/depends.c:440 +#: lib/depends.c:441 #, fuzzy msgid "(db provides)" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:453 +#: lib/depends.c:454 #, fuzzy msgid "(db package)" msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:881 +#: lib/depends.c:882 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" #. Record all relations. -#: lib/depends.c:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1591,7 +1591,7 @@ msgstr "mntctl() fugger msgid "failed to stat %s: %s\n" msgstr "stat %s ¤Ë¼ºÇÔ: %s" -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" @@ -1735,7 +1735,7 @@ msgstr "" " ¤È°ìÃפ¹¤ë¥Ñ¥Ã¥±¡¼¥¸Á´¤Æ¤òºï½ü¤·¤Þ¤¹(°ìÈÌ\n" "\t\t\t Ū¤ËÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤹ¤ë¤È¥¨¥é¡¼¤Ë¤Ê¤ê¤Þ¤¹)" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 #, fuzzy msgid "do not execute package scriptlet(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸»ØÄê¤Î¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó" @@ -1780,7 +1780,7 @@ msgstr "--replacepkgs msgid "upgrade package(s) if already installed" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 #, fuzzy msgid "+" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹" @@ -1806,7 +1806,8 @@ msgid "install documentation" msgstr "¥É¥­¥å¥á¥ó¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹" #: lib/poptI.c:159 -msgid "install package" +#, fuzzy +msgid "install package(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹" #: lib/poptI.c:161 @@ -1825,64 +1826,68 @@ msgstr "" "°Í¸À­¤òËþ¤¿¤¹¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î\n" "¥¤¥ó¥¹¥È¡¼¥ë¤òÍ׵ᤷ¤Þ¤»¤ó" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, fuzzy, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, fuzzy, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, fuzzy, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, fuzzy, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy -msgid "don't verify digest(s)" +msgid "don't verify package digest(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy -msgid "don't verify signature(s)" -msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" +msgid "don't verify package signature(s)" +msgstr "½ð̾¤Î¸¡¾Ú¤ò¤·¤Þ¤¹" -#: lib/poptI.c:192 +#: lib/poptI.c:196 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "" "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥¹¥¯¥ê¥×¥È¤ò\n" "¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, fuzzy, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸»ØÄê¤Î¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, fuzzy, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1890,53 +1895,53 @@ msgstr "" "¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹\n" "(¥¢¥Ã¥×¥°¥ì¡¼¥É»þ¤Î --force ¤Ï¤³¤ì¤ò¼«Æ°Åª¤Ë¹Ô¤¤¤Þ¤¹)" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÝ¤Ë '%' ¤Çɽ¼¨¤·¤Þ¤¹" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "" "ºÆÇÛÃÖ²Äǽ¤Ê¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·¡¢¥¤¥ó¥¹¥È¡¼¥ë¥Ñ¥¹\n" "ÀÜƬ¼­¤ò ¤ËÀßÄꤷ¤Þ¤¹" -#: lib/poptI.c:217 +#: lib/poptI.c:221 #, fuzzy msgid "relocate files from path to " msgstr " ¤«¤é ¤Ë¥Õ¥¡¥¤¥ë¤òºÆÇÛÃÖ¤µ¤»¤Þ¤¹" -#: lib/poptI.c:218 +#: lib/poptI.c:222 #, fuzzy msgid "=" msgstr " ¤«¤é ¤Ë¥Õ¥¡¥¤¥ë¤òºÆÇÛÃÖ¤µ¤»¤Þ¤¹" -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "" "¥¤¥ó¥¹¥È¡¼¥ë»þ¤ËÃÖ¤­´¹¤¨¤é¤ì¤ë¥Õ¥¡¥¤¥ë¤¬\n" "¤¢¤Ã¤Æ¤â¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "´û¤Ë¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ç¤âºÆ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹" -#: lib/poptI.c:229 +#: lib/poptI.c:233 msgid "deinstall new, reinstall old, package(s), back to " msgstr "" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤»¤º¤Ë¡¢¥Æ¥¹¥È¤Î¤ß¹Ô¤¤¤Þ¤¹" -#: lib/poptI.c:235 +#: lib/poptI.c:239 #, fuzzy msgid "upgrade package(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹" @@ -2140,7 +2145,7 @@ msgstr " #: lib/poptQV.c:298 #, fuzzy -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤·¤Þ¤¹(¸½ºß¤Î½ð̾¤Ï¼Î¤Æ¤é¤ì¤Þ¤¹)" #: lib/poptQV.c:300 @@ -2154,7 +2159,7 @@ msgstr "" #: lib/poptQV.c:304 #, fuzzy -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤·¤Þ¤¹(¸½ºß¤Î½ð̾¤Ï¼Î¤Æ¤é¤ì¤Þ¤¹)" #: lib/poptQV.c:306 @@ -2257,82 +2262,82 @@ msgstr " msgid "Data type %d not supported\n" msgstr "¥Ç¡¼¥¿¥¿¥¤¥× %d ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: lib/psm.c:447 +#: lib/psm.c:448 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "%s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n" -#: lib/psm.c:453 +#: lib/psm.c:454 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "%s ¤Ø½ñ¤­¹þ¤á¤Þ¤»¤ó" -#: lib/psm.c:486 +#: lib/psm.c:487 #, fuzzy msgid "source package expected, binary found\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Þ¤¹¡¢¥Ð¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: lib/psm.c:602 +#: lib/psm.c:603 #, fuzzy msgid "source package contains no .spec file\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó" -#: lib/psm.c:721 +#: lib/psm.c:722 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "¥Ý¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n" -#: lib/psm.c:887 +#: lib/psm.c:888 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:894 +#: lib/psm.c:895 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:1236 +#: lib/psm.c:1237 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n" -#: lib/psm.c:1356 +#: lib/psm.c:1357 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1498 +#: lib/psm.c:1499 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:1507 +#: lib/psm.c:1508 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s" -#: lib/psm.c:1550 +#: lib/psm.c:1551 #, fuzzy msgid " on file " msgstr "¥Õ¥¡¥¤¥ë¾å" -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s ¼ºÇÔ" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "¥Õ¥©¡¼¥Þ¥Ã¥ÈÃæ¤Î¥¨¥é¡¼: %s\n" @@ -2924,12 +2929,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "¥Þ¥¦¥ó¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ê¥¹¥È¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹\n" @@ -3423,68 +3428,68 @@ msgstr " msgid "File %s is smaller than %u bytes\n" msgstr "¥Õ¥¡¥¤¥ë %s: ¤Ï %d ¥Ð¥¤¥È¤è¤ê¾®¤µ¤¤¤Ç¤¹" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "À®¸ù" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 #, fuzzy msgid "Bad server response" msgstr "¥µ¡¼¥Ð¤«¤éÀµ¾ï¤Ê±þÅú¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 #, fuzzy msgid "Server I/O error" msgstr "¥µ¡¼¥Ð IO ¥¨¥é¡¼" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 #, fuzzy msgid "Server timeout" msgstr "¥µ¡¼¥Ð¥¿¥¤¥à¥¢¥¦¥È" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 #, fuzzy msgid "Unable to lookup server host address" msgstr "¥µ¡¼¥Ð¤Î¥Û¥¹¥È¥¢¥É¥ì¥¹¤òÄ´¤Ù¤é¤ì¤Þ¤»¤ó" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 #, fuzzy msgid "Unable to lookup server host name" msgstr "¥µ¡¼¥Ð¤Î¥Û¥¹¥È̾¤òÄ´¤Ù¤é¤ì¤Þ¤»¤ó" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 #, fuzzy msgid "Failed to connect to server" msgstr "¥µ¡¼¥Ð¤Ø¤ÎÀܳ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 #, fuzzy msgid "Failed to establish data connection to server" msgstr "¥µ¡¼¥Ð¤È¤Î¥Ç¡¼¥¿¥³¥Í¥¯¥·¥ç¥ó¤Î³ÎΩ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 #, fuzzy msgid "I/O error to local file" msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤Î IO ¥¨¥é¡¼" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "¥ê¥â¡¼¥È¥µ¡¼¥Ð¤Î¥Ñ¥Ã¥·¥Ö¥â¡¼¥ÉÀßÄꥨ¥é¡¼" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "¥µ¡¼¥Ð¾å¤Ë¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "½èÍýÃæ¤Î¥¢¥Ü¡¼¥È" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 #, fuzzy msgid "Unknown or unexpected error" msgstr "ÉÔÌÀ¤â¤·¤¯¤Ïͽ´ü¤»¤Ì¥¨¥é¡¼" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "%s ¤Ø %s pw %s ¤È¤·¤Æ¥í¥°¥¤¥óÃæ\n" @@ -3514,42 +3519,46 @@ msgstr " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "%s@%s ¤Î¥Ñ¥¹¥ï¡¼¥É:" -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, fuzzy, c-format msgid "error: %sport must be a number\n" msgstr "¥¨¥é¡¼: %s¥Ý¡¼¥È¤Ï¿ô»ú¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: rpmio/url.c:463 +#: rpmio/url.c:462 #, fuzzy msgid "url port must be a number\n" msgstr "url ¥Ý¡¼¥È¤Ï¿ô»ú¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" +#, fuzzy +#~ msgid "don't verify signature(s)" +#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" + #~ msgid "failed dependencies:\n" #~ msgstr "°Í¸À­¤Î·çÇ¡:\n" diff --git a/po/ko.po b/po/ko.po index b230ec2..5da1866 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "PO-Revision-Date: 2001-09-07 22:03+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -114,7 +114,7 @@ msgstr "< msgid "use as the top level directory" msgstr "<µð·ºÅ丮> ¸¦ ÃÖ»óÀ§ µð·ºÅ丮·Î »ç¿ëÇÕ´Ï´Ù" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "<µð·ºÅ丮>" @@ -824,7 +824,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, c-format msgid "Unable to write package: %s\n" msgstr "ÆÐÅ°Áö¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" @@ -854,7 +854,7 @@ msgstr "%s msgid "Unable to write payload to %s: %s\n" msgstr "%s ¿¡ payload¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "ÀÛ¼º: %s\n" @@ -1425,57 +1425,57 @@ msgstr " msgid " failed - " msgstr " ½ÇÆÐÇÔ - " -#: lib/depends.c:152 +#: lib/depends.c:153 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:407 +#: lib/depends.c:408 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:428 +#: lib/depends.c:429 #, fuzzy msgid "(db files)" msgstr "À߸øµÈ db ÆÄÀÏ %s\n" -#: lib/depends.c:440 +#: lib/depends.c:441 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" -#: lib/depends.c:453 +#: lib/depends.c:454 #, fuzzy msgid "(db package)" msgstr "ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:881 +#: lib/depends.c:882 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" #. Record all relations. -#: lib/depends.c:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1483,20 +1483,20 @@ msgid "" msgstr "" "========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "·çÇÁ(LOOP):\n" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1535,7 +1535,7 @@ msgstr "mntctl() msgid "failed to stat %s: %s\n" msgstr "%s ÀÇ »óÅÂ(stat)¸¦ Ç¥½ÃÇϴµ¥ ½ÇÆÐÇÔ: %s\n" -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, c-format msgid "failed to open %s: %s\n" msgstr "%s (À»)¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %s\n" @@ -1677,7 +1677,7 @@ msgstr "" "<ÆÐÅ°Áö> À̸§°ú ÀÏÄ¡ÇÏ´Â ÆÐÅ°Áö´Â ¸ðµÎ Á¦°ÅÇÕ´Ï´Ù (<ÆÐÅ°Áö> ¿¡ ¿©·¯°³ÀÇ ÆÐÅ°" "Áö¸¦ ÁöÁ¤ÇÏ½Ç °æ¿ì¿¡´Â ¿À·ù°¡ ¹ß»ýµË´Ï´Ù)" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 msgid "do not execute package scriptlet(s)" msgstr "ÆÐÅ°Áö ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù" @@ -1717,7 +1717,7 @@ msgstr "--replacepkgs msgid "upgrade package(s) if already installed" msgstr "±âÁ¸¿¡ ¼³Ä¡µÈ ÆÐÅ°Áö¸¦ ¾÷±×·¹À̵å ÇÕ´Ï´Ù" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 msgid "+" msgstr "<ÆÐÅ°ÁöÆÄÀÏ>+" @@ -1744,7 +1744,8 @@ msgid "install documentation" msgstr "ÆÐÅ°Áö¿¡ Æ÷ÇÔµÈ ¹®¼­ ÆÄÀÏÀ» ¼³Ä¡ÇÕ´Ï´Ù" #: lib/poptI.c:159 -msgid "install package" +#, fuzzy +msgid "install package(s)" msgstr "ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÕ´Ï´Ù" #: lib/poptI.c:161 @@ -1759,61 +1760,65 @@ msgstr " msgid "do not reorder package installation to satisfy dependencies" msgstr "ÀÇÁ¸¼ºÀÌ ÀÖ´Â ÆÐÅ°Áö¸¦ ¼³Ä¡Çϵµ·Ï Àç¿ä±¸ÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "%%pre ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù (ÀÖÀ» °æ¿ì)" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "%%post ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù (ÀÖÀ» °æ¿ì)" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "%%preun ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù (ÀÖÀ» °æ¿ì)" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "%%postun ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù (ÀÖÀ» °æ¿ì)" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy -msgid "don't verify digest(s)" +msgid "don't verify package digest(s)" msgstr "ÆÄÀÏÀÇ MD5 Ãà¾à(digest)À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy -msgid "don't verify signature(s)" -msgstr "ÆÄÀÏÀÇ ½Éº¼¸¯ ¸µÅ© °æ·Î¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" +msgid "don't verify package signature(s)" +msgstr "ÆÐÅ°ÁöÀÇ ¼­¸íÀ» °Ë»çÇÕ´Ï´Ù" -#: lib/poptI.c:192 +#: lib/poptI.c:196 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "ÀÌ ÆÐÅ°Áö¿¡ ÀÇÇØ ¹ß»ýµÇ´Â ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "%%triggerprein ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "%%triggerin ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "%%triggerun ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "%%triggerpostun ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1821,49 +1826,49 @@ msgstr "" "ÀÌÀü ¹öÀüÀÇ ÆÐÅ°Áö·Î ´Ù¿î±×·¹À̵å ÇÕ´Ï´Ù (--force ¿É¼ÇÀ» »ç¿ë½Ã¿¡´Â ÀÌ ¿É¼Ç" "ÀÌ ÀÚµ¿À¸·Î Àû¿ëµË´Ï´Ù)" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "ÆÐÅ°Áö ¼³Ä¡¸¦ ÆÛ¼¾Æ®(%)·Î Ç¥½ÃÇÕ´Ï´Ù" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "" "Àç¹èÄ¡ ±â´ÉÀÌ ÀÖ´Â ÆÐÅ°ÁöÀÇ °æ¿ì, ÁöÁ¤µÈ <µð·ºÅ丮> ·Î Àç¹èÄ¡ÇÏ¿© ¼³Ä¡ÇÕ´Ï´Ù" -#: lib/poptI.c:217 +#: lib/poptI.c:221 msgid "relocate files from path to " msgstr "<ÀÌÀü°æ·Î> ¿¡¼­ <»õ·Î¿î°æ·Î> ·Î ÆÄÀÏÀ» Àç¹èÄ¡ ÇÕ´Ï´Ù" -#: lib/poptI.c:218 +#: lib/poptI.c:222 msgid "=" msgstr "<ÀÌÀü°æ·Î>=<»õ·Î¿î°æ·Î>" -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "ÀçÆÐŰ¡(repackaging)À¸·Î ÀÎÇØ »èÁ¦µÇ´Â ÆÐÅ°Áö ÆÄÀÏÀ» ÀúÀåÇÕ´Ï´Ù" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "ÆÐÅ°Áö ¼³Ä¡½Ã ±âÁ¸¿¡ ¼³Ä¡µÇ¾î ÀÖ´Â ÆÄÀÏÀ» µ¤¾î¾¹´Ï´Ù" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "ÆÐÅ°Áö°¡ ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ´Â °æ¿ì¿¡µµ ¼³Ä¡ÇÕ´Ï´Ù" -#: lib/poptI.c:229 +#: lib/poptI.c:233 #, fuzzy msgid "deinstall new, reinstall old, package(s), back to " msgstr "»õ·Î¿î ÆÐÅ°Áö »èÁ¦, ÀÌÀü ÆÐÅ°Áö À缳ġ, ³¯Â¥ º¹±¸(back to date)" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "<³¯Â¥>" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÏÁö ¾Ê°í, Á¦´ë·Î ¼³Ä¡µÇ´ÂÁö¸¸ È®ÀÎÇÕ´Ï´Ù" -#: lib/poptI.c:235 +#: lib/poptI.c:239 msgid "upgrade package(s)" msgstr "ÆÐÅ°Áö¸¦ ¾÷±×·¹À̵å ÇÕ´Ï´Ù" @@ -2040,7 +2045,7 @@ msgstr " #: lib/poptQV.c:298 #, fuzzy -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "ÆÐÅ°Áö¿¡ ¼­¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼­¸íÀº »èÁ¦µË´Ï´Ù)" #: lib/poptQV.c:300 @@ -2054,7 +2059,7 @@ msgstr "" #: lib/poptQV.c:304 #, fuzzy -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "ÆÐÅ°Áö¿¡ ¼­¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼­¸íÀº »èÁ¦µË´Ï´Ù)" #: lib/poptQV.c:306 @@ -2153,85 +2158,85 @@ msgstr " ( msgid "Data type %d not supported\n" msgstr "%d µ¥ÀÌÅÍ À¯ÇüÀº »ç¿ëÇÏ½Ç ¼ö ¾ø½À´Ï´Ù\n" -#: lib/psm.c:447 +#: lib/psm.c:448 #, c-format msgid "cannot create %%%s %s\n" msgstr "%%%s %s (À»)¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/psm.c:453 +#: lib/psm.c:454 #, c-format msgid "cannot write to %%%s %s\n" msgstr "%%%s %s (À»)¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/psm.c:486 +#: lib/psm.c:487 msgid "source package expected, binary found\n" msgstr "¼Ò½º ÆÐÅ°Áö°¡ ¿ä±¸µË´Ï´Ù, ¹ÙÀ̳ʸ®¸¦ ã¾Ò½À´Ï´Ù\n" -#: lib/psm.c:602 +#: lib/psm.c:603 msgid "source package contains no .spec file\n" msgstr "¼Ò½º ÆÐÅ°Áö¿¡ .spec ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/psm.c:721 +#: lib/psm.c:722 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÕ´Ï´Ù (ÀÖÀ» °æ¿ì)\n" -#: lib/psm.c:887 +#: lib/psm.c:888 #, 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:894 +#: lib/psm.c:895 #, 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:1236 +#: lib/psm.c:1237 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s (ÀÌ)°¡ %d ÀÇ ÆÄÀÏÀ» °®°í ÀÖ½À´Ï´Ù, Å×½ºÆ® = %d\n" -#: lib/psm.c:1356 +#: lib/psm.c:1357 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" "%s: %s ½ºÅ©¸³Æ®¸´(scriptlet)°¡ ½ÇÆÐÇß½À´Ï´Ù (%d), %s-%s-%s (À»)¸¦ »ý·«ÇÕ´Ï" "´Ù\n" -#: lib/psm.c:1498 +#: lib/psm.c:1499 #, c-format msgid "user %s does not exist - using root\n" msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:1507 +#: lib/psm.c:1508 #, c-format msgid "group %s does not exist - using root\n" msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆÐÇÔ%s%s: %s\n" -#: lib/psm.c:1550 +#: lib/psm.c:1551 msgid " on file " msgstr " ´ÙÀ½ ÆÄÀÏ¿¡ " -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%2$s ÆÄÀÏÀÇ %1$s (ÀÌ)°¡ ½ÇÆÐÇÔ: %3$s\n" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, c-format msgid "%s failed: %s\n" msgstr "%s (ÀÌ)°¡ ½ÇÆÐÇÔ: %s\n" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, c-format msgid "incorrect format: %s\n" msgstr "¿Ã¹Ù¸£Áö ¸øÇÑ Çü½Ä: %s\n" @@ -2811,12 +2816,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s (À»)¸¦ »ý·«ÇÕ´Ï´Ù\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, c-format msgid "excluding directory %s\n" msgstr "%s µð·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "¸¶¿îÆ®µÈ ÆÄÀϽýºÅÛÀÇ ¸ñ·ÏÀ» ¼öÁýÇÏ°í ÀÖ½À´Ï´Ù\n" @@ -3313,60 +3318,60 @@ msgstr "%s msgid "File %s is smaller than %u bytes\n" msgstr "%s ÆÄÀÏÀÌ %u ¹ÙÀÌÆ® ¿ë·®º¸´Ù Àû½À´Ï´Ù\n" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "¼º°ø" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 msgid "Bad server response" msgstr "¼­¹ö ÀÀ´äÀÌ À߸øµÇ¾ú½À´Ï´Ù" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 msgid "Server I/O error" msgstr "¼­¹ö ÀÔ/Ãâ·Â ¿À·ùÀÔ´Ï´Ù" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 msgid "Server timeout" msgstr "¼­¹ö ´ë±â½Ã°£ÀÌ ÃÊ°úµÇ¾ú½À´Ï´Ù" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 msgid "Unable to lookup server host address" msgstr "¼­¹ö È£½ºÆ® ÁÖ¼Ò¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 msgid "Unable to lookup server host name" msgstr "¼­¹ö È£½ºÆ® À̸§À» ãÀ» ¼ö ¾ø½À´Ï´Ù" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 msgid "Failed to connect to server" msgstr "¼­¹ö¿¡ Á¢¼ÓÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 msgid "Failed to establish data connection to server" msgstr "¼­¹ö·Î ÀÚ·á Á¢¼ÓÀ» ½ÃµµÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 msgid "I/O error to local file" msgstr "·ÎÄà ÆÄÀÏ¿¡ ÀÔ/Ãâ·Â ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "" "¿ø°Ý ¼­¹ö¸¦ ¼öµ¿ ¸ðµå(passive mode)·Î ¼³Á¤ÇÏ´Â µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "¼­¹ö¿¡¼­ ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "ÁøÇàÀÌ ÁߴܵǾú½À´Ï´Ù" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 msgid "Unknown or unexpected error" msgstr "¾Ë ¼ö ¾ø´Â ȤÀº ¿¹»óÄ¡ ¸øÇÑ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "%s ¿¡ %s (À¸)·Î ±â·Ï(logging)ÇÕ´Ï´Ù, pw %s\n" @@ -3395,41 +3400,45 @@ msgstr " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "(%u ¹ÙÀÌÆ®)ÀÇ ¸Þ¸ð¸® ÇÒ´ç °ªÀÌ NULL·Î ¹ÝȯµÇ¾ú½À´Ï´Ù.\n" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "°æ°í: u %p ctrl %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "°æ°í: u %p data %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, fuzzy, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "°æ°í: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "%s@%s ÀÇ Æнº¿öµå: " -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, c-format msgid "error: %sport must be a number\n" msgstr "¿À·ù: %s Æ÷Æ®´Â ¹Ýµå½Ã ¼ýÀÚÀ̾î¾ß ÇÕ´Ï´Ù\n" -#: rpmio/url.c:463 +#: rpmio/url.c:462 msgid "url port must be a number\n" msgstr "URL Æ÷Æ®´Â ¹Ýµå½Ã ¼ýÀÚÀ̾î¾ß ÇÕ´Ï´Ù\n" #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, c-format msgid "failed to create %s: %s\n" msgstr "%s (À»)¸¦ »ý¼ºÇϴµ¥ ½ÇÆÐÇÔ: %s\n" +#, fuzzy +#~ msgid "don't verify signature(s)" +#~ msgstr "ÆÄÀÏÀÇ ½Éº¼¸¯ ¸µÅ© °æ·Î¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" + #~ msgid "failed dependencies:\n" #~ msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆÐÇÔ:\n" diff --git a/po/no.po b/po/no.po index b5d69bc..ed23519 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -114,7 +114,7 @@ msgstr "" msgid "use as the top level directory" msgstr "bruk som toppnivåkatalog" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "" @@ -827,7 +827,7 @@ msgstr "Kunne ikke msgid "Could not open %s: %s\n" msgstr "Kunne ikke åpne %s: %s\n" -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" @@ -857,7 +857,7 @@ msgstr "Kunne ikke lese \"payload\" fra %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "Kunne ikke skrive \"payload\" til %s: %s\n" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1426,72 +1426,72 @@ msgstr "" msgid " failed - " msgstr " feilet - " -#: lib/depends.c:152 +#: lib/depends.c:153 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "pakke %s er allerede installert" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:407 +#: lib/depends.c:408 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:428 +#: lib/depends.c:429 msgid "(db files)" msgstr "" -#: lib/depends.c:440 +#: lib/depends.c:441 msgid "(db provides)" msgstr "" -#: lib/depends.c:453 +#: lib/depends.c:454 #, fuzzy msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:881 +#: lib/depends.c:882 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1528,7 +1528,7 @@ msgstr "" msgid "failed to stat %s: %s\n" msgstr "feil under kjøring av stat på %s: %s\n" -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, c-format msgid "failed to open %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" @@ -1667,7 +1667,7 @@ msgstr "" "fjern alle pakker som er lik (normalt vil en feil genereres hvis " " spesifiserer flere pakker)" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 msgid "do not execute package scriptlet(s)" msgstr "ikke kjør pakkespesifikke skriptlet" @@ -1707,7 +1707,7 @@ msgstr "forkortning for --replacepkgs --replacefiles" msgid "upgrade package(s) if already installed" msgstr "oppgrader pakke(r) hvis allerede installert" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 msgid "+" msgstr "+" @@ -1732,7 +1732,8 @@ msgid "install documentation" msgstr "installer dokumentasjon" #: lib/poptI.c:159 -msgid "install package" +#, fuzzy +msgid "install package(s)" msgstr "installer pakke" #: lib/poptI.c:161 @@ -1747,61 +1748,65 @@ msgstr "ikke verifiser pakkeavhengigheter" msgid "do not reorder package installation to satisfy dependencies" msgstr "ikke ordne pakkeinstallasjon for å tilfredsstille avhengigheter" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "ikke kjør noen %%pre skriptlet (hvis noen)" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "ikke kjør %%post skriptlet (hvis noen)" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "ikke kjør %%preun skriptlet (hvis noen)" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "ikke kjør %%postun skriptlet (hvis noen)" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy -msgid "don't verify digest(s)" +msgid "don't verify package digest(s)" msgstr "ikke verifiser header SHA1 digest" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy -msgid "don't verify signature(s)" -msgstr "ikke verifiser sti til symbolske lenker for filer" +msgid "don't verify package signature(s)" +msgstr "verifiser pakkesignatur" -#: lib/poptI.c:192 +#: lib/poptI.c:196 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "Ikke kjør noen skriptlets som utløses av denne pakken" -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "ikke kjør %%triggerprein skriptlets" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "ikke kjør %%triggerin skriptlets" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "ikke kjør %%triggerun skriplets" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "ikke kjør %%triggerpostun skriptlets" -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1809,48 +1814,48 @@ msgstr "" "oppgrader til en gammel versjon av pakken (--force ved oppgraderinger gjør " "dette automatisk)" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "skriv ut prosentvis fremgang etter som pakken installeres" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "omplasser pakken til , hvis den er omplasserbar" -#: lib/poptI.c:217 +#: lib/poptI.c:221 msgid "relocate files from path to " msgstr "omplasser filer fra sti til " -#: lib/poptI.c:218 +#: lib/poptI.c:222 msgid "=" msgstr "=" -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "lagre slettede pakkefiler ved ompakking" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "installer selv om pakken erstatter installerte filer" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "reinstaller selv om pakken allerede er installert" -#: lib/poptI.c:229 +#: lib/poptI.c:233 msgid "deinstall new, reinstall old, package(s), back to " msgstr "" -#: lib/poptI.c:230 +#: lib/poptI.c:234 #, fuzzy msgid "" msgstr "" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "ikke installer, men si ifra om det ville virke eller ikke" -#: lib/poptI.c:235 +#: lib/poptI.c:239 msgid "upgrade package(s)" msgstr "oppgrader pakke(r)" @@ -2026,7 +2031,7 @@ msgstr "" #: lib/poptQV.c:298 #, fuzzy -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "signer en pakke (forkast nåværende signatur)" #: lib/poptQV.c:300 @@ -2040,7 +2045,7 @@ msgstr "" #: lib/poptQV.c:304 #, fuzzy -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "signer en pakke (forkast nåværende signatur)" #: lib/poptQV.c:306 @@ -2133,79 +2138,79 @@ msgstr " kreves av %s-%s-%s\n" msgid "Data type %d not supported\n" msgstr "Datatype %d ikke støttet\n" -#: lib/psm.c:447 +#: lib/psm.c:448 #, c-format msgid "cannot create %%%s %s\n" msgstr "kan ikke opprette %%%s %s\n" -#: lib/psm.c:453 +#: lib/psm.c:454 #, c-format msgid "cannot write to %%%s %s\n" msgstr "kan ikke skrive til %%%s %s\n" -#: lib/psm.c:486 +#: lib/psm.c:487 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær funnet\n" -#: lib/psm.c:602 +#: lib/psm.c:603 msgid "source package contains no .spec file\n" msgstr "kildepakke inneholder ikke en .spec-fil\n" -#: lib/psm.c:721 +#: lib/psm.c:722 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kjører %s-skript (hvis noen)\n" -#: lib/psm.c:887 +#: lib/psm.c:888 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:894 +#: lib/psm.c:895 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1236 +#: lib/psm.c:1237 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1356 +#: lib/psm.c:1357 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1498 +#: lib/psm.c:1499 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1507 +#: lib/psm.c:1508 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1550 +#: lib/psm.c:1551 msgid " on file " msgstr "" -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s feilet\n" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, c-format msgid "incorrect format: %s\n" msgstr "ukorrekt format: %s\n" @@ -2780,12 +2785,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer katalog %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "henter liste over monterte filsystemer\n" @@ -3267,59 +3272,59 @@ msgstr "Fil %s: %s\n" msgid "File %s is smaller than %u bytes\n" msgstr "Fil %s er mindre enn %u bytes\n" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -3348,41 +3353,45 @@ msgstr "advarsel: " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, fuzzy, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "advarseo: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "Passord for %s@%s: " -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, c-format msgid "error: %sport must be a number\n" msgstr "feil: %s-port må være et tall\n" -#: rpmio/url.c:463 +#: rpmio/url.c:462 msgid "url port must be a number\n" msgstr "url-port må være et tall\n" #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, c-format msgid "failed to create %s: %s\n" msgstr "kunne ikke opprette %s: %s\n" +#, fuzzy +#~ msgid "don't verify signature(s)" +#~ msgstr "ikke verifiser sti til symbolske lenker for filer" + #~ msgid "failed dependencies:\n" #~ msgstr "feilede avhengigheter:\n" diff --git a/po/pl.po b/po/pl.po index 2269418..bc40d85 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -122,7 +122,7 @@ msgstr "" msgid "use as the top level directory" msgstr "u¿yj jako katalogu najwy¿szego poziomu" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "" @@ -853,7 +853,7 @@ msgstr "Nie mo msgid "Could not open %s: %s\n" msgstr "Nie mo¿na otworzyæ %s\n" -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie mo¿na zapisaæ pakietu: %s" @@ -883,7 +883,7 @@ msgstr "Nie mo msgid "Unable to write payload to %s: %s\n" msgstr "Nie mo¿na zapisaæ pakietu: %s" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1466,76 +1466,76 @@ msgstr "" msgid " failed - " msgstr " nie powiod³o siê -" -#: lib/depends.c:152 +#: lib/depends.c:153 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 #, fuzzy msgid "(rpmrc provides)" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:407 +#: lib/depends.c:408 #, fuzzy msgid "(rpmlib provides)" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:428 +#: lib/depends.c:429 #, fuzzy msgid "(db files)" msgstr "b³êdny status pliku: %s" -#: lib/depends.c:440 +#: lib/depends.c:441 #, fuzzy msgid "(db provides)" msgstr "Udostêpniane zasoby:" -#: lib/depends.c:453 +#: lib/depends.c:454 #, fuzzy msgid "(db package)" msgstr "znaleziono %d pakietów\n" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:881 +#: lib/depends.c:882 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1574,7 +1574,7 @@ msgstr "" msgid "failed to stat %s: %s\n" msgstr "stat nie powiod³o siê %s: %s" -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s" @@ -1719,7 +1719,7 @@ msgstr "" "usuñ wszystkie pakiety, które spe³niaj± wzorzec (zazwyczaj " "wy¶wietlany jest b³±d gdy opisuje wiele pakietów)" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 #, fuzzy msgid "do not execute package scriptlet(s)" msgstr "nie wykonuj ¿adnych skryptów instalacyjnych" @@ -1764,7 +1764,7 @@ msgstr "skr msgid "upgrade package(s) if already installed" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 #, fuzzy msgid "+" msgstr " -p + " @@ -1790,7 +1790,8 @@ msgid "install documentation" msgstr "zainstaluj dokumentacjê" #: lib/poptI.c:159 -msgid "install package" +#, fuzzy +msgid "install package(s)" msgstr "instaluj pakiet" #: lib/poptI.c:161 @@ -1805,62 +1806,66 @@ msgstr "nie sprawdzaj zale msgid "do not reorder package installation to satisfy dependencies" msgstr "nie zmieniaj kolejno¶ci instalacji pakietów by zapewniæ zale¿no¶ci" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, fuzzy, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "nie wykonuj ¿adnych etapów" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, fuzzy, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "nie wykonuj ¿adnych etapów" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, fuzzy, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "nie wykonuj ¿adnych etapów" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, fuzzy, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "nie wykonuj ¿adnych etapów" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy -msgid "don't verify digest(s)" +msgid "don't verify package digest(s)" msgstr "nie sprawdzaj plików pakietu" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy -msgid "don't verify signature(s)" -msgstr "nie sprawdzaj plików pakietu" +msgid "don't verify package signature(s)" +msgstr "sprawd¼ sygnaturê pakietu" -#: lib/poptI.c:192 +#: lib/poptI.c:196 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "odpytywanie pakietów zahaczanych przez pakiet" -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, fuzzy, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "nie wykonuj ¿adnych skryptów instalacyjnych" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "nie wykonuj ¿adnych skryptów instalacyjnych" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "nie wykonuj ¿adnych skryptów instalacyjnych" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, fuzzy, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "nie wykonuj ¿adnych skryptów instalacyjnych" -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1868,49 +1873,49 @@ msgstr "" "uaktualnij do starej wersji (--force robi to samo automatycznie podczas " "uaktualniania)" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "wy¶wietlaj stan instalacji w procentach" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "przesuñ pliki pakietu do drzewa , je¶li jest przesuwalny" -#: lib/poptI.c:217 +#: lib/poptI.c:221 #, fuzzy msgid "relocate files from path to " msgstr "przesuñ pliki z drzewa do drzewa " -#: lib/poptI.c:218 +#: lib/poptI.c:222 #, fuzzy msgid "=" msgstr " --relocate =" -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "instaluj nawet gdy pakiet zastêpuje inne zainstalowane pliki" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "przeinstaluj je¶li pakiet jest ju¿ zainstalowany" -#: lib/poptI.c:229 +#: lib/poptI.c:233 msgid "deinstall new, reinstall old, package(s), back to " msgstr "" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "nie instaluj, podaj tylko czy instalacja zadzia³a czy nie" -#: lib/poptI.c:235 +#: lib/poptI.c:239 #, fuzzy msgid "upgrade package(s)" msgstr " --upgrade " @@ -2105,7 +2110,7 @@ msgstr "nie sprawdzaj plik #: lib/poptQV.c:298 #, fuzzy -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)" #: lib/poptQV.c:300 @@ -2119,7 +2124,7 @@ msgstr "" #: lib/poptQV.c:304 #, fuzzy -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)" #: lib/poptQV.c:306 @@ -2215,81 +2220,81 @@ msgstr " jest wymagany przez %s-%s-%s\n" msgid "Data type %d not supported\n" msgstr "Typ danych %d nie jest obs³ugiwany\n" -#: lib/psm.c:447 +#: lib/psm.c:448 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "nie mo¿na utworzyæ %s" -#: lib/psm.c:453 +#: lib/psm.c:454 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "nie mo¿na zapisaæ do %s" -#: lib/psm.c:486 +#: lib/psm.c:487 #, fuzzy msgid "source package expected, binary found\n" msgstr "spodziewany pakiet ¼ród³owy a nie binarny" -#: lib/psm.c:602 +#: lib/psm.c:603 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pakiet ¼ród³owy nie zawiera pliku .spec" -#: lib/psm.c:721 +#: lib/psm.c:722 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n" -#: lib/psm.c:887 +#: lib/psm.c:888 #, 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:894 +#: lib/psm.c:895 #, 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:1236 +#: lib/psm.c:1237 #, 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:1356 +#: lib/psm.c:1357 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1498 +#: lib/psm.c:1499 #, 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:1507 +#: lib/psm.c:1508 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s nie istnieje - u¿yto grupy root" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, 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:1550 +#: lib/psm.c:1551 msgid " on file " msgstr " na pliku " -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s nie powiod³o siê" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "b³±d w formacie: %s\n" @@ -2878,12 +2883,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "%s pominiêty z powodu flagi missingok\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "" @@ -3374,61 +3379,61 @@ msgstr "Plik %s: %s" msgid "File %s is smaller than %u bytes\n" msgstr "Plik %s jest mniejszy ni¿ %d bajtów" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "Sukces" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 msgid "Bad server response" msgstr "B³êdna odpowied¼ serwera" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 #, fuzzy msgid "Server I/O error" msgstr "B³±d WE/WY(IO) serwera" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 msgid "Server timeout" msgstr "Przekroczony limit czasu serwera" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 msgid "Unable to lookup server host address" msgstr "Nie mo¿na znale¼æ adresu serwera" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 msgid "Unable to lookup server host name" msgstr "Nie mo¿na znale¼æ nazwy serwera" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 msgid "Failed to connect to server" msgstr "Po³±czenie z serwerem nie powiod³o siê" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 msgid "Failed to establish data connection to server" msgstr "Otwarcie transmisji danych z serwera nie powiod³o siê" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 #, fuzzy msgid "I/O error to local file" msgstr "B³±d WE/WY(IO) na lokalnym pliku" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "B³±d: ustawienie zdalnego serwera w tryb pasywny nie powiod³o siê" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "Plik nie zosta³ znaleziony na serwerze" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "Przerywanie ..." -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 msgid "Unknown or unexpected error" msgstr "Nieznany lub nieoczekiwany b³±d" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "logowanie do %s jako %s, has³o %s\n" @@ -3458,41 +3463,45 @@ msgstr "ostrze msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "Has³o dla %s@%s: " -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, c-format msgid "error: %sport must be a number\n" msgstr "b³±d: %sport musi byæ liczb±\n" -#: rpmio/url.c:463 +#: rpmio/url.c:462 msgid "url port must be a number\n" msgstr "port musi byæ liczb±\n" #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "utworzenie %s nie powiod³o siê\n" +#, fuzzy +#~ msgid "don't verify signature(s)" +#~ msgstr "nie sprawdzaj plików pakietu" + #~ msgid "failed dependencies:\n" #~ msgstr "niespe³nione zale¿no¶ci:\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 0c3059e..1048cde 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" #: build.c:38 #, fuzzy @@ -118,7 +118,7 @@ msgstr "" msgid "use as the top level directory" msgstr "use como diretrio raiz" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "" @@ -912,7 +912,7 @@ msgid "Could not open %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "No consegui abrir: %s\n" @@ -947,7 +947,7 @@ msgstr "No consegui abrir: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "No consegui abrir: %s\n" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1578,75 +1578,75 @@ msgstr "" msgid " failed - " msgstr "Construo falhou.\n" -#: lib/depends.c:152 +#: lib/depends.c:153 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "no foi passado pacote para instalao" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:407 +#: lib/depends.c:408 msgid "(rpmlib provides)" msgstr "" # , c-format -#: lib/depends.c:428 +#: lib/depends.c:429 #, fuzzy msgid "(db files)" msgstr "No consegui abrir: %s\n" -#: lib/depends.c:440 +#: lib/depends.c:441 msgid "(db provides)" msgstr "" -#: lib/depends.c:453 +#: lib/depends.c:454 #, fuzzy msgid "(db package)" msgstr "pesquise todos os pacotes" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" # , c-format -#: lib/depends.c:881 +#: lib/depends.c:882 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "No consegui abrir: %s\n" #. Record all relations. -#: lib/depends.c:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1686,7 +1686,7 @@ msgid "failed to stat %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "No consegui abrir: %s\n" @@ -1834,7 +1834,7 @@ msgstr "" "remova todos os pacotes iguais a (normalmente um erro gerado se " " especificou mltiplos pacotes)" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 #, fuzzy msgid "do not execute package scriptlet(s)" msgstr "no execute nenhuma script especfica do pacote" @@ -1878,7 +1878,7 @@ msgstr "alis para --replacepkgs --replacefiles" msgid "upgrade package(s) if already installed" msgstr "no foi passado pacote para instalao" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 #, fuzzy msgid "+" msgstr " -b " @@ -1905,7 +1905,8 @@ msgid "install documentation" msgstr "instale documentao" #: lib/poptI.c:159 -msgid "install package" +#, fuzzy +msgid "install package(s)" msgstr "instale pacote" #: lib/poptI.c:161 @@ -1921,62 +1922,66 @@ msgstr "no verifique as dependncias do pacote" msgid "do not reorder package installation to satisfy dependencies" msgstr "no verifique as dependncias do pacote" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, fuzzy, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "no execute nenhum estgio" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, fuzzy, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "no execute nenhum estgio" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, fuzzy, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "no execute nenhum estgio" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, fuzzy, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "no execute nenhum estgio" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy -msgid "don't verify digest(s)" +msgid "don't verify package digest(s)" msgstr "instale pacote" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy -msgid "don't verify signature(s)" -msgstr "instale pacote" +msgid "don't verify package signature(s)" +msgstr "verifique a assinatura do pacote" -#: lib/poptI.c:192 +#: lib/poptI.c:196 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "pesquise o pacote ao qual pertence" -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, fuzzy, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "no execute nenhuma script especfica do pacote" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "no execute nenhuma script de instalao" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "no execute nenhuma script de instalao" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, fuzzy, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "no execute nenhuma script de instalao" -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1984,48 +1989,48 @@ msgstr "" "atualize para uma verso mais velha do pacote (--force em atualizaes no faz " "isto automaticamente)" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "imprima porcentagens a medida que o pacote vai sendo instalado" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "realoque o pacote para , se realocvel" -#: lib/poptI.c:217 +#: lib/poptI.c:221 msgid "relocate files from path to " msgstr "" -#: lib/poptI.c:218 +#: lib/poptI.c:222 #, fuzzy msgid "=" msgstr " [--nomd5] [alvos]" -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "instale mesmo que o pacote substitua arquivos j instalados" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "reinstale se o pacote j estiver presente" -#: lib/poptI.c:229 +#: lib/poptI.c:233 msgid "deinstall new, reinstall old, package(s), back to " msgstr "" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "no instale, mas diga se a instalao funcionar ou no" -#: lib/poptI.c:235 +#: lib/poptI.c:239 #, fuzzy msgid "upgrade package(s)" msgstr "instale pacote" @@ -2229,7 +2234,7 @@ msgstr "instale pacote" #: lib/poptQV.c:298 #, fuzzy -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "assine um pacote (descarte a assinatura corrente)" #: lib/poptQV.c:300 @@ -2243,7 +2248,7 @@ msgstr "" #: lib/poptQV.c:304 #, fuzzy -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "assine um pacote (descarte a assinatura corrente)" #: lib/poptQV.c:306 @@ -2336,82 +2341,82 @@ msgid "Data type %d not supported\n" msgstr "" # , c-format -#: lib/psm.c:447 +#: lib/psm.c:448 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/psm.c:453 +#: lib/psm.c:454 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:486 +#: lib/psm.c:487 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:602 +#: lib/psm.c:603 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pesquise o pacote ao qual pertence" -#: lib/psm.c:721 +#: lib/psm.c:722 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "no execute nenhum estgio" -#: lib/psm.c:887 +#: lib/psm.c:888 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:894 +#: lib/psm.c:895 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1236 +#: lib/psm.c:1237 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "no foi passado pacote para instalao" -#: lib/psm.c:1356 +#: lib/psm.c:1357 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1498 +#: lib/psm.c:1499 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1507 +#: lib/psm.c:1508 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "Construo falhou.\n" -#: lib/psm.c:1550 +#: lib/psm.c:1551 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "Construo falhou.\n" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -3035,12 +3040,12 @@ msgstr "" # "Content-Transfer-Encoding: 8-bit\n" # , c-format #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "RPM verso %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "" @@ -3547,59 +3552,59 @@ msgstr "No consegui ler o arquivo spec de %s\n" msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -3628,43 +3633,47 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:463 +#: rpmio/url.c:462 msgid "url port must be a number\n" msgstr "" # , c-format #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "No consegui abrir o pipe tar: %s\n" #, fuzzy +#~ msgid "don't verify signature(s)" +#~ msgstr "instale pacote" + +#, fuzzy #~ msgid "failed dependencies:\n" #~ msgstr "lista dependncias do pacote" diff --git a/po/ro.po b/po/ro.po index 9c9cd18..2b00fb5 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -113,7 +113,7 @@ msgstr "" msgid "use as the top level directory" msgstr "" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "" @@ -810,7 +810,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -840,7 +840,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1404,71 +1404,71 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:152 +#: lib/depends.c:153 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:407 +#: lib/depends.c:408 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:428 +#: lib/depends.c:429 msgid "(db files)" msgstr "" -#: lib/depends.c:440 +#: lib/depends.c:441 msgid "(db provides)" msgstr "" -#: lib/depends.c:453 +#: lib/depends.c:454 msgid "(db package)" msgstr "" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:881 +#: lib/depends.c:882 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1505,7 +1505,7 @@ msgstr "" msgid "failed to stat %s: %s\n" msgstr "" -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, c-format msgid "failed to open %s: %s\n" msgstr "" @@ -1642,7 +1642,7 @@ msgid "" " specified multiple packages)" msgstr "" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 msgid "do not execute package scriptlet(s)" msgstr "" @@ -1682,7 +1682,7 @@ msgstr "" msgid "upgrade package(s) if already installed" msgstr "" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 msgid "+" msgstr "" @@ -1707,7 +1707,7 @@ msgid "install documentation" msgstr "" #: lib/poptI.c:159 -msgid "install package" +msgid "install package(s)" msgstr "" #: lib/poptI.c:161 @@ -1722,105 +1722,109 @@ msgstr "" msgid "do not reorder package installation to satisfy dependencies" msgstr "" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 -msgid "don't verify digest(s)" +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +msgid "don't verify package digest(s)" msgstr "" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 -msgid "don't verify signature(s)" +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +msgid "don't verify package signature(s)" msgstr "" -#: lib/poptI.c:192 +#: lib/poptI.c:196 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "" -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "" -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" msgstr "" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "" -#: lib/poptI.c:217 +#: lib/poptI.c:221 msgid "relocate files from path to " msgstr "" -#: lib/poptI.c:218 +#: lib/poptI.c:222 msgid "=" msgstr "" -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "" -#: lib/poptI.c:229 +#: lib/poptI.c:233 msgid "deinstall new, reinstall old, package(s), back to " msgstr "" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "" -#: lib/poptI.c:235 +#: lib/poptI.c:239 msgid "upgrade package(s)" msgstr "" @@ -1988,7 +1992,7 @@ msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" #: lib/poptQV.c:298 -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "" #: lib/poptQV.c:300 @@ -2000,7 +2004,7 @@ msgid "import an armored public key" msgstr "" #: lib/poptQV.c:304 -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "" #: lib/poptQV.c:306 @@ -2091,79 +2095,79 @@ msgstr "" msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:447 +#: lib/psm.c:448 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:453 +#: lib/psm.c:454 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:486 +#: lib/psm.c:487 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:602 +#: lib/psm.c:603 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:721 +#: lib/psm.c:722 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:887 +#: lib/psm.c:888 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:894 +#: lib/psm.c:895 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1236 +#: lib/psm.c:1237 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1356 +#: lib/psm.c:1357 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1498 +#: lib/psm.c:1499 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1507 +#: lib/psm.c:1508 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1550 +#: lib/psm.c:1551 msgid " on file " msgstr "" -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, c-format msgid "%s failed: %s\n" msgstr "" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2735,12 +2739,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "" @@ -3222,59 +3226,59 @@ msgstr "" msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -3303,37 +3307,37 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:463 +#: rpmio/url.c:462 msgid "url port must be a number\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index a384bca..f64b5bf 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -119,7 +119,7 @@ msgstr "" msgid "use as the top level directory" msgstr "" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,71 +1410,71 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:152 +#: lib/depends.c:153 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:407 +#: lib/depends.c:408 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:428 +#: lib/depends.c:429 msgid "(db files)" msgstr "" -#: lib/depends.c:440 +#: lib/depends.c:441 msgid "(db provides)" msgstr "" -#: lib/depends.c:453 +#: lib/depends.c:454 msgid "(db package)" msgstr "" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:881 +#: lib/depends.c:882 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1511,7 +1511,7 @@ msgstr "" msgid "failed to stat %s: %s\n" msgstr "" -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, c-format msgid "failed to open %s: %s\n" msgstr "" @@ -1648,7 +1648,7 @@ msgid "" " specified multiple packages)" msgstr "" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 msgid "do not execute package scriptlet(s)" msgstr "" @@ -1688,7 +1688,7 @@ msgstr "" msgid "upgrade package(s) if already installed" msgstr "" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 msgid "+" msgstr "" @@ -1713,7 +1713,7 @@ msgid "install documentation" msgstr "" #: lib/poptI.c:159 -msgid "install package" +msgid "install package(s)" msgstr "" #: lib/poptI.c:161 @@ -1728,105 +1728,109 @@ msgstr "" msgid "do not reorder package installation to satisfy dependencies" msgstr "" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 -msgid "don't verify digest(s)" +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +msgid "don't verify package digest(s)" msgstr "" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 -msgid "don't verify signature(s)" +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +msgid "don't verify package signature(s)" msgstr "" -#: lib/poptI.c:192 +#: lib/poptI.c:196 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "" -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "" -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" msgstr "" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "" -#: lib/poptI.c:217 +#: lib/poptI.c:221 msgid "relocate files from path to " msgstr "" -#: lib/poptI.c:218 +#: lib/poptI.c:222 msgid "=" msgstr "" -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "" -#: lib/poptI.c:229 +#: lib/poptI.c:233 msgid "deinstall new, reinstall old, package(s), back to " msgstr "" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "" -#: lib/poptI.c:235 +#: lib/poptI.c:239 msgid "upgrade package(s)" msgstr "" @@ -1994,7 +1998,7 @@ msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" #: lib/poptQV.c:298 -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "" #: lib/poptQV.c:300 @@ -2006,7 +2010,7 @@ msgid "import an armored public key" msgstr "" #: lib/poptQV.c:304 -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "" #: lib/poptQV.c:306 @@ -2097,79 +2101,79 @@ msgstr "" msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:447 +#: lib/psm.c:448 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:453 +#: lib/psm.c:454 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:486 +#: lib/psm.c:487 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:602 +#: lib/psm.c:603 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:721 +#: lib/psm.c:722 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:887 +#: lib/psm.c:888 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:894 +#: lib/psm.c:895 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1236 +#: lib/psm.c:1237 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1356 +#: lib/psm.c:1357 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1498 +#: lib/psm.c:1499 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1507 +#: lib/psm.c:1508 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1550 +#: lib/psm.c:1551 msgid " on file " msgstr "" -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, c-format msgid "%s failed: %s\n" msgstr "" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2741,12 +2745,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "" @@ -3228,59 +3232,59 @@ msgstr "" msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -3309,37 +3313,37 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:463 +#: rpmio/url.c:462 msgid "url port must be a number\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 519b0af..2e8285a 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "PO-Revision-Date: 2001-08-29 13:55-0400\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -116,7 +116,7 @@ msgstr "< msgid "use as the top level directory" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ËÁÔÁÌÏÇ> ËÁË ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "<ËÁÔÁÌÏÇ>" @@ -836,7 +836,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, c-format msgid "Unable to write package: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÐÁËÅÔ: %s\n" @@ -866,7 +866,7 @@ msgstr " msgid "Unable to write payload to %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÏÄÅÒÖÉÍÏÅ × %s: %s\n" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "úÁÐÉÓÁÎ: %s\n" @@ -1443,57 +1443,57 @@ msgstr " msgid " failed - " msgstr "ÎÅ ÕÄÁÌÏÓØ - " -#: lib/depends.c:152 +#: lib/depends.c:153 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s YES (rpmrc provides)\n" -#: lib/depends.c:407 +#: lib/depends.c:408 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s YES (rpmlib provides)\n" -#: lib/depends.c:428 +#: lib/depends.c:429 #, fuzzy msgid "(db files)" msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" -#: lib/depends.c:440 +#: lib/depends.c:441 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s YES (db provides)\n" -#: lib/depends.c:453 +#: lib/depends.c:454 #, fuzzy msgid "(db package)" msgstr "ÎÅÔ ÐÁËÅÔÏ×\n" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:881 +#: lib/depends.c:882 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n" #. Record all relations. -#: lib/depends.c:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1502,20 +1502,20 @@ msgstr "" "========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, " "ÇÌÕÂÉÎÁ)\n" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "ãéëì:\n" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1554,7 +1554,7 @@ msgstr "mntctl() msgid "failed to stat %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï %s: %s\n" -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, c-format msgid "failed to open %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" @@ -1697,7 +1697,7 @@ msgstr "" "ÕÄÁÌÉÔØ ×ÓÅ ÐÁËÅÔÙ, ÓÏ×ÐÁÄÁÀÝÉÅ Ó <ÐÁËÅÔ> (ÏÂÙÞÎÏ, ÅÓÌÉ <ÐÁËÅÔ> " "ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÎÅÓËÏÌØËÉÍ ÐÁËÅÔÁÍ, ÇÅÎÅÒÉÒÕÅÔÓÑ ÏÛÉÂËÁ)" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 msgid "do not execute package scriptlet(s)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÎÉËÁËÉÈ ÓÃÅÎÁÒÉÅ× ÐÁËÅÔÁ(Ï×)" @@ -1737,7 +1737,7 @@ msgstr " msgid "upgrade package(s) if already installed" msgstr "ÏÂÎÏ×ÉÔØ ÐÁËÅÔ(Ù) ÅÓÌÉ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 msgid "+" msgstr "<ÆÁÊÌ ÐÁËÅÔÁ>+" @@ -1762,7 +1762,8 @@ msgid "install documentation" msgstr "ÕÓÔÁÎÏ×ÉÔØ ÄÏËÕÍÅÎÔÁÃÉÀ" #: lib/poptI.c:159 -msgid "install package" +#, fuzzy +msgid "install package(s)" msgstr "ÕÓÔÁÎÏ×ÉÔØ ÐÁËÅÔ" #: lib/poptI.c:161 @@ -1777,61 +1778,65 @@ msgstr " msgid "do not reorder package installation to satisfy dependencies" msgstr "ÎÅ ÍÅÎÑÔØ ÐÏÒÑÄÏË ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÏ× ÄÌÑ ÕÄÏ×ÌÅÔ×ÏÒÅÎÉÑ ÚÁ×ÉÓÉÍÏÓÔÅÊ" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%pre ÓÃÅÎÁÒÉÅ× (ÅÓÌÉ ÅÓÔØ)" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%post ÓÃÅÎÁÒÉÅ× (ÅÓÌÉ ÅÓÔØ)" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%preun ÓÃÅÎÁÒÉÅ× (ÅÓÌÉ ÅÓÔØ)" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%postun ÓÃÅÎÁÒÉÅ× (ÅÓÌÉ ÅÓÔØ)" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy -msgid "don't verify digest(s)" +msgid "don't verify package digest(s)" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÎÁ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ MD5" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy -msgid "don't verify signature(s)" -msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÐÕÔØ ÓÉÍ×ÏÌÉÞÅÓËÉÈ ÓÓÙÌÏË" +msgid "don't verify package signature(s)" +msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ × ÐÁËÅÔÅ" -#: lib/poptI.c:192 +#: lib/poptI.c:196 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÔÒÉÇÇÅÒ-ÓÃÅÎÁÒÉÅ×, ×Ú×ÅÄÅÎÎÙÈ ÜÔÉÍ ÐÁËÅÔÏÍ" -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%triggerprein ÓÃÅÎÁÒÉÅ×" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%triggerin ÓÃÅÎÁÒÉÅ×" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%triggerun ÓÃÅÎÁÒÉÅ×" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%triggerpostun ÓÃÅÎÁÒÉÅ×" -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1839,50 +1844,50 @@ msgstr "" "ÏÔËÁÔ ÎÁ ÂÏÌÅÅ ÓÔÁÒÕÀ ×ÅÒÓÉÀ ÐÁËÅÔÁ (--force ÐÒÉ ÏÂÎÏ×ÌÅÎÉÉ ÄÅÌÁÅÔ ÜÔÏ " "Á×ÔÏÍÁÔÉÞÅÓËÉ)" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "×Ù×ÏÄÉÔØ ÐÒÏÃÅÎÔ ÇÏÔÏ×ÎÏÓÔÉ ÐÏ ÍÅÒÅ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "ÐÅÒÅÍÅÓÔÉÔØ ÐÁËÅÔ × <ËÁÔÁÌÏÇ>, ÅÓÌÉ ÐÁËÅÔ ÜÔÏ ÐÏÚ×ÏÌÑÅÔ" -#: lib/poptI.c:217 +#: lib/poptI.c:221 msgid "relocate files from path to " msgstr "ÐÅÒÅÍÅÓÔÉÔØ ÆÁÊÌÙ ÉÚ ÐÕÔÉ × " -#: lib/poptI.c:218 +#: lib/poptI.c:222 msgid "=" msgstr "=" -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "ÓÏÈÒÁÎÉÔØ ÐÏÄÌÅÖÁÝÉÅ ÕÄÁÌÅÎÉÀ ÆÁÊÌÙ × ÎÏ×ÏÍ ÐÁËÅÔÅ" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, ÄÁÖÅ ÅÓÌÉ ÐÁËÅÔ ÐÅÒÅÐÉÛÅÔ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÆÁÊÌÙ" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ, ÅÓÌÉ ÐÁËÅÔ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/poptI.c:229 +#: lib/poptI.c:233 #, fuzzy msgid "deinstall new, reinstall old, package(s), back to " msgstr "" "ÕÄÁÌÉÔØ ÎÏ×ÙÊ(Å) ÐÁËÅÔ(Ù), ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ ÓÔÁÒÙÊ(Å) ÐÁËÅÔ(Ù), ÏÂÒÁÔÎÏ ÎÁ " "ÕËÁÚÁÎÎÕÀ ÄÁÔÕ" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "<ÄÁÔÁ>" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, Á ÔÏÌØËÏ ÓÏÏÂÝÉÔØ, ÕÄÁÓÔÓÑ ÌÉ ÕÓÔÁÎÏ×ËÁ" -#: lib/poptI.c:235 +#: lib/poptI.c:239 msgid "upgrade package(s)" msgstr "ÏÂÎÏ×ÉÔØ ÐÁËÅÔ(Ù)" @@ -2059,7 +2064,7 @@ msgstr " #: lib/poptQV.c:298 #, fuzzy -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕÝÕÀ ÐÏÄÐÉÓØ)" #: lib/poptQV.c:300 @@ -2073,7 +2078,7 @@ msgstr "" #: lib/poptQV.c:304 #, fuzzy -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕÝÕÀ ÐÏÄÐÉÓØ)" #: lib/poptQV.c:306 @@ -2166,79 +2171,79 @@ msgstr " msgid "Data type %d not supported\n" msgstr "ôÉÐ ÄÁÎÎÙÈ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n" -#: lib/psm.c:447 +#: lib/psm.c:448 #, c-format msgid "cannot create %%%s %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %%%s %s\n" -#: lib/psm.c:453 +#: lib/psm.c:454 #, c-format msgid "cannot write to %%%s %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÉÓÁÔØ × %%%s %s\n" -#: lib/psm.c:486 +#: lib/psm.c:487 msgid "source package expected, binary found\n" msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉÞÎÙÊ ÐÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ\n" -#: lib/psm.c:602 +#: lib/psm.c:603 msgid "source package contains no .spec file\n" msgstr "ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ\n" -#: lib/psm.c:721 +#: lib/psm.c:722 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: ×ÙÐÏÌÎÑÅÔÓÑ ÓÃÅÎÁÒÉÊ %s (ÅÓÌÉ ÅÓÔØ)\n" -#: lib/psm.c:887 +#: lib/psm.c:888 #, 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:894 +#: lib/psm.c:895 #, 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:1236 +#: lib/psm.c:1237 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s ÓÏÄÅÒÖÉÔ %d ÆÁÊÌÏ×, test = %d\n" -#: lib/psm.c:1356 +#: lib/psm.c:1357 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ %s (%d), %s-%s-%s ÐÒÏÐÕÓËÁÅÔÓÑ\n" -#: lib/psm.c:1498 +#: lib/psm.c:1499 #, c-format msgid "user %s does not exist - using root\n" msgstr "ÐÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:1507 +#: lib/psm.c:1508 #, c-format msgid "group %s does not exist - using root\n" msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "ÒÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n" -#: lib/psm.c:1550 +#: lib/psm.c:1551 msgid " on file " msgstr " ÎÁ ÆÁÊÌÅ " -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, c-format msgid "%s failed: %s\n" msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, c-format msgid "incorrect format: %s\n" msgstr "ÏÛÉÂËÁ × ÆÏÒÍÁÔÅ: %s\n" @@ -2819,12 +2824,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "%s ÐÒÏÐÕÝÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, c-format msgid "excluding directory %s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "ÐÏÌÕÞÅÎÉÅ ÓÐÉÓËÁ ÓÍÏÎÔÉÒÏ×ÁÎÎÙÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ\n" @@ -3317,59 +3322,59 @@ msgstr " msgid "File %s is smaller than %u bytes\n" msgstr "äÌÉÎÁ ÆÁÊÌÁ %s ÍÅÎØÛÅ ÞÅÍ %u ÂÁÊÔ\n" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "÷ÙÐÏÌÎÅÎÏ" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 msgid "Bad server response" msgstr "îÅ×ÅÒÎÙÊ ÏÔ×ÅÔ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 msgid "Server I/O error" msgstr "ïÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 msgid "Server timeout" msgstr "ôÁÊÍÁÕÔ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 msgid "Unable to lookup server host address" msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ ÁÄÒÅÓ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 msgid "Unable to lookup server host name" msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ ÉÍÑ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 msgid "Failed to connect to server" msgstr "îÅ ÍÏÇÕ ÓÏÅÄÉÎÉÔØÓÑ Ó ÓÅÒ×ÅÒÏÍ" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 msgid "Failed to establish data connection to server" msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ ÄÌÑ ÄÁÎÎÙÈ Ó ÓÅÒ×ÅÒÏÍ" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 msgid "I/O error to local file" msgstr "æÁÊÌÏ×ÁÑ ÏÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "ïÛÉÂËÁ ÐÒÉ ÐÅÒÅ×ÏÄÅ ÕÄÁÌÅÎÎÏÇÏ ÓÅÒ×ÅÒÁ × ÐÁÓÓÉ×ÎÙÊ ÒÅÖÉÍ" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ ÎÁ ÓÅÒ×ÅÒÅ" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "ïÔÍÅÎÁ × ÐÒÏÃÅÓÓÅ" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 msgid "Unknown or unexpected error" msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÉÌÉ ÎÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "ÒÅÇÉÓÔÒÉÒÕÀÓØ × %s ËÁË %s, ÐÁÒÏÌØ %s\n" @@ -3398,41 +3403,45 @@ msgstr " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "memory alloc (%u bytes) returned NULL.\n" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "×ÎÉÍÁÎÉÅ: u %p ctrl %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "×ÎÉÍÁÎÉÅ: u %p data %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, fuzzy, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "×ÎÉÍÁÎÉÅ: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "ðÁÒÏÌØ ÄÌÑ %s@%s: " -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, c-format msgid "error: %sport must be a number\n" msgstr "ÏÛÉÂËÁ: %s ÐÏÒÔ ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ\n" -#: rpmio/url.c:463 +#: rpmio/url.c:462 msgid "url port must be a number\n" msgstr "url ÐÏÒÔ ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ\n" #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, c-format msgid "failed to create %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n" +#, fuzzy +#~ msgid "don't verify signature(s)" +#~ msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÐÕÔØ ÓÉÍ×ÏÌÉÞÅÓËÉÈ ÓÓÙÌÏË" + #~ msgid "failed dependencies:\n" #~ msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" diff --git a/po/sk.po b/po/sk.po index 2fe6f18..7d548e4 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -115,7 +115,7 @@ msgstr "" msgid "use as the top level directory" msgstr "pou¾i» ako adresár najvy¹¹ej úrovne" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "" @@ -850,7 +850,7 @@ msgstr "Nie je mo msgid "Could not open %s: %s\n" msgstr "Otvorenie %s zlyhalo\n" -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" @@ -880,7 +880,7 @@ msgstr "Nie je mo msgid "Unable to write payload to %s: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "Zapísané: %s\n" @@ -1464,76 +1464,76 @@ msgstr "" msgid " failed - " msgstr " zlyhalo - " -#: lib/depends.c:152 +#: lib/depends.c:153 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 #, fuzzy msgid "(rpmrc provides)" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:407 +#: lib/depends.c:408 #, fuzzy msgid "(rpmlib provides)" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:428 +#: lib/depends.c:429 #, fuzzy msgid "(db files)" msgstr "chybný stav súboru: %s" -#: lib/depends.c:440 +#: lib/depends.c:441 #, fuzzy msgid "(db provides)" msgstr "Poskytuje:" -#: lib/depends.c:453 +#: lib/depends.c:454 #, fuzzy msgid "(db package)" msgstr "nájdených %d balíkov\n" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:881 +#: lib/depends.c:882 #, 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:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1572,7 +1572,7 @@ msgstr "mntctl() nevr msgid "failed to stat %s: %s\n" msgstr "nepodarilo sa zisti» stav %s: %s" -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" @@ -1715,7 +1715,7 @@ msgstr "" "odin¹talova» v¹etky balíky urèené (inak je chybou, pokiaµ " "¹pecifikuje viac ako jeden balík)" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 #, fuzzy msgid "do not execute package scriptlet(s)" msgstr "nevykona» ¾iadne skripty ¹pecifikované balíkom" @@ -1760,7 +1760,7 @@ msgstr "skratka pre --replacepkgs --replacefiles" msgid "upgrade package(s) if already installed" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 #, fuzzy msgid "+" msgstr " -p +" @@ -1786,7 +1786,8 @@ msgid "install documentation" msgstr "in¹talova» dokumentáciu" #: lib/poptI.c:159 -msgid "install package" +#, fuzzy +msgid "install package(s)" msgstr "in¹talova» balík" #: lib/poptI.c:161 @@ -1801,62 +1802,66 @@ msgstr "neoverova msgid "do not reorder package installation to satisfy dependencies" msgstr "nemeni» poradie balíkov kvôli vyrie¹eniu závislostí" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, fuzzy, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "nevykona» ¾iadne etapy" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, fuzzy, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "nevykona» ¾iadne etapy" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, fuzzy, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "nevykona» ¾iadne etapy" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, fuzzy, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "nevykona» ¾iadne etapy" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy -msgid "don't verify digest(s)" +msgid "don't verify package digest(s)" msgstr "zobrazi» súbory v balíku" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy -msgid "don't verify signature(s)" -msgstr "zobrazi» súbory v balíku" +msgid "don't verify package signature(s)" +msgstr "overi» podpis balíka" -#: lib/poptI.c:192 +#: lib/poptI.c:196 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "nevykona» ¾iadne skripty spú¹»ané týmto balíkom" -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, fuzzy, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "nevykona» ¾iadne skripty ¹pecifikované balíkom" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "nevykona» ¾iadne in¹talaèné skripty" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "nevykona» ¾iadne in¹talaèné skripty" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, fuzzy, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "nevykona» ¾iadne in¹talaèné skripty" -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1864,49 +1869,49 @@ msgstr "" "aktualizova» na star¹iu verziu balíka (--force to pri aktualizácii urobí " "automaticky)" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "vypisova» percentá poèas in¹talácie balíka" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "presunú» balík do , pokiaµ to balík povoµuje" -#: lib/poptI.c:217 +#: lib/poptI.c:221 #, fuzzy msgid "relocate files from path to " msgstr "presunú» súbory zo do " -#: lib/poptI.c:218 +#: lib/poptI.c:222 #, fuzzy msgid "=" msgstr " --relocate =" -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "in¹talova» aj pokiaµ balík prepí¹e in¹talované súbory" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "prein¹talova», pokiaµ u¾ balík existuje" -#: lib/poptI.c:229 +#: lib/poptI.c:233 msgid "deinstall new, reinstall old, package(s), back to " msgstr "" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "nein¹talova», ale oznámi», èi by to bolo mo¾né" -#: lib/poptI.c:235 +#: lib/poptI.c:239 #, fuzzy msgid "upgrade package(s)" msgstr " --upgrade " @@ -2103,7 +2108,7 @@ msgstr "zobrazi #: lib/poptQV.c:298 #, fuzzy -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "podpísa» balík (znièi» aktuálny podpis)" #: lib/poptQV.c:300 @@ -2117,7 +2122,7 @@ msgstr "" #: lib/poptQV.c:304 #, fuzzy -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "podpísa» balík (znièi» aktuálny podpis)" #: lib/poptQV.c:306 @@ -2211,81 +2216,81 @@ msgstr " je vy msgid "Data type %d not supported\n" msgstr "Typ údajov %d nie je podorovaný\n" -#: lib/psm.c:447 +#: lib/psm.c:448 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/psm.c:453 +#: lib/psm.c:454 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/psm.c:486 +#: lib/psm.c:487 #, fuzzy msgid "source package expected, binary found\n" msgstr "oèakávaný zdrojový balík, nájdený binárny" -#: lib/psm.c:602 +#: lib/psm.c:603 #, fuzzy msgid "source package contains no .spec file\n" msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor" -#: lib/psm.c:721 +#: lib/psm.c:722 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n" -#: lib/psm.c:887 +#: lib/psm.c:888 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:894 +#: lib/psm.c:895 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1236 +#: lib/psm.c:1237 #, 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:1356 +#: lib/psm.c:1357 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1498 +#: lib/psm.c:1499 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root" -#: lib/psm.c:1507 +#: lib/psm.c:1508 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ije sa root" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalenie archívu zlyhalo%s%s: %s" -#: lib/psm.c:1550 +#: lib/psm.c:1551 msgid " on file " msgstr " pre súbor " -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s zlyhalo" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "chyba formátu: %s\n" @@ -2874,12 +2879,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "%s vynechané kvôli príznaku missingok\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "vytvára sa adresár %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "" @@ -3370,61 +3375,61 @@ msgstr "S msgid "File %s is smaller than %u bytes\n" msgstr "Súbor %s je men¹í ako %d bajtov" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "Úspech" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 msgid "Bad server response" msgstr "Chybná odpoveï servera" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 #, fuzzy msgid "Server I/O error" msgstr "Chyba vstupu/výstupu servera" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 msgid "Server timeout" msgstr "Prekroèenie èasového limitu servera" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 msgid "Unable to lookup server host address" msgstr "Nie je mo¾né vyhµada» adresu servera" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 msgid "Unable to lookup server host name" msgstr "Nie je mo¾né vyhµada» názov servera" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 msgid "Failed to connect to server" msgstr "Pripojenie k serveru zlyhalo" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 msgid "Failed to establish data connection to server" msgstr "Vytvorenie dátového spojenia k serveru zlyhalo" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 #, fuzzy msgid "I/O error to local file" msgstr "Chyba vstupu/výstupu lokálneho súboru" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "Chyba pri nastavení vzdialeného servera do pasívneho re¾imu" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "Súbor sa na serveri nenachádza" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "Zru¹enie prebieha" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 msgid "Unknown or unexpected error" msgstr "Neznáma alebo neoèakávaná chyba" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "prihlasuje sa na %s ako %s, heslo %s\n" @@ -3454,41 +3459,45 @@ msgstr "varovanie: " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "Heslo pre %s@%s: " -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, c-format msgid "error: %sport must be a number\n" msgstr "chyba: %sport musí by» èíslo\n" -#: rpmio/url.c:463 +#: rpmio/url.c:462 msgid "url port must be a number\n" msgstr "url port musí by» èíslo\n" #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "nepodarilo sa vytvori» %s\n" +#, fuzzy +#~ msgid "don't verify signature(s)" +#~ msgstr "zobrazi» súbory v balíku" + #~ msgid "failed dependencies:\n" #~ msgstr "nevyrie¹ené závislosti:\n" diff --git a/po/sl.po b/po/sl.po index 4fcbf59..f80cc8e 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.238 2002/04/13 18:52:27 jbj Exp $ +# $Id: sl.po,v 1.239 2002/04/14 21:49:28 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -120,7 +120,7 @@ msgstr "" msgid "use as the top level directory" msgstr "uporabi za korenski imenik" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "" @@ -849,7 +849,7 @@ msgstr "Ikone %s ni mo msgid "Could not open %s: %s\n" msgstr "Ni mo¾no odpreti %s: %s\n" -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ni mo¾no zapisati paketa: %s" @@ -879,7 +879,7 @@ msgstr "Ikone %s ni mo msgid "Unable to write payload to %s: %s\n" msgstr "Ni mo¾no zapisati paketa %s: %s" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1466,76 +1466,76 @@ msgstr "" msgid " failed - " msgstr " neuspe¹no - " -#: lib/depends.c:152 +#: lib/depends.c:153 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s DA (rpmrc ponudbe)\n" -#: lib/depends.c:407 +#: lib/depends.c:408 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s DA (rpmlib ponudbe)\n" -#: lib/depends.c:428 +#: lib/depends.c:429 #, fuzzy msgid "(db files)" msgstr "po¹kodovana zbirka podatkov %s" -#: lib/depends.c:440 +#: lib/depends.c:441 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s DA (db ponudbe)\n" -#: lib/depends.c:453 +#: lib/depends.c:454 #, fuzzy msgid "(db package)" msgstr "ni paketov\n" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:881 +#: lib/depends.c:882 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1574,7 +1574,7 @@ msgstr "mntctl() ni uspe msgid "failed to stat %s: %s\n" msgstr "status %s ni na voljo: %s" -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, c-format msgid "failed to open %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" @@ -1716,7 +1716,7 @@ msgstr "" "odstrani vse pakete, ki vsebujejo vzorec (sicer program izide z " "napako, èe paket doloèa veè paketov)" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 #, fuzzy msgid "do not execute package scriptlet(s)" msgstr "brez izvajanja skriptov paketa" @@ -1760,7 +1760,7 @@ msgstr "okraj msgid "upgrade package(s) if already installed" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 #, fuzzy msgid "+" msgstr " -p + " @@ -1786,7 +1786,8 @@ msgid "install documentation" msgstr "namesti dokumentacijo" #: lib/poptI.c:159 -msgid "install package" +#, fuzzy +msgid "install package(s)" msgstr "name¹èanje paketa" #: lib/poptI.c:161 @@ -1802,62 +1803,66 @@ msgid "do not reorder package installation to satisfy dependencies" msgstr "" "brez spreminjanja vrstnega reda paketov z namenom zadovoljevanja soodvisnosti" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, fuzzy, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "brez izvajanja katerekoli stopen izgradnje" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, fuzzy, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "brez izvajanja katerekoli stopen izgradnje" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, fuzzy, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "brez izvajanja katerekoli stopen izgradnje" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, fuzzy, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "brez izvajanja katerekoli stopen izgradnje" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy -msgid "don't verify digest(s)" +msgid "don't verify package digest(s)" msgstr "brez preverjanja datotek v paketu" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy -msgid "don't verify signature(s)" -msgstr "brez preverjanja datotek v paketu" +msgid "don't verify package signature(s)" +msgstr "preveri podpis paketa(-ov)" -#: lib/poptI.c:192 +#: lib/poptI.c:196 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "brez izvajanja katerihkoli skriptov, ki jih po¾ene ta paket" -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, fuzzy, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "brez izvajanja skriptov paketa" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "brez izvajanja namestitvenih skriptov" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "brez izvajanja namestitvenih skriptov" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, fuzzy, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "brez izvajanja namestitvenih skriptov" -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1865,49 +1870,49 @@ msgstr "" "nadgraditev na starej¹o razlièico paketa (--force pri nadgradnjah " "avtomatièno vkljuèi to izbiro)" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "izpis odstotkov med namestitvijo" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "èe je mogoèe, bo paket prestavljen v imenik " -#: lib/poptI.c:217 +#: lib/poptI.c:221 #, fuzzy msgid "relocate files from path to " msgstr "prestavljanje datoteke iz stare poti v novo" -#: lib/poptI.c:218 +#: lib/poptI.c:222 #, fuzzy msgid "=" msgstr " --relocate =" -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "namesti, èetudi paket pi¹e prek ¾e name¹èene datoteke" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "ponovno namesti, èe paket ¾e obstaja" -#: lib/poptI.c:229 +#: lib/poptI.c:233 msgid "deinstall new, reinstall old, package(s), back to " msgstr "" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "ne namesti, a ugotovi, èe bi delovalo" -#: lib/poptI.c:235 +#: lib/poptI.c:239 #, fuzzy msgid "upgrade package(s)" msgstr " --upgrade " @@ -2102,7 +2107,7 @@ msgstr "brez preverjanja datotek v paketu" #: lib/poptQV.c:298 #, fuzzy -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)" #: lib/poptQV.c:300 @@ -2116,7 +2121,7 @@ msgstr "" #: lib/poptQV.c:304 #, fuzzy -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)" #: lib/poptQV.c:306 @@ -2211,81 +2216,81 @@ msgstr " potrebuje %s-%s-%s\n" msgid "Data type %d not supported\n" msgstr "Tip podatkov %d ni podprt\n" -#: lib/psm.c:447 +#: lib/psm.c:448 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "ni mo¾no ustvariti %s: %s\n" -#: lib/psm.c:453 +#: lib/psm.c:454 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "pisanje na %s ni mo¾no" -#: lib/psm.c:486 +#: lib/psm.c:487 #, fuzzy msgid "source package expected, binary found\n" msgstr "prièakovan je bil izvorni paket, najden binarni" -#: lib/psm.c:602 +#: lib/psm.c:603 #, fuzzy msgid "source package contains no .spec file\n" msgstr "izvorni paket ne vsebuje datoteke .spec" -#: lib/psm.c:721 +#: lib/psm.c:722 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n" -#: lib/psm.c:887 +#: lib/psm.c:888 #, 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:894 +#: lib/psm.c:895 #, 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:1236 +#: lib/psm.c:1237 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "paket: %s-%s-%s datoteke test = %d\n" -#: lib/psm.c:1356 +#: lib/psm.c:1357 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1498 +#: lib/psm.c:1499 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "uporabnik %s ne obstaja - uporabljam root" -#: lib/psm.c:1507 +#: lib/psm.c:1508 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s ne obstaja - uporabljam root" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, 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:1550 +#: lib/psm.c:1551 msgid " on file " msgstr " za datoteko " -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s neuspe¹en" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "napaka v obliki: %s\n" @@ -2875,12 +2880,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, c-format msgid "excluding directory %s\n" msgstr "izkljuèevanje imenika %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "zbiranje seznama priklopljenih datoteènih sistemov.\n" @@ -3378,61 +3383,61 @@ msgstr "Datoteka %s: %s" msgid "File %s is smaller than %u bytes\n" msgstr "Datoteka %s je kraj¹a od %d bajtov" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "Uspeh" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 msgid "Bad server response" msgstr "Nepravilen odziv stre¾nika" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 #, fuzzy msgid "Server I/O error" msgstr "V/I napaka na stre¾niku" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 msgid "Server timeout" msgstr "Èas odziva stre¾nika je potekel" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 msgid "Unable to lookup server host address" msgstr "Naslov stre¾nika ni ugotovljiv" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 msgid "Unable to lookup server host name" msgstr "Ime stre¾nika ni bilo ugotovljivo" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 msgid "Failed to connect to server" msgstr "Neuspe¹en poskus prikljuèitve na stre¾nik" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 msgid "Failed to establish data connection to server" msgstr "Neuspe¹na vzpostavitev podatkovne povezave s stre¾nikom" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 #, fuzzy msgid "I/O error to local file" msgstr "V/I napaka na lokalni datoteki" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "Napaka pri nastavitvi oddaljenega stre¾nika v pasivni naèin" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "Datoteke ni mo¾no najti na stre¾niku" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "Prekinitev v teku" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 msgid "Unknown or unexpected error" msgstr "Neznana ali neprièakovana napaka" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "prijava na %s kot %s, geslo %s\n" @@ -3462,41 +3467,45 @@ msgstr "opozorilo: " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "alokacija pomnilnika (%u bajtov) vrnjeno NIÈ.\n" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "opozorilo: u %p ctrl %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "opozorilo: u %p data %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, fuzzy, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "opozorilo: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "Geslo za %s@%s: " -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, c-format msgid "error: %sport must be a number\n" msgstr "napaka: vrata %s morajo biti ¹tevilka\n" -#: rpmio/url.c:463 +#: rpmio/url.c:462 msgid "url port must be a number\n" msgstr "vrata URL morajo biti ¹tevilka\n" #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, c-format msgid "failed to create %s: %s\n" msgstr "neuspe¹no ustvarjanje %s: %s\n" +#, fuzzy +#~ msgid "don't verify signature(s)" +#~ msgstr "brez preverjanja datotek v paketu" + #~ msgid "failed dependencies:\n" #~ msgstr "neuspe¹ne soodvisnosti:\n" diff --git a/po/sr.po b/po/sr.po index cc5f89d..d563dff 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -112,7 +112,7 @@ msgstr "" msgid "use as the top level directory" msgstr "koristi kao direktorijum najvi¹eg nivoa" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "" @@ -837,7 +837,7 @@ msgstr "Ne mogu da upi msgid "Could not open %s: %s\n" msgstr "neuspelo otvaranje %s\n" -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ne mogu da upi¹em %s" @@ -867,7 +867,7 @@ msgstr "Ne mogu da upi msgid "Unable to write payload to %s: %s\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1453,76 +1453,76 @@ msgstr "" msgid " failed - " msgstr "PGP omanuo" -#: lib/depends.c:152 +#: lib/depends.c:153 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "paket %s nije instaliran\n" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 #, fuzzy msgid "(rpmrc provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:407 +#: lib/depends.c:408 #, fuzzy msgid "(rpmlib provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:428 +#: lib/depends.c:429 #, fuzzy msgid "(db files)" msgstr "neuspelo otvaranje %s: %s" -#: lib/depends.c:440 +#: lib/depends.c:441 #, fuzzy msgid "(db provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:453 +#: lib/depends.c:454 #, fuzzy msgid "(db package)" msgstr "upit nad svim paketima" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:881 +#: lib/depends.c:882 #, 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:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1561,7 +1561,7 @@ msgstr "mntctl() nije vratio 'fugger' veli msgid "failed to stat %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "neuspelo otvaranje %s: %s" @@ -1704,7 +1704,7 @@ msgstr "" "ukloni sve pakete koji odgovaraju (normalno, javlja se gre¹ka ako " " oznaèava vi¹e paketa)" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 #, fuzzy msgid "do not execute package scriptlet(s)" msgstr "nemoj izvr¹iti nijedan skript iz paketa" @@ -1748,7 +1748,7 @@ msgstr "skra msgid "upgrade package(s) if already installed" msgstr "paket %s nije instaliran\n" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 #, fuzzy msgid "+" msgstr " -b \t " @@ -1774,7 +1774,8 @@ msgid "install documentation" msgstr "instaliraj dokumentaciju" #: lib/poptI.c:159 -msgid "install package" +#, fuzzy +msgid "install package(s)" msgstr "instaliraj paket" #: lib/poptI.c:161 @@ -1790,111 +1791,115 @@ msgid "do not reorder package installation to satisfy dependencies" msgstr "" "nemoj preurediti redosled instalacije paketa kako bi zadovoljio zavisnosti" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, fuzzy, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, fuzzy, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, fuzzy, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, fuzzy, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy -msgid "don't verify digest(s)" +msgid "don't verify package digest(s)" msgstr "instaliraj paket" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy -msgid "don't verify signature(s)" -msgstr "instaliraj paket" +msgid "don't verify package signature(s)" +msgstr "proveri potpis u paketu" -#: lib/poptI.c:192 +#: lib/poptI.c:196 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "upit nad paketom koji ima " -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, fuzzy, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "nemoj izvr¹iti nijedan skript iz paketa" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "nemoj izvr¹iti nijedan instalacioni skript" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "nemoj izvr¹iti nijedan instalacioni skript" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, fuzzy, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "nemoj izvr¹iti nijedan instalacioni skript" -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" msgstr "" "a¾uriraj na staru verziju paketa (--force kod a¾uriranja ovo radi automatski)" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "pi¹i procente instalacije paketa" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "premesti paket u , ako se mo¾e premestiti" -#: lib/poptI.c:217 +#: lib/poptI.c:221 #, fuzzy msgid "relocate files from path to " msgstr "premesti datoteke iz u " -#: lib/poptI.c:218 +#: lib/poptI.c:222 #, fuzzy msgid "=" msgstr "premesti datoteke iz u " -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "instaliraj èak iako æe paket zameniti instalirane datoteke" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "ponovo instaliraj ako je paket veæ prisutan" -#: lib/poptI.c:229 +#: lib/poptI.c:233 msgid "deinstall new, reinstall old, package(s), back to " msgstr "" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "nemoj instalirati, ali reci da li æe da radi ili ne" -#: lib/poptI.c:235 +#: lib/poptI.c:239 #, fuzzy msgid "upgrade package(s)" msgstr "instaliraj paket" @@ -2097,7 +2102,7 @@ msgstr "instaliraj paket" #: lib/poptQV.c:298 #, fuzzy -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "potpi¹i paket (ukloni tekuæi potpis)" #: lib/poptQV.c:300 @@ -2111,7 +2116,7 @@ msgstr "" #: lib/poptQV.c:304 #, fuzzy -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "potpi¹i paket (ukloni tekuæi potpis)" #: lib/poptQV.c:306 @@ -2205,80 +2210,80 @@ msgstr " je potreban paketu %s-%s-%s\n" msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:447 +#: lib/psm.c:448 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/psm.c:453 +#: lib/psm.c:454 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/psm.c:486 +#: lib/psm.c:487 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:602 +#: lib/psm.c:603 #, fuzzy msgid "source package contains no .spec file\n" msgstr "upit nad paketom koji ima " -#: lib/psm.c:721 +#: lib/psm.c:722 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/psm.c:887 +#: lib/psm.c:888 #, 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:894 +#: lib/psm.c:895 #, 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:1236 +#: lib/psm.c:1237 #, 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:1356 +#: lib/psm.c:1357 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1498 +#: lib/psm.c:1499 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1507 +#: lib/psm.c:1508 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/psm.c:1550 +#: lib/psm.c:1551 msgid " on file " msgstr "" -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "PGP omanuo" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "gre¹ka u formatu: %s\n" @@ -2870,12 +2875,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "" @@ -3362,68 +3367,68 @@ msgstr "neuspelo otvaranje %s: %s" msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 #, fuzzy msgid "Bad server response" msgstr "Lo¹ odgovor FTP servera" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 #, fuzzy msgid "Server I/O error" msgstr "Ulazno/izlazna FTP gre¹ka" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 #, fuzzy msgid "Server timeout" msgstr "Tajm-aut FTP servera" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 #, fuzzy msgid "Unable to lookup server host address" msgstr "Ne mogu da odredim host adresu FTP servera" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 #, fuzzy msgid "Unable to lookup server host name" msgstr "Ne mogu da odredim ime FTP hosta" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 #, fuzzy msgid "Failed to connect to server" msgstr "Ne mogu da se pove¾em sa FTP serverom" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 #, fuzzy msgid "Failed to establish data connection to server" msgstr "Ne mogu da uspostavim vezu podataka sa FTP serverom" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 #, fuzzy msgid "I/O error to local file" msgstr "Ulazno/izlazna gre¹ka kod lokalne datoteke" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "Gre¹ka kod stavljanja udaljenog servera u pasivni re¾im" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "Datoteka nije pronaðena na serveru" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 #, fuzzy msgid "Unknown or unexpected error" msgstr "Neoèekivana ili nepoznata FTP gre¹ka" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -3453,42 +3458,46 @@ msgstr "upozorenje: " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "Lozinka za %s@%s: " -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, fuzzy, c-format msgid "error: %sport must be a number\n" msgstr "gre¹ka: FTP port mora biti broj\n" -#: rpmio/url.c:463 +#: rpmio/url.c:462 #, fuzzy msgid "url port must be a number\n" msgstr "gre¹ka: FTP port mora biti broj\n" #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "neuspelo kreiranje %s\n" +#, fuzzy +#~ msgid "don't verify signature(s)" +#~ msgstr "instaliraj paket" + #~ msgid "failed dependencies:\n" #~ msgstr "lo¹e meðuzavisnosti:\n" diff --git a/po/sv.po b/po/sv.po index 7026e39..8bfe1cb 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "PO-Revision-Date: 2001-09-12 14:18+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -114,7 +114,7 @@ msgstr "" msgid "use as the top level directory" msgstr "använd som toppkatalog" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "" @@ -827,7 +827,7 @@ msgstr "Kan inte l msgid "Could not open %s: %s\n" msgstr "Kunde inte öppna %s: %s\n" -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunde inte skriva paket: %s\n" @@ -857,7 +857,7 @@ msgstr "Kan inte l msgid "Unable to write payload to %s: %s\n" msgstr "Kan inte skriva last till %s: %s\n" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1428,57 +1428,57 @@ msgstr "Ingen arkivfilen i huvud" msgid " failed - " msgstr " misslyckades - " -#: lib/depends.c:152 +#: lib/depends.c:153 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "paket %s är redan installerat" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n" -#: lib/depends.c:407 +#: lib/depends.c:408 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n" -#: lib/depends.c:428 +#: lib/depends.c:429 #, fuzzy msgid "(db files)" msgstr "felaktig db-fil %s\n" -#: lib/depends.c:440 +#: lib/depends.c:441 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s JA (db-tillhandahållande)\n" -#: lib/depends.c:453 +#: lib/depends.c:454 #, fuzzy msgid "(db package)" msgstr "inga paket\n" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:881 +#: lib/depends.c:882 #, 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:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1486,20 +1486,20 @@ msgid "" msgstr "" "========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "========== endast efterföljare (presentationsordning)\n" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "========== fortsätter med tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1538,7 +1538,7 @@ msgstr "mntctl() kunde inte returnera monteringspunkter: %s\n" msgid "failed to stat %s: %s\n" msgstr "kunde inte ta status på %s: %s\n" -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, c-format msgid "failed to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" @@ -1680,7 +1680,7 @@ msgstr "" "ta bort alla paket som matchar (normalt ger det ett fel om " "anger flera paket)" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 msgid "do not execute package scriptlet(s)" msgstr "kör inte paketskript" @@ -1720,7 +1720,7 @@ msgstr "kortform f msgid "upgrade package(s) if already installed" msgstr "uppgradera paket om redan installerat/de" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 msgid "+" msgstr "+" @@ -1746,7 +1746,8 @@ msgid "install documentation" msgstr "installera dokumentation" #: lib/poptI.c:159 -msgid "install package" +#, fuzzy +msgid "install package(s)" msgstr "installera paket" #: lib/poptI.c:161 @@ -1761,61 +1762,65 @@ msgstr "verifiera inte paketberoenden" msgid "do not reorder package installation to satisfy dependencies" msgstr "flytta inte om paketinstallationen för att tillfredsställa beroenden" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "utför inte (eventuellt) %%pre-skript" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "utför inte (eventuellt) %%post-skript" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "utför inte (eventuellt) %%preun-skript" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "utför inte (eventuellt) %%postun-skript" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy -msgid "don't verify digest(s)" +msgid "don't verify package digest(s)" msgstr "verifiera inte MD5-summor för filer" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy -msgid "don't verify signature(s)" -msgstr "verifiera inte sökvägen i symboliska länkar" +msgid "don't verify package signature(s)" +msgstr "verifiera paketsignatur" -#: lib/poptI.c:192 +#: lib/poptI.c:196 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "kör inte skript utlösta av detta paket" -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "kör inte %%triggerprein-skript" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "kör inte %%triggerin-skript" -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "kör inte %%triggerun-skript" -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "kör inte %%triggerpostun-skript" -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1823,49 +1828,49 @@ msgstr "" "uppgradera till en gammal version av paketet (--force vid uppgraderingar gör " "detta automatiskt)" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "skriv procent allt eftersom paketet installeras" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "flytta paketet till , om flyttbart" -#: lib/poptI.c:217 +#: lib/poptI.c:221 msgid "relocate files from path to " msgstr "relokera filer från till " -#: lib/poptI.c:218 +#: lib/poptI.c:222 msgid "=" msgstr "=" -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "spara raderade paketfiler genom ompaketering" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "installera även om paketet byter ut installerade filer" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "installera om ifall paketet redan är installerat" -#: lib/poptI.c:229 +#: lib/poptI.c:233 #, fuzzy msgid "deinstall new, reinstall old, package(s), back to " msgstr "" "avinstallera nya paket och ominstallera gamla paket tillbaka till datum" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "installera inte, men tala om ifall det skulle fungera eller inte" -#: lib/poptI.c:235 +#: lib/poptI.c:239 msgid "upgrade package(s)" msgstr "uppgradera paket" @@ -2042,7 +2047,7 @@ msgstr "verifiera inte MD5-summor f #: lib/poptQV.c:298 #, fuzzy -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "signera ett paket (släng nuvarande signatur)" #: lib/poptQV.c:300 @@ -2056,7 +2061,7 @@ msgstr "" #: lib/poptQV.c:304 #, fuzzy -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "signera ett paket (släng nuvarande signatur)" #: lib/poptQV.c:306 @@ -2149,80 +2154,80 @@ msgstr " beh msgid "Data type %d not supported\n" msgstr "Datatyp %d stöds inte\n" -#: lib/psm.c:447 +#: lib/psm.c:448 #, c-format msgid "cannot create %%%s %s\n" msgstr "kan inte skapa %%%s %s\n" -#: lib/psm.c:453 +#: lib/psm.c:454 #, c-format msgid "cannot write to %%%s %s\n" msgstr "kan inte skriva till %%%s %s\n" -#: lib/psm.c:486 +#: lib/psm.c:487 msgid "source package expected, binary found\n" msgstr "källpaket förväntades, fann binärpaket\n" -#: lib/psm.c:602 +#: lib/psm.c:603 msgid "source package contains no .spec file\n" msgstr "källpaket innehåller ingen .spec-fil\n" -#: lib/psm.c:721 +#: lib/psm.c:722 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kör (eventuellt) %s-skript\n" -#: lib/psm.c:887 +#: lib/psm.c:888 #, 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:894 +#: lib/psm.c:895 #, 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:1236 +#: lib/psm.c:1237 #, 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:1356 +#: lib/psm.c:1357 #, 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:1498 +#: lib/psm.c:1499 #, c-format msgid "user %s does not exist - using root\n" msgstr "användare %s finns inte - använder root\n" -#: lib/psm.c:1507 +#: lib/psm.c:1508 #, c-format msgid "group %s does not exist - using root\n" msgstr "grupp %s finns inte - använder root\n" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "uppackning av arkiv misslyckades%s%s: %s\n" -#: lib/psm.c:1550 +#: lib/psm.c:1551 msgid " on file " msgstr " vid fil " -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s misslyckades på fil %s: %s\n" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, c-format msgid "%s failed: %s\n" msgstr "%s misslyckades: %s\n" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, c-format msgid "incorrect format: %s\n" msgstr "fel format: %s\n" @@ -2804,12 +2809,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "%s överhoppad på grund av missingok-flagga\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, c-format msgid "excluding directory %s\n" msgstr "hoppar över katalogen %s\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "hämtar lista över monterade filsystem\n" @@ -3298,59 +3303,59 @@ msgstr "Fil %s: %s\n" msgid "File %s is smaller than %u bytes\n" msgstr "Filen %s är mindre än %u byte\n" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "Lyckades" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 msgid "Bad server response" msgstr "Konstigt svar från server" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 msgid "Server I/O error" msgstr "IO-fel mot server" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 msgid "Server timeout" msgstr "Förbindelsen med servern dog ut (timeout)" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 msgid "Unable to lookup server host address" msgstr "Kunde inte slå upp serverns adress" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 msgid "Unable to lookup server host name" msgstr "Kunde inte slå upp serverns namn" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 msgid "Failed to connect to server" msgstr "Misslyckades med att kontakta servern" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 msgid "Failed to establish data connection to server" msgstr "Misslyckades med att etablera en dataförbindelse till servern" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 msgid "I/O error to local file" msgstr "I/O-fel mot lokal fil" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "Fel när fjärrservern sattes i passivt läge" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "Filen fanns inte på servern" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "Avbruten under gång" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 msgid "Unknown or unexpected error" msgstr "Okänt eller oväntat fel" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "loggar in på %s som %s, lösenord %s\n" @@ -3379,41 +3384,45 @@ msgstr "varning: " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "minnesallokering (%u byte) returnerade NULL.\n" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "varning: u %p ctrl %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "varning: u %p data %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, fuzzy, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "varning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "Lösenord för %s@%s: " -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, c-format msgid "error: %sport must be a number\n" msgstr "fel: %s-port måste vara ett tal\n" -#: rpmio/url.c:463 +#: rpmio/url.c:462 msgid "url port must be a number\n" msgstr "url-port måste vara ett tal\n" #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, c-format msgid "failed to create %s: %s\n" msgstr "kunde inte skapa %s: %s\n" +#, fuzzy +#~ msgid "don't verify signature(s)" +#~ msgstr "verifiera inte sökvägen i symboliska länkar" + #~ msgid "failed dependencies:\n" #~ msgstr "ouppfyllda beroenden:\n" diff --git a/po/tr.po b/po/tr.po index b9b46af..384641e 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-13 14:47-0400\n" +"POT-Creation-Date: 2002-04-14 17:43-0400\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -115,7 +115,7 @@ msgstr "" msgid "use as the top level directory" msgstr "Üst düzey dizin olarak kullanýlýr" -#: rpmqv.c:125 lib/poptI.c:215 +#: rpmqv.c:125 lib/poptI.c:219 msgid "" msgstr "" @@ -838,7 +838,7 @@ msgstr "%s'den ba msgid "Could not open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: build/pack.c:622 lib/psm.c:1449 +#: build/pack.c:622 lib/psm.c:1450 #, c-format msgid "Unable to write package: %s\n" msgstr "paket yazýlamadý: %s\n" @@ -868,7 +868,7 @@ msgstr "%s'den payload okunamad msgid "Unable to write payload to %s: %s\n" msgstr "%s'e payload yazýlamadý: %s\n" -#: build/pack.c:703 lib/psm.c:1737 +#: build/pack.c:703 lib/psm.c:1738 #, c-format msgid "Wrote: %s\n" msgstr "Yazýldý: %s\n" @@ -1448,57 +1448,57 @@ msgstr "" msgid " failed - " msgstr " baþarýsýz - " -#: lib/depends.c:152 +#: lib/depends.c:153 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "%s zaten kurulu" -#: lib/depends.c:366 +#: lib/depends.c:367 msgid "(cached)" msgstr "" -#: lib/depends.c:391 +#: lib/depends.c:392 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s EVET (rpmrc saðlar)\n" -#: lib/depends.c:407 +#: lib/depends.c:408 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s EVET (rpmlib saðlar)\n" -#: lib/depends.c:428 +#: lib/depends.c:429 #, fuzzy msgid "(db files)" msgstr "db dosyasý %s hatalý\n" -#: lib/depends.c:440 +#: lib/depends.c:441 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s EVET (db saðlar)\n" -#: lib/depends.c:453 +#: lib/depends.c:454 #, fuzzy msgid "(db package)" msgstr "paket yok\n" -#: lib/depends.c:761 +#: lib/depends.c:762 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:881 +#: lib/depends.c:882 #, 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:1149 +#: lib/depends.c:1150 msgid "========== recording tsort relations\n" msgstr "========== tsort baðýntýlarý kaydediliyor\n" #. T4. Scan for zeroes. -#: lib/depends.c:1255 +#: lib/depends.c:1256 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1506,20 +1506,20 @@ msgid "" msgstr "" "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n" -#: lib/depends.c:1348 +#: lib/depends.c:1349 msgid "========== successors only (presentation order)\n" msgstr "========== sadece ardýllar (sunum sýrasý)\n" -#: lib/depends.c:1418 +#: lib/depends.c:1419 msgid "LOOP:\n" msgstr "ÇEVRÝM:\n" -#: lib/depends.c:1453 +#: lib/depends.c:1454 msgid "========== continuing tsort ...\n" msgstr "========== tsort sürüyor ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1458 +#: lib/depends.c:1459 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1558,7 +1558,7 @@ msgstr "mntctl() sonu msgid "failed to stat %s: %s\n" msgstr "stat %s baþarýsýz: %s\n" -#: lib/fs.c:153 rpmio/url.c:509 +#: lib/fs.c:153 rpmio/url.c:508 #, c-format msgid "failed to open %s: %s\n" msgstr "%s açýlamadý: %s\n" @@ -1701,7 +1701,7 @@ msgstr "" " ile eþlenen tüm paketleri kaldýrýr( ile çok sayýda paket " "belirtilmiþse normalde bir hata oluþur)" -#: lib/poptI.c:120 lib/poptI.c:171 +#: lib/poptI.c:120 lib/poptI.c:175 msgid "do not execute package scriptlet(s)" msgstr "paket betikleri çalýþtýrýlmaz" @@ -1743,7 +1743,7 @@ msgstr "--replacepkgs --replacefiles i msgid "upgrade package(s) if already installed" msgstr "paket(ler) kurulu ise paket(ler)i günceller" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236 +#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 msgid "+" msgstr "+" @@ -1768,7 +1768,8 @@ msgid "install documentation" msgstr "paket ile gelen belgeleri kurar" #: lib/poptI.c:159 -msgid "install package" +#, fuzzy +msgid "install package(s)" msgstr "paketi kurar" #: lib/poptI.c:161 @@ -1783,61 +1784,65 @@ msgstr "paket ba msgid "do not reorder package installation to satisfy dependencies" msgstr "paket kurulum sýrasýný baðýmlýlýklara göre düzenlemez" -#: lib/poptI.c:174 +#: lib/poptI.c:171 +msgid "do not suggest missing dependency resolution(s)" +msgstr "" + +#: lib/poptI.c:178 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "%%pre betiði (varsa) çalýþtýrýlmaz" -#: lib/poptI.c:177 +#: lib/poptI.c:181 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "%%post betiði (varsa) çalýþtýrýlmaz" -#: lib/poptI.c:180 +#: lib/poptI.c:184 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "%%preun betiði (varsa) çalýþtýrýlmaz" -#: lib/poptI.c:183 +#: lib/poptI.c:187 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "%%postun betiði (varsa) çalýþtýrýlmaz" -#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy -msgid "don't verify digest(s)" +msgid "don't verify package digest(s)" msgstr "dosyalarýn MD5 özümlemesi doðrulanmaz" -#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy -msgid "don't verify signature(s)" -msgstr "dosyalarýn sembolik bað dosya yollarý doðrulanmaz" +msgid "don't verify package signature(s)" +msgstr "paket imzasýný denetler" -#: lib/poptI.c:192 +#: lib/poptI.c:196 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "bu paket tarafýndan tetiklenen hiç bir betik çalýþtýrýlmaz" -#: lib/poptI.c:195 +#: lib/poptI.c:199 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "hiçbir %%triggerprein betiði çalýþtýrýlmaz" -#: lib/poptI.c:198 +#: lib/poptI.c:202 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "hiçbir %%triggerin betiði çalýþtýrýlmaz." -#: lib/poptI.c:201 +#: lib/poptI.c:205 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "hiçbir %%triggerun betiði çalýþtýrýlmaz." -#: lib/poptI.c:204 +#: lib/poptI.c:208 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "hiçbir %%triggerpostun betiði çalýþtýrýlmaz." -#: lib/poptI.c:208 +#: lib/poptI.c:212 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1845,49 +1850,49 @@ msgstr "" "paketin eski bir sürüme güncellenmesini saðlar (--force ayný iþi otomatik " "yapar)" -#: lib/poptI.c:212 +#: lib/poptI.c:216 msgid "print percentages as package installs" msgstr "kurulumun geliþimi yüzde olarak gösterilir" -#: lib/poptI.c:214 +#: lib/poptI.c:218 msgid "relocate the package to , if relocatable" msgstr "eðer deðitirilebiliyorsa paketin yerini 'e deðiþtirir" -#: lib/poptI.c:217 +#: lib/poptI.c:221 msgid "relocate files from path to " msgstr "dosyalarý dizininden kaldýrýp dizinine yerleþtirir" -#: lib/poptI.c:218 +#: lib/poptI.c:222 msgid "=" msgstr "=" -#: lib/poptI.c:221 +#: lib/poptI.c:225 msgid "save erased package files by repackaging" msgstr "yeniden paketleme sýrasýnda silinen paket dosyalarýný kaydeder" -#: lib/poptI.c:224 +#: lib/poptI.c:228 msgid "install even if the package replaces installed files" msgstr "paket dosyalarý mevcut dosyalarla yer deðiþtirse bile paketi kurar" -#: lib/poptI.c:227 +#: lib/poptI.c:231 msgid "reinstall if the package is already present" msgstr "paketi yeniden kurar" -#: lib/poptI.c:229 +#: lib/poptI.c:233 #, fuzzy msgid "deinstall new, reinstall old, package(s), back to " msgstr "" "yeni paket(ler) kaldýrýlýr, geriye dönük eski paket(ler) yeniden kurulur" -#: lib/poptI.c:230 +#: lib/poptI.c:234 msgid "" msgstr "" -#: lib/poptI.c:232 +#: lib/poptI.c:236 msgid "don't install, but tell if it would work or not" msgstr "yükleme yapmaz, sadece çalýþýp çalýþmayacaðýný belirtir" -#: lib/poptI.c:235 +#: lib/poptI.c:239 msgid "upgrade package(s)" msgstr "paket günceller" @@ -2066,7 +2071,7 @@ msgstr "dosyalar #: lib/poptQV.c:298 #, fuzzy -msgid "sign a packagei (identical to --resign)" +msgid "sign package(s) (identical to --resign)" msgstr "paketi imzalar (mevcut imza kaldýrýlýr)" #: lib/poptQV.c:300 @@ -2080,7 +2085,7 @@ msgstr "" #: lib/poptQV.c:304 #, fuzzy -msgid "sign a packagei (identical to --addsign)" +msgid "sign package(s) (identical to --addsign)" msgstr "paketi imzalar (mevcut imza kaldýrýlýr)" #: lib/poptQV.c:306 @@ -2173,79 +2178,79 @@ msgstr " %s-%s-%s i msgid "Data type %d not supported\n" msgstr "%d veri türü desteklenmiyor\n" -#: lib/psm.c:447 +#: lib/psm.c:448 #, c-format msgid "cannot create %%%s %s\n" msgstr "%%%s dosyasý oluþturulamýyor: %s\n" -#: lib/psm.c:453 +#: lib/psm.c:454 #, c-format msgid "cannot write to %%%s %s\n" msgstr "%%%s dosyasýna yazýlamaz %s\n" -#: lib/psm.c:486 +#: lib/psm.c:487 msgid "source package expected, binary found\n" msgstr "kaynak paketi gerekirken çalýþtýrýlabilir paketi bulundu\n" -#: lib/psm.c:602 +#: lib/psm.c:603 msgid "source package contains no .spec file\n" msgstr "kaynak paketi .spec dosyasý içermiyor\n" -#: lib/psm.c:721 +#: lib/psm.c:722 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s betiði çalýþtýrýlýyor (varsa)\n" -#: lib/psm.c:887 +#: lib/psm.c:888 #, 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:894 +#: lib/psm.c:895 #, 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:1236 +#: lib/psm.c:1237 #, 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:1356 +#: lib/psm.c:1357 #, 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:1498 +#: lib/psm.c:1499 #, c-format msgid "user %s does not exist - using root\n" msgstr "kullanýcý %s yok - root kullanýlacak\n" -#: lib/psm.c:1507 +#: lib/psm.c:1508 #, c-format msgid "group %s does not exist - using root\n" msgstr "grup %s yok - root kullanýlacak\n" -#: lib/psm.c:1549 +#: lib/psm.c:1550 #, 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:1550 +#: lib/psm.c:1551 msgid " on file " msgstr " dosyada " -#: lib/psm.c:1745 +#: lib/psm.c:1746 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/psm.c:1748 +#: lib/psm.c:1749 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s baþarýsýz\n" -#: lib/query.c:125 lib/rpmts.c:186 +#: lib/query.c:125 lib/rpmts.c:227 #, c-format msgid "incorrect format: %s\n" msgstr "biçem yanlýþ: %s\n" @@ -2825,12 +2830,12 @@ msgid "%s skipped due to missingok flag\n" msgstr "missingok flamasýndan dolayý %s atlandý\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:1002 #, c-format msgid "excluding directory %s\n" msgstr "%s dizini dýþlanýyor\n" -#: lib/transaction.c:1080 +#: lib/transaction.c:1092 msgid "getting list of mounted filesystems\n" msgstr "baðlý dosya sistemlerinin listesi alýnýyor\n" @@ -3322,59 +3327,59 @@ msgstr "%s dosyas msgid "File %s is smaller than %u bytes\n" msgstr "%s dosyasý %u bayttan küçük\n" -#: rpmio/rpmio.c:660 +#: rpmio/rpmio.c:654 msgid "Success" msgstr "Baþarýlý" -#: rpmio/rpmio.c:663 +#: rpmio/rpmio.c:657 msgid "Bad server response" msgstr "Sunucudan kötü yanýt" -#: rpmio/rpmio.c:666 +#: rpmio/rpmio.c:660 msgid "Server I/O error" msgstr "Sunucu G/Ç hatasý" -#: rpmio/rpmio.c:669 +#: rpmio/rpmio.c:663 msgid "Server timeout" msgstr "Sunucu zaman aþýmý" -#: rpmio/rpmio.c:672 +#: rpmio/rpmio.c:666 msgid "Unable to lookup server host address" msgstr "Sunucu makina adresi bulunamadý" -#: rpmio/rpmio.c:675 +#: rpmio/rpmio.c:669 msgid "Unable to lookup server host name" msgstr "Sunucu makina ismi bulunamadý" -#: rpmio/rpmio.c:678 +#: rpmio/rpmio.c:672 msgid "Failed to connect to server" msgstr "Sunucuya baðlanýlamadý" -#: rpmio/rpmio.c:681 +#: rpmio/rpmio.c:675 msgid "Failed to establish data connection to server" msgstr "Sunucuya veri baðlantýsý kurulamadý" -#: rpmio/rpmio.c:684 +#: rpmio/rpmio.c:678 msgid "I/O error to local file" msgstr "Yerel dosyaya G/Ç hatasý" -#: rpmio/rpmio.c:687 +#: rpmio/rpmio.c:681 msgid "Error setting remote server to passive mode" msgstr "Karþý sunucuyu pasif kipe sokma ayarlarýnda hata" -#: rpmio/rpmio.c:690 +#: rpmio/rpmio.c:684 msgid "File not found on server" msgstr "Dosya sunucuda bulunamadý" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:687 msgid "Abort in progress" msgstr "Kesme iþlemi sürüyor" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:691 msgid "Unknown or unexpected error" msgstr "Bilinmeyen ya da beklenmeyen hata" -#: rpmio/rpmio.c:1369 +#: rpmio/rpmio.c:1363 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "%s sunucusuna %s olarak giriliyor, parola %s\n" @@ -3403,41 +3408,45 @@ msgstr "uyar msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "bellek ayrýlýrken (%u bayt) NULL döndü.\n" -#: rpmio/url.c:119 +#: rpmio/url.c:118 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "uyarý: u %p ctrl %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:139 +#: rpmio/url.c:138 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "uyarý: u %p veri %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:167 +#: rpmio/url.c:166 #, fuzzy, c-format msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "uyarý: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" -#: rpmio/url.c:264 +#: rpmio/url.c:262 #, c-format msgid "Password for %s@%s: " msgstr "%s@%s için parola: " -#: rpmio/url.c:289 rpmio/url.c:315 +#: rpmio/url.c:287 rpmio/url.c:313 #, c-format msgid "error: %sport must be a number\n" msgstr "hata: %sport bir sayý olmalý\n" -#: rpmio/url.c:463 +#: rpmio/url.c:462 msgid "url port must be a number\n" msgstr "url portu bir sayý olmalý\n" #. XXX Fstrerror -#: rpmio/url.c:529 +#: rpmio/url.c:528 #, c-format msgid "failed to create %s: %s\n" msgstr "%s oluþturulamadý: %s\n" +#, fuzzy +#~ msgid "don't verify signature(s)" +#~ msgstr "dosyalarýn sembolik bað dosya yollarý doðrulanmaz" + #~ msgid "failed dependencies:\n" #~ msgstr "baðýmlýlýklarda hata; gerekli paketler:\n" diff --git a/python/Makefile.in b/python/Makefile.in index 980615a..b7b07ca 100644 --- a/python/Makefile.in +++ b/python/Makefile.in @@ -68,7 +68,6 @@ AR = @AR@ AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BUILD_RPMNLSTOOLS = @BUILD_RPMNLSTOOLS@ BZIP2BIN = @BZIP2BIN@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -107,7 +106,6 @@ LIBMISC = @LIBMISC@ LIBOBJS = @LIBOBJS@ LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@ LIBRPMRC_FILENAME = @LIBRPMRC_FILENAME@ -LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALEDIR = @LOCALEDIR@ @@ -207,7 +205,8 @@ INCLUDES = \ @INCPATH@ -EXTRA_DIST = hash.h upgrade.h +EXTRA_DIST = db-py.h hash.h header-py.h upgrade.h + mylibs = \ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmdb/librpmdb.la \ @@ -222,11 +221,12 @@ python_PROGRAMS = rpmmodule.so poptmodule.so rpmmodule_so_SOURCES = rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so + poptmodule_so_SOURCES = poptmodule.c poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so noinst_LTLIBRARIES = librpmmodule.la -librpmmodule_la_SOURCES = rpmmodule.c hash.c upgrade.c +librpmmodule_la_SOURCES = rpmmodule.c hash.c upgrade.c header-py.c db-py.c subdir = python mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h @@ -235,7 +235,8 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) librpmmodule_la_LDFLAGS = librpmmodule_la_LIBADD = -am_librpmmodule_la_OBJECTS = rpmmodule.lo hash.lo upgrade.lo +am_librpmmodule_la_OBJECTS = rpmmodule.lo hash.lo upgrade.lo \ + header-py.lo db-py.lo librpmmodule_la_OBJECTS = $(am_librpmmodule_la_OBJECTS) python_PROGRAMS = rpmmodule.so$(EXEEXT) poptmodule.so$(EXEEXT) PROGRAMS = $(python_PROGRAMS) @@ -255,7 +256,8 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/depcomp -@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/hash.Plo $(DEPDIR)/poptmodule.Po \ +@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/db-py.Plo $(DEPDIR)/hash.Plo \ +@AMDEP_TRUE@ $(DEPDIR)/header-py.Plo $(DEPDIR)/poptmodule.Po \ @AMDEP_TRUE@ $(DEPDIR)/rpmmodule.Plo $(DEPDIR)/upgrade.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -326,7 +328,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/db-py.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hash.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/header-py.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/poptmodule.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rpmmodule.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/upgrade.Plo@am__quote@ diff --git a/rpm.spec b/rpm.spec index 0bb2798..fb6db1d 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.07 +Release: 0.08 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,10 @@ fi %{__prefix}/include/popt.h %changelog +* Sun Apr 14 2002 Jeff Johnson 4.1-0.08 +- use build time to choose one of multiple alternative suggestions. +- add --nosuggests to disable suggested resolutions. + * Sat Apr 13 2002 Jeff Johnson 4.1-0.07 - merge conflicts into problems, handle as transaction set variable. diff --git a/rpm.spec.in b/rpm.spec.in index 40ded0b..faf58a6 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.07 +Release: 0.08 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,10 @@ fi %{__prefix}/include/popt.h %changelog +* Sun Apr 14 2002 Jeff Johnson 4.1-0.08 +- use build time to choose one of multiple alternative suggestions. +- add --nosuggests to disable suggested resolutions. + * Sat Apr 13 2002 Jeff Johnson 4.1-0.07 - merge conflicts into problems, handle as transaction set variable. diff --git a/rpmio/.lclintrc b/rpmio/.lclintrc index f648efd..4aaf64c 100644 --- a/rpmio/.lclintrc +++ b/rpmio/.lclintrc @@ -1,4 +1,4 @@ --I. -I.. -I../popt -DHAVE_CONFIG_H -D_GNU_SOURCE +-I. -I.. -I../beecrypt -I../popt -I../zlib -DHAVE_CONFIG_H -D_GNU_SOURCE +partial +forcehints @@ -35,14 +35,11 @@ -incondefs # heartburn -matchfields # heartburn -namechecks # tedious ANSI compliance checks --numenummembers 1024 # RPMTAG has 138 members --numstructfields 256 # Java jni.h has 229 fields -ptrarith # tedious -compdestroy -mustdefine --shiftimplementation -#-shiftnegative +-shiftimplementation # ctype.h pain -strictops -strictusereleased diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index 6edf5f5..1d29675 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -8,11 +8,8 @@ EXTRA_PROGRAMS = tdigest tdir tfts tglob tinv tkey tring trpmio dumpasn1 INCLUDES = \ -I$(top_srcdir) \ - -I$(top_srcdir)/build \ - -I$(top_srcdir)/lib \ -I$(top_srcdir)/beecrypt \ -I$(top_srcdir)/popt \ - @WITH_ZLIB_INCLUDE@ \ @INCPATH@ pkgincdir = $(pkgincludedir) diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c index c39dfdc..99e3fed 100644 --- a/rpmio/rpmio.c +++ b/rpmio/rpmio.c @@ -269,12 +269,6 @@ DBGIO(fd, (stderr, "==> fdFdopen(%p,\"%s\") fdno %d -> fp %p fdno %d\n", cookie, } #endif -#if 0 -#undef fdLink -#undef fdFree -#undef fdNew -#endif - /* =============================================================== */ /*@-modfilesys@*/ /*@-mustmod@*/ /* FIX: cookie is modified */ diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h index b9ac3b4..a2008ad 100644 --- a/rpmio/rpmio.h +++ b/rpmio/rpmio.h @@ -58,26 +58,28 @@ extern "C" { /** */ typedef ssize_t (*fdio_read_function_t) (void *cookie, char *buf, size_t nbytes) - /*@globals fileSystem @*/ - /*@modifies *cookie, fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies *cookie, errno, fileSystem @*/ + /*@requires maxSet(buf) >= (nbytes - 1) @*/ + /*@ensures maxRead(buf) >= nbytes @*/ ; /** */ typedef ssize_t (*fdio_write_function_t) (void *cookie, const char *buf, size_t nbytes) - /*@globals fileSystem @*/ - /*@modifies *cookie, fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies *cookie, errno, fileSystem @*/; /** */ typedef int (*fdio_seek_function_t) (void *cookie, _libio_pos_t pos, int whence) - /*@globals fileSystem @*/ - /*@modifies *cookie, fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies *cookie, errno, fileSystem @*/; /** */ typedef int (*fdio_close_function_t) (void *cookie) - /*@globals fileSystem @*/ - /*@modifies *cookie, fileSystem @*/; + /*@globals errno, fileSystem, systemState @*/ + /*@modifies *cookie, errno, fileSystem, systemState @*/; /** @@ -113,8 +115,8 @@ typedef int (*fdio_fileno_function_t) (void * cookie) /** */ typedef FD_t (*fdio_open_function_t) (const char * path, int flags, mode_t mode) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies errno, fileSystem @*/; /** */ @@ -144,51 +146,51 @@ typedef int (*fdio_fflush_function_t) (FD_t fd) /** */ typedef int (*fdio_mkdir_function_t) (const char * path, mode_t mode) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies errno, fileSystem @*/; /** */ typedef int (*fdio_chdir_function_t) (const char * path) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies errno, fileSystem @*/; /** */ typedef int (*fdio_rmdir_function_t) (const char * path) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies errno, fileSystem @*/; /** */ typedef int (*fdio_rename_function_t) (const char * oldpath, const char * newpath) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies errno, fileSystem @*/; /** */ typedef int (*fdio_unlink_function_t) (const char * path) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies errno, fileSystem @*/; /*@-typeuse@*/ /** */ typedef int (*fdio_stat_function_t) (const char * path, /*@out@*/ struct stat * st) - /*@globals fileSystem @*/ - /*@modifies *st, fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies *st, errno, fileSystem @*/; /** */ typedef int (*fdio_lstat_function_t) (const char * path, /*@out@*/ struct stat * st) - /*@globals fileSystem @*/ - /*@modifies *st, fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies *st, errno, fileSystem @*/; /** */ typedef int (*fdio_access_function_t) (const char * path, int amode) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies errno, fileSystem @*/; /*@=typeuse@*/ /*@}*/ @@ -300,8 +302,8 @@ int Fileno(FD_t fd) */ /*@unused@*/ int Fcntl(FD_t fd, int op, void *lip) - /*@globals fileSystem @*/ - /*@modifies fd, *lip, fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies fd, *lip, errno, fileSystem @*/; /*@}*/ @@ -314,71 +316,73 @@ int Fcntl(FD_t fd, int op, void *lip) * mkdir(2) clone. */ int Mkdir(const char * path, mode_t mode) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies errno, fileSystem @*/; /** * chdir(2) clone. */ int Chdir(const char * path) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies errno, fileSystem @*/; /** * rmdir(2) clone. */ int Rmdir(const char * path) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies errno, fileSystem @*/; /** * rename(2) clone. */ int Rename(const char * oldpath, const char * newpath) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies errno, fileSystem @*/; /** * link(2) clone. */ int Link(const char * oldpath, const char * newpath) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies errno, fileSystem @*/; /** * unlink(2) clone. */ int Unlink(const char * path) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies errno, fileSystem @*/; /** * readlink(2) clone. */ int Readlink(const char * path, /*@out@*/ char * buf, size_t bufsiz) - /*@globals fileSystem @*/ - /*@modifies *buf, fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies *buf, errno, fileSystem @*/ + /*@requires maxSet(buf) >= (bufsiz - 1) @*/ + /*@ensures result <= bufsiz @*/; /** * stat(2) clone. */ int Stat(const char * path, /*@out@*/ struct stat * st) - /*@globals fileSystem @*/ - /*@modifies *st, fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies *st, errno, fileSystem @*/; /** * lstat(2) clone. */ int Lstat(const char * path, /*@out@*/ struct stat * st) - /*@globals fileSystem @*/ - /*@modifies *st, fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies *st, errno, fileSystem @*/; /** * access(2) clone. */ int Access(const char * path, int amode) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies errno, fileSystem @*/; /** @@ -403,23 +407,23 @@ void Globfree( /*@only@*/ glob_t * pglob) */ /*@null@*/ DIR * Opendir(const char * path) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies errno, fileSystem @*/; /** * readdir(3) clone. */ /*@null@*/ struct dirent * Readdir(DIR * dir) - /*@globals fileSystem @*/ - /*@modifies *dir, fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies *dir, errno, fileSystem @*/; /** * closedir(3) clone. */ int Closedir(/*@only@*/ DIR * dir) - /*@globals fileSystem @*/ - /*@modifies *dir, fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies *dir, errno, fileSystem @*/; /*@}*/ @@ -459,29 +463,31 @@ off_t fdSize(FD_t fd) /** */ /*@null@*/ FD_t fdOpen(const char *path, int flags, mode_t mode) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies errno, fileSystem @*/; #define fdOpen(_path, _flags, _mode) fdio->_open((_path), (_flags), (_mode)) /** */ ssize_t fdRead(void * cookie, /*@out@*/ char * buf, size_t count) - /*@globals fileSystem @*/ - /*@modifies *cookie, *buf, fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies *cookie, *buf, errno, fileSystem @*/ + /*@requires maxSet(buf) >= (count - 1) @*/ + /*@ensures maxRead(buf) >= count @*/ ; #define fdRead(_fd, _buf, _count) fdio->read((_fd), (_buf), (_count)) /** */ ssize_t fdWrite(void * cookie, const char * buf, size_t count) - /*@globals fileSystem @*/ - /*@modifies *cookie, fileSystem @*/; + /*@globals errno, fileSystem @*/ + /*@modifies *cookie, errno, fileSystem @*/; #define fdWrite(_fd, _buf, _count) fdio->write((_fd), (_buf), (_count)) /** */ int fdClose( /*@only@*/ void * cookie) - /*@globals fileSystem @*/ - /*@modifies *cookie, fileSystem @*/; + /*@globals errno, fileSystem, systemState @*/ + /*@modifies *cookie, errno, fileSystem, systemState @*/; #define fdCLose(_fd) fdio->close(_fd) /** diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h index 5681ed4..599b10d 100644 --- a/rpmio/rpmio_internal.h +++ b/rpmio/rpmio_internal.h @@ -157,8 +157,13 @@ extern int _ftp_debug; #define DBG(_f, _m, _x) \ if ((_rpmio_debug | ((_f) ? ((FD_t)(_f))->flags : 0)) & (_m)) fprintf _x +#if defined(__LCLINT__XXX) +#define DBGIO(_f, _x) +#define DBGREFS(_f, _x) +#else #define DBGIO(_f, _x) DBG((_f), RPMIO_DEBUG_IO, _x) #define DBGREFS(_f, _x) DBG((_f), RPMIO_DEBUG_REFS, _x) +#endif #ifdef __cplusplus extern "C" { diff --git a/rpmio/rpmrpc.c b/rpmio/rpmrpc.c index 95e8951..02e6109 100644 --- a/rpmio/rpmrpc.c +++ b/rpmio/rpmrpc.c @@ -1,4 +1,3 @@ -/*@-type@*/ /* LCL: function typedefs */ /** \ingroup rpmio * \file rpmio/rpmrpc.c */ @@ -1083,6 +1082,7 @@ struct __dirstream { static int ftpmagicdir = 0x8440291; #define ISFTPMAGIC(_dir) (!memcmp((_dir), &ftpmagicdir, sizeof(ftpmagicdir))) +/*@-type@*/ /* FIX: abstract DIR */ /*@null@*/ static DIR * ftpOpendir(const char * path) /*@globals fileSystem @*/ @@ -1260,6 +1260,7 @@ fprintf(stderr, "*** ftpReaddir(%p) %p \"%s\"\n", (void *)dir, dp, dp->d_name); return dp; } +/*@=type@*/ static int ftpClosedir(/*@only@*/ DIR * dir) /*@globals fileSystem @*/ @@ -1386,11 +1387,13 @@ fprintf(stderr, "*** Glob(%s,0x%x,%p,%p)\n", pattern, (unsigned)flags, (void *)e /*@=castfcnptr@*/ switch (ut) { case URL_IS_FTP: +/*@-type@*/ pglob->gl_closedir = Closedir; pglob->gl_readdir = Readdir; pglob->gl_opendir = Opendir; pglob->gl_lstat = Lstat; pglob->gl_stat = Stat; +/*@=type@*/ flags |= GLOB_ALTDIRFUNC; break; case URL_IS_HTTP: /* XXX WRONG WRONG WRONG */ @@ -1460,4 +1463,3 @@ fprintf(stderr, "*** Closedir(%p)\n", (void *)dir); return closedir(dir); } /*@=voidabstract@*/ -/*@=type@*/ diff --git a/rpmio/url.c b/rpmio/url.c index 4c2e3da..bc89ec7 100644 --- a/rpmio/url.c +++ b/rpmio/url.c @@ -1,4 +1,3 @@ -/*@-type@*/ /* LCL: function typedefs */ /** \ingroup rpmio * \file rpmio/url.c */ @@ -177,10 +176,9 @@ void urlFreeCache(void) static int urlStrcmp(/*@null@*/ const char * str1, /*@null@*/ const char * str2) /*@*/ { - if (str1 && str2) - /*@-nullpass@*/ /* LCL: 2nd arg claims to be NULL */ - return strcmp(str1, str2); - /*@=nullpass@*/ + if (str1) + if (str2) + return strcmp(str1, str2); if (str1 != str2) return -1; return 0; @@ -331,7 +329,8 @@ static void urlFind(/*@null@*/ /*@in@*/ /*@out@*/ urlinfo * uret, int mustAsk) */ /*@observer@*/ /*@unchecked@*/ static struct urlstring { -/*@observer@*/ /*@null@*/ const char * leadin; +/*@observer@*/ /*@null@*/ + const char * leadin; urltype ret; } urlstrings[] = { { "file://", URL_IS_PATH }, @@ -471,9 +470,9 @@ int urlSplit(const char * url, urlinfo *uret) if (u->port < 0 && u->service != NULL) { struct servent *serv; - /*@-unrecog -multithreaded -moduncon @*/ + /*@-multithreaded -moduncon @*/ serv = getservbyname(u->service, "tcp"); - /*@=unrecog =multithreaded =moduncon @*/ + /*@=multithreaded =moduncon @*/ if (serv != NULL) u->port = ntohs(serv->s_port); else if (u->urltype == URL_IS_FTP) @@ -557,4 +556,3 @@ exit: return rc; } -/*@=type@*/ diff --git a/system.h b/system.h index 45a6c15..00594a1 100644 --- a/system.h +++ b/system.h @@ -162,7 +162,7 @@ char *realpath(const char *path, char resolved_path []); #if defined(__LCLINT__) /*@-declundef -incondefs @*/ /* LCL: missing annotation */ -/*@only@*/ void * alloca (size_t __size) +/*@only@*/ /*@out@*/ void * alloca (size_t __size) /*@ensures MaxSet(result) == (__size - 1) @*/ /*@*/; /*@=declundef =incondefs @*/ diff --git a/tools/Makefile.am b/tools/Makefile.am index 02d1467..99554ca 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -24,11 +24,8 @@ LDADD = \ $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la \ $(top_builddir)/popt/libpopt.la \ - @WITH_ZLIB_LIB@ \ @INTLLIBS@ -LIBS = - noinst_PROGRAMS = \ dump dumpdb rpmarchive rpmheader rpmlead rpmsignature rpmsort -- 2.7.4