From: jbj Date: Mon, 19 Aug 2002 22:27:44 +0000 (+0000) Subject: - add --with-efence to configure, check install/upgrade with efence. X-Git-Tag: rpm-4.4-release~1008 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae8428475cbfde3af746d51a056e0655fe6269d8;p=platform%2Fupstream%2Frpm.git - add --with-efence to configure, check install/upgrade with efence. - beecrypt: short hex string conversion overflows target buffer. - mark "successors only" packages in transaction. - reap scriptlets with SIGCHLD handler. - rename PSM_t to rpmpsm, add methods and refcounts to manage. - remove %%configure/%%makeinstall from arch-os/macros, default is OK. - don't export MALLOC_CHECK_ to scriptlets. - squeaky clean memory leak checking. - always malloc rpmfi structure, refcounts are correct in rpmtsRun(). - skip redundant /sbin/ldconfig scripts on upgrade (if possible). CVS patchset: 5645 CVS date: 2002/08/19 22:27:44 --- diff --git a/CHANGES b/CHANGES index ca45ab2..02182b7 100644 --- a/CHANGES +++ b/CHANGES @@ -243,6 +243,16 @@ - rollback: re-create empty transaction set for multiple rollbacks. - fix: %%basename typo (Dmitry V. Levin). - fix: queryformat segfaults (Dmitry V. Levin). + - add --with-efence to configure, check install/upgrade with efence. + - beecrypt: short hex string conversion overflows target buffer. + - mark "successors only" packages in transaction. + - reap scriptlets with SIGCHLD handler. + - rename PSM_t to rpmpsm, add methods and refcounts to manage. + - remove %%configure/%%makeinstall from arch-os/macros, default is OK. + - don't export MALLOC_CHECK_ to scriptlets. + - squeaky clean memory leak checking. + - always malloc rpmfi structure, refcounts are correct in rpmtsRun(). + - skip redundant /sbin/ldconfig scripts on upgrade (if possible). 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/beecrypt/mp32number.c b/beecrypt/mp32number.c index 2432b84..778c75b 100644 --- a/beecrypt/mp32number.c +++ b/beecrypt/mp32number.c @@ -207,10 +207,13 @@ void mp32nsethex(mp32number* n, const char* hex) { *(dst++) = val; val = 0; - } + rem = 0; + } else + rem = 1; } - if (rem != 0) + if (rem != 0) { *dst = val; + } } else { n->size = 0; diff --git a/build/files.c b/build/files.c index d07fb38..b08cf5e 100644 --- a/build/files.c +++ b/build/files.c @@ -1365,17 +1365,16 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl, (void) rpmlibNeedsFeature(h, "CompressedFileNames", "3.0.4-1"); } - { rpmfi fi = xcalloc(1, sizeof(*fi)); - int scareMem = 1; + { int scareMem = 1; + rpmts ts = NULL; /* XXX FIXME drill rpmts ts all the way down here */ + rpmfi fi = rpmfiNew(ts, h, RPMTAG_BASENAMES, scareMem); char * a, * d; - /* XXX FIXME drill rpmts ts all the way down here */ -/*@i@*/ fi->te = xcalloc(1, sizeof(*fi->te)); -/*@i@*/ fi->te->type = TR_ADDED; - - fi = rpmfiNew(NULL, fi, h, RPMTAG_BASENAMES, scareMem); if (fi == NULL) return; /* XXX can't happen */ + fi->te = xcalloc(1, sizeof(*fi->te)); + fi->te->type = TR_ADDED; + fi->dnl = _free(fi->dnl); fi->bnl = _free(fi->bnl); @@ -2332,6 +2331,7 @@ static StringBuf getOutputFrom(char * dir, char * argv[], (void) chdir(dir); } + unsetenv("MALLOC_CHECK_"); (void) execvp(argv[0], argv); /* XXX this error message is probably not seen. */ rpmError(RPMERR_EXEC, _("Couldn't exec %s: %s\n"), diff --git a/build/rpmbuild.h b/build/rpmbuild.h index 2f42550..7985836 100644 --- a/build/rpmbuild.h +++ b/build/rpmbuild.h @@ -363,7 +363,8 @@ int lookupPackage(Spec spec, /*@null@*/ const char * name, int flag, * @param spec spec file control structure * @return package control structure */ -/*@only@*/ Package newPackage(Spec spec) +/*@only@*/ +Package newPackage(Spec spec) /*@modifies spec->packages, spec->packages->next @*/; /** \ingroup rpmbuild @@ -371,16 +372,20 @@ int lookupPackage(Spec spec, /*@null@*/ const char * name, int flag, * @param packages package control structure chain * @return NULL */ -/*@null@*/ Package freePackages(/*@only@*/ /*@null@*/ Package packages) - /*@modifies packages @*/; +/*@null@*/ +Package freePackages(/*@only@*/ /*@null@*/ Package packages) + /*@globals fileSystem @*/ + /*@modifies packages, fileSystem @*/; /** \ingroup rpmbuild * Destroy package control structure. * @param pkg package control structure * @return NULL */ -/*@null@*/ Package freePackage(/*@only@*/ /*@null@*/ Package pkg) - /*@modifies pkg @*/; +/*@null@*/ +Package freePackage(/*@only@*/ /*@null@*/ Package pkg) + /*@globals fileSystem @*/ + /*@modifies pkg, fileSystem @*/; /** \ingroup rpmbuild * Add dependency to header, filtering duplicates. diff --git a/build/spec.c b/build/spec.c index 3a7797f..9b83007 100644 --- a/build/spec.c +++ b/build/spec.c @@ -167,12 +167,7 @@ Package freePackage(Package pkg) if (pkg->cpioList) { rpmfi fi = pkg->cpioList; pkg->cpioList = NULL; - fi = rpmfiFree(fi, 1); -#ifdef DYING - /*@-refcounttrans@*/ /* FIX: fi needs to be only */ - fi = _free(fi); - /*@=refcounttrans@*/ -#endif + fi = rpmfiFree(fi); } pkg->specialDoc = freeStringBuf(pkg->specialDoc); @@ -525,12 +520,7 @@ Spec freeSpec(Spec spec) if (spec->sourceCpioList) { rpmfi fi = spec->sourceCpioList; spec->sourceCpioList = NULL; - fi = rpmfiFree(fi, 1); -#ifdef DYING - /*@-refcounttrans@*/ /* FIX: fi needs to be only */ - fi = _free(fi); - /*@=refcounttrans@*/ -#endif + fi = rpmfiFree(fi); } spec->buildRestrictions = headerFree(spec->buildRestrictions); diff --git a/configure.ac b/configure.ac index c7154e2..ceb644d 100644 --- a/configure.ac +++ b/configure.ac @@ -901,6 +901,13 @@ if test $withval = yes ; then LIBS="$LIBS -ldmalloc" fi +withval=no +AC_ARG_WITH(efence, [ --with-efence build with efence debugging support ]) +if test $withval = yes ; then + AC_DEFINE(EFENCE, 1, [Build with libefence support?]) + LIBS="$LIBS -lefence" +fi + AC_CHECK_FUNCS(setlocale) dnl XXX Solaris <= 2.6 only permits 8 chars in password. diff --git a/lib/depends.c b/lib/depends.c index 1ad5ca6..a83062d 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -78,7 +78,8 @@ static int intcmp(const void * a, const void * b) */ static int removePackage(rpmts ts, Header h, int dboffset, /*@exposed@*/ /*@dependent@*/ /*@null@*/ alKey depends) - /*@modifies ts, h @*/ + /*@globals fileSystem @*/ + /*@modifies ts, h, fileSystem @*/ { rpmte p; @@ -1387,6 +1388,7 @@ rescan: } if (!_printed && loopcheck == qlen && rpmteTSI(q)->tsi_suc != NULL) { _printed++; + (void) rpmtsUnorderedSuccessors(ts, orderingCount); rpmMessage(RPMMESS_DEBUG, _("========== successors only (presentation order)\n")); diff --git a/lib/formats.c b/lib/formats.c index e64620f..dbc05f8 100644 --- a/lib/formats.c +++ b/lib/formats.c @@ -429,15 +429,13 @@ static int fsnamesTag( /*@unused@*/ Header h, /*@out@*/ int_32 * type, const char ** list; /*@-boundswrite@*/ - if (rpmGetFilesystemList(&list, count)) { + if (rpmGetFilesystemList(&list, count)) return 1; - } /*@=boundswrite@*/ - *type = RPM_STRING_ARRAY_TYPE; - *((const char ***) data) = list; - - *freeData = 0; + if (type) *type = RPM_STRING_ARRAY_TYPE; + if (data) *((const char ***) data) = list; + if (freeData) *freeData = 0; return 0; } @@ -468,11 +466,11 @@ static int instprefixTag(Header h, /*@null@*/ /*@out@*/ rpmTagType * type, if (freeData) *freeData = 0; return 0; } else if (hge(h, RPMTAG_INSTPREFIXES, &ipt, (void **) &array, count)) { + if (type) *type = RPM_STRING_TYPE; /*@-boundsread@*/ if (data) *data = xstrdup(array[0]); /*@=boundsread@*/ if (freeData) *freeData = 1; - if (type) *type = RPM_STRING_TYPE; array = hfd(array, ipt); return 0; } @@ -514,9 +512,8 @@ static int fssizesTag(Header h, /*@out@*/ rpmTagType * type, } /*@-boundswrite@*/ - if (rpmGetFilesystemList(NULL, count)) { + if (rpmGetFilesystemList(NULL, count)) return 1; - } /*@=boundswrite@*/ *type = RPM_INT32_TYPE; diff --git a/lib/fs.c b/lib/fs.c index 9976f14..4fc24f0 100644 --- a/lib/fs.c +++ b/lib/fs.c @@ -25,20 +25,16 @@ static int numFilesystems = 0; void freeFilesystems(void) { - if (filesystems) { - int i; + int i; + /*@-boundswrite@*/ - for (i = 0; i < numFilesystems; i++) - filesystems[i].mntPoint = _free(filesystems[i].mntPoint); + if (filesystems) + for (i = 0; i < numFilesystems; i++) + filesystems[i].mntPoint = _free(filesystems[i].mntPoint); /*@=boundswrite@*/ - filesystems = _free(filesystems); - } - if (fsnames) { -#if 0 /* XXX leak/segfault on exit of "rpm -qp --qf '%{#fsnames}' pkg" */ - free(fsnames); -#endif - fsnames = NULL; - } + + filesystems = _free(filesystems); + fsnames = _free(fsnames); numFilesystems = 0; } diff --git a/lib/fsm.c b/lib/fsm.c index 610546b..ae8e780 100644 --- a/lib/fsm.c +++ b/lib/fsm.c @@ -101,11 +101,12 @@ const char * fsmFsPath(/*@special@*/ /*@null@*/ const FSM_t fsm, * @retval NULL always */ static /*@null@*/ void * mapFreeIterator(/*@only@*//*@null@*/ void * p) - /*@*/ + /*@globals fileSystem @*/ + /*@modifies fileSystem @*/ { FSMI_t iter = p; if (iter) { - iter->ts = rpmtsUnlink(iter->ts, "mapIterator"); + iter->ts = rpmtsFree(iter->ts); iter->fi = rpmfiUnlink(iter->fi, "mapIterator"); } return _free(p); diff --git a/lib/fsm.h b/lib/fsm.h index 8cd4f0b..dcaca2e 100644 --- a/lib/fsm.h +++ b/lib/fsm.h @@ -225,7 +225,8 @@ extern "C" { * @return always NULL */ /*@null@*/ FSM_t freeFSM(/*@only@*/ /*@null@*/ FSM_t fsm) - /*@modifies fsm @*/; + /*@globals fileSystem @*/ + /*@modifies fsm, fileSystem @*/; /** * Load external data into file state machine. diff --git a/lib/poptALL.c b/lib/poptALL.c index b278f22..0f46337 100644 --- a/lib/poptALL.c +++ b/lib/poptALL.c @@ -31,6 +31,9 @@ extern int _fps_debug; extern int _fsm_debug; /*@unchecked@*/ +extern int _psm_debug; + +/*@unchecked@*/ extern int _rpmal_debug; /*@unchecked@*/ @@ -262,6 +265,8 @@ struct poptOption rpmcliAllPoptTable[] = { { "poptdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_popt_debug, -1, N_("debug option/argument processing"), NULL}, #endif + { "psmdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_psm_debug, -1, + N_("debug package state machine"), NULL}, { "rpmaldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmal_debug, -1, NULL, NULL}, { "rpmdbdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmdb_debug, -1, diff --git a/lib/psm.c b/lib/psm.c index cf50bfe..5631085 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -33,13 +33,16 @@ #include "rpmdb.h" /* XXX for db_chrootDone */ #include "debug.h" +/*@unchecked@*/ +int _psm_debug = 0; + /*@access Header @*/ /* compared with NULL */ /*@access rpmdbMatchIterator @*//* compared with NULL */ /*@access FD_t @*/ /* compared with NULL */ /*@access rpmdb @*/ /* compared with NULL */ /*@access FSM_t @*/ /* compared with NULL */ -/*@access PSM_t @*/ +/*@access rpmpsm @*/ /*@access rpmfi @*/ /*@access rpmte @*/ /* XXX rpmInstallSourcePackage */ @@ -340,7 +343,7 @@ static int mergeFiles(rpmfi fi, Header h, Header newH) * @return 0 always */ /*@-bounds@*/ -static int markReplacedFiles(const PSM_t psm) +static int markReplacedFiles(const rpmpsm psm) /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/ /*@modifies psm, rpmGlobalMacroContext, fileSystem, internalState @*/ { @@ -426,8 +429,8 @@ rpmRC rpmInstallSourcePackage(rpmts ts, FD_t fd, HGE_t hge; HFD_t hfd; Header h = NULL; - struct psm_s psmbuf; - PSM_t psm = &psmbuf; + struct rpmpsm_s psmbuf; + rpmpsm psm = &psmbuf; int isSource; rpmRC rc; int i; @@ -447,7 +450,7 @@ rpmRC rpmInstallSourcePackage(rpmts ts, FD_t fd, (void) rpmtsAddInstallElement(ts, h, NULL, 0, NULL); - fi = rpmfiNew(ts, fi, h, RPMTAG_BASENAMES, scareMem); + fi = rpmfiNew(ts, h, RPMTAG_BASENAMES, scareMem); h = headerFree(h); if (fi == NULL) { /* XXX can't happen */ @@ -567,9 +570,9 @@ rpmRC rpmInstallSourcePackage(rpmts ts, FD_t fd, psm->goal = PSM_PKGINSTALL; /*@-compmempass@*/ /* FIX: psm->fi->dnl should be owned. */ - rc = psmStage(psm, PSM_PROCESS); + rc = rpmpsmStage(psm, PSM_PROCESS); - (void) psmStage(psm, PSM_FINI); + (void) rpmpsmStage(psm, PSM_FINI); /*@=compmempass@*/ if (rc) rc = RPMRC_FAIL; @@ -592,7 +595,7 @@ exit: (void) Fclose(fi->te->fd); fi->te->fd = NULL; fi->te = NULL; - fi = rpmfiFree(fi, 1); + fi = rpmfiFree(fi); } /*@=branchstate@*/ @@ -602,7 +605,7 @@ exit: /* XXX nuke the added package(s). */ rpmtsClean(ts); - psm->ts = rpmtsUnlink(ts, "InstallSourcePackage"); + psm->ts = rpmtsFree(psm->ts); return rc; } @@ -629,6 +632,293 @@ static /*@observer@*/ const char * const tag2sln(int tag) } /** + */ +/*@unchecked@*/ +static sigset_t caught; + +/** + */ +/*@unchecked@*/ +static struct psmtbl_s { + int nalloced; + int npsms; +/*@null@*/ + rpmpsm * psms; +} psmtbl = { 0, 0, NULL }; + +/* forward ref */ +static void handler(int signum) + /*@globals caught, psmtbl, fileSystem @*/ + /*@modifies caught, psmtbl, fileSystem @*/; + +/** + */ +/*@unchecked@*/ +/*@-fullinitblock@*/ +static struct sigtbl_s { + int signum; + int active; + struct sigaction act; + struct sigaction oact; +} satbl[] = { + { SIGCHLD, 0, { {handler} } }, + { -1, 0, { {NULL} } }, +}; +/*@=fullinitblock@*/ + +/** + */ +/*@-incondefs@*/ +static void handler(int signum) +{ + struct sigtbl_s * tbl; + + for(tbl = satbl; tbl->signum >= 0; tbl++) { + if (tbl->signum != signum) + continue; + if (!tbl->active) + continue; + (void) sigaddset(&caught, signum); + switch (signum) { + case SIGCHLD: + { int status = 0; + pid_t reaped = waitpid(0, &status, WNOHANG); + int i; + + if (psmtbl.psms) + for (i = 0; i < psmtbl.npsms; i++) { + rpmpsm psm = psmtbl.psms[i]; + if (psm->child != reaped) + /*@innercontinue@*/ continue; +/*@-modfilesys@*/ +if (_psm_debug) +fprintf(stderr, " Reap: %p[%d:%d:%d] = %p child %d\n", psmtbl.psms, i, psmtbl.npsms, psmtbl.nalloced, psm, psm->child); +/*@=modfilesys@*/ + psm->reaped = reaped; + psm->status = status; + /*@innerbreak@*/ break; + } + } /*@switchbreak@*/ break; + default: + /*@switchbreak@*/ break; + } + break; + } +} +/*@=incondefs@*/ + +/** + * Enable a signal handler. + */ +static int enableSignal(int signum) + /*@globals caught, satbl, fileSystem @*/ + /*@modifies caught, satbl, fileSystem @*/ +{ + sigset_t newMask, oldMask; + struct sigtbl_s * tbl; + + (void) sigfillset(&newMask); /* block all signals */ + (void) sigprocmask(SIG_BLOCK, &newMask, &oldMask); + for (tbl = satbl; tbl->signum >= 0; tbl++) { + if (signum >= 0 && signum != tbl->signum) + continue; +/*@-modfilesys@*/ +if (_psm_debug) +fprintf(stderr, " Enable: %p[0:%d:%d] active %d\n", psmtbl.psms, psmtbl.npsms, psmtbl.nalloced, tbl->active); +/*@=modfilesys@*/ + if (tbl->active++ <= 0) { + (void) sigdelset(&caught, tbl->signum); + (void) sigaction(tbl->signum, &tbl->act, &tbl->oact); + } + break; + } + return sigprocmask(SIG_SETMASK, &oldMask, NULL); +} + +/** + * Disable a signal handler. + */ +static int disableSignal(int signum) + /*@globals satbl, fileSystem @*/ + /*@modifies satbl, fileSystem @*/ +{ + sigset_t newMask, oldMask; + struct sigtbl_s * tbl; + + (void) sigfillset(&newMask); /* block all signals */ + (void) sigprocmask(SIG_BLOCK, &newMask, &oldMask); + for (tbl = satbl; tbl->signum >= 0; tbl++) { + if (signum >= 0 && signum != tbl->signum) + continue; +/*@-modfilesys@*/ +if (_psm_debug) +fprintf(stderr, " Disable: %p[0:%d:%d] active %d\n", psmtbl.psms, psmtbl.npsms, psmtbl.nalloced, tbl->active); +/*@=modfilesys@*/ + if (--tbl->active <= 0) { + tbl->active = 0; /* XXX just in case */ + (void) sigaction(tbl->signum, &tbl->oact, NULL); + } + break; + } + return sigprocmask(SIG_SETMASK, &oldMask, NULL); +} + +/** + * Register a child reaper. + */ +static int psmRegister(rpmpsm psm, pid_t child) + /*@globals psmtbl, fileSystem @*/ + /*@modifies psm, psmtbl, fileSystem @*/ +{ + sigset_t newMask, oldMask; + int empty = -1; + int i = psmtbl.npsms; + + (void) sigfillset(&newMask); /* block all signals */ + (void) sigprocmask(SIG_BLOCK, &newMask, &oldMask); + + if (psmtbl.psms) + for (i = 0; i < psmtbl.npsms; i++) { + if (empty == -1 && psmtbl.psms[i] == NULL) + empty = i; + if (psm != psmtbl.psms[i]) + continue; + break; + } + if (i == psmtbl.npsms) { + if (i >= psmtbl.nalloced) { + if (psmtbl.nalloced == 0) psmtbl.nalloced = 5; + while (psmtbl.nalloced < i) + psmtbl.nalloced += psmtbl.nalloced; + psmtbl.psms = xrealloc(psmtbl.psms, + psmtbl.nalloced * sizeof(*psmtbl.psms)); + } + empty = psmtbl.npsms++; + } + psm->child = child; + psm->reaped = 0; + if (psmtbl.psms) /* XXX can't happen */ + psmtbl.psms[empty] = rpmpsmLink(psm, "psmRegister"); +/*@-modfilesys@*/ +if (_psm_debug) +fprintf(stderr, " Register: %p[%d:%d:%d] = %p child %d\n", psmtbl.psms, empty, psmtbl.npsms, psmtbl.nalloced, psm, child); +/*@=modfilesys@*/ + + (void) enableSignal(SIGCHLD); + return sigprocmask(SIG_SETMASK, &oldMask, NULL); +} + +/** + * Unregister a child reaper. + */ +static int psmUnregister(rpmpsm psm, pid_t child) + /*@globals psmtbl, fileSystem @*/ + /*@modifies psmtbl, fileSystem @*/ +{ + sigset_t newMask, oldMask; + int i = 0; + + (void) sigfillset(&newMask); /* block all signals */ + (void) sigprocmask(SIG_BLOCK, &newMask, &oldMask); + + if (psmtbl.psms) + for (i = 0; i < psmtbl.npsms; i++) { + if (psmtbl.psms[i] == NULL) + continue; + if (psm != psmtbl.psms[i]) + continue; + if (child != psm->child) + continue; + break; + } + + if (i < psmtbl.npsms) { + (void) disableSignal(SIGCHLD); +/*@-modfilesys@*/ +if (_psm_debug) +fprintf(stderr, "Unregister: %p[%d:%d:%d] = %p child %d\n", psmtbl.psms, i, psmtbl.npsms, psmtbl.nalloced, psm, child); +/*@=modfilesys@*/ + if (psmtbl.psms) /* XXX can't happen */ + psmtbl.psms[i] = rpmpsmFree(psmtbl.psms[i]); + if (psmtbl.npsms == (i+1)) + psmtbl.npsms--; + if (psmtbl.npsms == 0) { + psmtbl.psms = _free(psmtbl.psms); + psmtbl.nalloced = 0; + } + } + + return sigprocmask(SIG_SETMASK, &oldMask, NULL); +} + +/** + * Register a new child process with the reaper. + * @param psm package state machine data + * @return + */ +static pid_t psmFork(rpmpsm psm) + /*@globals fileSystem, internalState @*/ + /*@modifies psm, fileSystem, internalState @*/ +{ + pid_t child; + + /* Fork and Register parent's signal handler. */ + if ((child = fork()) != 0) { + if (!psm->reaper) { + psm->child = child; + psm->reaped = 0; + } else { + (void) psmRegister(psm, child); + } +/*@-modfilesys@*/ +if (_psm_debug) +fprintf(stderr, " Fork: %p[%d:%d:%d] = %p child %d\n", psmtbl.psms, 0, psmtbl.npsms, psmtbl.nalloced, psm, child); +/*@=modfilesys@*/ + } + return child; +} + +/** + * Wait for child process to be reaped. + * @param psm package state machine data + * @return + */ +static pid_t psmWait(rpmpsm psm) + /*@globals fileSystem, internalState @*/ + /*@modifies psm, fileSystem, internalState @*/ +{ + if (psm->reaper) { + /* XXX FIXME: signal race on psm->reaped prevents pause(3) */ + while (psm->reaped == 0) + (void) sleep(2); + /*@=infloops@*/ +/*@-modfilesys@*/ +if (_psm_debug) +fprintf(stderr, " Wait: %p[%d:%d:%d] = %p child %d\n", psmtbl.psms, 0, psmtbl.npsms, psmtbl.nalloced, psm, psm->child); +/*@=modfilesys@*/ + (void) psmUnregister(psm, psm->child); + } else { + do { + psm->reaped = waitpid(psm->child, &psm->status, 0); + } while (psm->reaped >= 0 && psm->reaped != psm->child); + } + + rpmMessage(RPMMESS_DEBUG, _("%s: waitpid(%d) rc %d status %x\n"), + psm->stepName, (unsigned)psm->child, + (unsigned)psm->reaped, psm->status); + + return psm->reaped; +} + +/** + */ +/*@unchecked@*/ +static int ldconfig_done = 0; + +/*@unchecked@*/ /*@observer@*/ +static const char * ldconfig_path = "/sbin/ldconfig"; + +/** * Run scriptlet with args. * * Run a script with an interpreter. If the interpreter is not specified, @@ -646,12 +936,12 @@ static /*@observer@*/ const char * const tag2sln(int tag) * @param arg2 ditto, but for the target package * @return 0 on success, 1 on error */ -static int runScript(PSM_t psm, Header h, +static int runScript(rpmpsm psm, Header h, const char * sln, int progArgc, const char ** progArgv, const char * script, int arg1, int arg2) /*@globals rpmGlobalMacroContext, fileSystem, internalState@*/ - /*@modifies rpmGlobalMacroContext, fileSystem, internalState @*/ + /*@modifies psm, rpmGlobalMacroContext, fileSystem, internalState @*/ { const rpmts ts = psm->ts; rpmfi fi = psm->fi; @@ -666,8 +956,6 @@ static int runScript(PSM_t psm, Header h, int maxPrefixLength; int len; char * prefixBuf = NULL; - pid_t child; - int status = 0; const char * fn = NULL; int i, xx; int freePrefixes = 0; @@ -679,20 +967,44 @@ static int runScript(PSM_t psm, Header h, if (progArgv == NULL && script == NULL) return 0; - rpmMessage(RPMMESS_DEBUG, _("%s: running %s scriptlet\n"), - psm->stepName, tag2sln(psm->scriptTag)); + psm->child = 0; + psm->reaped = 0; + psm->status = 0; + psm->reaper = 1; + + /* XXX FIXME: except for %verifyscript, rpmteNEVR can be used. */ + xx = headerNVR(h, &n, &v, &r); + /* + * If a successor node, and ldconfig was just run, don't bother. + */ + if (ldconfig_path && progArgv && psm->unorderedSuccessor) { + if (ldconfig_done && !strcmp(progArgv[0], ldconfig_path)) { + rpmMessage(RPMMESS_DEBUG, + _("%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"), + psm->stepName, tag2sln(psm->scriptTag), n, v, r, + progArgv[0]); + return rc; + } + } + + rpmMessage(RPMMESS_DEBUG, + _("%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"), + psm->stepName, tag2sln(psm->scriptTag), n, v, r, + (psm->unorderedSuccessor ? "a" : "")); if (!progArgv) { argv = alloca(5 * sizeof(*argv)); argv[0] = "/bin/sh"; argc = 1; + ldconfig_done = 0; } else { argv = alloca((progArgc + 4) * sizeof(*argv)); memcpy(argv, progArgv, progArgc * sizeof(*argv)); argc = progArgc; + ldconfig_done = (ldconfig_path && !strcmp(argv[0], ldconfig_path) + ? 1 : 0); } - xx = headerNVR(h, &n, &v, &r); if (hge(h, RPMTAG_INSTPREFIXES, &ipt, (void **) &prefixes, &numPrefixes)) { freePrefixes = 1; } else if (hge(h, RPMTAG_INSTALLPREFIX, NULL, (void **) &oldPrefix, NULL)) { @@ -727,6 +1039,9 @@ static int runScript(PSM_t psm, Header h, xx = Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd); } + if (ldconfig_path && strstr(script, ldconfig_path) != NULL) + ldconfig_done = 1; + xx = Fwrite(script, sizeof(script[0]), strlen(script), fd); xx = Fclose(fd); @@ -765,14 +1080,11 @@ static int runScript(PSM_t psm, Header h, } } else { out = fdDup(STDOUT_FILENO); -#ifdef DYING - out = fdLink(out, "runScript persist"); -#endif } if (out == NULL) return 1; /* XXX can't happen */ /*@-branchstate@*/ - if (!(child = fork())) { + if (!psmFork(psm)) { const char * rootDir; int pipes[2]; @@ -830,12 +1142,22 @@ static int runScript(PSM_t psm, Header h, rootDir = strchr(rootDir, '/'); /*@fallthrough@*/ case URL_IS_UNKNOWN: - if (!rpmtsChrootDone(ts) && !(rootDir[0] == '/' && rootDir[1] == '\0')) { + if (!rpmtsChrootDone(ts) && + !(rootDir[0] == '/' && rootDir[1] == '\0')) + { /*@-superuser -noeffect @*/ xx = chroot(rootDir); /*@=superuser =noeffect @*/ } xx = chdir("/"); + rpmMessage(RPMMESS_DEBUG, _("%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"), + psm->stepName, sln, n, v, r, + argv[0], (unsigned)getpid()); +/*@-modfilesys@*/ +if (_psm_debug) +fprintf(stderr, " Exec: %s \"%s\"\n", sln, argv[0]); +/*@=modfilesys@*/ + unsetenv("MALLOC_CHECK_"); xx = execv(argv[0], (char *const *)argv); break; default: @@ -847,19 +1169,19 @@ static int runScript(PSM_t psm, Header h, } /*@=branchstate@*/ - if (waitpid(child, &status, 0) < 0) { + (void) psmWait(psm); + + if (psm->reaped < 0) { rpmError(RPMERR_SCRIPT, - _("execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"), - sln, n, v, r, strerror (errno)); - /* XXX what to do here? */ - rc = RPMRC_OK; - } else { - if (!WIFEXITED(status) || WEXITSTATUS(status)) { - rpmError(RPMERR_SCRIPT, - _("execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"), - sln, n, v, r, WEXITSTATUS(status)); - rc = RPMRC_FAIL; - } + _("%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"), + sln, n, v, r, psm->child, psm->reaped, strerror(errno)); + rc = RPMRC_FAIL; + } else + if (!WIFEXITED(psm->status) || WEXITSTATUS(psm->status)) { + rpmError(RPMERR_SCRIPT, + _("%s(%s-%s-%s) scriptlet failed, exit status %d\n"), + sln, n, v, r, WEXITSTATUS(psm->status)); + rc = RPMRC_FAIL; } if (freePrefixes) prefixes = hfd(prefixes, ipt); @@ -882,9 +1204,9 @@ static int runScript(PSM_t psm, Header h, * @param psm package state machine data * @return rpmRC return code */ -static rpmRC runInstScript(PSM_t psm) +static rpmRC runInstScript(rpmpsm psm) /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/ - /*@modifies rpmGlobalMacroContext, fileSystem, internalState @*/ + /*@modifies psm, rpmGlobalMacroContext, fileSystem, internalState @*/ { rpmfi fi = psm->fi; HGE_t hge = fi->hge; @@ -935,11 +1257,11 @@ exit: * @param triggersAlreadyRun * @return */ -static int handleOneTrigger(const PSM_t psm, Header sourceH, Header triggeredH, +static int handleOneTrigger(const rpmpsm psm, Header sourceH, Header triggeredH, int arg2, unsigned char * triggersAlreadyRun) /*@globals rpmGlobalMacroContext, fileSystem, internalState@*/ - /*@modifies triggeredH, *triggersAlreadyRun, rpmGlobalMacroContext, + /*@modifies psm, triggeredH, *triggersAlreadyRun, rpmGlobalMacroContext, fileSystem, internalState @*/ { int scareMem = 1; @@ -1032,7 +1354,7 @@ static int handleOneTrigger(const PSM_t psm, Header sourceH, Header triggeredH, * @param psm package state machine data * @return 0 on success, 1 on error */ -static int runTriggers(PSM_t psm) +static int runTriggers(rpmpsm psm) /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/ /*@modifies psm, rpmGlobalMacroContext, @@ -1040,12 +1362,17 @@ static int runTriggers(PSM_t psm) { const rpmts ts = psm->ts; rpmfi fi = psm->fi; - int numPackage; + int numPackage = -1; rpmRC rc = RPMRC_OK; + const char * N = NULL; - numPackage = rpmdbCountPackages(rpmtsGetRdb(ts), rpmteN(psm->te)) + psm->countCorrection; + if (psm->te) /* XXX can't happen */ + N = rpmteN(psm->te); + if (N) /* XXX can't happen */ + numPackage = rpmdbCountPackages(rpmtsGetRdb(ts), N) + + psm->countCorrection; if (numPackage < 0) - return 1; + return RPMRC_NOTFOUND; if (fi->h != NULL) /* XXX can't happen */ { Header triggeredH; @@ -1053,11 +1380,9 @@ static int runTriggers(PSM_t psm) int countCorrection = psm->countCorrection; psm->countCorrection = 0; - mi = rpmtsInitIterator(ts, RPMTAG_TRIGGERNAME, rpmteN(psm->te), 0); - while((triggeredH = rpmdbNextIterator(mi)) != NULL) { + mi = rpmtsInitIterator(ts, RPMTAG_TRIGGERNAME, N, 0); + while((triggeredH = rpmdbNextIterator(mi)) != NULL) rc |= handleOneTrigger(psm, fi->h, triggeredH, numPackage, NULL); - } - mi = rpmdbFreeIterator(mi); psm->countCorrection = countCorrection; } @@ -1070,7 +1395,7 @@ static int runTriggers(PSM_t psm) * @param psm package state machine data * @return 0 on success, 1 on error */ -static int runImmedTriggers(PSM_t psm) +static int runImmedTriggers(rpmpsm psm) /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/ /*@modifies psm, rpmGlobalMacroContext, @@ -1164,12 +1489,85 @@ static int runImmedTriggers(PSM_t psm) /*@noteached@*/ } +rpmpsm XrpmpsmUnlink(rpmpsm psm, const char * msg, const char * fn, unsigned ln) +{ + if (psm == NULL) return NULL; +/*@-modfilesys@*/ +if (_psm_debug && msg != NULL) +fprintf(stderr, "--> psm %p -- %d %s at %s:%u\n", psm, psm->nrefs, msg, fn, ln); +/*@=modfilesys@*/ + psm->nrefs--; + return NULL; +} + +rpmpsm XrpmpsmLink(rpmpsm psm, const char * msg, const char * fn, unsigned ln) +{ + if (psm == NULL) return NULL; + psm->nrefs++; + +/*@-modfilesys@*/ +if (_psm_debug && msg != NULL) +fprintf(stderr, "--> psm %p ++ %d %s at %s:%u\n", psm, psm->nrefs, msg, fn, ln); +/*@=modfilesys@*/ + + /*@-refcounttrans@*/ return psm; /*@=refcounttrans@*/ +} + +rpmpsm rpmpsmFree(rpmpsm psm) +{ + const char * msg = "rpmpsmFree"; + if (psm == NULL) + return NULL; + + if (psm->nrefs > 1) + return rpmpsmUnlink(psm, msg); + +/*@-nullstate@*/ + psm->fi = rpmfiFree(psm->fi); +#ifdef NOTYET + psm->te = rpmteFree(psm->te); +#else + psm->te = NULL; +#endif + psm->ts = rpmtsFree(psm->ts); + + (void) rpmpsmUnlink(psm, msg); + + /*@-refcounttrans -usereleased@*/ +/*@-boundswrite@*/ + memset(psm, 0, sizeof(*psm)); /* XXX trash and burn */ +/*@=boundswrite@*/ + psm = _free(psm); + /*@=refcounttrans =usereleased@*/ + + return NULL; +/*@=nullstate@*/ +} + +rpmpsm rpmpsmNew(rpmts ts, rpmte te, rpmfi fi) +{ + const char * msg = "rpmpsmNew"; + rpmpsm psm = xcalloc(1, sizeof(*psm)); + + if (ts) psm->ts = rpmtsLink(ts, msg); +#ifdef NOTYET + if (te) psm->te = rpmteLink(te, msg); +#else +/*@-assignexpose -temptrans @*/ + if (te) psm->te = te; +/*@=assignexpose =temptrans @*/ +#endif + if (fi) psm->fi = rpmfiLink(fi, msg); + + return rpmpsmLink(psm, msg); +} + /** * @todo Packages w/o files never get a callback, hence don't get displayed * on install with -v. */ -/*@-nullpass@*/ /* FIX: testing null annotation for fi->h */ -int psmStage(PSM_t psm, pkgStage stage) +/*@-bounds -nullpass@*/ /* FIX: testing null annotation for fi->h */ +int rpmpsmStage(rpmpsm psm, pkgStage stage) { const rpmts ts = psm->ts; rpmfi fi = psm->fi; @@ -1265,8 +1663,9 @@ assert(psm->mi == NULL); psm->scriptArg = psm->npkgs_installed - 1; /* Retrieve installed header. */ - rc = psmStage(psm, PSM_RPMDB_LOAD); + rc = rpmpsmStage(psm, PSM_RPMDB_LOAD); if (rc == 0) +if (psm->te) psm->te->h = headerLink(fi->h); } if (psm->goal == PSM_PKGSAVE) { @@ -1293,7 +1692,7 @@ psm->te->h = headerLink(fi->h); if (rpmtsFlags(ts) & RPMTRANS_FLAG_TEST) break; /* Change root directory if requested and not already done. */ - rc = psmStage(psm, PSM_CHROOT_IN); + rc = rpmpsmStage(psm, PSM_CHROOT_IN); if (psm->goal == PSM_PKGINSTALL) { psm->scriptTag = RPMTAG_PREIN; @@ -1304,7 +1703,7 @@ psm->te->h = headerLink(fi->h); } if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPRE)) { - rc = psmStage(psm, PSM_SCRIPT); + rc = rpmpsmStage(psm, PSM_SCRIPT); if (rc) { rpmError(RPMERR_SCRIPT, _("%s: %s scriptlet failed (%d), skipping %s\n"), @@ -1323,16 +1722,16 @@ psm->te->h = headerLink(fi->h); if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOTRIGGERUN)) { /* Run triggers in other package(s) this package sets off. */ - rc = psmStage(psm, PSM_TRIGGERS); + rc = rpmpsmStage(psm, PSM_TRIGGERS); if (rc) break; /* Run triggers in this package other package(s) set off. */ - rc = psmStage(psm, PSM_IMMED_TRIGGERS); + rc = rpmpsmStage(psm, PSM_IMMED_TRIGGERS); if (rc) break; } if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPREUN)) - rc = psmStage(psm, PSM_SCRIPT); + rc = rpmpsmStage(psm, PSM_SCRIPT); } if (psm->goal == PSM_PKGSAVE) { int noArchiveSize = 0; @@ -1378,7 +1777,7 @@ psm->te->h = headerLink(fi->h); /* Retrieve type of payload compression. */ /*@-nullstate@*/ /* FIX: psm->oh may be NULL */ - rc = psmStage(psm, PSM_RPMIO_FLAGS); + rc = rpmpsmStage(psm, PSM_RPMIO_FLAGS); /*@=nullstate@*/ /* Write the lead section into the package. */ @@ -1483,7 +1882,7 @@ psm->te->h = headerLink(fi->h); } /* Retrieve type of payload compression. */ - rc = psmStage(psm, PSM_RPMIO_FLAGS); + rc = rpmpsmStage(psm, PSM_RPMIO_FLAGS); if (rpmteFd(fi->te) == NULL) { /* XXX can't happen */ rc = RPMRC_FAIL; @@ -1510,13 +1909,13 @@ psm->te->h = headerLink(fi->h); /*@=mods@*/ if (!rc) - rc = psmStage(psm, PSM_COMMIT); + rc = rpmpsmStage(psm, PSM_COMMIT); /* XXX make sure progress is closed out */ psm->what = RPMCALLBACK_INST_PROGRESS; psm->amount = (fi->archiveSize ? fi->archiveSize : 100); psm->total = psm->amount; - xx = psmStage(psm, PSM_NOTIFY); + xx = rpmpsmStage(psm, PSM_NOTIFY); if (rc) { rpmError(RPMERR_CPIO, @@ -1530,7 +1929,7 @@ psm->te->h = headerLink(fi->h); psm->what = RPMCALLBACK_UNPACK_ERROR; psm->amount = 0; psm->total = 0; - xx = psmStage(psm, PSM_NOTIFY); + xx = rpmpsmStage(psm, PSM_NOTIFY); break; } @@ -1545,7 +1944,7 @@ psm->te->h = headerLink(fi->h); psm->what = RPMCALLBACK_UNINST_START; psm->amount = fc; /* XXX W2DO? looks wrong. */ psm->total = fc; - xx = psmStage(psm, PSM_NOTIFY); + xx = rpmpsmStage(psm, PSM_NOTIFY); rc = fsmSetup(fi->fsm, FSM_PKGERASE, ts, fi, NULL, NULL, &psm->failedFile); @@ -1554,7 +1953,7 @@ psm->te->h = headerLink(fi->h); psm->what = RPMCALLBACK_UNINST_STOP; psm->amount = 0; /* XXX W2DO? looks wrong. */ psm->total = fc; - xx = psmStage(psm, PSM_NOTIFY); + xx = rpmpsmStage(psm, PSM_NOTIFY); } if (psm->goal == PSM_PKGSAVE) { @@ -1592,7 +1991,7 @@ psm->te->h = headerLink(fi->h); psm->what = RPMCALLBACK_INST_PROGRESS; psm->amount = (fi->archiveSize ? fi->archiveSize : 100); psm->total = psm->amount; - xx = psmStage(psm, PSM_NOTIFY); + xx = rpmpsmStage(psm, PSM_NOTIFY); fi->action = action; fi->actions = actions; @@ -1636,11 +2035,11 @@ psm->te->h = headerLink(fi->h); * the database before adding the new one. */ if (fi->record && !(rpmtsFlags(ts) & RPMTRANS_FLAG_APPLYONLY)) { - rc = psmStage(psm, PSM_RPMDB_REMOVE); + rc = rpmpsmStage(psm, PSM_RPMDB_REMOVE); if (rc) break; } - rc = psmStage(psm, PSM_RPMDB_ADD); + rc = rpmpsmStage(psm, PSM_RPMDB_ADD); if (rc) break; psm->scriptTag = RPMTAG_POSTIN; @@ -1649,16 +2048,16 @@ psm->te->h = headerLink(fi->h); psm->countCorrection = 0; if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPOST)) { - rc = psmStage(psm, PSM_SCRIPT); + rc = rpmpsmStage(psm, PSM_SCRIPT); if (rc) break; } if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOTRIGGERIN)) { /* Run triggers in other package(s) this package sets off. */ - rc = psmStage(psm, PSM_TRIGGERS); + rc = rpmpsmStage(psm, PSM_TRIGGERS); if (rc) break; /* Run triggers in this package other package(s) set off. */ - rc = psmStage(psm, PSM_IMMED_TRIGGERS); + rc = rpmpsmStage(psm, PSM_IMMED_TRIGGERS); if (rc) break; } @@ -1674,30 +2073,30 @@ psm->te->h = headerLink(fi->h); psm->countCorrection = -1; if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPOSTUN)) { - rc = psmStage(psm, PSM_SCRIPT); + rc = rpmpsmStage(psm, PSM_SCRIPT); /* XXX WTFO? postun failures don't cause erasure failure. */ } if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOTRIGGERPOSTUN)) { /* Run triggers in other package(s) this package sets off. */ - rc = psmStage(psm, PSM_TRIGGERS); + rc = rpmpsmStage(psm, PSM_TRIGGERS); if (rc) break; } if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_APPLYONLY)) - rc = psmStage(psm, PSM_RPMDB_REMOVE); + rc = rpmpsmStage(psm, PSM_RPMDB_REMOVE); } if (psm->goal == PSM_PKGSAVE) { } /* Restore root directory if changed. */ - xx = psmStage(psm, PSM_CHROOT_OUT); + xx = rpmpsmStage(psm, PSM_CHROOT_OUT); break; case PSM_UNDO: break; case PSM_FINI: /* Restore root directory if changed. */ - xx = psmStage(psm, PSM_CHROOT_OUT); + xx = rpmpsmStage(psm, PSM_CHROOT_OUT); if (psm->fd) { saveerrno = errno; /* XXX FIXME: Fclose with libio destroys errno */ @@ -1729,11 +2128,12 @@ psm->te->h = headerLink(fi->h); psm->amount = 0; psm->total = 0; /*@-nullstate@*/ /* FIX: psm->fd may be NULL. */ - xx = psmStage(psm, PSM_NOTIFY); + xx = rpmpsmStage(psm, PSM_NOTIFY); /*@=nullstate@*/ } if (psm->goal == PSM_PKGERASE || psm->goal == PSM_PKGSAVE) { +if (psm->te) if (psm->te->h) psm->te->h = headerFree(psm->te->h); if (fi->h) @@ -1759,11 +2159,11 @@ psm->te->h = headerFree(psm->te->h); psm->rc = RPMRC_OK; psm->stepName = pkgStageString(stage); - rc = psmStage(psm, PSM_INIT); - if (!rc) rc = psmStage(psm, PSM_PRE); - if (!rc) rc = psmStage(psm, PSM_PROCESS); - if (!rc) rc = psmStage(psm, PSM_POST); - xx = psmStage(psm, PSM_FINI); + rc = rpmpsmStage(psm, PSM_INIT); + if (!rc) rc = rpmpsmStage(psm, PSM_PRE); + if (!rc) rc = rpmpsmStage(psm, PSM_PROCESS); + if (!rc) rc = rpmpsmStage(psm, PSM_POST); + xx = rpmpsmStage(psm, PSM_FINI); break; case PSM_PKGCOMMIT: break; @@ -1772,7 +2172,9 @@ psm->te->h = headerFree(psm->te->h); break; case PSM_NOTIFY: { void * ptr; +/*@-nullpass@*/ /* FIX: psm->te may be NULL */ ptr = rpmtsNotify(ts, psm->te, psm->what, psm->amount, psm->total); +/*@-nullpass@*/ } break; case PSM_DESTROY: break; @@ -1890,4 +2292,4 @@ assert(psm->mi == NULL); return rc; /*@=nullstate@*/ } -/*@=nullpass@*/ +/*@=bounds =nullpass@*/ diff --git a/lib/psm.h b/lib/psm.h index 1b5befe..33d4d9b 100644 --- a/lib/psm.h +++ b/lib/psm.h @@ -6,6 +6,11 @@ * Package state machine to handle a package from a transaction set. */ +/*@-exportlocal@*/ +/*@unchecked@*/ +extern int _psm_debug; +/*@=exportlocal@*/ + /** */ #define PSM_VERBOSE 0x8000 @@ -54,10 +59,10 @@ typedef enum pkgStage_e { /** */ -struct psm_s { +struct rpmpsm_s { /*@refcounted@*/ rpmts ts; /*!< transaction set */ -/*@dependent@*/ +/*@dependent@*/ /*@null@*/ rpmte te; /*!< current transaction element */ /*@refcounted@*/ rpmfi fi; /*!< transaction element file info */ @@ -83,6 +88,11 @@ struct psm_s { int sense; /*!< One of RPMSENSE_TRIGGER{IN,UN,POSTUN}. */ int countCorrection; /*!< 0 if installing, -1 if removing. */ int chrootDone; /*!< Was chroot(2) done by pkgStage? */ + int unorderedSuccessor; /*!< Can the PSM be run asynchronously? */ + int reaper; /*!< Register SIGCHLD handler? */ + pid_t reaped; /*!< Reaped waitpid return. */ + pid_t child; /*!< Currently running process. */ + int status; /*!< Reaped waitpid status. */ rpmCallbackType what; /*!< Callback type. */ unsigned long amount; /*!< Callback amount. */ unsigned long total; /*!< Callback total. */ @@ -90,6 +100,9 @@ struct psm_s { pkgStage goal; /*@unused@*/ pkgStage stage; + +/*@refs@*/ + int nrefs; /*!< Reference count. */ }; #ifdef __cplusplus @@ -97,16 +110,73 @@ extern "C" { #endif /** + * Unreference a package state machine instance. + * @param psm package state machine + * @param msg + * @return NULL always + */ +/*@unused@*/ /*@null@*/ +rpmpsm rpmpsmUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ rpmpsm psm, + /*@null@*/ const char * msg) + /*@modifies psm @*/; + +/** @todo Remove debugging entry from the ABI. */ +/*@-exportlocal@*/ +/*@null@*/ +rpmpsm XrpmpsmUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ rpmpsm psm, + /*@null@*/ const char * msg, const char * fn, unsigned ln) + /*@modifies psm @*/; +/*@=exportlocal@*/ +#define rpmpsmUnlink(_psm, _msg) XrpmpsmUnlink(_psm, _msg, __FILE__, __LINE__) + +/** + * Reference a package state machine instance. + * @param psm package state machine + * @param msg + * @return new package state machine reference + */ +/*@unused@*/ /*@newref@*/ +rpmpsm rpmpsmLink (/*@null@*/ rpmpsm psm, /*@null@*/ const char * msg) + /*@modifies psm @*/; + +/** @todo Remove debugging entry from the ABI. */ +/*@-exportlocal@*/ +/*@newref@*/ +rpmpsm XrpmpsmLink (/*@null@*/ rpmpsm psm, /*@null@*/ const char * msg, + const char * fn, unsigned ln) + /*@modifies psm @*/; +/*@=exportlocal@*/ +#define rpmpsmLink(_psm, _msg) XrpmpsmLink(_psm, _msg, __FILE__, __LINE__) + +/** + * Destroy a package state machine. + * @param psm package state machine + * @return NULL always + */ +/*@null@*/ +rpmpsm rpmpsmFree(/*@killref@*/ /*@only@*/ /*@null@*/ rpmpsm psm) + /*@globals fileSystem @*/ + /*@modifies psm, fileSystem @*/; + +/** + * Create and load a package state machine. + * @param ts transaction set + * @param te transaction set element + * @param fi file info set + * @return new package state machine + */ +rpmpsm rpmpsmNew(rpmts ts, /*@null@*/ rpmte te, rpmfi fi) + /*@modifies ts, fi @*/; + +/** * Package state machine driver. * @param psm package state machine data * @param stage next stage * @return 0 on success */ -int psmStage(PSM_t psm, pkgStage stage) - /*@globals rpmGlobalMacroContext, - fileSystem, internalState @*/ - /*@modifies psm, rpmGlobalMacroContext, - fileSystem, internalState @*/; +int rpmpsmStage(rpmpsm psm, pkgStage stage) + /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/ + /*@modifies psm, rpmGlobalMacroContext, fileSystem, internalState @*/; #ifdef __cplusplus } diff --git a/lib/query.c b/lib/query.c index 13799e8..c2aaf35 100644 --- a/lib/query.c +++ b/lib/query.c @@ -175,7 +175,7 @@ int showQueryPackage(QVA_t qva, /*@unused@*/ rpmts ts, Header h) if (!(qva->qva_flags & QUERY_FOR_LIST)) goto exit; - fi = rpmfiNew(ts, NULL, h, RPMTAG_BASENAMES, scareMem); + fi = rpmfiNew(ts, h, RPMTAG_BASENAMES, scareMem); if (rpmfiFC(fi) <= 0) { /*@-boundswrite@*/ te = stpcpy(te, _("(contains no files)")); @@ -337,7 +337,7 @@ exit: } t = _free(t); - fi = rpmfiFree(fi, 1); + fi = rpmfiFree(fi); return rc; } diff --git a/lib/rpmal.c b/lib/rpmal.c index 2a69167..637e993 100644 --- a/lib/rpmal.c +++ b/lib/rpmal.c @@ -215,7 +215,7 @@ rpmal rpmalFree(rpmal al) if ((alp = al->list) != NULL) for (i = 0; i < al->size; i++, alp++) { alp->provides = rpmdsFree(alp->provides); - alp->fi = rpmfiFree(alp->fi, 1); + alp->fi = rpmfiFree(alp->fi); } if ((die = al->dirs) != NULL) @@ -368,7 +368,7 @@ fprintf(stderr, "*** del %p[%d]\n", al->list, pkgNum); } alp->provides = rpmdsFree(alp->provides); - alp->fi = rpmfiFree(alp->fi, 1); + alp->fi = rpmfiFree(alp->fi); /*@-boundswrite@*/ memset(alp, 0, sizeof(*alp)); /* XXX trash and burn */ diff --git a/lib/rpmal.h b/lib/rpmal.h index 508be2d..0a4f1fe 100644 --- a/lib/rpmal.h +++ b/lib/rpmal.h @@ -37,7 +37,8 @@ rpmal rpmalCreate(int delta) */ /*@null@*/ rpmal rpmalFree(/*@only@*/ /*@null@*/ rpmal al) - /*@modifies al @*/; + /*@globals fileSystem @*/ + /*@modifies al, fileSystem @*/; /** * Delete package from available list. @@ -46,7 +47,8 @@ rpmal rpmalFree(/*@only@*/ /*@null@*/ rpmal al) */ /*@-exportlocal@*/ void rpmalDel(/*@null@*/ rpmal al, /*@null@*/ alKey pkgKey) - /*@modifies al @*/; + /*@globals fileSystem @*/ + /*@modifies al, fileSystem @*/; /*@=exportlocal@*/ /** @@ -62,7 +64,8 @@ alKey rpmalAdd(rpmal * alistp, /*@dependent@*/ /*@null@*/ alKey pkgKey, /*@dependent@*/ /*@null@*/ fnpyKey key, /*@null@*/ rpmds provides, /*@null@*/ rpmfi fi) - /*@modifies *alistp, provides, fi @*/; + /*@globals fileSystem @*/ + /*@modifies *alistp, provides, fi, fileSystem @*/; /** * Add package provides to available list index. diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c index 4bea28f..008340f 100644 --- a/lib/rpmchecksig.c +++ b/lib/rpmchecksig.c @@ -549,6 +549,7 @@ static int rpmcliImportPubkeys(const rpmts ts, while ((fn = *argv++) != NULL) { /*@=boundsread@*/ +rpmtsClean(ts); pkt = _free(pkt); /* Read pgp packet. */ @@ -573,6 +574,7 @@ static int rpmcliImportPubkeys(const rpmts ts, } /*@=branchstate@*/ +rpmtsClean(ts); pkt = _free(pkt); return res; } diff --git a/lib/rpmcli.h b/lib/rpmcli.h index 4cd8505..b66ff41 100644 --- a/lib/rpmcli.h +++ b/lib/rpmcli.h @@ -337,8 +337,8 @@ int rpmQueryVerify(QVA_t qva, rpmts ts, const char * arg) * @return 0 always */ int showQueryPackage(QVA_t qva, rpmts ts, Header h) - /*@globals internalState @*/ - /*@modifies ts, h, internalState @*/; + /*@globals fileSystem, internalState @*/ + /*@modifies ts, h, fileSystem, internalState @*/; /** \ingroup rpmcli * Display package information. diff --git a/lib/rpmds.c b/lib/rpmds.c index 97c50df..5885475 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -30,10 +30,10 @@ int _rpmds_unspecified_epoch_noise = 0; rpmds XrpmdsUnlink(rpmds ds, const char * msg, const char * fn, unsigned ln) { if (ds == NULL) return NULL; -/*@-modfilesystem@*/ +/*@-modfilesys@*/ if (_rpmds_debug && msg != NULL) fprintf(stderr, "--> ds %p -- %d %s at %s:%u\n", ds, ds->nrefs, msg, fn, ln); -/*@=modfilesystem@*/ +/*@=modfilesys@*/ ds->nrefs--; return NULL; } @@ -43,10 +43,10 @@ rpmds XrpmdsLink(rpmds ds, const char * msg, const char * fn, unsigned ln) if (ds == NULL) return NULL; ds->nrefs++; -/*@-modfilesystem@*/ +/*@-modfilesys@*/ if (_rpmds_debug && msg != NULL) fprintf(stderr, "--> ds %p ++ %d %s at %s:%u\n", ds, ds->nrefs, msg, fn, ln); -/*@=modfilesystem@*/ +/*@=modfilesys@*/ /*@-refcounttrans@*/ return ds; /*@=refcounttrans@*/ } @@ -62,10 +62,10 @@ rpmds rpmdsFree(rpmds ds) if (ds->nrefs > 1) return rpmdsUnlink(ds, ds->Type); -/*@-modfilesystem@*/ +/*@-modfilesys@*/ if (_rpmds_debug < 0) fprintf(stderr, "*** ds %p\t%s[%d]\n", ds, ds->Type, ds->Count); -/*@=modfilesystem@*/ +/*@=modfilesys@*/ if (ds->tagN == RPMTAG_PROVIDENAME) { tagEVR = RPMTAG_PROVIDEVERSION; @@ -175,10 +175,10 @@ rpmds rpmdsNew(Header h, rpmTag tagN, int scareMem) ds->Flags, ds->Count * sizeof(*ds->Flags)); /*@=boundsread@*/ -/*@-modfilesystem@*/ +/*@-modfilesys@*/ if (_rpmds_debug < 0) fprintf(stderr, "*** ds %p\t%s[%d]\n", ds, ds->Type, ds->Count); -/*@=modfilesystem@*/ +/*@=modfilesys@*/ } /*@=branchstate@*/ @@ -497,10 +497,10 @@ int rpmdsNext(/*@null@*/ rpmds ds) } else ds->i = -1; -/*@-modfilesystem @*/ +/*@-modfilesys @*/ if (_rpmds_debug < 0 && i != -1) fprintf(stderr, "*** ds %p\t%s[%d]: %s\n", ds, (ds->Type ? ds->Type : "?Type?"), i, (ds->DNEVR ? ds->DNEVR : "?DNEVR?")); -/*@=modfilesystem @*/ +/*@=modfilesys @*/ } diff --git a/lib/rpmfi.c b/lib/rpmfi.c index 686ebcd..1035762 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -30,10 +30,10 @@ int _rpmfi_debug = 0; rpmfi XrpmfiUnlink(rpmfi fi, const char * msg, const char * fn, unsigned ln) { if (fi == NULL) return NULL; -/*@-modfilesystem@*/ +/*@-modfilesys@*/ if (_rpmfi_debug && msg != NULL) fprintf(stderr, "--> fi %p -- %d %s at %s:%u\n", fi, fi->nrefs, msg, fn, ln); -/*@=modfilesystem@*/ +/*@=modfilesys@*/ fi->nrefs--; return NULL; } @@ -42,10 +42,10 @@ rpmfi XrpmfiLink(rpmfi fi, const char * msg, const char * fn, unsigned ln) { if (fi == NULL) return NULL; fi->nrefs++; -/*@-modfilesystem@*/ +/*@-modfilesys@*/ if (_rpmfi_debug && msg != NULL) fprintf(stderr, "--> fi %p ++ %d %s at %s:%u\n", fi, fi->nrefs, msg, fn, ln); -/*@=modfilesystem@*/ +/*@=modfilesys@*/ /*@-refcounttrans@*/ return fi; /*@=refcounttrans@*/ } @@ -340,10 +340,10 @@ int rpmfiNext(rpmfi fi) } else fi->i = -1; -/*@-modfilesystem @*/ +/*@-modfilesys @*/ if (_rpmfi_debug < 0 && i != -1) fprintf(stderr, "*** fi %p\t%s[%d] %s%s\n", fi, (fi->Type ? fi->Type : "?Type?"), i, (i >= 0 ? fi->dnl[fi->j] : ""), (i >= 0 ? fi->bnl[fi->i] : "")); -/*@=modfilesystem @*/ +/*@=modfilesys @*/ } @@ -374,10 +374,10 @@ int rpmfiNextD(rpmfi fi) else fi->j = -1; -/*@-modfilesystem @*/ +/*@-modfilesys @*/ if (_rpmfi_debug < 0 && j != -1) fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, (fi->Type ? fi->Type : "?Type?"), j); -/*@=modfilesystem @*/ +/*@=modfilesys @*/ } @@ -883,7 +883,7 @@ Header relocateFileList(const rpmts ts, rpmfi fi, } /*@=bounds@*/ -rpmfi rpmfiFree(rpmfi fi, int freefimem) +rpmfi rpmfiFree(rpmfi fi) { HFD_t hfd = headerFreeData; @@ -892,10 +892,10 @@ rpmfi rpmfiFree(rpmfi fi, int freefimem) if (fi->nrefs > 1) return rpmfiUnlink(fi, fi->Type); -/*@-modfilesystem@*/ +/*@-modfilesys@*/ if (_rpmfi_debug < 0) fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, fi->Type, fi->fc); -/*@=modfilesystem@*/ +/*@=modfilesys@*/ /*@-branchstate@*/ if (fi->fc > 0) { @@ -946,12 +946,8 @@ fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, fi->Type, fi->fc); /*@-nullstate -refcounttrans -usereleased@*/ (void) rpmfiUnlink(fi, fi->Type); - /*@-branchstate@*/ - if (freefimem) { - memset(fi, 0, sizeof(*fi)); /* XXX trash and burn */ - fi = _free(fi); - } - /*@=branchstate@*/ + memset(fi, 0, sizeof(*fi)); /* XXX trash and burn */ + fi = _free(fi); /*@=nullstate =refcounttrans =usereleased@*/ return NULL; @@ -979,15 +975,14 @@ static inline unsigned char nibble(char c) (_fi)->_data = memcpy(xmalloc((_fi)->fc * sizeof(*(_fi)->_data)), \ (_fi)->_data, (_fi)->fc * sizeof(*(_fi)->_data)) -rpmfi rpmfiNew(rpmts ts, rpmfi fi, - Header h, rpmTag tagN, int scareMem) +rpmfi rpmfiNew(rpmts ts, Header h, rpmTag tagN, int scareMem) { HGE_t hge = (scareMem ? (HGE_t) headerGetEntryMinMemory : (HGE_t) headerGetEntry); HFD_t hfd = headerFreeData; + rpmfi fi = NULL; const char * Type; uint_32 * uip; - int malloced = 0; int dnlmax, bnlmax; unsigned char * t; int len; @@ -1001,12 +996,7 @@ rpmfi rpmfiNew(rpmts ts, rpmfi fi, goto exit; } - /*@-branchstate@*/ - if (fi == NULL) { - fi = xcalloc(1, sizeof(*fi)); - malloced = 0; /* XXX always return with memory alloced. */ - } - /*@=branchstate@*/ + fi = xcalloc(1, sizeof(*fi)); fi->magic = RPMFIMAGIC; fi->Type = Type; @@ -1030,19 +1020,8 @@ rpmfi rpmfiNew(rpmts ts, rpmfi fi, fi->archiveSize = (xx ? *uip : 0); if (!hge(h, RPMTAG_BASENAMES, NULL, (void **) &fi->bnl, &fi->fc)) { - /*@-branchstate@*/ - if (malloced) { - if (scareMem && fi->h) - fi->h = headerFree(fi->h); - fi->fsm = freeFSM(fi->fsm); - /*@-refcounttrans@*/ - fi = _free(fi); - /*@=refcounttrans@*/ - } else { - fi->fc = 0; - fi->dc = 0; - } - /*@=branchstate@*/ + fi->fc = 0; + fi->dc = 0; goto exit; } xx = hge(h, RPMTAG_DIRNAMES, NULL, (void **) &fi->dnl, &fi->dc); @@ -1147,10 +1126,10 @@ if (fi->actions == NULL) fi->fperms = 0644; exit: -/*@-modfilesystem@*/ +/*@-modfilesys@*/ if (_rpmfi_debug < 0) fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, Type, (fi ? fi->fc : 0)); -/*@=modfilesystem@*/ +/*@=modfilesys@*/ /*@-compdef -nullstate@*/ /* FIX: rpmfi null annotations */ return rpmfiLink(fi, (fi ? fi->Type : NULL)); diff --git a/lib/rpmfi.h b/lib/rpmfi.h index da112b4..87b1f43 100644 --- a/lib/rpmfi.h +++ b/lib/rpmfi.h @@ -409,26 +409,25 @@ rpmfi rpmfiInitD(/*@null@*/ rpmfi fi, int dx) /** * Destroy a file info set. * @param fi file info set - * @param freefimem free fi memory too? * @return NULL always */ /*@null@*/ -rpmfi rpmfiFree(/*@killref@*/ /*@only@*/ /*@null@*/ rpmfi fi, int freefimem) - /*@modifies fi@*/; +rpmfi rpmfiFree(/*@killref@*/ /*@only@*/ /*@null@*/ rpmfi fi) + /*@globals fileSystem @*/ + /*@modifies fi, fileSystem @*/; /** * Create and load a file info set. * @param ts transaction set - * @param fi file info set (NULL if creating) * @param h header * @param tagN RPMTAG_BASENAMES * @param scareMem Use pointers to refcounted header memory? * @return new file info set */ /*@null@*/ -rpmfi rpmfiNew(/*@null@*/ rpmts ts, /*@null@*/ rpmfi fi, - Header h, rpmTag tagN, int scareMem) - /*@modifies ts, fi, h @*/; +rpmfi rpmfiNew(/*@null@*/ rpmts ts, Header h, rpmTag tagN, int scareMem) + /*@globals fileSystem @*/ + /*@modifies ts, h, fileSystem @*/; /** * Return file type from mode_t. diff --git a/lib/rpmlib.h b/lib/rpmlib.h index e1cfdfc..11dd02f 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -847,7 +847,7 @@ typedef /*@abstract@*/ struct fsm_s * FSM_t; /** \ingroup rpmtrans * Package state machine data. */ -typedef /*@abstract@*/ struct psm_s * PSM_t; +typedef /*@abstract@*/ /*@refcounted@*/ struct rpmpsm_s * rpmpsm; /** * Return package header from file handle, verifying digests/signatures as diff --git a/lib/rpmps.c b/lib/rpmps.c index 4afb871..69d7b3f 100644 --- a/lib/rpmps.c +++ b/lib/rpmps.c @@ -20,10 +20,10 @@ int _rpmps_debug = 0; rpmps XrpmpsUnlink(rpmps ps, const char * msg, const char * fn, unsigned ln) { -/*@-modfilesystem@*/ +/*@-modfilesys@*/ if (_rpmps_debug > 0 && msg != NULL) fprintf(stderr, "--> ps %p -- %d %s at %s:%u\n", ps, ps->nrefs, msg, fn, ln); -/*@=modfilesystem@*/ +/*@=modfilesys@*/ ps->nrefs--; /*@-refcounttrans@*/ return ps; @@ -34,10 +34,10 @@ rpmps XrpmpsLink(rpmps ps, const char * msg, const char * fn, unsigned ln) { ps->nrefs++; -/*@-modfilesystem@*/ +/*@-modfilesys@*/ if (_rpmps_debug > 0 && msg != NULL) fprintf(stderr, "--> ps %p ++ %d %s at %s:%u\n", ps, ps->nrefs, msg, fn, ln); -/*@=modfilesystem@*/ +/*@=modfilesys@*/ /*@-refcounttrans@*/ return ps; /*@=refcounttrans@*/ diff --git a/lib/rpmrc.c b/lib/rpmrc.c index b022e9d..1ab7d30 100644 --- a/lib/rpmrc.c +++ b/lib/rpmrc.c @@ -1645,6 +1645,12 @@ void rpmFreeRpmrc(void) { int i, j, k; + if (platpat) + for (i = 0; i < nplatpat; i++) + platpat[i] = _free(platpat[i]); + platpat = _free(platpat); + nplatpat = 0; + for (i = 0; i < RPM_MACHTABLE_COUNT; i++) { tableType t; t = tables + i; diff --git a/lib/rpmte.c b/lib/rpmte.c index 246c6f9..3c72914 100644 --- a/lib/rpmte.c +++ b/lib/rpmte.c @@ -35,7 +35,8 @@ void rpmteCleanDS(rpmte te) /** */ static void delTE(rpmte p) - /*@modifies p @*/ + /*@globals fileSystem @*/ + /*@modifies p, fileSystem @*/ { rpmRelocation * r; @@ -49,7 +50,7 @@ static void delTE(rpmte p) rpmteCleanDS(p); - p->fi = rpmfiFree(p->fi, 1); + p->fi = rpmfiFree(p->fi); /*@-noeffectuncon@*/ if (p->fd != NULL) @@ -78,7 +79,8 @@ static void delTE(rpmte p) static void addTE(rpmts ts, rpmte p, Header h, /*@dependent@*/ /*@null@*/ fnpyKey key, /*@null@*/ rpmRelocation * relocs) - /*@modifies ts, p, h @*/ + /*@globals fileSystem @*/ + /*@modifies ts, p, h, fileSystem @*/ { int scareMem = 0; HGE_t hge = (HGE_t)headerGetEntryMinMemory; @@ -112,7 +114,7 @@ static void addTE(rpmts ts, rpmte p, Header h, p->this = rpmdsThis(h, RPMTAG_PROVIDENAME, RPMSENSE_EQUAL); p->provides = rpmdsNew(h, RPMTAG_PROVIDENAME, scareMem); - p->fi = rpmfiNew(ts, NULL, h, RPMTAG_BASENAMES, scareMem); + p->fi = rpmfiNew(ts, h, RPMTAG_BASENAMES, scareMem); p->requires = rpmdsNew(h, RPMTAG_REQUIRENAME, scareMem); p->conflicts = rpmdsNew(h, RPMTAG_CONFLICTNAME, scareMem); p->obsoletes = rpmdsNew(h, RPMTAG_OBSOLETENAME, scareMem); @@ -428,8 +430,10 @@ int rpmtsiOc(rpmtsi tsi) rpmtsi XrpmtsiFree(/*@only@*//*@null@*/ rpmtsi tsi, const char * fn, unsigned int ln) { + /* XXX watchout: a funky recursion segfaults here iff nrefs is wrong. */ if (tsi) - tsi->ts = rpmtsUnlink(tsi->ts, "rpmtsiInit"); + tsi->ts = rpmtsFree(tsi->ts); + /*@-modfilesys@*/ if (_rpmte_debug) fprintf(stderr, "*** tsi %p -- %s:%d\n", tsi, fn, ln); diff --git a/lib/rpmte.h b/lib/rpmte.h index 5fbd235..6ee4dcc 100644 --- a/lib/rpmte.h +++ b/lib/rpmte.h @@ -144,7 +144,8 @@ extern "C" { */ /*@null@*/ rpmte rpmteFree(/*@only@*/ /*@null@*/ rpmte te) - /*@modifies te@*/; + /*@globals fileSystem @*/ + /*@modifies te, fileSystem @*/; /** * Create a transaction element. @@ -163,7 +164,8 @@ rpmte rpmteNew(const rpmts ts, Header h, rpmElementType type, /*@null@*/ rpmRelocation * relocs, int dboffset, /*@exposed@*/ /*@dependent@*/ /*@null@*/ alKey pkgKey) - /*@modifies ts, h @*/; + /*@globals fileSystem @*/ + /*@modifies ts, h, fileSystem @*/; /** * Retrieve type of transaction element. @@ -456,7 +458,8 @@ int rpmtsiOc(rpmtsi tsi) */ /*@unused@*/ /*@null@*/ rpmtsi rpmtsiFree(/*@only@*//*@null@*/ rpmtsi tsi) - /*@*/; + /*@globals fileSystem @*/ + /*@modifies fileSystem @*/; /** * Destroy transaction element iterator. @@ -468,7 +471,8 @@ rpmtsi rpmtsiFree(/*@only@*//*@null@*/ rpmtsi tsi) /*@null@*/ rpmtsi XrpmtsiFree(/*@only@*//*@null@*/ rpmtsi tsi, const char * fn, unsigned int ln) - /*@*/; + /*@globals fileSystem @*/ + /*@modifies fileSystem @*/; #define rpmtsiFree(_tsi) XrpmtsiFree(_tsi, __FILE__, __LINE__) /** diff --git a/lib/rpmts.c b/lib/rpmts.c index d06d658..aa79034 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.c @@ -86,10 +86,10 @@ char * hGetNEVR(Header h, const char ** np) rpmts XrpmtsUnlink(rpmts ts, const char * msg, const char * fn, unsigned ln) { -/*@-modfilesystem@*/ +/*@-modfilesys@*/ if (_rpmts_debug) fprintf(stderr, "--> ts %p -- %d %s at %s:%u\n", ts, ts->nrefs, msg, fn, ln); -/*@=modfilesystem@*/ +/*@=modfilesys@*/ ts->nrefs--; return NULL; } @@ -97,10 +97,10 @@ fprintf(stderr, "--> ts %p -- %d %s at %s:%u\n", ts, ts->nrefs, msg, fn, ln); rpmts XrpmtsLink(rpmts ts, const char * msg, const char * fn, unsigned ln) { ts->nrefs++; -/*@-modfilesystem@*/ +/*@-modfilesys@*/ if (_rpmts_debug) fprintf(stderr, "--> ts %p ++ %d %s at %s:%u\n", ts, ts->nrefs, msg, fn, ln); -/*@=modfilesystem@*/ +/*@=modfilesys@*/ /*@-refcounttrans@*/ return ts; /*@=refcounttrans@*/ } @@ -432,10 +432,10 @@ int rpmtsSolve(rpmts ts, rpmds ds, /*@unused@*/ const void * data) } if (ts->transFlags & RPMTRANS_FLAG_ADDINDEPS) { - Header h; FD_t fd; rpmRC rpmrc; + h = headerFree(h); fd = Fopen(str, "r.ufdio"); if (fd == NULL || Ferror(fd)) { rpmError(RPMERR_OPEN, _("open of %s failed: %s\n"), str, @@ -520,10 +520,15 @@ int rpmtsSetSolveCallback(rpmts ts, const void * solveData) { int rc = 0; + +/*@-branchstate@*/ if (ts) { +/*@-assignexpose -temptrans @*/ ts->solve = solve; ts->solveData = solveData; +/*@=assignexpose =temptrans @*/ } +/*@=branchstate@*/ return rc; } @@ -539,7 +544,7 @@ rpmps rpmtsProblems(rpmts ts) void rpmtsCleanDig(rpmts ts) { - ts->sig = headerFreeData(ts->sig, ts->sigtype); + ts->sig = headerFreeData(ts->sig, -1); ts->dig = pgpFreeDig(ts->dig); } @@ -589,21 +594,18 @@ void rpmtsEmpty(rpmts ts) ts->orderCount = 0; ts->numRemovedPackages = 0; +/*@-nullstate@*/ /* FIX: partial annotations */ + return; +/*@=nullstate@*/ } rpmts rpmtsFree(rpmts ts) { - rpmtsi pi; rpmte p; - int oc; - if (ts == NULL) return NULL; - (void) rpmtsUnlink(ts, "tsCreate"); - -/*@-usereleased@*/ - if (ts->nrefs > 0) - return NULL; + if (ts->nrefs > 1) + return rpmtsUnlink(ts, "tsCreate"); /*@-nullstate@*/ /* FIX: partial annotations */ rpmtsEmpty(ts); @@ -637,8 +639,11 @@ rpmts rpmtsFree(rpmts ts) ts->pkpktlen = 0; memset(ts->pksignid, 0, sizeof(ts->pksignid)); - /*@-refcounttrans@*/ ts = _free(ts); /*@=refcounttrans@*/ -/*@=usereleased@*/ + (void) rpmtsUnlink(ts, "tsCreate"); + + /*@-refcounttrans -usereleased @*/ + ts = _free(ts); + /*@=refcounttrans =usereleased @*/ return NULL; } @@ -661,6 +666,17 @@ rpmVSFlags rpmtsSetVSFlags(rpmts ts, rpmVSFlags vsflags) return ovsflags; } +int rpmtsUnorderedSuccessors(rpmts ts, int first) +{ + int unorderedSuccessors = 0; + if (ts != NULL) { + unorderedSuccessors = ts->unorderedSuccessors; + if (first >= 0) + ts->unorderedSuccessors = first; + } + return unorderedSuccessors; +} + const char * rpmtsRootDir(rpmts ts) { return (ts != NULL ? ts->rootDir : NULL); @@ -812,8 +828,7 @@ int rpmtsSetSig(rpmts ts, int_32 sigtag, int_32 sigtype, const void * sig, int_32 siglen) { if (ts != NULL) { - if (ts->sig) - ts->sig = headerFreeData(ts->sig, ts->sigtype); + ts->sig = headerFreeData(ts->sig, -1); ts->sigtag = sigtag; ts->sigtype = sigtype; /*@-assignexpose -kepttrans@*/ diff --git a/lib/rpmts.h b/lib/rpmts.h index 1aa882e..b6d2f7f 100644 --- a/lib/rpmts.h +++ b/lib/rpmts.h @@ -156,10 +156,11 @@ struct rpmts_s { int numAvailablePackages; /*!< No. available package instances. */ #endif -/*@owned@*/ +/*@owned@*/ /*@relnull@*/ rpmte * order; /*!< Packages sorted by dependencies. */ int orderCount; /*!< No. of transaction elements. */ int orderAlloced; /*!< No. of allocated transaction elements. */ + int unorderedSuccessors; /*!< Index of 1st element of successors. */ int chrootDone; /*!< Has chroot(2) been been done? */ /*@only@*/ /*@null@*/ @@ -254,10 +255,12 @@ rpmts rpmtsUnlink (/*@killref@*/ /*@only@*/ rpmts ts, /*@modifies ts @*/; /** @todo Remove debugging entry from the ABI. */ +/*@-exportlocal@*/ /*@null@*/ rpmts XrpmtsUnlink (/*@killref@*/ /*@only@*/ rpmts ts, const char * msg, const char * fn, unsigned ln) /*@modifies ts @*/; +/*@=exportlocal@*/ #define rpmtsUnlink(_ts, _msg) XrpmtsUnlink(_ts, _msg, __FILE__, __LINE__) /** \ingroup rpmts @@ -428,14 +431,16 @@ void rpmtsCleanDig(rpmts ts) * @param ts transaction set */ void rpmtsClean(rpmts ts) - /*@modifies ts @*/; + /*@globals fileSystem @*/ + /*@modifies ts, fileSystem @*/; /** \ingroup rpmts * Re-create an empty transaction set. * @param ts transaction set */ void rpmtsEmpty(rpmts ts) - /*@modifies ts @*/; + /*@globals fileSystem @*/ + /*@modifies ts, fileSystem @*/; /** \ingroup rpmts * Destroy transaction set, closing the database as well. @@ -465,6 +470,15 @@ rpmVSFlags rpmtsSetVSFlags(rpmts ts, rpmVSFlags vsflags) /*@modifies ts @*/; /** \ingroup rpmts + * Set index of 1st element of successors. + * @param ts transaction set + * @param first new index of 1st element of successors + * @return previous value + */ +int rpmtsUnorderedSuccessors(rpmts ts, int first) + /*@modifies ts @*/; + +/** \ingroup rpmts * Get transaction rootDir, i.e. path to chroot(2). * @param ts transaction set * @return transaction rootDir @@ -759,8 +773,10 @@ rpmts rpmtsCreate(void) int rpmtsAddInstallElement(rpmts ts, Header h, /*@exposed@*/ /*@null@*/ const fnpyKey key, int upgrade, /*@null@*/ rpmRelocation * relocs) - /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/ - /*@modifies ts, h, rpmGlobalMacroContext, fileSystem, internalState @*/; + /*@globals rpmcliPackagesTotal, rpmGlobalMacroContext, + fileSystem, internalState @*/ + /*@modifies ts, h, rpmcliPackagesTotal, rpmGlobalMacroContext, + fileSystem, internalState @*/; /** \ingroup rpmts * Add package to be erased to transaction set. @@ -770,7 +786,8 @@ int rpmtsAddInstallElement(rpmts ts, Header h, * @return 0 on success */ int rpmtsAddEraseElement(rpmts ts, Header h, int dboffset) - /*@modifies ts, h @*/; + /*@globals fileSystem @*/ + /*@modifies ts, h, fileSystem @*/; /** \ingroup rpmts * Retrieve keys from ordered transaction set. @@ -784,7 +801,8 @@ int rpmtsAddEraseElement(rpmts ts, Header h, int dboffset) int rpmtsGetKeys(rpmts ts, /*@null@*/ /*@out@*/ fnpyKey ** ep, /*@null@*/ /*@out@*/ int * nep) - /*@modifies ts, ep, nep @*/; + /*@globals fileSystem @*/ + /*@modifies ts, ep, nep, fileSystem @*/; /** * Return (malloc'd) header name-version-release string. diff --git a/lib/signature.c b/lib/signature.c index 39ec04a..88c07ad 100644 --- a/lib/signature.c +++ b/lib/signature.c @@ -313,6 +313,7 @@ static int makePGPSignature(const char * file, /*@out@*/ byte ** pkt, /* dosetenv("PGPPASS", passPhrase, 1); */ + unsetenv("MALLOC_CHECK_"); if ((path = rpmDetectPGPVersion(&pgpVer)) != NULL) { switch(pgpVer) { case PGP_2: @@ -443,6 +444,7 @@ static int makeGPGSignature(const char * file, /*@out@*/ byte ** pkt, (void) dosetenv("GNUPGHOME", gpg_path, 1); /*@=boundsread@*/ + unsetenv("MALLOC_CHECK_"); cmd = rpmExpand("%{?__gpg_sign_cmd}", NULL); rc = poptParseArgvString(cmd, NULL, (const char ***)&av); /*@-boundsread@*/ @@ -712,6 +714,7 @@ static int checkPassPhrase(const char * passPhrase, const int sigTag) } xx = dup2(passPhrasePipe[0], 3); + unsetenv("MALLOC_CHECK_"); switch (sigTag) { case RPMSIGTAG_DSA: case RPMSIGTAG_GPG: diff --git a/lib/transaction.c b/lib/transaction.c index 8d16eba..d424115 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -36,7 +36,7 @@ /*@access dbiIndexSet @*/ /*@access rpmdb @*/ -/*@access PSM_t @*/ +/*@access rpmpsm @*/ /*@access alKey @*/ /*@access fnpyKey @*/ @@ -229,7 +229,7 @@ static int handleInstInstalledFiles(const rpmts ts, &shared->otherPkg, sizeof(shared->otherPkg)); while ((h = rpmdbNextIterator(mi)) != NULL) { altNEVR = hGetNEVR(h, NULL); - otherFi = rpmfiNew(ts, NULL, h, RPMTAG_BASENAMES, scareMem); + otherFi = rpmfiNew(ts, h, RPMTAG_BASENAMES, scareMem); break; } mi = rpmdbFreeIterator(mi); @@ -288,7 +288,7 @@ static int handleInstInstalledFiles(const rpmts ts, ps = rpmpsFree(ps); altNEVR = _free(altNEVR); - otherFi = rpmfiFree(otherFi, 1); + otherFi = rpmfiFree(otherFi); fi->replaced = xrealloc(fi->replaced, /* XXX memory leak */ sizeof(*fi->replaced) * (numReplaced + 1)); @@ -961,10 +961,10 @@ int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet) sharedFileInfo shared, sharedList; int numShared; int nexti; - alKey lastKey; + alKey lastFailKey; fingerPrintCache fpc; rpmps ps; - PSM_t psm = memset(alloca(sizeof(*psm)), 0, sizeof(*psm)); + rpmpsm psm; rpmtsi pi; rpmte p; rpmtsi qi; rpmte q; int numAdded; @@ -1006,9 +1006,6 @@ int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet) (void) rpmtsSetTid(ts, tid); } - memset(psm, 0, sizeof(*psm)); - psm->ts = rpmtsLink(ts, "tsRun"); - /* Get available space on mounted file systems. */ xx = rpmtsInitDSI(ts); @@ -1197,7 +1194,6 @@ rpmMessage(RPMMESS_DEBUG, _("computing file dispositions\n")); /* Extract file info for all files in this package from the database. */ matches = xcalloc(fc, sizeof(*matches)); if (rpmdbFindFpList(rpmtsGetRdb(ts), fi->fps, matches, fc)) { - psm->ts = rpmtsUnlink(ts, "tsRun (rpmFindFpList fail)"); ps = rpmpsFree(ps); return 1; /* XXX WTFO? */ } @@ -1335,8 +1331,6 @@ rpmMessage(RPMMESS_DEBUG, _("computing file dispositions\n")); (okProbs != NULL || rpmpsTrim(ts->probs, okProbs))) ) { - if (psm->ts != NULL) - psm->ts = rpmtsUnlink(psm->ts, "tsRun (problems)"); return ts->orderCount; } @@ -1348,7 +1342,8 @@ rpmMessage(RPMMESS_DEBUG, _("computing file dispositions\n")); progress = 0; pi = rpmtsiInit(ts); while ((p = rpmtsiNext(pi, 0)) != NULL) { - fi = rpmtsiFi(pi); + if ((fi = rpmtsiFi(pi)) == NULL) + continue; /* XXX can't happen */ switch (rpmteType(p)) { case TR_ADDED: /*@switchbreak@*/ break; @@ -1363,16 +1358,17 @@ rpmMessage(RPMMESS_DEBUG, _("computing file dispositions\n")); numRemoved, NULL, ts->notifyData)); progress++; - psm->te = p; - psm->fi = rpmfiLink(fi, "tsRepackage"); /* XXX TR_REMOVED needs CPIO_MAP_{ABSOLUTE,ADDDOT} CPIO_ALL_HARDLINKS */ - psm->fi->mapflags |= CPIO_MAP_ABSOLUTE; - psm->fi->mapflags |= CPIO_MAP_ADDDOT; - psm->fi->mapflags |= CPIO_ALL_HARDLINKS; - xx = psmStage(psm, PSM_PKGSAVE); - (void) rpmfiUnlink(fi, "tsRepackage"); - psm->fi = NULL; - psm->te = NULL; + fi->mapflags |= CPIO_MAP_ABSOLUTE; + fi->mapflags |= CPIO_MAP_ADDDOT; + fi->mapflags |= CPIO_ALL_HARDLINKS; + psm = rpmpsmNew(ts, p, fi); + xx = rpmpsmStage(psm, PSM_PKGSAVE); + psm = rpmpsmFree(psm); + fi->mapflags &= ~CPIO_MAP_ABSOLUTE; + fi->mapflags &= ~CPIO_MAP_ADDDOT; + fi->mapflags &= ~CPIO_ALL_HARDLINKS; + /*@switchbreak@*/ break; } } @@ -1386,8 +1382,7 @@ rpmMessage(RPMMESS_DEBUG, _("computing file dispositions\n")); /* =============================================== * Install and remove packages. */ -rpmMessage(RPMMESS_DEBUG, _("install/erase %d elements\n"), rpmtsNElements(ts)); - lastKey = (alKey)-2; /* erased packages have -1 */ + lastFailKey = (alKey)-2; /* erased packages have -1 */ pi = rpmtsiInit(ts); /*@-branchstate@*/ /* FIX: fi reload needs work */ while ((p = rpmtsiNext(pi, 0)) != NULL) { @@ -1398,8 +1393,10 @@ rpmMessage(RPMMESS_DEBUG, _("install/erase %d elements\n"), rpmtsNElements(ts)); if ((fi = rpmtsiFi(pi)) == NULL) continue; /* XXX can't happen */ - psm->te = p; - psm->fi = rpmfiLink(fi, "tsInstall"); + psm = rpmpsmNew(ts, p, fi); + psm->unorderedSuccessor = + (rpmtsiOc(pi) >= rpmtsUnorderedSuccessors(ts, -1) ? 1 : 0); + switch (rpmteType(p)) { case TR_ADDED: @@ -1438,40 +1435,43 @@ rpmMessage(RPMMESS_DEBUG, _("install/erase %d elements\n"), rpmtsNElements(ts)); /*@=type@*/ if (rpmteFd(p) != NULL) { + /* + * XXX Sludge necessary to tranfer existing fstates/actions + * XXX around a recreated file info set. + */ + psm->fi = rpmfiFree(psm->fi); { -char * fstates = fi->fstates; -fileAction * actions = fi->actions; - -fi->fstates = NULL; -fi->actions = NULL; - psm->fi = rpmfiFree(psm->fi, 1); - (void) rpmfiFree(fi, 0); -/*@-usereleased@*/ -fi->magic = RPMFIMAGIC; -fi->te = p; -fi->record = 0; - (void) rpmfiNew(ts, fi, p->h, RPMTAG_BASENAMES, 1); - psm->fi = rpmfiLink(fi, "tsInstall"); -fi->fstates = _free(fi->fstates); -fi->fstates = fstates; -fi->actions = _free(fi->actions); -fi->actions = actions; -/*@=usereleased@*/ - + char * fstates = fi->fstates; + fileAction * actions = fi->actions; + + fi->fstates = NULL; + fi->actions = NULL; + fi = rpmfiFree(fi); + fi = rpmfiNew(ts, p->h, RPMTAG_BASENAMES, 1); + p->fi = fi; + fi->te = p; + fi->fstates = _free(fi->fstates); + fi->fstates = fstates; + fi->actions = _free(fi->actions); + fi->actions = actions; } + psm->fi = rpmfiLink(p->fi, NULL); + if (rpmteMultiLib(p)) (void) rpmtsSetFlags(ts, (rpmtsFlags(ts) | RPMTRANS_FLAG_MULTILIB)); else (void) rpmtsSetFlags(ts, (rpmtsFlags(ts) & ~RPMTRANS_FLAG_MULTILIB)); - if (psmStage(psm, PSM_PKGINSTALL)) { +/*@-nullstate@*/ /* FIX: psm->fi may be NULL */ + if (rpmpsmStage(psm, PSM_PKGINSTALL)) { ourrc++; - lastKey = pkgKey; + lastFailKey = pkgKey; } +/*@=nullstate@*/ fi->h = headerFree(fi->h); } else { ourrc++; - lastKey = pkgKey; + lastFailKey = pkgKey; } p->h = headerFree(p->h); @@ -1488,26 +1488,30 @@ fi->actions = actions; /*@switchbreak@*/ break; case TR_REMOVED: rpmMessage(RPMMESS_DEBUG, "========== --- %s\n", rpmteNEVR(p)); - /* If install failed, then we shouldn't erase. */ - if (rpmteDependsOnKey(p) != lastKey) { - if (psmStage(psm, PSM_PKGERASE)) + /* + * XXX This has always been a hack, now mostly broken. + * If install failed, then we shouldn't erase. + */ + if (rpmteDependsOnKey(p) != lastFailKey) { + if (rpmpsmStage(psm, PSM_PKGERASE)) ourrc++; } /*@switchbreak@*/ break; } xx = rpmdbSync(rpmtsGetRdb(ts)); - (void) rpmfiUnlink(psm->fi, "tsInstall"); - psm->fi = NULL; - psm->te = NULL; + +/*@-nullstate@*/ /* FIX: psm->fi may be NULL */ + psm = rpmpsmFree(psm); +/*@=nullstate@*/ + /*@-type@*/ /* FIX: p is almost opaque */ - p->fi = rpmfiFree(fi, 1); + p->fi = rpmfiFree(fi); /*@=type@*/ + } /*@=branchstate@*/ pi = rpmtsiFree(pi); - psm->ts = rpmtsUnlink(psm->ts, "tsRun"); - /*@-nullstate@*/ /* FIX: ts->flList may be NULL */ if (ourrc) return -1; diff --git a/lib/verify.c b/lib/verify.c index fcb7f3a..7184f5a 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -18,7 +18,7 @@ /*@access rpmps @*/ /*@access rpmProblem @*/ -/*@access PSM_t @*/ /* XXX for %verifyscript through psmStage() */ +/*@access rpmpsm @*/ /* XXX for %verifyscript through rpmpsmStage() */ /*@access FD_t @*/ /* XXX compared with NULL */ #define S_ISDEV(m) (S_ISBLK((m)) || S_ISCHR((m))) @@ -222,26 +222,21 @@ static int rpmVerifyScript(/*@unused@*/ QVA_t qva, rpmts ts, /*@modifies ts, fi, scriptFd, rpmGlobalMacroContext, fileSystem, internalState @*/ { + rpmpsm psm = rpmpsmNew(ts, NULL, fi); int rc = 0; - PSM_t psm; - - psm = memset(alloca(sizeof(*psm)), 0, sizeof(*psm)); - psm->ts = rpmtsLink(ts, "rpmVerifyScript"); if (scriptFd != NULL) - rpmtsSetScriptFd(ts, scriptFd); + rpmtsSetScriptFd(psm->ts, scriptFd); - psm->fi = rpmfiLink(fi, "rpmVerifyScript"); psm->stepName = "verify"; psm->scriptTag = RPMTAG_VERIFYSCRIPT; psm->progTag = RPMTAG_VERIFYSCRIPTPROG; - rc = psmStage(psm, PSM_SCRIPT); - psm->fi = rpmfiUnlink(fi, "rpmVerifyScript"); + rc = rpmpsmStage(psm, PSM_SCRIPT); if (scriptFd != NULL) - rpmtsSetScriptFd(ts, NULL); + rpmtsSetScriptFd(psm->ts, NULL); - psm->ts = rpmtsUnlink(ts, "rpmVerifyScript"); + psm = rpmpsmFree(psm); return rc; } @@ -431,7 +426,7 @@ int showVerifyPackage(QVA_t qva, rpmts ts, Header h) int ec = 0; int rc; - fi = rpmfiNew(ts, NULL, h, RPMTAG_BASENAMES, scareMem); + fi = rpmfiNew(ts, h, RPMTAG_BASENAMES, scareMem); if (fi != NULL) { if (qva->qva_flags & VERIFY_DEPS) { @@ -458,7 +453,7 @@ int showVerifyPackage(QVA_t qva, rpmts ts, Header h) rc = Fclose(fdo); } - fi = rpmfiFree(fi, 1); + fi = rpmfiFree(fi); } return ec; diff --git a/platform.in b/platform.in index cff01c3..5a6fad7 100644 --- a/platform.in +++ b/platform.in @@ -32,45 +32,6 @@ %_defaultdocdir @DEFAULTDOCDIR@ -#============================================================================== -# ---- configure and makeinstall. -# -%configure \ - CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ - CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ - FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \ - ./configure %{_target_platform} \\\ - --prefix=%{_prefix} \\\ - --exec-prefix=%{_exec_prefix} \\\ - --bindir=%{_bindir} \\\ - --sbindir=%{_sbindir} \\\ - --sysconfdir=%{_sysconfdir} \\\ - --datadir=%{_datadir} \\\ - --includedir=%{_includedir} \\\ - --libdir=%{_libdir} \\\ - --libexecdir=%{_libexecdir} \\\ - --localstatedir=%{_localstatedir} \\\ - --sharedstatedir=%{_sharedstatedir} \\\ - --mandir=%{_mandir} \\\ - --infodir=%{_infodir} - -%makeinstall \ - make \\\ - prefix=%{?buildroot:%{buildroot}}%{_prefix} \\\ - exec_prefix=%{?buildroot:%{buildroot}}%{_exec_prefix} \\\ - bindir=%{?buildroot:%{buildroot}}%{_bindir} \\\ - sbindir=%{?buildroot:%{buildroot}}%{_sbindir} \\\ - sysconfdir=%{?buildroot:%{buildroot}}%{_sysconfdir} \\\ - datadir=%{?buildroot:%{buildroot}}%{_datadir} \\\ - includedir=%{?buildroot:%{buildroot}}%{_includedir} \\\ - libdir=%{?buildroot:%{buildroot}}%{_libdir} \\\ - libexecdir=%{?buildroot:%{buildroot}}%{_libexecdir} \\\ - localstatedir=%{?buildroot:%{buildroot}}%{_localstatedir} \\\ - sharedstatedir=%{?buildroot:%{buildroot}}%{_sharedstatedir} \\\ - mandir=%{?buildroot:%{buildroot}}%{_mandir} \\\ - infodir=%{?buildroot:%{buildroot}}%{_infodir} \\\ - install - %_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\ && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\ [ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS") diff --git a/po/cs.po b/po/cs.po index bbbd56b..4289f1c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -109,7 +109,7 @@ msgstr "Spole msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "RPM verze %s\n" @@ -515,52 +515,52 @@ msgstr "Soubor uveden dvakr msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Symbolická linka ukazuje na BuildRoot: %s -> %s\n" -#: build/files.c:1565 +#: build/files.c:1564 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Soubor nesouhlasí s prefixem (%s): %s\n" -#: build/files.c:1589 +#: build/files.c:1588 #, c-format msgid "File not found: %s\n" msgstr "Soubor nenalezen: %s\n" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "©patný vlastník/skupina: %s\n" -#: build/files.c:1645 +#: build/files.c:1644 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Soubor %4d: %07o %s.%s\t %s\n" -#: build/files.c:1762 +#: build/files.c:1761 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "Soubor potøebuje úvodní \"/\": %s\n" -#: build/files.c:1785 +#: build/files.c:1784 #, c-format msgid "Glob not permitted: %s\n" msgstr "Glob není dovolen: %s\n" -#: build/files.c:1800 +#: build/files.c:1799 #, c-format msgid "File not found by glob: %s\n" msgstr "Soubor nenalezen globem: %s\n" -#: build/files.c:1864 +#: build/files.c:1863 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Nemohu otevøít %%files soubor %s: %s\n" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "øádek: %s\n" -#: build/files.c:2262 +#: build/files.c:2261 #, c-format msgid "Bad file: %s: %s\n" msgstr "©patný soubor: %s: %s\n" @@ -751,7 +751,7 @@ msgstr "Nemohu p msgid "Could not open %s: %s\n" msgstr "Nemohu otevøít %s: %s\n" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, c-format msgid "Unable to write package: %s\n" msgstr "Nemohu zapsat balíèek: %s\n" @@ -781,7 +781,7 @@ msgstr "Nemohu p msgid "Unable to write payload to %s: %s\n" msgstr "Nemohu zapsat payload do %s: %s\n" -#: build/pack.c:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "Zapsáno: %s\n" @@ -1268,19 +1268,19 @@ msgstr "nekontrolovat z msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "generovat hlavièky balíèkù kompatibilní s RPM verze 2 a 3" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "nekontrolovat závislosti balíèkù" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "nekontrolovat architekturu balíèku" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1314,17 +1314,17 @@ msgstr "c msgid "lookup i18N strings in specfile catalog" msgstr "vyhledat i18N øetìzce ve specfile katalogu" -#: build/spec.c:238 +#: build/spec.c:233 #, c-format msgid "line %d: Bad number: %s\n" msgstr "øádek %d: ©patné èíslo: %s\n" -#: build/spec.c:244 +#: build/spec.c:239 #, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "øádek %d: ©patné èíslo %s: %d\n" -#: build/spec.c:307 +#: build/spec.c:302 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "øádek %d: ©patné èíslo %s: %s\n" @@ -1370,57 +1370,57 @@ msgstr "" msgid " failed - " msgstr "selhal - " -#: lib/depends.c:162 +#: lib/depends.c:163 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/depends.c:394 +#: lib/depends.c:395 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:422 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ANO (rpmrc poskytuje)\n" -#: lib/depends.c:438 +#: lib/depends.c:439 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ANO (rpmlib poskytuje)\n" -#: lib/depends.c:467 +#: lib/depends.c:468 #, fuzzy msgid "(db files)" msgstr "©patný soubor: %s: %s\n" -#: lib/depends.c:480 +#: lib/depends.c:481 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ANO (db poskytuje)\n" -#: lib/depends.c:493 +#: lib/depends.c:494 #, fuzzy msgid "(db package)" msgstr "¾ádné balíèky\n" -#: lib/depends.c:851 +#: lib/depends.c:852 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:973 +#: lib/depends.c:974 #, 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:1207 +#: lib/depends.c:1208 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" #. T4. Scan for zeroes. -#: lib/depends.c:1308 +#: lib/depends.c:1309 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1470,72 +1470,72 @@ msgstr "(nen msgid "(not an OpenPGP signature)" msgstr "vynechat pøípadné PGP podpisy" -#: lib/fs.c:77 +#: lib/fs.c:73 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() nevrátil velikost: %s\n" -#: lib/fs.c:92 +#: lib/fs.c:88 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl() nevrátil pøípojné body: %s\n" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, c-format msgid "failed to stat %s: %s\n" msgstr "nemohu zjistit stav %s: %s\n" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/fs.c:330 +#: lib/fs.c:326 #, c-format msgid "file %s is on an unknown device\n" msgstr "soubor %s je na neznámém zaøízení\n" -#: lib/fsm.c:338 +#: lib/fsm.c:339 #, fuzzy msgid "========== Directories not explictly included in package:\n" msgstr "========= Adresáøe, které nebyly explicitnì zaøazeny do balíèku:\n" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "vytvoøen adresáø %s s právy %04o.\n" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, c-format msgid "%s saved as %s\n" msgstr "%s ulo¾eno jako %s\n" -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s odstranìní %s selhalo: Adresáø není prázdný\n" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir %s selhal: %s\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s unlink %s selhal: %s\n" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, c-format msgid "%s created as %s\n" msgstr "%s vytvoøen jako %s\n" @@ -1556,7 +1556,7 @@ msgid "error creating temporary file %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1570,122 +1570,127 @@ msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "tato verze RPM podporuje práci s balíèky s verzí <= 4\n" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, fuzzy, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: readLead selhalo\n" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead selhalo\n" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread selhalo: %s\n" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 #, fuzzy msgid "print macro expansion of EXPR" msgstr "vypsat expanzi makra +" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 #, fuzzy msgid "read instead of default file(s)" msgstr "èíst místo implicitního makro souboru" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "zakázat pou¾ití libio(3) API" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 #, fuzzy msgid "send stdout to CMD" msgstr "odeslat stdout do " -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 #, fuzzy msgid "use ROOT as top level directory" msgstr "pou¾ít jako adresáø nejvy¹¹í úrovnì" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "zobrazit známé znaèky pro dotazy" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "zobrazit finální konfiguraci rpmrc a maker" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "poskytnout výstu s ménì detaily" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "poskytnout detailnìj¹í výstup" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "vypsat pou¾ívanou verzi rpm" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 #, fuzzy msgid "debug payload file state machine" msgstr "ladit nástroj stavu souborù" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "ladit protokol datového toku" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 #, fuzzy msgid "debug option/argument processing" msgstr "Interní chyba pøi zpracování parametrù (%d) :-(\n" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +#, fuzzy +msgid "debug package state machine" +msgstr "ladit nástroj stavu souborù" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "ladit rpmio I/O" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "ladit manipulaci s URL cache" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2113,74 +2118,89 @@ msgstr "generovat PGP/GPG podpis" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "Datový typ %d není podporován\n" -#: lib/psm.c:443 +#: lib/psm.c:446 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:562 +#: lib/psm.c:565 msgid "source package contains no .spec file\n" msgstr "zdrojový balíèek neobsahuje .spec soubor\n" -#: lib/psm.c:682 -#, fuzzy, c-format -msgid "%s: running %s scriptlet\n" -msgstr "%s: spou¹tím %s skript(y) (pokud existují)\n" +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:983 #, 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" +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" +msgstr "" -#: lib/psm.c:859 +#: lib/psm.c:991 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" +msgstr "" + +#: lib/psm.c:1153 +#, c-format +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" +msgstr "" + +#: lib/psm.c:1176 +#, fuzzy, c-format +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" +msgstr "%s: scriptlet %s selhal (%d), pøeskakuji %s-%s-%s\n" + +#: lib/psm.c:1182 +#, fuzzy, c-format +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "provedení %s skripletu z %s-%s-%s selhalo, návratový kód: %d\n" -#: lib/psm.c:1188 +#: lib/psm.c:1586 #, 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:1310 +#: lib/psm.c:1709 #, 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:1420 +#: lib/psm.c:1819 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Nemohu pøeèíst hlavièku z %s: %s\n" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, 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:1475 +#: lib/psm.c:1874 #, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ita skupina root\n" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalování archívu selhalo %s%s: %s\n" -#: lib/psm.c:1524 +#: lib/psm.c:1923 msgid " on file " msgstr " na souboru " -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s selhalo\n" @@ -2348,7 +2368,7 @@ msgstr "makeTempFile selhalo\n" msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite selhalo: %s\n" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "parametr není RPM balíèek\n" @@ -2378,53 +2398,53 @@ msgstr "%s: Fwrite selhalo: %s\n" msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: Fwrite selhalo: %s\n" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLead selhalo\n" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLead selhalo\n" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead selhalo\n" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 #, fuzzy msgid "NOT OK" msgstr "NE " -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr "" -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr "" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "" @@ -2796,17 +2816,17 @@ msgstr "Nezn msgid "Please contact rpm-list@redhat.com\n" msgstr "" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, fuzzy, c-format msgid "Cannot expand %s\n" msgstr "nemohu znovu otevøít payload: %s\n" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, fuzzy, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Nemohu otevøít %s: %s\n" @@ -2870,116 +2890,116 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Nemohu spustit %s: %s\n" -#: lib/signature.c:356 +#: lib/signature.c:357 #, fuzzy msgid "pgp failed\n" msgstr "%s selhalo\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 #, fuzzy msgid "pgp failed to write signature\n" msgstr "generovat PGP/GPG podpis" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 #, fuzzy msgid "unable to read the signature\n" msgstr "Nemohu pøeèíst hlavièku z %s: %s\n" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:470 +#: lib/signature.c:472 #, fuzzy msgid "gpg failed\n" msgstr "%s selhalo\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 #, fuzzy msgid "gpg failed to write signature\n" msgstr "generovat PGP/GPG podpis" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, fuzzy, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "©patná %%_signature spec v souboru maker.\n" -#: lib/signature.c:808 +#: lib/signature.c:811 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:823 +#: lib/signature.c:826 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:872 +#: lib/signature.c:875 #, fuzzy msgid "Header+Payload size: " msgstr "Velikost hlavièky je pøili¹ velká" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 #, fuzzy msgid "Header SHA1 digest: " msgstr "nekontrolovat SHA1 digest v hlavièce" -#: lib/signature.c:1044 +#: lib/signature.c:1047 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "vynechat pøípadné MD5 souèty" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 #, fuzzy msgid "V3 DSA signature: " msgstr "generovat PGP/GPG podpis" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -3003,7 +3023,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3016,7 +3036,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3024,24 +3044,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, fuzzy, c-format msgid "missing %c %s" msgstr "chybí { po %" -#: lib/verify.c:398 +#: lib/verify.c:393 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "chybné závislosti pøi sestavování:\n" @@ -3233,153 +3245,153 @@ msgstr "nemohu otev msgid "cannot open %s index\n" msgstr "nemohu otevøít RPM databázi v %s\n" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "znovu vytvoøit databázi z existující databáze" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "nemohu provést dotaz %s: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Nelze pøejmenovat %s na %s: %m\n" @@ -3748,6 +3760,14 @@ msgid "DIRECTORY" msgstr "" #, fuzzy +#~ msgid "%s: running %s scriptlet\n" +#~ msgstr "%s: spou¹tím %s skript(y) (pokud existují)\n" + +#~ 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" + +#, fuzzy #~ msgid "%s: base64 encode failed.\n" #~ msgstr "%s: readLead selhalo\n" diff --git a/po/da.po b/po/da.po index 6c907c0..df54c01 100644 --- a/po/da.po +++ b/po/da.po @@ -109,7 +109,7 @@ msgstr "F msgid "%s: %s\n" msgstr "fil %s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "RPM version %s\n" @@ -510,52 +510,52 @@ msgstr "Fil angivet to gange: %s\n" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Symbolsk lænke peger på BuildRoot: %s -> %s\n" -#: build/files.c:1565 +#: build/files.c:1564 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Fil passer ikke til præfiks (%s): %s\n" -#: build/files.c:1589 +#: build/files.c:1588 #, c-format msgid "File not found: %s\n" msgstr "Fil ikke fundet: %s\n" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Ugyldig ejer/gruppe: %s\n" -#: build/files.c:1645 +#: build/files.c:1644 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Fil %4d: %07o %s.%s\t %s\n" -#: build/files.c:1762 +#: build/files.c:1761 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "Fil kræver foranstillet \"/\": %s\n" -#: build/files.c:1785 +#: build/files.c:1784 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "linie %d: Filnavn ikke tilladt: %s\n" -#: build/files.c:1800 +#: build/files.c:1799 #, c-format msgid "File not found by glob: %s\n" msgstr "Fil ikke fundet med glob: %s\n" -#: build/files.c:1864 +#: build/files.c:1863 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Kunne ikke åbne '%%files'-fil %s: %s\n" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "linie: %s\n" -#: build/files.c:2262 +#: build/files.c:2261 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ugyldig fil: %s: %s\n" @@ -748,7 +748,7 @@ msgstr "Kunne ikke l msgid "Could not open %s: %s\n" msgstr "Kunne ikke åbne %s: %s\n" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" @@ -778,7 +778,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:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1268,19 +1268,19 @@ msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" "generér pakkehoved(er), der er kompatible med (gamle) rpm[23]-indpakninger" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "undlad at tjekke pakkers afhængighedskrav" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "tjek ikke pakkens arkitektur" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1314,17 +1314,17 @@ msgstr "gennemtving m msgid "lookup i18N strings in specfile catalog" msgstr "slå i18N-strenge op i spec-fil katalog" -#: build/spec.c:238 +#: build/spec.c:233 #, c-format msgid "line %d: Bad number: %s\n" msgstr "linie %d: Ugyldigt tal: %s\n" -#: build/spec.c:244 +#: build/spec.c:239 #, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "linie %d: Ugyldigt 'no%s'-tal: %d\n" -#: build/spec.c:307 +#: build/spec.c:302 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "linie %d: Ugyldigt %s-tal: %s\n" @@ -1469,71 +1469,71 @@ msgstr "(ikke et tal)" msgid "(not an OpenPGP signature)" msgstr "overspring eventuelle PGP-signaturer" -#: lib/fs.c:77 +#: lib/fs.c:73 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() returnerede ingen størrelse: %s\n" -#: lib/fs.c:92 +#: lib/fs.c:88 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl() returnerede ingen monteringspunkter: %s\n" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, c-format msgid "failed to stat %s: %s\n" msgstr "kunne ikke finde %s: %s\n" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/fs.c:330 +#: lib/fs.c:326 #, c-format msgid "file %s is on an unknown device\n" msgstr "fil %s er på en ukendt enhed\n" -#: lib/fsm.c:338 +#: lib/fsm.c:339 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, fuzzy, c-format msgid "%10d %s\n" msgstr "linie %d: %s\n" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, c-format msgid "%s saved as %s\n" msgstr "%s gemt som %s\n" -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "kan ikke fjerne %s - katalog ikke tomt\n" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "fjernelse (rmdir) af %s mislykkedes: %s\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "åbning af %s mislykkedes %s\n" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, c-format msgid "%s created as %s\n" msgstr "%s oprettet som %s\n" @@ -1554,7 +1554,7 @@ msgid "error creating temporary file %s\n" msgstr "fejl ved oprettelse af midlertidig fil %s\n" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1569,121 +1569,125 @@ msgid "" msgstr "" "kun indpakninger med hovedversion <= 4 understøttes af denne udgave af RPM\n" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature mislykkedes\n" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ingen tilgængelig signatur\n" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead mislykkedes\n" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread mislykkedes: %s\n" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 #, fuzzy msgid "print macro expansion of EXPR" msgstr "udlæs makroudvidelse af +" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 #, fuzzy msgid "read instead of default file(s)" msgstr "læs i stedet for standard makrofil(er)" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "undlad at benytte libio(3)-API" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 #, fuzzy msgid "send stdout to CMD" msgstr "send standard-ud til " -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 #, fuzzy msgid "use ROOT as top level directory" msgstr "brug som topniveau-katalog" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "vis kendte forespørgselsmærker" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "vis den endelige rpmrc og makrokonfiguration" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "medtag mindre detaljerede oplysninger" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "medtag mere detaljerede oplysninger" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "vis versionen af rpm som benyttes" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 msgid "debug payload file state machine" msgstr "" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "aflus protokol-datastrøm" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 #, fuzzy msgid "debug option/argument processing" msgstr "Intern fejl i parameterfortolkningen (%d) :-(\n" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +msgid "debug package state machine" +msgstr "" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "aflus rpmio I/O" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "aflus URL-bufferhåndtering" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2126,76 +2130,90 @@ msgstr "gener #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "Datatype %d understøttes ikke\n" -#: lib/psm.c:443 +#: lib/psm.c:446 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær fundet\n" -#: lib/psm.c:562 +#: lib/psm.c:565 msgid "source package contains no .spec file\n" msgstr "kildepakke indeholder ingen .spec-fil\n" -#: lib/psm.c:682 -#, fuzzy, c-format -msgid "%s: running %s scriptlet\n" -msgstr "kører postinstallations-skript (hvis det findes)\n" +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" -#: lib/psm.c:852 -#, fuzzy, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +#: lib/psm.c:983 +#, c-format +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -"kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n" -#: lib/psm.c:859 +#: lib/psm.c:991 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" +msgstr "" + +#: lib/psm.c:1153 +#, c-format +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" +msgstr "" + +#: lib/psm.c:1176 +#, fuzzy, c-format +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" +msgstr "overspringer installation af %s-%s-%s, %%pre-småskript fejlede rc %d\n" + +#: lib/psm.c:1182 +#, fuzzy, c-format +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "" "kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n" -#: lib/psm.c:1188 +#: lib/psm.c:1586 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "pakke: %s-%s-%s filer test = %d\n" -#: lib/psm.c:1310 +#: lib/psm.c:1709 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1420 +#: lib/psm.c:1819 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Kunne ikke læse hoved fra %s: %s\n" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, c-format msgid "user %s does not exist - using root\n" msgstr "bruger %s eksisterer ikke - bruger root\n" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, c-format msgid "group %s does not exist - using root\n" msgstr "gruppe %s eksisterer ikke - bruger root\n" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "udpakning af arkiv mislykkedes%s%s: %s\n" -#: lib/psm.c:1524 +#: lib/psm.c:1923 msgid " on file " msgstr " for fil " -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s mislykkedes\n" @@ -2363,7 +2381,7 @@ msgstr "makeTempFile mislykkedes\n" msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite mislykkedes: %s\n" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "parameter er ikke en RPM-pakke\n" @@ -2393,52 +2411,52 @@ msgstr "%s: writeLead mislykkedes: %s\n" msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature mislykkedes: %s\n" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLead mislykkedes\n" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLead mislykkedes\n" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead mislykkedes\n" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Ingen tilgængelig signatur (v1.0 RPM)\n" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "IKKE O.K." -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 msgid " (MISSING KEYS:" msgstr " (MANGLENDE NØGLER: " -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr " (IKKE-BETROEDE NØGLER:" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "O.K." @@ -2813,17 +2831,17 @@ msgstr "" msgid "Please contact rpm-list@redhat.com\n" msgstr "Kontakt venligst rpm-list@redhat.com (på engelsk)\n" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, c-format msgid "Cannot expand %s\n" msgstr "Kan ikke udfolde %s\n" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "Kunne ikke læse %s, HOME er for stor.\n" -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Kunne ikke åbne %s for læsning: %s.\n" @@ -2887,111 +2905,111 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "Signaturstørrelse: %d\n" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Kunne ikke udføre %s: %s\n" -#: lib/signature.c:356 +#: lib/signature.c:357 msgid "pgp failed\n" msgstr "pgp fejlede\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 msgid "pgp failed to write signature\n" msgstr "pgp kunne ikke skrive signatur\n" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "PGP-signaturstørrelse: %d\n" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 msgid "unable to read the signature\n" msgstr "kunne ikke læse signaturen\n" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Fik %d byte af PGP-signatur\n" -#: lib/signature.c:470 +#: lib/signature.c:472 msgid "gpg failed\n" msgstr "gpg fejlede\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 msgid "gpg failed to write signature\n" msgstr "gpg kunne ikke skrive signaturen\n" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "GPG-signaturstørrelse: %d\n" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Fik %d byte GPG-signatur\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "Ugyldig angivelse af '%%_signature'-spec i makrofil.\n" -#: lib/signature.c:808 +#: lib/signature.c:811 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Du skal angive \"%%_gpg_name\" i din makrofil\n" -#: lib/signature.c:823 +#: lib/signature.c:826 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Du skal angive \"%%_pgp_name\" i din makrofil\n" -#: lib/signature.c:872 +#: lib/signature.c:875 #, fuzzy msgid "Header+Payload size: " msgstr "Hovedstørrelse er for stor" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 #, fuzzy msgid "Header SHA1 digest: " msgstr "verificér ikke filerne i pakke" -#: lib/signature.c:1044 +#: lib/signature.c:1047 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "overspring eventuelle MD5-signaturer" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 #, fuzzy msgid "V3 DSA signature: " msgstr "Ingen signatur\n" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Signaturfyld : %d\n" @@ -3015,7 +3033,7 @@ msgstr "ekskluderer kataloget %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3028,7 +3046,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3036,24 +3054,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, fuzzy, c-format msgid "missing %c %s" msgstr "manglende %s" -#: lib/verify.c:398 +#: lib/verify.c:393 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "Ikke-tilfredsstillede afhængighedskrav for %s-%s-%s: " @@ -3245,157 +3255,157 @@ msgstr "kan ikke msgid "cannot open %s index\n" msgstr "kan ikke åbne '%s'-indeks\n" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 msgid "no dbpath has been set\n" msgstr "der er ikke sat nogen dbpath\n" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "fejl(%d) ved gemning af post %s i %s\n" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: kan ikke læse hoved ved 0x%x\n" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "fjerner \"%s\" fra %s-indekset.\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, c-format msgid "removing %d entries from %s index.\n" msgstr "fjerne %d indgange fra %s-indekset.\n" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "fejl(%d) ved gemning af post %s i %s\n" -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "fejl(%d) ved fjernelse af post %s fra %s\n" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "fejl(%d) under allokering af ny pakkeinstans\n" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" "tilføjer \"%s\" til '%s'-indekset.\n" "\n" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, c-format msgid "adding %d entries to %s index.\n" msgstr "tilføjer %d indgange til '%s'-indekset.\n" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "fejl(%d) ved gemning af post %s i %s\n" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "fjerner %s efter vellykket genopbygning af db3.\n" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "der ikke sat nogen dbpath" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, c-format msgid "rebuilding database %s into %s\n" msgstr "genopbygger database %s over i %s\n" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "temporary database %s already exists\n" msgstr "den midlertidige database %s eksisterer allerede\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, c-format msgid "creating directory %s\n" msgstr "" "opretter kataloget %s\n" "\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, c-format msgid "creating directory %s: %s\n" msgstr "opretter kataloget %s: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, c-format msgid "opening old database with dbapi %d\n" msgstr "åbner gammel database med dbapi %d\n" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, c-format msgid "opening new database with dbapi %d\n" msgstr "åbner ny database med dbapi %d\n" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "post nummer %d i databasen er fejlbehæftet -- overspringer.\n" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "kunne ikke tilføje posten, der tidligere var ved %d\n" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunne ikke genopbygge database: original-databasen beholdes\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "kunne ikke erstatte gammel database med ny database!\n" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "erstat filer i %s med filer fra %s for at genoprette" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, c-format msgid "removing directory %s\n" msgstr "fjerner kataloget %s\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunne ikke fjerne katalog %s: %s\n" @@ -3759,6 +3769,16 @@ msgid "DIRECTORY" msgstr "" #, fuzzy +#~ msgid "%s: running %s scriptlet\n" +#~ msgstr "kører postinstallations-skript (hvis det findes)\n" + +#, fuzzy +#~ 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" + +#, fuzzy #~ msgid "%s: base64 encode failed.\n" #~ msgstr "%s: readLead mislykkedes\n" @@ -4778,10 +4798,6 @@ msgstr "" #~ msgid "running preinstall script (if any)\n" #~ msgstr "kører præinstallations-skript (hvis det findes)\n" -#~ msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" -#~ msgstr "" -#~ "overspringer installation af %s-%s-%s, %%pre-småskript fejlede rc %d\n" - #~ msgid "removal of %s failed: %s\n" #~ msgstr "fjernelse af %s mislykkedes: %s\n" diff --git a/po/de.po b/po/de.po index 7bcf8d7..128a6f6 100644 --- a/po/de.po +++ b/po/de.po @@ -152,7 +152,7 @@ msgid "%s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "RPM Version %s\n" @@ -584,55 +584,55 @@ msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" # , c-format -#: build/files.c:1565 +#: build/files.c:1564 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Lesen von %s fehlgeschlagen: %s." -#: build/files.c:1589 +#: build/files.c:1588 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Datei auf dem Server nicht gefunden" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" # , c-format -#: build/files.c:1645 +#: build/files.c:1644 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/files.c:1762 +#: build/files.c:1761 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "Verschiebungen müssen mit einem »/« beginnen" -#: build/files.c:1785 +#: build/files.c:1784 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" -#: build/files.c:1800 +#: build/files.c:1799 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Datei auf dem Server nicht gefunden" -#: build/files.c:1864 +#: build/files.c:1863 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Fehler: kann Datei %s nicht öffnen\n" # , c-format -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: build/files.c:2262 +#: build/files.c:2261 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -837,7 +837,7 @@ msgid "Could not open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen\n" # , c-format -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nicht möglich %s zu schreiben" @@ -872,7 +872,7 @@ msgstr "Nicht m msgid "Unable to write payload to %s: %s\n" msgstr "Nicht möglich %s zu schreiben" -#: build/pack.c:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1393,19 +1393,19 @@ msgstr "Dateiabh msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "Dateiabhängigkeiten nicht überprüfen" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "Paket-Architektur nicht überprüfen" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1442,17 +1442,17 @@ msgstr "" msgid "lookup i18N strings in specfile catalog" msgstr "" -#: build/spec.c:238 +#: build/spec.c:233 #, fuzzy, c-format msgid "line %d: Bad number: %s\n" msgstr "ungültige Paket-Nummer: %s\n" -#: build/spec.c:244 +#: build/spec.c:239 #, fuzzy, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "ungültige Paket-Nummer: %s\n" -#: build/spec.c:307 +#: build/spec.c:302 #, fuzzy, c-format msgid "line %d: Bad %s number: %s\n" msgstr "ungültige Paket-Nummer: %s\n" @@ -1601,74 +1601,74 @@ msgid "(not an OpenPGP signature)" msgstr "alle PGP-Signaturen überspringen" # , c-format -#: lib/fs.c:77 +#: lib/fs.c:73 #, fuzzy, c-format msgid "mntctl() failed to return size: %s\n" msgstr "anlegen von %s fehlgeschlagen\n" -#: lib/fs.c:92 +#: lib/fs.c:88 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "" # , c-format -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, fuzzy, c-format msgid "failed to stat %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/fs.c:330 +#: lib/fs.c:326 #, c-format msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:338 +#: lib/fsm.c:339 msgid "========== Directories not explictly included in package:\n" msgstr "" # , c-format -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, fuzzy, c-format msgid "%10d %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "kann %s nicht entfernen - Verzeichnis ist nicht leer" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "Entfernen von %s fehlgeschlagen: %s" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "kann Datei %s nicht öffnen: " @@ -1689,7 +1689,7 @@ msgid "error creating temporary file %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1707,121 +1707,127 @@ msgid "" msgstr "" "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: »rpmReadSignature« fehlgeschlagen\n" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "%s: Keine Signatur verfügbar\n" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 #, fuzzy msgid "print macro expansion of EXPR" msgstr "Die benutzte RPM-Version anzeigen" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 msgid "read instead of default file(s)" msgstr "" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 #, fuzzy msgid "send stdout to CMD" msgstr "Standard-Ausgabe nach umleiten" -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 #, fuzzy msgid "use ROOT as top level directory" msgstr " als Stammverzeichnis benutzen" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "Die benutzte RPM-Version anzeigen" # , c-format -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 #, fuzzy msgid "debug payload file state machine" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 msgid "debug option/argument processing" msgstr "" -#: lib/poptALL.c:274 +# , c-format +#: lib/poptALL.c:269 +#, fuzzy +msgid "debug package state machine" +msgstr "Öffnen von %s fehlgeschlagen: %s" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2284,78 +2290,93 @@ msgstr "PGP-Signatur generieren" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:443 +#: lib/psm.c:446 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:562 +#: lib/psm.c:565 #, fuzzy msgid "source package contains no .spec file\n" msgstr "Anfrage nach Paket, das die Datei besitzt" -#: lib/psm.c:682 -#, fuzzy, c-format -msgid "%s: running %s scriptlet\n" -msgstr "Keine Stufen ausführen" +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" + +#: lib/psm.c:983 +#, c-format +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" +msgstr "" + +#: lib/psm.c:991 +#, c-format +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" +msgstr "" + +#: lib/psm.c:1153 +#, c-format +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" +msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:1176 #, fuzzy, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" -msgstr "Ausführung des Skripts fehlgeschlagen" +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" +msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n" -#: lib/psm.c:859 +#: lib/psm.c:1182 #, fuzzy, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "Ausführung des Skripts fehlgeschlagen" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/psm.c:1188 +#: lib/psm.c:1586 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/psm.c:1310 +#: lib/psm.c:1709 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" # , c-format -#: lib/psm.c:1420 +#: lib/psm.c:1819 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Nicht möglich %s zu schreiben" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/psm.c:1524 +#: lib/psm.c:1923 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp fehlgeschlagen" @@ -2530,7 +2551,7 @@ msgstr "%s: msgid "%s: Fwrite failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "Fehler: %s scheint zu keinem RPM-Paket zu gehören\n" @@ -2560,53 +2581,53 @@ msgstr "%s: msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: »rpmReadSignature« fehlgeschlagen\n" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 #, fuzzy msgid " (MISSING KEYS:" msgstr " (FEHLENDE SCHLüSSEL)" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr "" -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr "" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "" @@ -2986,18 +3007,18 @@ msgstr "" msgid "Please contact rpm-list@redhat.com\n" msgstr "" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, fuzzy, c-format msgid "Cannot expand %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" # , c-format -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, fuzzy, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s." @@ -3064,115 +3085,115 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Konnte pgp nicht durchführen" -#: lib/signature.c:356 +#: lib/signature.c:357 #, fuzzy msgid "pgp failed\n" msgstr "pgp fehlgeschlagen" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 #, fuzzy msgid "pgp failed to write signature\n" msgstr "pgp fehlgeschlagen beim Schreiben der Signatur" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 #, fuzzy msgid "unable to read the signature\n" msgstr "nicht möglich, die Signatur zu lesen" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:470 +#: lib/signature.c:472 #, fuzzy msgid "gpg failed\n" msgstr "pgp fehlgeschlagen" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 #, fuzzy msgid "gpg failed to write signature\n" msgstr "pgp fehlgeschlagen beim Schreiben der Signatur" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:808 +#: lib/signature.c:811 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein" -#: lib/signature.c:823 +#: lib/signature.c:826 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein" -#: lib/signature.c:872 +#: lib/signature.c:875 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 #, fuzzy msgid "Header SHA1 digest: " msgstr "Paket installieren" -#: lib/signature.c:1044 +#: lib/signature.c:1047 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "alle MD5-Signaturen überspringen" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 #, fuzzy msgid "V3 DSA signature: " msgstr "%s: Keine Signatur verfügbar\n" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -3196,7 +3217,7 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3209,7 +3230,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3217,24 +3238,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, fuzzy, c-format msgid "missing %c %s" msgstr "fehlende { nach %{" -#: lib/verify.c:398 +#: lib/verify.c:393 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: " @@ -3429,160 +3442,160 @@ msgstr "kann Datei %s nicht msgid "cannot open %s index\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 #, fuzzy msgid "no dbpath has been set\n" msgstr "»dbpath« ist nicht gesetzt" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "Fehler beim Eintrag %s von %s" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "Fehler bei Schreiben des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "Fehler beim Eintrag %s von %s" # FIXME -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" # FIXME -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "Fehler beim Eintrag %s von %s" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "Fehler bei Schreiben des Eintrags %s nach %s" # FIXME -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # FIXME -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "Fehler bei Schreiben des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "»dbpath« ist nicht gesetzt" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "die temporäre Datenbank %s existiert schon" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" "Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" # , c-format -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -3956,6 +3969,15 @@ msgid "DIRECTORY" msgstr "" #, fuzzy +#~ msgid "%s: running %s scriptlet\n" +#~ msgstr "Keine Stufen ausführen" + +#, fuzzy +#~ msgid "" +#~ "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +#~ msgstr "Ausführung des Skripts fehlgeschlagen" + +#, fuzzy #~ msgid "%s: base64 encode failed.\n" #~ msgstr "%s: »readLead« fehlgeschlagen\n" @@ -4915,10 +4937,6 @@ msgstr "" #~ msgstr "umbennen von %s nach %s fehlgeschlagen: %s" #, fuzzy -#~ msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" -#~ msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n" - -#, fuzzy #~ msgid "removal of %s failed: %s\n" #~ msgstr "öffnen von %s fehlgeschlagen: %s" diff --git a/po/fi.po b/po/fi.po index 85c5cb8..fe0f186 100644 --- a/po/fi.po +++ b/po/fi.po @@ -109,7 +109,7 @@ msgstr "" msgid "%s: %s\n" msgstr "en voinut avata %s: %s" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "RPM versio %s\n" @@ -525,52 +525,52 @@ msgstr "En voi lukea %s: %s." msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1565 +#: build/files.c:1564 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "En voi lukea %s: %s." -#: build/files.c:1589 +#: build/files.c:1588 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Tiedostoa ei löytynyt palvelimelta" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1645 +#: build/files.c:1644 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "en voinut avata %s: %s" -#: build/files.c:1762 +#: build/files.c:1761 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "siirtojen pitää alkaa /-merkillä" -#: build/files.c:1785 +#: build/files.c:1784 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: build/files.c:1800 +#: build/files.c:1799 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Tiedostoa ei löytynyt palvelimelta" -#: build/files.c:1864 +#: build/files.c:1863 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "en voinut avata %s: %s" -#: build/files.c:2262 +#: build/files.c:2261 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "en voinut avata %s: %s" @@ -761,7 +761,7 @@ msgstr "%s:n kirjoitus ei onnistu" msgid "Could not open %s: %s\n" msgstr "%s:n avaus epäonnistui\n" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "%s:n kirjoitus ei onnistu" @@ -791,7 +791,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:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1286,19 +1286,19 @@ msgstr " msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "älä tarkista paketin riippuvuuksia" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "älä tarkista paketin arkkitehtuuria" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1335,17 +1335,17 @@ msgstr "" msgid "lookup i18N strings in specfile catalog" msgstr "" -#: build/spec.c:238 +#: build/spec.c:233 #, fuzzy, c-format msgid "line %d: Bad number: %s\n" msgstr "virheellinen paketin numero: %s\n" -#: build/spec.c:244 +#: build/spec.c:239 #, fuzzy, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "virheellinen paketin numero: %s\n" -#: build/spec.c:307 +#: build/spec.c:302 #, fuzzy, c-format msgid "line %d: Bad %s number: %s\n" msgstr "virheellinen paketin numero: %s\n" @@ -1491,71 +1491,71 @@ msgstr "(ei ole luku)" msgid "(not an OpenPGP signature)" msgstr "ohita PGP-allekirjoitukset" -#: lib/fs.c:77 +#: lib/fs.c:73 #, fuzzy, c-format msgid "mntctl() failed to return size: %s\n" msgstr "%s:n luonti epäonnistui\n" -#: lib/fs.c:92 +#: lib/fs.c:88 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, fuzzy, c-format msgid "failed to stat %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/fs.c:330 +#: lib/fs.c:326 #, c-format msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:338 +#: lib/fsm.c:339 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, fuzzy, c-format msgid "%10d %s\n" msgstr "en voinut avata %s: %s" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "en voi poistaa %s -hakemisto ei ole tyhjä" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s:n rmdir epäonnistui: %s" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "en voinut avata tiedostoa %s: " @@ -1576,7 +1576,7 @@ msgid "error creating temporary file %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1594,120 +1594,125 @@ msgid "" msgstr "" "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature epäonnistui\n" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ei allekirjoitusta saatavilla\n" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead epäonnistui\n" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: readLead epäonnistui\n" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 #, fuzzy msgid "print macro expansion of EXPR" msgstr "tulosta käytetyn rpm:n versio" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 msgid "read instead of default file(s)" msgstr "" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 #, fuzzy msgid "send stdout to CMD" msgstr "lähetä vakiotuloste :lle" -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 #, fuzzy msgid "use ROOT as top level directory" msgstr "käytä ylimpänä hakemistona" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "tulosta käytetyn rpm:n versio" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 #, fuzzy msgid "debug payload file state machine" msgstr "en voinut avata %s: %s" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 msgid "debug option/argument processing" msgstr "" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +#, fuzzy +msgid "debug package state machine" +msgstr "en voinut avata %s: %s" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2167,75 +2172,90 @@ msgstr "generoi PGP-allekirjoitus" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:443 +#: lib/psm.c:446 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:562 +#: lib/psm.c:565 #, fuzzy msgid "source package contains no .spec file\n" msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/psm.c:682 -#, fuzzy, c-format -msgid "%s: running %s scriptlet\n" -msgstr "älä suorita mitään vaiheita" +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" + +#: lib/psm.c:983 +#, c-format +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" +msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:991 +#, c-format +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" +msgstr "" + +#: lib/psm.c:1153 +#, c-format +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" +msgstr "" + +#: lib/psm.c:1176 #, fuzzy, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" -msgstr "skriptin ajo epäonnistui" +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" +msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n" -#: lib/psm.c:859 +#: lib/psm.c:1182 #, fuzzy, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "skriptin ajo epäonnistui" -#: lib/psm.c:1188 +#: lib/psm.c:1586 #, 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:1310 +#: lib/psm.c:1709 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1420 +#: lib/psm.c:1819 #, fuzzy msgid "Unable to reload signature header\n" msgstr "%s:n kirjoitus ei onnistu" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/psm.c:1524 +#: lib/psm.c:1923 msgid " on file " msgstr "" -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp epäonnistui" @@ -2406,7 +2426,7 @@ msgstr "%s: avaus ei onnistunut\n" msgid "%s: Fwrite failed: %s\n" msgstr "%s: readLead epäonnistui\n" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "virhe: %s ei vaikuta RPM paketilta\n" @@ -2436,53 +2456,53 @@ msgstr "%s: readLead ep msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmReadSignature epäonnistui\n" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLead epäonnistui\n" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLead epäonnistui\n" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead epäonnistui\n" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 #, fuzzy msgid " (MISSING KEYS:" msgstr "(PUUTTUVAT AVAIMET)" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr "" -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr "" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "" @@ -2851,17 +2871,17 @@ msgstr "" msgid "Please contact rpm-list@redhat.com\n" msgstr "" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, fuzzy, c-format msgid "Cannot expand %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, fuzzy, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "En voi avata %s luettavaksi: %s." @@ -2926,115 +2946,115 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "En voinut ajaa pgp:tä" -#: lib/signature.c:356 +#: lib/signature.c:357 #, fuzzy msgid "pgp failed\n" msgstr "pgp epäonnistui" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 #, fuzzy msgid "pgp failed to write signature\n" msgstr "pgp ei voinut kirjoittaa allekirjoitusta" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 #, fuzzy msgid "unable to read the signature\n" msgstr "en voinut lukea allekirjoitusta" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:470 +#: lib/signature.c:472 #, fuzzy msgid "gpg failed\n" msgstr "pgp epäonnistui" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 #, fuzzy msgid "gpg failed to write signature\n" msgstr "pgp ei voinut kirjoittaa allekirjoitusta" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:808 +#: lib/signature.c:811 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa" -#: lib/signature.c:823 +#: lib/signature.c:826 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa" -#: lib/signature.c:872 +#: lib/signature.c:875 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 #, fuzzy msgid "Header SHA1 digest: " msgstr "asenna paketti" -#: lib/signature.c:1044 +#: lib/signature.c:1047 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "ohita MD5-allekirjoitukset" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 #, fuzzy msgid "V3 DSA signature: " msgstr "%s: Ei allekirjoitusta saatavilla\n" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -3058,7 +3078,7 @@ msgstr "virhe luotaessa hakemistoa %s: %s" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3071,7 +3091,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3079,24 +3099,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, fuzzy, c-format msgid "missing %c %s" msgstr "puuttuva '{' '%':n jälkeen" -#: lib/verify.c:398 +#: lib/verify.c:393 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:" @@ -3290,154 +3302,154 @@ msgstr "en voinut avata tiedostoa %s: " msgid "cannot open %s index\n" msgstr "virhe: en voi avata %s\n" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath ei ole asetettu" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "en voi lukea headeria %d:stä päivittäessä" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "virhe etsittäessä pakettia %s\n" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "dbpath ei ole asetettu" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "väliaikainen tietokanta %s on jo olemassa" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "en voi lisätä tietuetta %d:stä" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "en voinut avata %s: %s" @@ -3809,6 +3821,15 @@ msgid "DIRECTORY" msgstr "" #, fuzzy +#~ msgid "%s: running %s scriptlet\n" +#~ msgstr "älä suorita mitään vaiheita" + +#, fuzzy +#~ msgid "" +#~ "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +#~ msgstr "skriptin ajo epäonnistui" + +#, fuzzy #~ msgid "%s: base64 encode failed.\n" #~ msgstr "%s: readLead epäonnistui\n" @@ -4765,10 +4786,6 @@ msgstr "" #~ msgstr "%s:n nimeäminen %s:ksi epäonnistui: %s" #, fuzzy -#~ msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" -#~ msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n" - -#, fuzzy #~ msgid "removal of %s failed: %s\n" #~ msgstr "%s:n poisto epäonnistui: %s" diff --git a/po/fr.po b/po/fr.po index 31a48bc..8bf4d30 100644 --- a/po/fr.po +++ b/po/fr.po @@ -113,7 +113,7 @@ msgstr "" msgid "%s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "" @@ -547,52 +547,52 @@ msgstr "impossible d'ouvrir: %s\n" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1565 +#: build/files.c:1564 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1589 +#: build/files.c:1588 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1645 +#: build/files.c:1644 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1762 +#: build/files.c:1761 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "les arguments de --root (-r) doivent commencer par un /" -#: build/files.c:1785 +#: build/files.c:1784 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1800 +#: build/files.c:1799 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: build/files.c:1864 +#: build/files.c:1863 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:2262 +#: build/files.c:2261 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -783,7 +783,7 @@ msgstr "impossible d'ouvrir: %s\n" msgid "Could not open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -813,7 +813,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:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1313,19 +1313,19 @@ msgstr "impossible d'ouvrir: %s\n" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "" " -f + - interroge le package qui appartient " -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 msgid "don't verify database header(s) when retrieved" msgstr "" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1366,17 +1366,17 @@ msgstr "" msgid "lookup i18N strings in specfile catalog" msgstr "" -#: build/spec.c:238 +#: build/spec.c:233 #, fuzzy, c-format msgid "line %d: Bad number: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/spec.c:244 +#: build/spec.c:239 #, fuzzy, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "impossible d'ouvrir: %s\n" -#: build/spec.c:307 +#: build/spec.c:302 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "" @@ -1516,71 +1516,71 @@ msgstr "" msgid "(not an OpenPGP signature)" msgstr " --sign - genre une signature PGP" -#: lib/fs.c:77 +#: lib/fs.c:73 #, fuzzy, c-format msgid "mntctl() failed to return size: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/fs.c:92 +#: lib/fs.c:88 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, fuzzy, c-format msgid "failed to stat %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/fs.c:330 +#: lib/fs.c:326 #, c-format msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:338 +#: lib/fsm.c:339 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, fuzzy, c-format msgid "%10d %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "La construction a chou.\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "La construction a chou.\n" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -1601,7 +1601,7 @@ msgid "error creating temporary file %s\n" msgstr "impossible d'ouvrir: %s\n" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1615,120 +1615,125 @@ msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 #, fuzzy msgid "print macro expansion of EXPR" msgstr " --version\t\t- affiche la version de rpm utilise" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 msgid "read instead of default file(s)" msgstr "" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 msgid "send stdout to CMD" msgstr "" -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 #, fuzzy msgid "use ROOT as top level directory" msgstr " --root \t- utilise comme rpertoire racine" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 #, fuzzy msgid "print the version of rpm being used" msgstr " --version\t\t- affiche la version de rpm utilise" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 #, fuzzy msgid "debug payload file state machine" msgstr "impossible d'ouvrir: %s\n" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 msgid "debug option/argument processing" msgstr "" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +#, fuzzy +msgid "debug package state machine" +msgstr "impossible d'ouvrir: %s\n" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2206,76 +2211,91 @@ msgstr " --sign - genre une signature PGP" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:443 +#: lib/psm.c:446 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:562 +#: lib/psm.c:565 #, fuzzy msgid "source package contains no .spec file\n" msgstr "" " -f + - interroge le package qui appartient " -#: lib/psm.c:682 +#: lib/psm.c:906 #, c-format -msgid "%s: running %s scriptlet\n" +msgid "%s: waitpid(%d) rc %d status %x\n" msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:983 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:859 +#: lib/psm.c:991 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:1188 +#: lib/psm.c:1153 +#, c-format +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" +msgstr "" + +#: lib/psm.c:1176 +#, c-format +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" +msgstr "" + +#: lib/psm.c:1182 +#, c-format +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" +msgstr "" + +#: lib/psm.c:1586 #, 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:1310 +#: lib/psm.c:1709 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1420 +#: lib/psm.c:1819 #, fuzzy msgid "Unable to reload signature header\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "La construction a chou.\n" -#: lib/psm.c:1524 +#: lib/psm.c:1923 msgid " on file " msgstr "" -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "La construction a chou.\n" @@ -2446,7 +2466,7 @@ msgstr "La construction a chou.\n" msgid "%s: Fwrite failed: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2476,52 +2496,52 @@ msgstr "" msgid "%s: rpmWriteSignature failed: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr "" -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr "" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "" @@ -2890,17 +2910,17 @@ msgstr "" msgid "Please contact rpm-list@redhat.com\n" msgstr "" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, fuzzy, c-format msgid "Cannot expand %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, fuzzy, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "impossible d'ouvrir: %s\n" @@ -2963,113 +2983,113 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/signature.c:356 +#: lib/signature.c:357 #, fuzzy msgid "pgp failed\n" msgstr "La construction a chou.\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 #, fuzzy msgid "pgp failed to write signature\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 #, fuzzy msgid "unable to read the signature\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:470 +#: lib/signature.c:472 #, fuzzy msgid "gpg failed\n" msgstr "La construction a chou.\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 #, fuzzy msgid "gpg failed to write signature\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:808 +#: lib/signature.c:811 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:823 +#: lib/signature.c:826 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:872 +#: lib/signature.c:875 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1044 +#: lib/signature.c:1047 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 #, fuzzy msgid "V3 DSA signature: " msgstr " --sign - genre une signature PGP" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -3093,7 +3113,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3106,7 +3126,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3114,24 +3134,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, c-format msgid "missing %c %s" msgstr "" -#: lib/verify.c:398 +#: lib/verify.c:393 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "impossible d'ouvrir: %s\n" @@ -3325,153 +3337,153 @@ msgstr "impossible d'ouvrir: %s\n" msgid "cannot open %s index\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" diff --git a/po/gl.po b/po/gl.po index 63de2f1..ecdb540 100644 --- a/po/gl.po +++ b/po/gl.po @@ -107,7 +107,7 @@ msgstr "" msgid "%s: %s\n" msgstr "" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "" @@ -495,52 +495,52 @@ msgstr "" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1565 +#: build/files.c:1564 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1589 +#: build/files.c:1588 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1645 +#: build/files.c:1644 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1762 +#: build/files.c:1761 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1785 +#: build/files.c:1784 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1800 +#: build/files.c:1799 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1864 +#: build/files.c:1863 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2262 +#: build/files.c:2261 #, c-format msgid "Bad file: %s: %s\n" msgstr "" @@ -727,7 +727,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -757,7 +757,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1237,17 +1237,17 @@ msgstr "" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 msgid "don't verify package digest(s)" msgstr "" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 msgid "don't verify database header(s) when retrieved" msgstr "" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 msgid "don't verify package signature(s)" msgstr "" @@ -1280,17 +1280,17 @@ msgstr "" msgid "lookup i18N strings in specfile catalog" msgstr "" -#: build/spec.c:238 +#: build/spec.c:233 #, c-format msgid "line %d: Bad number: %s\n" msgstr "" -#: build/spec.c:244 +#: build/spec.c:239 #, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "" -#: build/spec.c:307 +#: build/spec.c:302 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "" @@ -1426,71 +1426,71 @@ msgstr "" msgid "(not an OpenPGP signature)" msgstr "" -#: lib/fs.c:77 +#: lib/fs.c:73 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "" -#: lib/fs.c:92 +#: lib/fs.c:88 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, c-format msgid "failed to stat %s: %s\n" msgstr "" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "" -#: lib/fs.c:330 +#: lib/fs.c:326 #, c-format msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:338 +#: lib/fsm.c:339 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, c-format msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1511,7 +1511,7 @@ msgid "error creating temporary file %s\n" msgstr "" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1525,116 +1525,120 @@ msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 msgid "print macro expansion of EXPR" msgstr "" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 msgid "read instead of default file(s)" msgstr "" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 msgid "send stdout to CMD" msgstr "" -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 msgid "use ROOT as top level directory" msgstr "" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 msgid "debug payload file state machine" msgstr "" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 msgid "debug option/argument processing" msgstr "" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +msgid "debug package state machine" +msgstr "" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2040,73 +2044,88 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:443 +#: lib/psm.c:446 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:562 +#: lib/psm.c:565 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:682 +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" + +#: lib/psm.c:983 +#, c-format +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" +msgstr "" + +#: lib/psm.c:991 #, c-format -msgid "%s: running %s scriptlet\n" +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:1153 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:859 +#: lib/psm.c:1176 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "" -#: lib/psm.c:1188 +#: lib/psm.c:1182 +#, c-format +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" +msgstr "" + +#: lib/psm.c:1586 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1310 +#: lib/psm.c:1709 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1420 +#: lib/psm.c:1819 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1524 +#: lib/psm.c:1923 msgid " on file " msgstr "" -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2271,7 +2290,7 @@ msgstr "" msgid "%s: Fwrite failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, c-format msgid "%s: not an rpm package\n" msgstr "" @@ -2301,52 +2320,52 @@ msgstr "" msgid "%s: rpmWriteSignature failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, c-format msgid "%s: import read failed.\n" msgstr "" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, c-format msgid "%s: import failed.\n" msgstr "" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, c-format msgid "%s: headerGetEntry failed\n" msgstr "" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr "" -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr "" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "" @@ -2710,17 +2729,17 @@ msgstr "" msgid "Please contact rpm-list@redhat.com\n" msgstr "" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, c-format msgid "Cannot expand %s\n" msgstr "" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "" @@ -2782,107 +2801,107 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, c-format msgid "Could not exec %s: %s\n" msgstr "" -#: lib/signature.c:356 +#: lib/signature.c:357 msgid "pgp failed\n" msgstr "" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 msgid "pgp failed to write signature\n" msgstr "" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 msgid "unable to read the signature\n" msgstr "" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:470 +#: lib/signature.c:472 msgid "gpg failed\n" msgstr "" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 msgid "gpg failed to write signature\n" msgstr "" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:808 +#: lib/signature.c:811 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:823 +#: lib/signature.c:826 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:872 +#: lib/signature.c:875 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1044 +#: lib/signature.c:1047 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -2906,7 +2925,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2919,7 +2938,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2927,24 +2946,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, c-format msgid "missing %c %s" msgstr "" -#: lib/verify.c:398 +#: lib/verify.c:393 #, c-format msgid "Unsatisfied dependencies for %s: " msgstr "" @@ -3134,153 +3145,153 @@ msgstr "" msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/is.po b/po/is.po index 006e9e0..599614e 100644 --- a/po/is.po +++ b/po/is.po @@ -108,7 +108,7 @@ msgstr "" msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "RPM útgáfa %s\n" @@ -498,52 +498,52 @@ msgstr "Skr msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1565 +#: build/files.c:1564 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1589 +#: build/files.c:1588 #, c-format msgid "File not found: %s\n" msgstr "Skráin fannst ekki: %s\n" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1645 +#: build/files.c:1644 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Skrá %s: %s\n" -#: build/files.c:1762 +#: build/files.c:1761 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1785 +#: build/files.c:1784 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "Gat ekki opnað PreUn skrá: %s\n" -#: build/files.c:1800 +#: build/files.c:1799 #, c-format msgid "File not found by glob: %s\n" msgstr "Skráin fannst ekki með 'glob': %s\n" -#: build/files.c:1864 +#: build/files.c:1863 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Gat ekki opnað %%files skrána %s: %s\n" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "lína: %s\n" -#: build/files.c:2262 +#: build/files.c:2261 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ógild skrá %s: %s\n" @@ -734,7 +734,7 @@ msgstr "Get ekki lesi msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, c-format msgid "Unable to write package: %s\n" msgstr "Get ekki ritað í pakka: %s\n" @@ -764,7 +764,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:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "Skrifaði: %s\n" @@ -1245,19 +1245,19 @@ msgstr "ekki sko msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "ekki skoða pakkaskilyrðin" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "ekki skoða pakkaskilyrðin" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1291,17 +1291,17 @@ msgstr "" msgid "lookup i18N strings in specfile catalog" msgstr "" -#: build/spec.c:238 +#: build/spec.c:233 #, c-format msgid "line %d: Bad number: %s\n" msgstr "" -#: build/spec.c:244 +#: build/spec.c:239 #, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "" -#: build/spec.c:307 +#: build/spec.c:302 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "" @@ -1439,71 +1439,71 @@ msgstr "" msgid "(not an OpenPGP signature)" msgstr "búa til undirskrift" -#: lib/fs.c:77 +#: lib/fs.c:73 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() skilaði ekki stærð: %s\n" -#: lib/fs.c:92 +#: lib/fs.c:88 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, c-format msgid "failed to stat %s: %s\n" msgstr "gat ekki skoðað %s: %s\n" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "gat ekki opnað %s: %s\n" -#: lib/fs.c:330 +#: lib/fs.c:326 #, c-format msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:338 +#: lib/fsm.c:339 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, c-format msgid "%s saved as %s\n" msgstr "%s vistað sem %s\n" -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir %s brást: %s\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s gat ekki eytt %s: %s\n" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, c-format msgid "%s created as %s\n" msgstr "%s búið til sem %s\n" @@ -1524,7 +1524,7 @@ msgid "error creating temporary file %s\n" msgstr "" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1538,118 +1538,122 @@ msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: Fseek brást: %s\n" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 #, fuzzy msgid "print macro expansion of EXPR" msgstr "prenta útvíkkun fjölva +" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 msgid "read instead of default file(s)" msgstr "" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 #, fuzzy msgid "send stdout to CMD" msgstr "senda frálag í " -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 msgid "use ROOT as top level directory" msgstr "" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "sýna endanlega rpmrc og stillingar fjölva" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "prenta útgáfunúmer rpm sem verið er að nota" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 msgid "debug payload file state machine" msgstr "" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 msgid "debug option/argument processing" msgstr "" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +msgid "debug package state machine" +msgstr "" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2066,74 +2070,89 @@ msgstr "b #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:443 +#: lib/psm.c:446 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:562 +#: lib/psm.c:565 msgid "source package contains no .spec file\n" msgstr "pakkinn inniheldur enga .spec skrá\n" -#: lib/psm.c:682 +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" + +#: lib/psm.c:983 +#, c-format +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" +msgstr "" + +#: lib/psm.c:991 #, c-format -msgid "%s: running %s scriptlet\n" +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:1153 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:859 +#: lib/psm.c:1176 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "" -#: lib/psm.c:1188 +#: lib/psm.c:1182 +#, c-format +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" +msgstr "" + +#: lib/psm.c:1586 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1310 +#: lib/psm.c:1709 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1420 +#: lib/psm.c:1819 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Get ekki lesið haus úr %s: %s\n" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1524 +#: lib/psm.c:1923 msgid " on file " msgstr "" -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "gat ekki opnað %s: %s\n" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s brást\n" @@ -2298,7 +2317,7 @@ msgstr "" msgid "%s: Fwrite failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "get ekki opnað pakka gagnagrunn í\n" @@ -2328,52 +2347,52 @@ msgstr "" msgid "%s: rpmWriteSignature failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: Fseek brást: %s\n" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: Fseek brást: %s\n" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: gat ekki lesið manifest: %s\n" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr "" -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr "" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "" @@ -2739,17 +2758,17 @@ msgstr "" msgid "Please contact rpm-list@redhat.com\n" msgstr "" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, c-format msgid "Cannot expand %s\n" msgstr "" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Get ekki opnað %s til lesturs: %s.\n" @@ -2811,108 +2830,108 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Gat ekki keyrt %s: %s\n" -#: lib/signature.c:356 +#: lib/signature.c:357 msgid "pgp failed\n" msgstr "pgp brást\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 msgid "pgp failed to write signature\n" msgstr "pgp gat ekki lesið undirskriftina\n" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 msgid "unable to read the signature\n" msgstr "get ekki lesið undirskriftina\n" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:470 +#: lib/signature.c:472 msgid "gpg failed\n" msgstr "ggp brást\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 msgid "gpg failed to write signature\n" msgstr "gpg get ekki lesið undirskriftina\n" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:808 +#: lib/signature.c:811 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:823 +#: lib/signature.c:826 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:872 +#: lib/signature.c:875 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 #, fuzzy msgid "Header SHA1 digest: " msgstr "ekki yfirfara SHA1 undirritunina" -#: lib/signature.c:1044 +#: lib/signature.c:1047 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -2936,7 +2955,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2949,7 +2968,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2957,24 +2976,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, fuzzy, c-format msgid "missing %c %s" msgstr "vantar %s" -#: lib/verify.c:398 +#: lib/verify.c:393 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "Óuppfyllt pakkaskilyrði fyrir %s-%s-%s: " @@ -3164,153 +3175,153 @@ msgstr "get ekki opna msgid "cannot open %s index\n" msgstr "get ekki opnað %s index\n" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index 98ed224..17bc26c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -116,7 +116,7 @@ msgstr "" msgid "%s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "RPM ¥Ð¡¼¥¸¥ç¥ó %s\n" @@ -540,52 +540,52 @@ msgstr " msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1565 +#: build/files.c:1564 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "¥Õ¥¡¥¤¥ë¤Ï prefix (%s) ¤È°ìÃפ·¤Þ¤»¤ó: %s" -#: build/files.c:1589 +#: build/files.c:1588 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "ÉÔÀµ¤Ê½êÍ­¼Ô/¥°¥ë¡¼¥×: %s\n" -#: build/files.c:1645 +#: build/files.c:1644 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "¥Õ¥¡¥¤¥ë %4d: %07o %s.%s\t %s\n" -#: build/files.c:1762 +#: build/files.c:1761 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "¥Õ¥¡¥¤¥ë¤ÏÀèƬ¤Ë \"/\" ¤¬É¬ÍפǤ¹: %s" -#: build/files.c:1785 +#: build/files.c:1784 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "%d ¹ÔÌÜ: ¥Ð¡¼¥¸¥ç¥ó¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s" -#: build/files.c:1800 +#: build/files.c:1799 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó(by glob): %s" -#: build/files.c:1864 +#: build/files.c:1863 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "%%files ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "¹ÔÌÜ: %s" -#: build/files.c:2262 +#: build/files.c:2261 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s: %s\n" @@ -777,7 +777,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" @@ -807,7 +807,7 @@ msgstr " msgid "Unable to write payload to %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: build/pack.c:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "½ñ¤­¹þ¤ßÃæ: %s\n" @@ -1305,19 +1305,19 @@ msgstr " msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ÎÂоݥ¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1356,17 +1356,17 @@ msgstr " msgid "lookup i18N strings in specfile catalog" msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¥«¥¿¥í¥°Ãæ¤Î I18N ʸ»úÎó¤òõ¤·¤Æ¤¤¤Þ¤¹" -#: build/spec.c:238 +#: build/spec.c:233 #, fuzzy, c-format msgid "line %d: Bad number: %s\n" msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤ÊÈÖ¹æ: %s" -#: build/spec.c:244 +#: build/spec.c:239 #, fuzzy, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê no%s ÈÖ¹æ: %d" -#: build/spec.c:307 +#: build/spec.c:302 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê %s ÈÖ¹æ: %s\n" @@ -1514,71 +1514,71 @@ msgstr "( msgid "(not an OpenPGP signature)" msgstr "PGP ½ð̾¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹" -#: lib/fs.c:77 +#: lib/fs.c:73 #, fuzzy, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() fugger ¥µ¥¤¥º¤òÊÖ¤¹¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: lib/fs.c:92 +#: lib/fs.c:88 #, fuzzy, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl() fugger ¥µ¥¤¥º¤òÊÖ¤¹¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, fuzzy, c-format msgid "failed to stat %s: %s\n" msgstr "stat %s ¤Ë¼ºÇÔ: %s" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" -#: lib/fs.c:330 +#: lib/fs.c:326 #, fuzzy, c-format msgid "file %s is on an unknown device\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤ÏÉÔÌÀ¤Ê¥Ç¥Ð¥¤¥¹¤Ç¤¹" -#: lib/fsm.c:338 +#: lib/fsm.c:339 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%d ¹ÔÌÜ: %s" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆÊݸ¤µ¤ì¤Þ¤¹" -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s ¤òºï½ü¤Ç¤­¤Þ¤»¤ó - ¥Ç¥£¥ì¥¯¥È¥ê¤¬¶õ¤Ç¤¢¤ê¤Þ¤»¤ó" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s ¤Î rmdir ¤Ë¼ºÇÔ: %s" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆºîÀ®¤µ¤ì¤Þ¤¹" @@ -1599,7 +1599,7 @@ msgid "error creating temporary file %s\n" msgstr "°ì»þ¥Õ¥¡¥¤¥ë %s ¤ÎºîÀ®¥¨¥é¡¼" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1617,121 +1617,126 @@ msgid "" msgstr "" "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "%s: Í­¸ú¤Ê½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 #, fuzzy msgid "print macro expansion of EXPR" msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 msgid "read instead of default file(s)" msgstr "" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 #, fuzzy msgid "send stdout to CMD" msgstr "ɸ½à½ÐÎϤò ¤Ø¥Ñ¥¤¥×¤·¤Þ¤¹" -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 #, fuzzy msgid "use ROOT as top level directory" msgstr "¥È¥Ã¥×¥Ç¥£¥ì¥¯¥È¥ê¤È¤·¤Æ ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 #, fuzzy msgid "debug payload file state machine" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 #, fuzzy msgid "debug option/argument processing" msgstr "°ú¿ô½èÍý(%d)¤Ç¤ÎÆâÉô¥¨¥é¡¼ :-(\n" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +#, fuzzy +msgid "debug package state machine" +msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2202,77 +2207,92 @@ msgstr "PGP/GPG #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "¥Ç¡¼¥¿¥¿¥¤¥× %d ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: lib/psm.c:443 +#: lib/psm.c:446 #, fuzzy msgid "source package expected, binary found\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Þ¤¹¡¢¥Ð¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: lib/psm.c:562 +#: lib/psm.c:565 #, fuzzy msgid "source package contains no .spec file\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó" -#: lib/psm.c:682 -#, fuzzy, c-format -msgid "%s: running %s scriptlet\n" -msgstr "¥Ý¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n" +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" + +#: lib/psm.c:983 +#, c-format +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" +msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:991 +#, c-format +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" +msgstr "" + +#: lib/psm.c:1153 +#, c-format +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" +msgstr "" + +#: lib/psm.c:1176 #, fuzzy, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" -msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" +msgstr "%s ¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹ - žÁ÷¼ºÇÔ - %s\n" -#: lib/psm.c:859 +#: lib/psm.c:1182 #, fuzzy, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:1188 +#: lib/psm.c:1586 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n" -#: lib/psm.c:1310 +#: lib/psm.c:1709 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1420 +#: lib/psm.c:1819 #, fuzzy msgid "Unable to reload signature header\n" msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s" -#: lib/psm.c:1524 +#: lib/psm.c:1923 #, fuzzy msgid " on file " msgstr "¥Õ¥¡¥¤¥ë¾å" -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s ¼ºÇÔ" @@ -2443,7 +2463,7 @@ msgstr "makeTempFile msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "°ú¿ô¤Ï RPM ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" @@ -2473,53 +2493,53 @@ msgstr "%s: writedLead msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Í­¸ú¤Ê½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó(v1.0 RPM)\n" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 #, fuzzy msgid " (MISSING KEYS:" msgstr " (¥­¡¼¤Îʶ¼º) " -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr "" -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr " (¿®Íê¤Ç¤­¤Ê¤¤¸°:" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr "" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "" @@ -2899,17 +2919,17 @@ msgstr " msgid "Please contact rpm-list@redhat.com\n" msgstr "rpm-list@redhat.com ¤ËÏ¢Íí¤ò²¼¤µ¤¤\n" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, fuzzy, c-format msgid "Cannot expand %s\n" msgstr "¿­Ä¥¤Ç¤­¤Þ¤»¤ó %s" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, fuzzy, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Æɤ߹þ¤à¤¿¤á¤Ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s¡£" @@ -2973,116 +2993,116 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "½ð̾¥µ¥¤¥º: %d\n" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "%s ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: lib/signature.c:356 +#: lib/signature.c:357 #, fuzzy msgid "pgp failed\n" msgstr "pgp ¼ºÇÔ" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 #, fuzzy msgid "pgp failed to write signature\n" msgstr "pgp ¤¬½ð̾¤ò½ñ¤­¹þ¤à¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "PGP ½ð̾¥µ¥¤¥º: %d\n" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 #, fuzzy msgid "unable to read the signature\n" msgstr "½ð̾¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "PGP ½ð̾¤Î %d ¥Ð¥¤¥È¤ò¼èÆÀ\n" -#: lib/signature.c:470 +#: lib/signature.c:472 #, fuzzy msgid "gpg failed\n" msgstr "gpg ¼ºÇÔ" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 #, fuzzy msgid "gpg failed to write signature\n" msgstr "gpg ¤¬½ð̾¤ò½ñ¤­¹þ¤à¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: lib/signature.c:483 +#: lib/signature.c:485 #, fuzzy, c-format msgid "GPG sig size: %d\n" msgstr "GPG ½ð̾¥µ¥¤¥º: %s\n" -#: lib/signature.c:506 +#: lib/signature.c:508 #, fuzzy, c-format msgid "Got %d bytes of GPG sig\n" msgstr "GPG ½ð̾¤Î %d ¥Ð¥¤¥È¤ò¼èÆÀ\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, fuzzy, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ëÃæ¤Î̵¸ú¤Ê %%_signature ¡£\n" -#: lib/signature.c:808 +#: lib/signature.c:811 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: lib/signature.c:823 +#: lib/signature.c:826 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: lib/signature.c:872 +#: lib/signature.c:875 #, fuzzy msgid "Header+Payload size: " msgstr "¥Ø¥Ã¥À¥µ¥¤¥º¤¬Â礭¤¹¤®¤Þ¤¹" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 #, fuzzy msgid "Header SHA1 digest: " msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/signature.c:1044 +#: lib/signature.c:1047 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "MD5 ½ð̾¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 #, fuzzy msgid "V3 DSA signature: " msgstr "½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "½ð̾¥Ñ¥Ã¥É: %d\n" @@ -3106,7 +3126,7 @@ msgstr " #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3119,7 +3139,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3127,24 +3147,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, fuzzy, c-format msgid "missing %c %s" msgstr "%s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: lib/verify.c:398 +#: lib/verify.c:393 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À­¤òËþ¤¿¤·¤Æ¤¤¤Þ¤»¤ó:" @@ -3337,156 +3349,156 @@ msgstr "%s msgid "cannot open %s index\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Þ¤¹" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ­¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤­´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤­´¹¤¨¤Þ¤¹" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n" @@ -3859,6 +3871,15 @@ msgid "DIRECTORY" msgstr "" #, fuzzy +#~ msgid "%s: running %s scriptlet\n" +#~ msgstr "¥Ý¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n" + +#, fuzzy +#~ msgid "" +#~ "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +#~ msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" + +#, fuzzy #~ msgid "%s: base64 encode failed.\n" #~ msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" @@ -4503,10 +4524,6 @@ msgstr "" #~ msgstr "¥×¥ê¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n" #, fuzzy -#~ msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" -#~ msgstr "%s ¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹ - žÁ÷¼ºÇÔ - %s\n" - -#, fuzzy #~ msgid "removal of %s failed: %s\n" #~ msgstr "%s ¤Îºï½ü¤Ë¼ºÇÔ: %s" diff --git a/po/ko.po b/po/ko.po index 7154426..0b44e98 100644 --- a/po/ko.po +++ b/po/ko.po @@ -109,7 +109,7 @@ msgstr " msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "RPM ¹öÀü - %s\n" @@ -509,52 +509,52 @@ msgstr " msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "BuildRoot¿¡ ½Éº¼¸¯¸µÅ©ÇÔ: %s -> %s\n" -#: build/files.c:1565 +#: build/files.c:1564 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "ÆÄÀÏÀÌ prefix (%s)¿Í ÀÏÄ¡ÇÏÁö ¾ÊÀ½: %s\n" -#: build/files.c:1589 +#: build/files.c:1588 #, c-format msgid "File not found: %s\n" msgstr "ÆÄÀÏÀ» ãÀ» ¼ö ¾øÀ½: %s\n" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "À߸øµÈ ¼ÒÀ¯ÀÚ/±×·ì: %s\n" -#: build/files.c:1645 +#: build/files.c:1644 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "ÆÄÀÏ%5d: %07o %s.%s\t %s\n" -#: build/files.c:1762 +#: build/files.c:1761 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "ÆÄÀÏÀº \"/\" ·Î ½ÃÀÛÇؾßÇÔ: %s\n" -#: build/files.c:1785 +#: build/files.c:1784 #, c-format msgid "Glob not permitted: %s\n" msgstr "GlobÀ» »ç¿ëÇÒ ¼ö ¾øÀ½: %s\n" -#: build/files.c:1800 +#: build/files.c:1799 #, c-format msgid "File not found by glob: %s\n" msgstr "globÀ¸·Î ÆÄÀÏÀ» ãÀ» ¼ö ¾øÀ½: %s\n" -#: build/files.c:1864 +#: build/files.c:1863 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "%s ÆÄÀÏÀÇ %%files¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "Çà: %s\n" -#: build/files.c:2262 +#: build/files.c:2261 #, c-format msgid "Bad file: %s: %s\n" msgstr "À߸øµÈ ÆÄÀÏ: %s: %s\n" @@ -741,7 +741,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "%s(À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, c-format msgid "Unable to write package: %s\n" msgstr "ÆÐÅ°Áö¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" @@ -771,7 +771,7 @@ msgstr "%s msgid "Unable to write payload to %s: %s\n" msgstr "%s¿¡ payload¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "ÀÛ¼º: %s\n" @@ -1254,19 +1254,19 @@ msgstr " msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "(±âÁ¸ÀÇ) rpm[23] ÆÐŰ¡°ú ȣȯÇÏ´Â ÆÐÅ°Áö Çì´õ¸¦ »ý¼ºÇÕ´Ï´Ù" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "ÆÐÅ°ÁöÀÇ ÀÇÁ¸¼ºÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "ÆÐÅ°ÁöÀÇ ¾ÆÅ°ÅØÃĸ¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1300,17 +1300,17 @@ msgstr " msgid "lookup i18N strings in specfile catalog" msgstr "specÆÄÀÏ ¸ñ·Ï(catalog)¿¡¼­ i18N ¹®ÀÚ¿­À» °Ë»öÇÕ´Ï´Ù" -#: build/spec.c:238 +#: build/spec.c:233 #, c-format msgid "line %d: Bad number: %s\n" msgstr "%d ¹ø° Çà: À߸øµÈ ¼ýÀÚÀÔ´Ï´Ù: %s\n" -#: build/spec.c:244 +#: build/spec.c:239 #, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "%d ¹ø° Çà: no%s(Àº)´Â À߸øµÈ ¼ýÀÚÀÔ´Ï´Ù: %d\n" -#: build/spec.c:307 +#: build/spec.c:302 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "%d ¹ø° Çà: %s(Àº)´Â À߸øµÈ ¼ýÀÚÀÔ´Ï´Ù: %s\n" @@ -1356,57 +1356,57 @@ msgstr " msgid " failed - " msgstr " ½ÇÆÐÇÔ - " -#: lib/depends.c:162 +#: lib/depends.c:163 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/depends.c:394 +#: lib/depends.c:395 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:422 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:438 +#: lib/depends.c:439 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:467 +#: lib/depends.c:468 #, fuzzy msgid "(db files)" msgstr "À߸øµÈ db ÆÄÀÏ %s\n" -#: lib/depends.c:480 +#: lib/depends.c:481 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" -#: lib/depends.c:493 +#: lib/depends.c:494 #, fuzzy msgid "(db package)" msgstr "ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/depends.c:851 +#: lib/depends.c:852 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "´ÙÀ½°ú °ü·ÃµÈ ÆÐÅ°Áö À̸§À» ¹«½ÃÇÕ´Ï´Ù [%d]\t%s -> %s\n" -#: lib/depends.c:973 +#: lib/depends.c:974 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\"(À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" #. Record all relations. -#: lib/depends.c:1207 +#: lib/depends.c:1208 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n" #. T4. Scan for zeroes. -#: lib/depends.c:1308 +#: lib/depends.c:1309 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" @@ -1454,72 +1454,72 @@ msgstr "(BLOB[Binary Large OBject] msgid "(not an OpenPGP signature)" msgstr "¾î¶°ÇÑ PGP ¼­¸íµµ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/fs.c:77 +#: lib/fs.c:73 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl()¿¡¼­ Å©±â¸¦ ¹ÝȯÇϴµ¥ ½ÇÆÐÇÔ: %s\n" -#: lib/fs.c:92 +#: lib/fs.c:88 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl()¿¡¼­ ¸¶¿îÆ®ÇÒ ÁöÁ¡À» ¹ÝȯÇϴµ¥ ½ÇÆÐÇÔ: %s\n" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, c-format msgid "failed to stat %s: %s\n" msgstr "%sÀÇ »óÅÂ(stat)¸¦ Ç¥½ÃÇϴµ¥ ½ÇÆÐÇÔ: %s\n" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "%s(À»)¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %s\n" -#: lib/fs.c:330 +#: lib/fs.c:326 #, c-format msgid "file %s is on an unknown device\n" msgstr "%s ÆÄÀÏÀº ¾Ë ¼ö ¾ø´Â ÀåÄ¡ »ó¿¡ ÀÖ½À´Ï´Ù\n" -#: lib/fsm.c:338 +#: lib/fsm.c:339 #, fuzzy msgid "========== Directories not explictly included in package:\n" msgstr "========= ÆÐÅ°Áö¿¡ µð·ºÅ丮°¡ Æ÷ÇԵǾî ÀÖÁö ¾ÊÀ½:\n" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "%2$04oÀÇ Çã°¡±Ç(perms)À» °¡Áø %1$s µð·ºÅ丮°¡ »ý¼ºµÇ¾ú½À´Ï´Ù.\n" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "Çì´õ ÆÄÀÏ ¸ñ·Ï¿¡¼­ ¾ÆÄ«À̺ê ÆÄÀÏ %s(À»)¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, c-format msgid "%s saved as %s\n" msgstr "%s(ÀÌ)°¡ %s(À¸)·Î ÀúÀåµÇ¾ú½À´Ï´Ù\n" -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s %s µð·ºÅ丮 »èÁ¦¿¡ ½ÇÆÐÇÔ: ºó µð·ºÅ丮°¡ ¾Æ´Õ´Ï´Ù\n" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s %s µð·ºÅ丮 »èÁ¦¿¡ ½ÇÆÐÇÔ: %s\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s %s ¸µÅ© ÇØÁ¦¿¡ ½ÇÆÐÇÔ: %s\n" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, c-format msgid "%s created as %s\n" msgstr "%s(ÀÌ)°¡ %s(À¸)·Î »ý¼ºµÇ¾ú½À´Ï´Ù\n" @@ -1540,7 +1540,7 @@ msgid "error creating temporary file %s\n" msgstr "Àӽà ÆÄÀÏ %s(À»)¸¦ »ý¼ºÇÏ´Â µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1554,122 +1554,127 @@ msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "ÀÌ RPM ¹öÀüÀº ÁÖ ¹øÈ£(major number)°¡ <= 4 ÀÎ ÆÐŰ¡ ¸¸À» Áö¿øÇÕ´Ï´Ù\n" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignatureÀÌ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù\n" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLeadÀÌ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: FreadÀÌ ½ÇÆÐÇß½À´Ï´Ù: %s\n" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 #, fuzzy msgid "print macro expansion of EXPR" msgstr "<Ç¥Çö½Ä>+ ÀÇ ¸ÅÅ©·Î È®ÀåÀ» Ãâ·ÂÇÕ´Ï´Ù" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 #, fuzzy msgid "read instead of default file(s)" msgstr "±âº» ¸ÅÅ©·Î ÆÄÀÏ ´ë½Å <ÆÄÀÏ:..>À» ÀоîµéÀÔ´Ï´Ù" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "libio(3) APIÀÇ »ç¿ëÀ» ÇØÁ¦ÇÕ´Ï´Ù" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 #, fuzzy msgid "send stdout to CMD" msgstr "Ç¥ÁØÃâ·ÂÀ» <¸í·É>À¸·Î º¸³À´Ï´Ù" -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 #, fuzzy msgid "use ROOT as top level directory" msgstr "<µð·ºÅ丮>¸¦ ÃÖ»óÀ§ µð·ºÅ丮·Î »ç¿ëÇÕ´Ï´Ù" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "ÁúÀÇ Å±׸¦ º¸¿©ÁÝ´Ï´Ù" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "ÇöÀç ¼³Á¤µÇ¾î ÀÖ´Â rpmrcÀÇ ³»¿ë°ú ¸ÅÅ©·Î¸¦ º¸¿©ÁÝ´Ï´Ù" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "ÀÚ¼¼ÇÑ Ãâ·ÂÀ» Á¦°øÇÕ´Ï´Ù" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "¾ÆÁÖ »ó¼¼ÇÑ Ãâ·ÂÀ» Á¦°øÇÕ´Ï´Ù" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "ÇöÀç »ç¿ëµÇ°í ÀÖ´Â rpm ¹öÀüÀ» Ç¥½ÃÇÕ´Ï´Ù" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 #, fuzzy msgid "debug payload file state machine" msgstr "ÄÄÇ»ÅÍÀÇ »óÅÂ(state) ÆÄÀÏÀ» µð¹ö±× ÇÕ´Ï´Ù" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "µ¥ÀÌÅÍ ½ºÆ®¸² ÇÁ·ÎÅäÄÝÀ» µð¹ö±× ÇÕ´Ï´Ù" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 #, fuzzy msgid "debug option/argument processing" msgstr "Àμö 󸮰úÁ¤ (%d) µµÁß ³»ºÎ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù :-(\n" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +#, fuzzy +msgid "debug package state machine" +msgstr "ÄÄÇ»ÅÍÀÇ »óÅÂ(state) ÆÄÀÏÀ» µð¹ö±× ÇÕ´Ï´Ù" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "rpmio ÀÔ/Ãâ·ÂÀ» µð¹ö±× ÇÕ´Ï´Ù" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "URL ij½Ã Çڵ鸵À» µð¹ö±× ÇÕ´Ï´Ù" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2097,79 +2102,93 @@ msgstr " #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "%d µ¥ÀÌÅÍ À¯ÇüÀº »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/psm.c:443 +#: lib/psm.c:446 msgid "source package expected, binary found\n" msgstr "¼Ò½º ÆÐÅ°Áö°¡ ÇÊ¿äÇϸç, ¹ÙÀ̳ʸ®°¡ °Ë»öµÇ¾ú½À´Ï´Ù\n" -#: lib/psm.c:562 +#: lib/psm.c:565 msgid "source package contains no .spec file\n" msgstr "¼Ò½º ÆÐÅ°Áö¿¡ .spec ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/psm.c:682 -#, fuzzy, c-format -msgid "%s: running %s scriptlet\n" -msgstr "%s: %s ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÕ´Ï´Ù (ÀÖÀ» °æ¿ì)\n" +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:983 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -"%2$s-%3$s-%4$sÀÇ %1$s ½ºÅ©¸³Æ²¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù, waitpid°¡ %5" -"$s(À»)¸¦ ¹ÝȯÇÏ¿´½À´Ï´Ù\n" -#: lib/psm.c:859 +#: lib/psm.c:991 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" +msgstr "" + +#: lib/psm.c:1153 +#, c-format +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" +msgstr "" + +#: lib/psm.c:1176 +#, fuzzy, c-format +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" +msgstr "" +"%s: %s ½ºÅ©¸³Æ²¸´(scriptlet)ÀÌ ½ÇÆÐÇß½À´Ï´Ù (%d), %s-%s-%s(À»)¸¦ »ý·«ÇÕ´Ï´Ù\n" + +#: lib/psm.c:1182 +#, fuzzy, c-format +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "" "%2$s-%3$s-%4$sÀÇ %1$s ½ºÅ©¸³Æ²¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù, Á¾·á »óȲ %5" "$d\n" -#: lib/psm.c:1188 +#: lib/psm.c:1586 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s¿¡ %dÀÇ ÆÄÀÏÀÌ ÀÖ½À´Ï´Ù, Å×½ºÆ® = %d\n" -#: lib/psm.c:1310 +#: lib/psm.c:1709 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" "%s: %s ½ºÅ©¸³Æ²¸´(scriptlet)ÀÌ ½ÇÆÐÇß½À´Ï´Ù (%d), %s-%s-%s(À»)¸¦ »ý·«ÇÕ´Ï´Ù\n" -#: lib/psm.c:1420 +#: lib/psm.c:1819 #, fuzzy msgid "Unable to reload signature header\n" msgstr "¼­¸í(signature) Çì´õ¸¦ ´Ù½Ã Àоî¿Ã ¼ö ¾ø½À´Ï´Ù.\n" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, c-format msgid "user %s does not exist - using root\n" msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, c-format msgid "group %s does not exist - using root\n" msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆÐÇÔ%s%s: %s\n" -#: lib/psm.c:1524 +#: lib/psm.c:1923 msgid " on file " msgstr " ´ÙÀ½ ÆÄÀÏÀÇ " -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%2$s ÆÄÀÏÀÇ %1$s(ÀÌ)°¡ ½ÇÆÐÇÔ: %3$s\n" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, c-format msgid "%s failed: %s\n" msgstr "%s(ÀÌ)°¡ ½ÇÆÐÇÔ: %s\n" @@ -2338,7 +2357,7 @@ msgstr "makeTempFile msgid "%s: Fwrite failed: %s\n" msgstr "%s: FwriteÀÌ ½ÇÆÐÇß½À´Ï´Ù: %s\n" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "Àμö °ªÀ¸·Î RPM ÆÐÅ°Áö°¡ ÁöÁ¤µÇ¾î¾ß ÇÕ´Ï´Ù\n" @@ -2368,52 +2387,52 @@ msgstr "%s: writeLead msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignatureÀÌ ½ÇÆÐÇß½À´Ï´Ù: %s\n" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLeadÀÌ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLeadÀÌ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLeadÀÌ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù (v1.0 RPM)\n" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "¿Ã¹Ù¸£Áö ¾ÊÀ½" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 msgid " (MISSING KEYS:" msgstr " (Å°¸¦ ãÀ» ¼ö ¾øÀ½:" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr " (Å°¸¦ ½Å·ÚÇÒ ¼ö ¾øÀ½:" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "È®ÀÎ" @@ -2790,17 +2809,17 @@ msgstr " msgid "Please contact rpm-list@redhat.com\n" msgstr "rpm-list@redhat.comÀ¸·Î ¿¬¶ô¹Ù¶ø´Ï´Ù\n" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, c-format msgid "Cannot expand %s\n" msgstr "%s(À»)¸¦ È®Àå(expand)ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "%s(À»)¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù, HOMEÀÌ ³Ê¹« Å®´Ï´Ù.\n" -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "%s(À»)¸¦ ¿­ ¼ö ¾øÀ½: %s.\n" @@ -2862,111 +2881,111 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "¼­¸í: size(%d)+pad(%d)\n" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, c-format msgid "Could not exec %s: %s\n" msgstr "%s(À»)¸¦ ½ÇÇàÇÒ ¼ö ¾øÀ½: %s\n" -#: lib/signature.c:356 +#: lib/signature.c:357 msgid "pgp failed\n" msgstr "pgp°¡ ½ÇÆÐÇÔ\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 msgid "pgp failed to write signature\n" msgstr "pgp ¼­¸íÀ» ÀÛ¼ºÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "PGP ¼­¸í ¿ë·®: %d\n" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 msgid "unable to read the signature\n" msgstr "¼­¸íÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "%d ¹ÙÀÌÆ®ÀÇ PGP ¼­¸íÀ» ¾ò¾ú½À´Ï´Ù\n" -#: lib/signature.c:470 +#: lib/signature.c:472 msgid "gpg failed\n" msgstr "gpg°¡ ½ÇÆÐÇÔ\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 msgid "gpg failed to write signature\n" msgstr "gpg ¼­¸íÀ» ÀÛ¼ºÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "GPG ¼­¸í ¿ë·®: %d\n" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "%d ¹ÙÀÌÆ®ÀÇ GPG ¼­¸íÀ» ¾ò¾ú½À´Ï´Ù\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "¸ÅÅ©·Î ÆÄÀÏ ¾È¿¡ ºÎÀûÇÕÇÑ %%_signature ³»¿ë(spec)ÀÌ ÀÖ½À´Ï´Ù\n" -#: lib/signature.c:808 +#: lib/signature.c:811 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "¸ÅÅ©·Î ÆÄÀÏ ¾È¿¡ ¹Ýµå½Ã \"%%_gpg_name\"À» ¼³Á¤ÇØ¾ß ÇÕ´Ï´Ù\n" -#: lib/signature.c:823 +#: lib/signature.c:826 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "¸ÅÅ©·Î ÆÄÀÏ ¾È¿¡ ¹Ýµå½Ã \"%%_pgp_name\"À» ¼³Á¤ÇØ¾ß ÇÕ´Ï´Ù\n" -#: lib/signature.c:872 +#: lib/signature.c:875 #, fuzzy msgid "Header+Payload size: " msgstr "Çì´õÀÇ Å©±â°¡ ³Ê¹« Å®´Ï´Ù" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 #, fuzzy msgid "Header SHA1 digest: " msgstr "SHA1 Ãà¾à(digest) Çì´õ¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/signature.c:1044 +#: lib/signature.c:1047 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "¾î¶°ÇÑ MD5 ¼­¸íµµ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 #, fuzzy msgid "V3 DSA signature: " msgstr "¼­¸íÀÌ ¾ø½À´Ï´Ù\n" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "¼Õ»óµÈ MD5 Ãà¾à(digest): Áö¿øÇÏÁö ¾ÊÀ½\n" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "¼­¸í: size(%d)+pad(%d)\n" @@ -2990,7 +3009,7 @@ msgstr "%s #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3003,7 +3022,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3011,24 +3030,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, fuzzy, c-format msgid "missing %c %s" msgstr "´ÙÀ½À» ãÀ» ¼ö ¾øÀ½ %s" -#: lib/verify.c:398 +#: lib/verify.c:393 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "%s-%s-%s¿¡ ÀÇÁ¸¼º ¹®Á¦ ¹ß»ý: " @@ -3222,157 +3233,157 @@ msgstr "db%2$d( msgid "cannot open %s index\n" msgstr "%s À妽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 msgid "no dbpath has been set\n" msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" "%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, fuzzy, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: ¼Õ»óµÈ Çì´õ #%u(ÀÌ)°¡ º¹±¸(retrieved)µÇ¾ú½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%xÀÇ Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" "%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "%2$s À妽º¿¡¼­ \"%1$s\"(À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, c-format msgid "removing %d entries from %s index.\n" msgstr "%2$s À妽º¿¡¼­ %1$d Ç׸ñµé(entries)À» »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" "%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "%3$s¿¡¼­ %2$s ·¹Äڵ带 »èÁ¦ÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "»õ·Î¿î ÆÐÅ°Áö¸¦ ¹èÄ¡ÇÏ´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%2$s À妽º¿¡ \"%1$s\"(À»)¸¦ Ãß°¡ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, c-format msgid "adding %d entries to %s index.\n" msgstr "%2$s À妽º¿¡ %1$d Ç׸ñµé(entries)À» Ãß°¡ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "db3¸¦ À籸ÃàÇÑ ÈÄ¿¡ %s(À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%2$s¿¡ %1$s µ¥ÀÌÅͺ£À̽º¸¦ À籸Ãà ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "temporary database %s already exists\n" msgstr "Àӽà µ¥ÀÌÅͺ£À̽º %s(ÀÌ)°¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, c-format msgid "creating directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, c-format msgid "creating directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÔ: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, c-format msgid "opening old database with dbapi %d\n" msgstr "dbapi %d·Î ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, c-format msgid "opening new database with dbapi %d\n" msgstr "dbapi %d·Î »õ·Î¿î µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "µ¥ÀÌÅͺ£À̽ºÀÇ ·¹ÄÚµå ¹øÈ£ %u(ÀÌ)°¡ À߸øµÇ¾ú½À´Ï´Ù -- »ý·«ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, c-format msgid "cannot add record originally at %u\n" msgstr "%u¿¡ óÀ½ºÎÅÍ ·¹Äڵ带 Ãß°¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "µ¥ÀÌÅͺ£À̽º¸¦ À籸ÃàÇϴµ¥ ½ÇÆÐÇÔ: ¿øº» µ¥ÀÌÅͺ£À̽º´Â ±×´ë·Î À¯ÁöµË´Ï´Ù\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ »õ·Î¿î µ¥ÀÌÅͺ£À̽º·Î ±³Ã¼Çϴµ¥ ½ÇÆÐÇß½À´Ï´Ù!\n" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "º¹±¸Çϱâ À§ÇØ %2$sÀÇ ÆÄÀÏÀ» %1$sÀÇ ÆÄÀÏ·Î ±³Ã¼ÇÕ´Ï´Ù" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, c-format msgid "removing directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆÐÇÔ: %s\n" @@ -3735,6 +3746,16 @@ msgid "DIRECTORY" msgstr "" #, fuzzy +#~ msgid "%s: running %s scriptlet\n" +#~ msgstr "%s: %s ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÕ´Ï´Ù (ÀÖÀ» °æ¿ì)\n" + +#~ 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" + +#, fuzzy #~ msgid "%s: base64 encode failed.\n" #~ msgstr "%s: readLeadÀÌ ½ÇÆÐÇß½À´Ï´Ù\n" diff --git a/po/no.po b/po/no.po index efcc770..f467d0f 100644 --- a/po/no.po +++ b/po/no.po @@ -108,7 +108,7 @@ msgstr "" msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "RPM versjon %s\n" @@ -509,52 +509,52 @@ msgstr "Fil listet to ganger: %s\n" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Symbolsk lenke peker til BuildRoot: %s -> %s\n" -#: build/files.c:1565 +#: build/files.c:1564 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1589 +#: build/files.c:1588 #, c-format msgid "File not found: %s\n" msgstr "Fil ikke funnet: %s\n" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Ugyldig eier/gruppe: %s\n" -#: build/files.c:1645 +#: build/files.c:1644 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Fil %s: %s\n" -#: build/files.c:1762 +#: build/files.c:1761 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1785 +#: build/files.c:1784 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "linje %d: Filnavn ikke tillatt: %s\n" -#: build/files.c:1800 +#: build/files.c:1799 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1864 +#: build/files.c:1863 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "Installerer %s\n" -#: build/files.c:2262 +#: build/files.c:2261 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ugyldig fil %s: %s\n" @@ -745,7 +745,7 @@ msgstr "Kunne ikke msgid "Could not open %s: %s\n" msgstr "Kunne ikke åpne %s: %s\n" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" @@ -775,7 +775,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:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1260,19 +1260,19 @@ msgstr "ikke verifiser pakkeavhengigheter" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "ikke verifiser pakkeavhengigheter" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "ikke verifiser pakkearkitektur" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1306,17 +1306,17 @@ msgstr "" msgid "lookup i18N strings in specfile catalog" msgstr "" -#: build/spec.c:238 +#: build/spec.c:233 #, c-format msgid "line %d: Bad number: %s\n" msgstr "linje %d: Ugyldig nummer: %s\n" -#: build/spec.c:244 +#: build/spec.c:239 #, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "linje %d: Ugyldig no%s nummer: %d\n" -#: build/spec.c:307 +#: build/spec.c:302 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "linje %d: Ugyldig %s-nummer: %s\n" @@ -1454,71 +1454,71 @@ msgstr "" msgid "(not an OpenPGP signature)" msgstr "hopp over PGP-signaturer" -#: lib/fs.c:77 +#: lib/fs.c:73 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() feilet å returnere størrelse: %s\n" -#: lib/fs.c:92 +#: lib/fs.c:88 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, c-format msgid "failed to stat %s: %s\n" msgstr "feil under kjøring av stat på %s: %s\n" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: lib/fs.c:330 +#: lib/fs.c:326 #, c-format msgid "file %s is on an unknown device\n" msgstr "fil %s er på en ukjent enhet\n" -#: lib/fsm.c:338 +#: lib/fsm.c:339 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, c-format msgid "%s saved as %s\n" msgstr "%s lagret som %s\n" -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s rmdir av %s feilet: Katalogen er ikke tom\n" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir av %s feilet: %s\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s unlink av %s feilet: %s\n" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, c-format msgid "%s created as %s\n" msgstr "%s opprettet som %s\n" @@ -1539,7 +1539,7 @@ msgid "error creating temporary file %s\n" msgstr "feil under oppretting av midlertidig fil %s\n" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1553,121 +1553,125 @@ msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature feilet\n" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ingen signatur tilgjengelig\n" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead feilet\n" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread feilet: %s\n" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 #, fuzzy msgid "print macro expansion of EXPR" msgstr "skriv ut makroutvidelsen av +" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 #, fuzzy msgid "read instead of default file(s)" msgstr "les i stedet for standard makrofil(er)" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "slå av bruk av libio(3) API" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 #, fuzzy msgid "send stdout to CMD" msgstr "send stdout til " -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 #, fuzzy msgid "use ROOT as top level directory" msgstr "bruk som toppnivåkatalog" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "vis kjente tagger for spørring" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "vis endelig rpmrc og makrokonfigurasjon" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "gi mindre detaljert info" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "gi mer detaljert info" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "skriv ut hvilken versjon av rpm som brukes" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 msgid "debug payload file state machine" msgstr "" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "feilsøking på protokoll-datastrøm" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 #, fuzzy msgid "debug option/argument processing" msgstr "Intern feil i argumentprosesseringen (%d) :-(\n" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +msgid "debug package state machine" +msgstr "" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "feilsøk rpmio I/U" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "feilsøk URL-cache håndtering" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2092,74 +2096,89 @@ msgstr "generer signatur" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "Datatype %d ikke støttet\n" -#: lib/psm.c:443 +#: lib/psm.c:446 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær funnet\n" -#: lib/psm.c:562 +#: lib/psm.c:565 msgid "source package contains no .spec file\n" msgstr "kildepakke inneholder ikke en .spec-fil\n" -#: lib/psm.c:682 -#, fuzzy, c-format -msgid "%s: running %s scriptlet\n" -msgstr "%s: kjører %s-skript (hvis noen)\n" +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:983 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:859 +#: lib/psm.c:991 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:1188 +#: lib/psm.c:1153 +#, c-format +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" +msgstr "" + +#: lib/psm.c:1176 +#, c-format +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" +msgstr "" + +#: lib/psm.c:1182 +#, c-format +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" +msgstr "" + +#: lib/psm.c:1586 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1310 +#: lib/psm.c:1709 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1420 +#: lib/psm.c:1819 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1524 +#: lib/psm.c:1923 msgid " on file " msgstr "" -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s feilet\n" @@ -2325,7 +2344,7 @@ msgstr "makeTempFile feilet\n" msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite feilet: %s\n" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "argumentet er ikke en RPM-pakke\n" @@ -2355,52 +2374,52 @@ msgstr "%s: writeLead feilet: %s\n" msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature feilet: %s\n" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLead feilet\n" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLead feilet\n" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead feilet\n" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Ingen signatur tilgjengelig (v1.0 RPM)\n" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "IKKE OK" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr "" -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr "" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "OK" @@ -2769,17 +2788,17 @@ msgstr "" msgid "Please contact rpm-list@redhat.com\n" msgstr "" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, c-format msgid "Cannot expand %s\n" msgstr "Kan ikke utvide %s\n" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" @@ -2841,110 +2860,110 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Kunne ikke kjøre %s: %s\n" -#: lib/signature.c:356 +#: lib/signature.c:357 msgid "pgp failed\n" msgstr "" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 msgid "pgp failed to write signature\n" msgstr "" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 msgid "unable to read the signature\n" msgstr "" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:470 +#: lib/signature.c:472 msgid "gpg failed\n" msgstr "" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 msgid "gpg failed to write signature\n" msgstr "" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:808 +#: lib/signature.c:811 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:823 +#: lib/signature.c:826 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:872 +#: lib/signature.c:875 #, fuzzy msgid "Header+Payload size: " msgstr "For stor header" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 #, fuzzy msgid "Header SHA1 digest: " msgstr "ikke verifiser header SHA1 digest" -#: lib/signature.c:1044 +#: lib/signature.c:1047 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "hopp over MD5-signaturer" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -2968,7 +2987,7 @@ msgstr "ekskluderer katalog %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2981,7 +3000,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2989,24 +3008,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, fuzzy, c-format msgid "missing %c %s" msgstr "mangler %s" -#: lib/verify.c:398 +#: lib/verify.c:393 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "feilede avhengigheter:\n" @@ -3196,153 +3207,153 @@ msgstr "kan ikke msgid "cannot open %s index\n" msgstr "kan ikke åpne %s indeks\n" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "feil(%d) under lagring av post %s til %s\n" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "feil(%d) under lagring av post %s til %s\n" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "feil(%d) under fjerning av post %s fra %s\n" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "feil(%d) under lagring av post %s til %s\n" -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "feil(%d) under fjerning av post %s fra %s\n" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "feil(%d) under lagring av post %s til %s\n" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -3702,6 +3713,10 @@ msgid "DIRECTORY" msgstr "" #, fuzzy +#~ msgid "%s: running %s scriptlet\n" +#~ msgstr "%s: kjører %s-skript (hvis noen)\n" + +#, fuzzy #~ msgid "%s: base64 encode failed.\n" #~ msgstr "%s: readLead feilet\n" diff --git a/po/pl.po b/po/pl.po index c9ab6fb..f436bde 100644 --- a/po/pl.po +++ b/po/pl.po @@ -116,7 +116,7 @@ msgstr "" msgid "%s: %s\n" msgstr "plik %s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "RPM wersja %s\n" @@ -531,52 +531,52 @@ msgstr "Plik podany dwukrotnie: %s" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1565 +#: build/files.c:1564 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Plik nie zgadza siê z prefiksem (%s): %s" -#: build/files.c:1589 +#: build/files.c:1588 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Nie znaleziono pliku: %s" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "B³êdny u¿ytkownik/grupa: %s\n" -#: build/files.c:1645 +#: build/files.c:1644 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Plik %4d: 0%o %s.%s\t %s\n" -#: build/files.c:1762 +#: build/files.c:1761 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "Plik musi siê zaczynaæ od \"/\": %s" -#: build/files.c:1785 +#: build/files.c:1784 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "linia %d: Wersja niedozwolona: %s" -#: build/files.c:1800 +#: build/files.c:1799 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Nie znaleziono pliku: %s" -#: build/files.c:1864 +#: build/files.c:1863 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Nie mo¿na otworzyæ %%files pliku: %s" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "linia: %s" -#: build/files.c:2262 +#: build/files.c:2261 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "plik %s: %s\n" @@ -768,7 +768,7 @@ msgstr "Nie mo msgid "Could not open %s: %s\n" msgstr "Nie mo¿na otworzyæ %s\n" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie mo¿na zapisaæ pakietu: %s" @@ -798,7 +798,7 @@ msgstr "Nie mo msgid "Unable to write payload to %s: %s\n" msgstr "Nie mo¿na zapisaæ pakietu: %s" -#: build/pack.c:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1294,19 +1294,19 @@ msgstr "nie sprawdzaj zale msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "nie sprawdzaj zale¿no¶ci pakietu" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "nie sprawdzaj architektury systemu" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1342,17 +1342,17 @@ msgstr "wymu msgid "lookup i18N strings in specfile catalog" msgstr "wyszukaj wpisy I18N w katalogu speca" -#: build/spec.c:238 +#: build/spec.c:233 #, fuzzy, c-format msgid "line %d: Bad number: %s\n" msgstr "linia %d: B³êdny numer: %s" -#: build/spec.c:244 +#: build/spec.c:239 #, fuzzy, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "linia %d: b³êdny numer no%s: %d" -#: build/spec.c:307 +#: build/spec.c:302 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "linia %d: B³êdny numer %s: %s\n" @@ -1496,71 +1496,71 @@ msgstr "(nie jest liczb msgid "(not an OpenPGP signature)" msgstr "pomiñ wszelkie sygnatury PGP" -#: lib/fs.c:77 +#: lib/fs.c:73 #, fuzzy, c-format msgid "mntctl() failed to return size: %s\n" msgstr "utworzenie %s nie powiod³o siê\n" -#: lib/fs.c:92 +#: lib/fs.c:88 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, fuzzy, c-format msgid "failed to stat %s: %s\n" msgstr "stat nie powiod³o siê %s: %s" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s" -#: lib/fs.c:330 +#: lib/fs.c:326 #, fuzzy, c-format msgid "file %s is on an unknown device\n" msgstr "plik %s jest na nieznanym urz±dzeniu" -#: lib/fsm.c:338 +#: lib/fsm.c:339 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, fuzzy, c-format msgid "%10d %s\n" msgstr "linia %d: %s" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "ostrze¿enie: %s zapisany jako %s" -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "nie mo¿na usun±æ %s - katalog nie jest pusty" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "skasowanie katalogu %s nie powiod³o siê" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "otwarcie %s nie powiod³o siê\n" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "ostrze¿enie: %s utworzony jako %s" @@ -1581,7 +1581,7 @@ msgid "error creating temporary file %s\n" msgstr "b³±d w tworzeniu pliku tymczasowego %s" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1599,121 +1599,126 @@ msgid "" msgstr "" "tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature nie powiod³o siê\n" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "%s: Sygnatura nie jest dostêpna\n" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead nie powiod³o siê\n" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: readLead nie powiod³o siê\n" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 #, fuzzy msgid "print macro expansion of EXPR" msgstr "wy¶wietl wersjê u¿ywanego rpm-a" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 msgid "read instead of default file(s)" msgstr "" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 #, fuzzy msgid "send stdout to CMD" msgstr "przeka¿ standartowe wyj¶cie do " -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 #, fuzzy msgid "use ROOT as top level directory" msgstr "u¿yj jako katalogu najwy¿szego poziomu" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "wy¶wietl wersjê u¿ywanego rpm-a" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 #, fuzzy msgid "debug payload file state machine" msgstr "b³êdny status pliku: %s" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 #, fuzzy msgid "debug option/argument processing" msgstr "B³±d wewnêtrzny w przetwarzaniu argumentu (%d) :-(\n" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +#, fuzzy +msgid "debug package state machine" +msgstr "b³êdny status pliku: %s" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2167,76 +2172,91 @@ msgstr "generuj sygnatur #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "Typ danych %d nie jest obs³ugiwany\n" -#: lib/psm.c:443 +#: lib/psm.c:446 #, fuzzy msgid "source package expected, binary found\n" msgstr "spodziewany pakiet ¼ród³owy a nie binarny" -#: lib/psm.c:562 +#: lib/psm.c:565 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pakiet ¼ród³owy nie zawiera pliku .spec" -#: lib/psm.c:682 -#, fuzzy, c-format -msgid "%s: running %s scriptlet\n" -msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n" +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" + +#: lib/psm.c:983 +#, c-format +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" +msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:991 +#, c-format +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" +msgstr "" + +#: lib/psm.c:1153 +#, c-format +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" +msgstr "" + +#: lib/psm.c:1176 #, fuzzy, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" -msgstr "wykonanie skryptu nie powiod³o siê" +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" +msgstr "%s pomijany - transmisja %s nie powiod³a siê\n" -#: lib/psm.c:859 +#: lib/psm.c:1182 #, fuzzy, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "wykonanie skryptu nie powiod³o siê" -#: lib/psm.c:1188 +#: lib/psm.c:1586 #, 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:1310 +#: lib/psm.c:1709 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1420 +#: lib/psm.c:1819 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Nie mo¿na odczytaæ ikony: %s" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, 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:1475 +#: lib/psm.c:1874 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s nie istnieje - u¿yto grupy root" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, 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:1524 +#: lib/psm.c:1923 msgid " on file " msgstr " na pliku " -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s nie powiod³o siê" @@ -2406,7 +2426,7 @@ msgstr "wykonanie nie powiod msgid "%s: Fwrite failed: %s\n" msgstr "%s: readLead nie powiod³o siê\n" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "argument nie jest pakietem RPM\n" @@ -2436,52 +2456,52 @@ msgstr "%s: readLead nie powiod msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmReadSignature nie powiod³o siê\n" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLead nie powiod³o siê\n" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLead nie powiod³o siê\n" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead nie powiod³o siê\n" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Sygnatura nie jest dostêpna (v1.0 RPM)\n" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "NIE DOBRZE" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 msgid " (MISSING KEYS:" msgstr " (BRAK KLUCZY:" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr "(NIEWIARYGODNE KLUCZE:" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "OK" @@ -2853,17 +2873,17 @@ msgstr "Nieznany system: %s\n" msgid "Please contact rpm-list@redhat.com\n" msgstr "Skontaktuj siê, proszê, z rpm-list@redhat.com\n" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, fuzzy, c-format msgid "Cannot expand %s\n" msgstr "Nie mo¿na rozszerzyæ %s" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, fuzzy, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Nie mo¿na otworzyæ %s do odczytu: %s." @@ -2926,116 +2946,116 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "Rozmiar sygnatury: %d\n" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Nie mo¿na uruchomiæ %s" -#: lib/signature.c:356 +#: lib/signature.c:357 #, fuzzy msgid "pgp failed\n" msgstr "pgp nie powiod³o siê" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 #, fuzzy msgid "pgp failed to write signature\n" msgstr "zapisanie sygnatury przez pgp nie powiod³o siê" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "rozmiar sygnatury PGP: %d\n" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 #, fuzzy msgid "unable to read the signature\n" msgstr "nie mo¿na odczytaæ sygnatury" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Mam %d bajtów sygnatury PGP\n" -#: lib/signature.c:470 +#: lib/signature.c:472 #, fuzzy msgid "gpg failed\n" msgstr "gpg nie powiod³o siê" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 #, fuzzy msgid "gpg failed to write signature\n" msgstr "zapisanie sygnatury przez gpg nie powiod³o siê" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "rozmiar sygnatury GPG: %d\n" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Mam %d bajtów sygnatury GPG\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, fuzzy, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "B³êdny %%_signature spec w pliku makra.\n" -#: lib/signature.c:808 +#: lib/signature.c:811 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Musisz ustawiæ \"%%_gpg_name\" w pliku swego makra" -#: lib/signature.c:823 +#: lib/signature.c:826 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Musisz ustawiæ \"%%_pgp_name\" w pliku swego makra" -#: lib/signature.c:872 +#: lib/signature.c:875 #, fuzzy msgid "Header+Payload size: " msgstr "Rozmiar nag³ówka jest zbyt du¿y" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 #, fuzzy msgid "Header SHA1 digest: " msgstr "nie sprawdzaj plików pakietu" -#: lib/signature.c:1044 +#: lib/signature.c:1047 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "pomiñ wszelkie sygnatury MD5" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 #, fuzzy msgid "V3 DSA signature: " msgstr "Brak sygnatury\n" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Blok sygnatury: %d\n" @@ -3059,7 +3079,7 @@ msgstr "tworzenie katalogu: %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3072,7 +3092,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3080,24 +3100,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, fuzzy, c-format msgid "missing %c %s" msgstr "brak %s\n" -#: lib/verify.c:398 +#: lib/verify.c:393 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: " @@ -3290,155 +3302,155 @@ msgstr "nie mo msgid "cannot open %s index\n" msgstr "nie mo¿na otworzyæ %s\n" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 #, fuzzy msgid "no dbpath has been set\n" msgstr "¶cie¿ka bazy danych nie zosta³a podana" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "b³±d pobierania rekordu %s z %s" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "b³±d zapisywania rekordu %s do %s" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla poszukiwania" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "b³±d pobierania rekordu %s z %s" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "usuwanie indeksu grupy\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "usuwanie indeksu nazw\n" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "b³±d pobierania rekordu %s z %s" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "b³±d zapisywania rekordu %s do %s" -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "b³±d usuwania rekordu %s z %s" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "b³±d szukania pakietu %s\n" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "b³±d zapisywania rekordu %s do %s" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "¶cie¿ka bazy danych nie zosta³a podana" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "odbudowywujê bazê danych w rootdir %s\n" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "tymczasowa baza danych %s ju¿ istnieje" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otwieranie starej bazy danych\n" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otwieranie nowej bazy danych\n" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "rekord numer %d w bazie danych jest b³êdny -- rekord pominiêto" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "przebudowanie bazy nie powiod³o siê; stara pozosta³a na miejscu\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "zamiana starej bazy na now± nie powiod³a siê!\n" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "naprawcze zastêpowanie plików w %s plikami z %s" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n" @@ -3803,6 +3815,15 @@ msgid "DIRECTORY" msgstr "" #, fuzzy +#~ msgid "%s: running %s scriptlet\n" +#~ msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n" + +#, fuzzy +#~ msgid "" +#~ "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +#~ msgstr "wykonanie skryptu nie powiod³o siê" + +#, fuzzy #~ msgid "%s: base64 encode failed.\n" #~ msgstr "%s: readLead nie powiod³o siê\n" @@ -4869,10 +4890,6 @@ msgstr "" #~ msgstr "uruchamianie skryptu preinstall (je¶li istnieje)\n" #, fuzzy -#~ msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" -#~ msgstr "%s pomijany - transmisja %s nie powiod³a siê\n" - -#, fuzzy #~ msgid "removal of %s failed: %s\n" #~ msgstr "skasowanie %s nie powiod³o siê: %s" diff --git a/po/pt.po b/po/pt.po index 68aeb20..63884c9 100644 --- a/po/pt.po +++ b/po/pt.po @@ -108,7 +108,7 @@ msgstr "Op msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "RPM versão %s\n" @@ -517,52 +517,52 @@ msgstr "Ficheiro listado duas vezes: %s\n" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "A 'symlink' aponta para a BuildRoot: %s -> %s\n" -#: build/files.c:1565 +#: build/files.c:1564 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "O ficheiro não corresponde ao prefixo (%s): %s\n" -#: build/files.c:1589 +#: build/files.c:1588 #, c-format msgid "File not found: %s\n" msgstr "Ficheiro não encontrado: %s\n" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Dono/grupo inválido: %s\n" -#: build/files.c:1645 +#: build/files.c:1644 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Ficheiro%5d: %07o %s.%s\t %s\n" -#: build/files.c:1762 +#: build/files.c:1761 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "O ficheiro precisa de começar por \"/\": %s\n" -#: build/files.c:1785 +#: build/files.c:1784 #, c-format msgid "Glob not permitted: %s\n" msgstr "Glob não permitido: %s\n" -#: build/files.c:1800 +#: build/files.c:1799 #, c-format msgid "File not found by glob: %s\n" msgstr "Ficheiro não encontrado pelo glob: %s\n" -#: build/files.c:1864 +#: build/files.c:1863 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Não consegui abrir o ficheiro do %%files %s: %s\n" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "linha: %s\n" -#: build/files.c:2262 +#: build/files.c:2261 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ficheiro inválido: %s: %s\n" @@ -751,7 +751,7 @@ msgstr "N msgid "Could not open %s: %s\n" msgstr "Não consigo aceder ao %s: %s\n" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, c-format msgid "Unable to write package: %s\n" msgstr "Não consegui gravar o pacote: %s\n" @@ -781,7 +781,7 @@ msgstr "N msgid "Unable to write payload to %s: %s\n" msgstr "Não consegui escrever o conteúdo de %s: %s\n" -#: build/pack.c:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "Gravei: %s\n" @@ -1270,19 +1270,19 @@ msgstr "n msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "gerar um cabeçalho do pacote compatível com os pacotes do rpm[23]" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "não verificar as dependências do pacote" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "não verifica a arquitectura do pacote" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1316,17 +1316,17 @@ msgstr "ignorar a plataforma-alvo" msgid "lookup i18N strings in specfile catalog" msgstr "procurar as mensagens de i18N no catálogo do ficheiro spec" -#: build/spec.c:238 +#: build/spec.c:233 #, c-format msgid "line %d: Bad number: %s\n" msgstr "linha %d: Número inválido: %s\n" -#: build/spec.c:244 +#: build/spec.c:239 #, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "linha %d: Número no%s inválido: %d\n" -#: build/spec.c:307 +#: build/spec.c:302 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "linha %d: Número %s inválido: %s\n" @@ -1469,74 +1469,74 @@ msgstr "(n msgid "(not an OpenPGP signature)" msgstr "ignorar as assinaturas de PGP" -#: lib/fs.c:77 +#: lib/fs.c:73 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "o mntctl() falhou ao devolver o tamanho: %s\n" -#: lib/fs.c:92 +#: lib/fs.c:88 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "o mntctl() falhou ao devolver o número de pontos de montagem: %s\n" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, c-format msgid "failed to stat %s: %s\n" msgstr "Não consegui analisar o %s: %s\n" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "falhei ao aceder ao %s: %s\n" -#: lib/fs.c:330 +#: lib/fs.c:326 #, c-format msgid "file %s is on an unknown device\n" msgstr "o ficheiro %s está num dispositivo desconhecido\n" -#: lib/fsm.c:338 +#: lib/fsm.c:339 #, fuzzy msgid "========== Directories not explictly included in package:\n" msgstr "========= Directorias não incluidas explicitamente no pacote:\n" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "directoria %s criada com as permissões %04o.\n" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" "o ficheiro de arquivo %s não foi encontrado na lista de ficheiros do " "cabeçalho\n" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, c-format msgid "%s saved as %s\n" msgstr "%s gravado como %s\n" -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s rmdir de %s falhou: Directoria não está vazia\n" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir de %s falhou: %s\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s unlink de %s falhou: %s\n" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, c-format msgid "%s created as %s\n" msgstr "%s criado como %s\n" @@ -1557,7 +1557,7 @@ msgid "error creating temporary file %s\n" msgstr "erro ao criar o ficheiro temporário %s\n" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1571,122 +1571,127 @@ msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "só os pacotes com versão <= 4 são suportados por esta versão do RPM\n" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: o rpmReadSignature falhou\n" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "%s: Nenhuma assinatura disponível\n" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr ":%s: o readLead falhou\n" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: O fread falhou: %s\n" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 #, fuzzy msgid "print macro expansion of EXPR" msgstr "imprimir a expansão da macro +" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 #, fuzzy msgid "read instead of default file(s)" msgstr "ler o em vez do(s) ficheiro(s) de macros por omissão" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "desactivar o uso da API da libio(3)" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 #, fuzzy msgid "send stdout to CMD" msgstr "manda o stdout para " -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 #, fuzzy msgid "use ROOT as top level directory" msgstr "usa como a directoria de topo" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "mostrar as opções de pesquisa conhecidas" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "mostra a configuração final do rpmrc e das macros" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "devolver um resultado menos detalhado" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "devolver um resultado mais detalhado" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "imprime a versão do RPM que está a usar" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 #, fuzzy msgid "debug payload file state machine" msgstr "depurar máquina de estados de ficheiros" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "depurar a sequência de dados do protocolo" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 #, fuzzy msgid "debug option/argument processing" msgstr "Erro interno no processamento de argumentos (%d) :-(\n" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +#, fuzzy +msgid "debug package state machine" +msgstr "depurar máquina de estados de ficheiros" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "depurar a E/S da rpmio" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "depurar a gestão da 'cache' de URLs" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2111,76 +2116,91 @@ msgstr "gerar a assinatura" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "O tipo de dados %d não é suportado\n" -#: lib/psm.c:443 +#: lib/psm.c:446 msgid "source package expected, binary found\n" msgstr "" "esperava-se um pacote com código-fonte, foi encontrado um pacote binário\n" -#: lib/psm.c:562 +#: lib/psm.c:565 msgid "source package contains no .spec file\n" msgstr "o pacote de código-fonte não contem um ficheiro .spec\n" -#: lib/psm.c:682 -#, fuzzy, c-format -msgid "%s: running %s scriptlet\n" -msgstr "%s: a correr os scripts(s) %s (se existirem)\n" +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:983 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" -msgstr "a execução do script %s do %s-%s-%s falhou, waitpid devolveu %s\n" +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" +msgstr "" -#: lib/psm.c:859 +#: lib/psm.c:991 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" +msgstr "" + +#: lib/psm.c:1153 +#, c-format +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" +msgstr "" + +#: lib/psm.c:1176 +#, fuzzy, c-format +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" +msgstr "%s: %s script falhou (%d), a saltar %s-%s-%s\n" + +#: lib/psm.c:1182 +#, fuzzy, c-format +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "" "a execução do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n" -#: lib/psm.c:1188 +#: lib/psm.c:1586 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s tem %d ficheiros, teste = %d\n" -#: lib/psm.c:1310 +#: lib/psm.c:1709 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: %s script falhou (%d), a saltar %s-%s-%s\n" -#: lib/psm.c:1420 +#: lib/psm.c:1819 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Não consegui reler o cabeçalho do assinatura.\n" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, c-format msgid "user %s does not exist - using root\n" msgstr "o utilizador %s não existe - a usar o root\n" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, c-format msgid "group %s does not exist - using root\n" msgstr "o grupo %s não existe - a usar o root\n" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "a abertura do pacote falhou%s%s: %s\n" -#: lib/psm.c:1524 +#: lib/psm.c:1923 msgid " on file " msgstr " no ficheiro " -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s falhou no ficheiro %s: %s\n" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, c-format msgid "%s failed: %s\n" msgstr "%s falhou: %s\n" @@ -2349,7 +2369,7 @@ msgstr "o makeTempFile falhou\n" msgid "%s: Fwrite failed: %s\n" msgstr "%s: O fwrite falhou: %s\n" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "o argumento não é um pacote RPM\n" @@ -2379,52 +2399,52 @@ msgstr "%s: o writeLead falhou: %s\n" msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: o rpmWriteSignature falhou: %s\n" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr ":%s: o readLead falhou\n" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr ":%s: o readLead falhou\n" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr ":%s: o readLead falhou\n" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Nenhuma assinatura disponível (RPM v1.0)\n" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "NÃO-OK" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 msgid " (MISSING KEYS:" msgstr " (FALTAM AS CHAVES:" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr " (CHAVES SUSPEITAS:" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "OK" @@ -2799,17 +2819,17 @@ msgstr "Sistema desconhecido: %s\n" msgid "Please contact rpm-list@redhat.com\n" msgstr "Por favor contacte o rpm-list@redhat.com\n" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, c-format msgid "Cannot expand %s\n" msgstr "Não consigo expandir o %s\n" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "Não consigo ler o %s, a HOME é demasiado grande.\n" -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Não consegui abrir o %s para leitura: %s.\n" @@ -2872,111 +2892,111 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "Assinatura: tamanho(%d)+pad(%d)\n" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, c-format msgid "Could not exec %s: %s\n" msgstr "Não consegui executar %s: %s\n" -#: lib/signature.c:356 +#: lib/signature.c:357 msgid "pgp failed\n" msgstr "o pgp falhou\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 msgid "pgp failed to write signature\n" msgstr "o pgp não conseguiu gravar a assinatura\n" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "tamanho da assinatura do PGP: %d\n" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 msgid "unable to read the signature\n" msgstr "incapaz de ler a assinatura\n" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Obtive %d bytes da assinatura PGP\n" -#: lib/signature.c:470 +#: lib/signature.c:472 msgid "gpg failed\n" msgstr "o gpg falhou\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 msgid "gpg failed to write signature\n" msgstr "o gpg não conseguiu gravar a assinatura\n" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "Tamanho da assinatura do GPG: %d\n" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Obtive %d bytes da assinatura do GPG\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "'Spec' %%_signature inválido no ficheiro de macros\n" -#: lib/signature.c:808 +#: lib/signature.c:811 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Precisa definir o \"%%_gpg_name\" no seu ficheiro de macros\n" -#: lib/signature.c:823 +#: lib/signature.c:826 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Precisa definir o \"%%_pgp_name\" no seu ficheiro de macros\n" -#: lib/signature.c:872 +#: lib/signature.c:875 #, fuzzy msgid "Header+Payload size: " msgstr "Tamanho do cabeçalho demasiado grande" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 #, fuzzy msgid "Header SHA1 digest: " msgstr "não verificar o SHA1 do cabeçalho" -#: lib/signature.c:1044 +#: lib/signature.c:1047 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "ignorar as assinaturas de MD5" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 #, fuzzy msgid "V3 DSA signature: " msgstr "Sem assinatura\n" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "'Digest' MD5 estragado: NÃO SUPORTADO\n" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Assinatura: tamanho(%d)+pad(%d)\n" @@ -3000,7 +3020,7 @@ msgstr "a excluir a directoria %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3013,7 +3033,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3021,24 +3041,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, fuzzy, c-format msgid "missing %c %s" msgstr "falta %s" -#: lib/verify.c:398 +#: lib/verify.c:393 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "Dependências não satisfeitas para o %s-%s-%s: " @@ -3230,154 +3242,154 @@ msgstr "n msgid "cannot open %s index\n" msgstr "não consigo abrir o índice do %s\n" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 msgid "no dbpath has been set\n" msgstr "não foi definido o dbpath\n" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "erro(%d) ao guardar o registo %s em %s\n" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, fuzzy, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: recebida instância do cabeçalho #%u estragada, a ignorar.\n" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: não consigo ler o cabeçalho em 0x%x\n" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "a remover o \"%s\" do índice %s.\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, c-format msgid "removing %d entries from %s index.\n" msgstr "a remover %d registos do índice %s.\n" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "erro(%d) ao guardar o registo %s em %s\n" -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "erro(%d) ao remover o registo %s do %s\n" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "erro(%d) ao criar uma nova instância do pacote\n" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "a adicionar o \"%s\" ao índice %s.\n" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, c-format msgid "adding %d entries to %s index.\n" msgstr "a adicionar %d registos ao índice %s.\n" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "erro(%d) ao guardar o registo %s em %s\n" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "a remover o %s depois duma reconstrução bem sucedida do db3.\n" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "não foi definido o dbpath" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, c-format msgid "rebuilding database %s into %s\n" msgstr "a reconstruir a base de dados %s em %s\n" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "temporary database %s already exists\n" msgstr "A base de dados temporária %s já existe\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, c-format msgid "creating directory %s\n" msgstr "a criar a directoria %s\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, c-format msgid "creating directory %s: %s\n" msgstr "a criar a directoria %s: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, c-format msgid "opening old database with dbapi %d\n" msgstr "a abrir a base de dados antiga com a dbapi %d\n" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, c-format msgid "opening new database with dbapi %d\n" msgstr "a abrir a base de dados nova com a dbapi %d\n" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "o número do registo %u na base de dados está errado -- a ignorar.\n" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, c-format msgid "cannot add record originally at %u\n" msgstr "não consigo adicionar o registo originalmente em %u\n" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "falhou a reconstrução da base de dados: a base de dados original mantém-se\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "falhou a substituição da base de dados antiga pela nova!\n" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "substituir os ficheiros em %s por ficheiros de %s a recuperar" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, c-format msgid "removing directory %s\n" msgstr "a remover a directoria %s\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "falhou a remoção da directoria %s: %s\n" @@ -3739,6 +3751,14 @@ msgid "DIRECTORY" msgstr "" #, fuzzy +#~ msgid "%s: running %s scriptlet\n" +#~ msgstr "%s: a correr os scripts(s) %s (se existirem)\n" + +#~ msgid "" +#~ "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +#~ msgstr "a execução do script %s do %s-%s-%s falhou, waitpid devolveu %s\n" + +#, fuzzy #~ msgid "%s: base64 encode failed.\n" #~ msgstr ":%s: o readLead falhou\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index e2a2857..ff9e83a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -123,7 +123,7 @@ msgstr "No consegui ler o arquivo spec de %s\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "RPM verso %s\n" @@ -566,57 +566,57 @@ msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" # , c-format -#: build/files.c:1565 +#: build/files.c:1564 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: build/files.c:1589 +#: build/files.c:1588 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "no foi passado pacote para desinstalao" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" # , c-format -#: build/files.c:1645 +#: build/files.c:1644 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: build/files.c:1762 +#: build/files.c:1761 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "argumentos para o --dbpath devem comear com uma /" # , c-format -#: build/files.c:1785 +#: build/files.c:1784 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "No consegui abrir: %s\n" -#: build/files.c:1800 +#: build/files.c:1799 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "no foi passado pacote para desinstalao" # , c-format -#: build/files.c:1864 +#: build/files.c:1863 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format -#: build/files.c:2262 +#: build/files.c:2261 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" @@ -831,7 +831,7 @@ msgid "Could not open %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "No consegui abrir: %s\n" @@ -866,7 +866,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:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1407,19 +1407,19 @@ msgstr "no verifique as dependncias do pacote" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "no verifique as dependncias do pacote" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "no verifique a arquitetura do pacote" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1457,18 +1457,18 @@ msgid "lookup i18N strings in specfile catalog" msgstr "" # , c-format -#: build/spec.c:238 +#: build/spec.c:233 #, fuzzy, c-format msgid "line %d: Bad number: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/spec.c:244 +#: build/spec.c:239 #, fuzzy, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "No consegui abrir: %s\n" -#: build/spec.c:307 +#: build/spec.c:302 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "" @@ -1611,77 +1611,77 @@ msgid "(not an OpenPGP signature)" msgstr "desconsidere quaisquer assinaturas PGP" # , c-format -#: lib/fs.c:77 +#: lib/fs.c:73 #, fuzzy, c-format msgid "mntctl() failed to return size: %s\n" msgstr "No consegui abrir o pipe tar: %s\n" -#: lib/fs.c:92 +#: lib/fs.c:88 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "" # , c-format -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, fuzzy, c-format msgid "failed to stat %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/fs.c:330 +#: lib/fs.c:326 #, c-format msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:338 +#: lib/fsm.c:339 msgid "========== Directories not explictly included in package:\n" msgstr "" # , c-format -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, fuzzy, c-format msgid "%10d %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" # , c-format -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "No consegui abrir: %s\n" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "Construo falhou.\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "Construo falhou.\n" # , c-format -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "No consegui abrir: %s\n" @@ -1705,7 +1705,7 @@ msgid "error creating temporary file %s\n" msgstr "No consegui abrir: %s\n" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1719,123 +1719,129 @@ msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "" # , c-format -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 #, fuzzy msgid "print macro expansion of EXPR" msgstr "mostra a verso do programa rpm sendo usado" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 msgid "read instead of default file(s)" msgstr "" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 #, fuzzy msgid "send stdout to CMD" msgstr "envia a saida padro para " -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 #, fuzzy msgid "use ROOT as top level directory" msgstr "use como diretrio raiz" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "mostra a verso do programa rpm sendo usado" # , c-format -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 #, fuzzy msgid "debug payload file state machine" msgstr "No consegui abrir: %s\n" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 msgid "debug option/argument processing" msgstr "" -#: lib/poptALL.c:274 +# , c-format +#: lib/poptALL.c:269 +#, fuzzy +msgid "debug package state machine" +msgstr "No consegui abrir: %s\n" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2297,77 +2303,92 @@ msgstr "gere assinatura PGP" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:443 +#: lib/psm.c:446 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:562 +#: lib/psm.c:565 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pesquise o pacote ao qual pertence" -#: lib/psm.c:682 -#, fuzzy, c-format -msgid "%s: running %s scriptlet\n" -msgstr "no execute nenhum estgio" +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" + +#: lib/psm.c:983 +#, c-format +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" +msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:991 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:859 +#: lib/psm.c:1153 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:1188 +#: lib/psm.c:1176 +#, c-format +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" +msgstr "" + +#: lib/psm.c:1182 +#, c-format +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" +msgstr "" + +#: lib/psm.c:1586 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "no foi passado pacote para instalao" -#: lib/psm.c:1310 +#: lib/psm.c:1709 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" # , c-format -#: lib/psm.c:1420 +#: lib/psm.c:1819 #, fuzzy msgid "Unable to reload signature header\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "Construo falhou.\n" -#: lib/psm.c:1524 +#: lib/psm.c:1923 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "Construo falhou.\n" @@ -2543,7 +2564,7 @@ msgstr "Construo falhou.\n" msgid "%s: Fwrite failed: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "no foram passados pacotes para assinatura" @@ -2575,54 +2596,54 @@ msgid "%s: rpmWriteSignature failed: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "No consegui abrir: %s\n" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" # , c-format -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "No consegui abrir: %s\n" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr "" -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr "" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "" @@ -3035,18 +3056,18 @@ msgid "Please contact rpm-list@redhat.com\n" msgstr "" # , c-format -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, fuzzy, c-format msgid "Cannot expand %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" # , c-format -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, fuzzy, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "No consegui abrir: %s\n" @@ -3121,115 +3142,115 @@ msgstr "" # , c-format #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: lib/signature.c:356 +#: lib/signature.c:357 #, fuzzy msgid "pgp failed\n" msgstr "Construo falhou.\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 #, fuzzy msgid "pgp failed to write signature\n" msgstr "gere assinatura PGP" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 #, fuzzy msgid "unable to read the signature\n" msgstr "gere assinatura PGP" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:470 +#: lib/signature.c:472 #, fuzzy msgid "gpg failed\n" msgstr "Construo falhou.\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 #, fuzzy msgid "gpg failed to write signature\n" msgstr "gere assinatura PGP" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:808 +#: lib/signature.c:811 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:823 +#: lib/signature.c:826 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:872 +#: lib/signature.c:875 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 #, fuzzy msgid "Header SHA1 digest: " msgstr "instale pacote" -#: lib/signature.c:1044 +#: lib/signature.c:1047 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "desconsidere quaisquer assinaturas MD5" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 #, fuzzy msgid "V3 DSA signature: " msgstr "gere assinatura PGP" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -3261,7 +3282,7 @@ msgstr "RPM verso %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3274,7 +3295,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3282,24 +3303,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, c-format msgid "missing %c %s" msgstr "" -#: lib/verify.c:398 +#: lib/verify.c:393 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "lista dependncias do pacote" @@ -3495,154 +3508,154 @@ msgstr "No consegui abrir: %s\n" msgid "cannot open %s index\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 msgid "no dbpath has been set\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" # , c-format -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "no foi passado pacote para desinstalao" # , c-format -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "no foi passado pacote para instalao" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "temporary database %s already exists\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" @@ -3655,13 +3668,13 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "RPM verso %s\n" # , c-format -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "No consegui abrir: %s\n" @@ -4027,6 +4040,10 @@ msgstr "" msgid "DIRECTORY" msgstr "" +#, fuzzy +#~ msgid "%s: running %s scriptlet\n" +#~ msgstr "no execute nenhum estgio" + # , c-format #, fuzzy #~ msgid "%s: base64 encode failed.\n" diff --git a/po/ro.po b/po/ro.po index fff868b..14452c5 100644 --- a/po/ro.po +++ b/po/ro.po @@ -107,7 +107,7 @@ msgstr "" msgid "%s: %s\n" msgstr "" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "" @@ -495,52 +495,52 @@ msgstr "" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1565 +#: build/files.c:1564 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1589 +#: build/files.c:1588 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1645 +#: build/files.c:1644 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1762 +#: build/files.c:1761 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1785 +#: build/files.c:1784 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1800 +#: build/files.c:1799 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1864 +#: build/files.c:1863 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2262 +#: build/files.c:2261 #, c-format msgid "Bad file: %s: %s\n" msgstr "" @@ -727,7 +727,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -757,7 +757,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1237,17 +1237,17 @@ msgstr "" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 msgid "don't verify package digest(s)" msgstr "" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 msgid "don't verify database header(s) when retrieved" msgstr "" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 msgid "don't verify package signature(s)" msgstr "" @@ -1280,17 +1280,17 @@ msgstr "" msgid "lookup i18N strings in specfile catalog" msgstr "" -#: build/spec.c:238 +#: build/spec.c:233 #, c-format msgid "line %d: Bad number: %s\n" msgstr "" -#: build/spec.c:244 +#: build/spec.c:239 #, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "" -#: build/spec.c:307 +#: build/spec.c:302 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "" @@ -1426,71 +1426,71 @@ msgstr "" msgid "(not an OpenPGP signature)" msgstr "" -#: lib/fs.c:77 +#: lib/fs.c:73 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "" -#: lib/fs.c:92 +#: lib/fs.c:88 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, c-format msgid "failed to stat %s: %s\n" msgstr "" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "" -#: lib/fs.c:330 +#: lib/fs.c:326 #, c-format msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:338 +#: lib/fsm.c:339 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, c-format msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1511,7 +1511,7 @@ msgid "error creating temporary file %s\n" msgstr "" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1525,116 +1525,120 @@ msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 msgid "print macro expansion of EXPR" msgstr "" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 msgid "read instead of default file(s)" msgstr "" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 msgid "send stdout to CMD" msgstr "" -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 msgid "use ROOT as top level directory" msgstr "" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 msgid "debug payload file state machine" msgstr "" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 msgid "debug option/argument processing" msgstr "" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +msgid "debug package state machine" +msgstr "" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2040,73 +2044,88 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:443 +#: lib/psm.c:446 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:562 +#: lib/psm.c:565 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:682 +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" + +#: lib/psm.c:983 +#, c-format +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" +msgstr "" + +#: lib/psm.c:991 #, c-format -msgid "%s: running %s scriptlet\n" +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:1153 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:859 +#: lib/psm.c:1176 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "" -#: lib/psm.c:1188 +#: lib/psm.c:1182 +#, c-format +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" +msgstr "" + +#: lib/psm.c:1586 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1310 +#: lib/psm.c:1709 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1420 +#: lib/psm.c:1819 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1524 +#: lib/psm.c:1923 msgid " on file " msgstr "" -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2271,7 +2290,7 @@ msgstr "" msgid "%s: Fwrite failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, c-format msgid "%s: not an rpm package\n" msgstr "" @@ -2301,52 +2320,52 @@ msgstr "" msgid "%s: rpmWriteSignature failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, c-format msgid "%s: import read failed.\n" msgstr "" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, c-format msgid "%s: import failed.\n" msgstr "" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, c-format msgid "%s: headerGetEntry failed\n" msgstr "" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr "" -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr "" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "" @@ -2710,17 +2729,17 @@ msgstr "" msgid "Please contact rpm-list@redhat.com\n" msgstr "" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, c-format msgid "Cannot expand %s\n" msgstr "" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "" @@ -2782,107 +2801,107 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, c-format msgid "Could not exec %s: %s\n" msgstr "" -#: lib/signature.c:356 +#: lib/signature.c:357 msgid "pgp failed\n" msgstr "" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 msgid "pgp failed to write signature\n" msgstr "" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 msgid "unable to read the signature\n" msgstr "" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:470 +#: lib/signature.c:472 msgid "gpg failed\n" msgstr "" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 msgid "gpg failed to write signature\n" msgstr "" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:808 +#: lib/signature.c:811 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:823 +#: lib/signature.c:826 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:872 +#: lib/signature.c:875 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1044 +#: lib/signature.c:1047 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -2906,7 +2925,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2919,7 +2938,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2927,24 +2946,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, c-format msgid "missing %c %s" msgstr "" -#: lib/verify.c:398 +#: lib/verify.c:393 #, c-format msgid "Unsatisfied dependencies for %s: " msgstr "" @@ -3134,153 +3145,153 @@ msgstr "" msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 8ce6773..60be484 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -113,7 +113,7 @@ msgstr "" msgid "%s: %s\n" msgstr "" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "" @@ -501,52 +501,52 @@ msgstr "" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1565 +#: build/files.c:1564 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1589 +#: build/files.c:1588 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1645 +#: build/files.c:1644 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1762 +#: build/files.c:1761 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1785 +#: build/files.c:1784 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1800 +#: build/files.c:1799 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1864 +#: build/files.c:1863 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2262 +#: build/files.c:2261 #, c-format msgid "Bad file: %s: %s\n" msgstr "" @@ -733,7 +733,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -763,7 +763,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1243,17 +1243,17 @@ msgstr "" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 msgid "don't verify package digest(s)" msgstr "" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 msgid "don't verify database header(s) when retrieved" msgstr "" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 msgid "don't verify package signature(s)" msgstr "" @@ -1286,17 +1286,17 @@ msgstr "" msgid "lookup i18N strings in specfile catalog" msgstr "" -#: build/spec.c:238 +#: build/spec.c:233 #, c-format msgid "line %d: Bad number: %s\n" msgstr "" -#: build/spec.c:244 +#: build/spec.c:239 #, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "" -#: build/spec.c:307 +#: build/spec.c:302 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "" @@ -1432,71 +1432,71 @@ msgstr "" msgid "(not an OpenPGP signature)" msgstr "" -#: lib/fs.c:77 +#: lib/fs.c:73 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "" -#: lib/fs.c:92 +#: lib/fs.c:88 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, c-format msgid "failed to stat %s: %s\n" msgstr "" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "" -#: lib/fs.c:330 +#: lib/fs.c:326 #, c-format msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:338 +#: lib/fsm.c:339 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, c-format msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1517,7 +1517,7 @@ msgid "error creating temporary file %s\n" msgstr "" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1531,116 +1531,120 @@ msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 msgid "print macro expansion of EXPR" msgstr "" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 msgid "read instead of default file(s)" msgstr "" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 msgid "send stdout to CMD" msgstr "" -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 msgid "use ROOT as top level directory" msgstr "" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 msgid "debug payload file state machine" msgstr "" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 msgid "debug option/argument processing" msgstr "" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +msgid "debug package state machine" +msgstr "" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2046,73 +2050,88 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:443 +#: lib/psm.c:446 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:562 +#: lib/psm.c:565 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:682 +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" + +#: lib/psm.c:983 +#, c-format +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" +msgstr "" + +#: lib/psm.c:991 #, c-format -msgid "%s: running %s scriptlet\n" +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:1153 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:859 +#: lib/psm.c:1176 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "" -#: lib/psm.c:1188 +#: lib/psm.c:1182 +#, c-format +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" +msgstr "" + +#: lib/psm.c:1586 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1310 +#: lib/psm.c:1709 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1420 +#: lib/psm.c:1819 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1524 +#: lib/psm.c:1923 msgid " on file " msgstr "" -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2277,7 +2296,7 @@ msgstr "" msgid "%s: Fwrite failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, c-format msgid "%s: not an rpm package\n" msgstr "" @@ -2307,52 +2326,52 @@ msgstr "" msgid "%s: rpmWriteSignature failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, c-format msgid "%s: import read failed.\n" msgstr "" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, c-format msgid "%s: import failed.\n" msgstr "" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, c-format msgid "%s: headerGetEntry failed\n" msgstr "" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr "" -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr "" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "" @@ -2716,17 +2735,17 @@ msgstr "" msgid "Please contact rpm-list@redhat.com\n" msgstr "" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, c-format msgid "Cannot expand %s\n" msgstr "" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "" @@ -2788,107 +2807,107 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, c-format msgid "Could not exec %s: %s\n" msgstr "" -#: lib/signature.c:356 +#: lib/signature.c:357 msgid "pgp failed\n" msgstr "" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 msgid "pgp failed to write signature\n" msgstr "" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 msgid "unable to read the signature\n" msgstr "" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:470 +#: lib/signature.c:472 msgid "gpg failed\n" msgstr "" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 msgid "gpg failed to write signature\n" msgstr "" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:808 +#: lib/signature.c:811 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:823 +#: lib/signature.c:826 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:872 +#: lib/signature.c:875 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1044 +#: lib/signature.c:1047 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -2912,7 +2931,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2925,7 +2944,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2933,24 +2952,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, c-format msgid "missing %c %s" msgstr "" -#: lib/verify.c:398 +#: lib/verify.c:393 #, c-format msgid "Unsatisfied dependencies for %s: " msgstr "" @@ -3140,153 +3151,153 @@ msgstr "" msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 85937cc..8677082 100644 --- a/po/ru.po +++ b/po/ru.po @@ -111,7 +111,7 @@ msgstr " msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "RPM ×ÅÒÓÉÑ %s\n" @@ -521,52 +521,52 @@ msgstr " msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "óÉÍ×ÏÌÉÞÅÓËÁÑ ÓÓÙÌËÁ ÕËÁÚÙ×ÁÅÔ ÎÁ BuildRoot: %s -> %s\n" -#: build/files.c:1565 +#: build/files.c:1564 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "æÁÊÌ ÎÅ ÓÏÏÔ×ÅÔÓÔÕÅÔ ÐÒÅÆÉËÓÕ (%s): %s\n" -#: build/files.c:1589 +#: build/files.c:1588 #, c-format msgid "File not found: %s\n" msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s\n" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "îÅ×ÅÒÎÁÑ ÐÁÒÁ ×ÌÁÄÅÌÅÃ/ÇÒÕÐÐÁ: %s\n" -#: build/files.c:1645 +#: build/files.c:1644 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "æÁÊÌ%5d: %07o %s.%s\t %s\n" -#: build/files.c:1762 +#: build/files.c:1761 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "æÁÊÌ ÄÏÌÖÅÎ ÎÁÞÉÎÁÔØÓÑ Ó \"/\": %s\n" -#: build/files.c:1785 +#: build/files.c:1784 #, c-format msgid "Glob not permitted: %s\n" msgstr "Glob ÎÅ ÒÁÚÒÅÛÁÀÔÓÑ: %s\n" -#: build/files.c:1800 +#: build/files.c:1799 #, c-format msgid "File not found by glob: %s\n" msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s\n" -#: build/files.c:1864 +#: build/files.c:1863 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %%files %s: %s\n" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "ÓÔÒÏËÁ: %s\n" -#: build/files.c:2262 +#: build/files.c:2261 #, c-format msgid "Bad file: %s: %s\n" msgstr "îÅ×ÅÒÎÙÊ ÆÁÊÌ %s: %s\n" @@ -753,7 +753,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, c-format msgid "Unable to write package: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÐÁËÅÔ: %s\n" @@ -783,7 +783,7 @@ msgstr " msgid "Unable to write payload to %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÏÄÅÒÖÉÍÏÅ × %s: %s\n" -#: build/pack.c:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "úÁÐÉÓÁÎ: %s\n" @@ -1276,19 +1276,19 @@ msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" "ÓÏÚÄÁÔØ ÚÁÇÏÌÏ×ÏË(ËÉ) ÐÁËÅÔÁ, ÓÏ×ÍÅÓÔÉÍÙÅ Ó (ÕÓÔÁÒÅ×ÛÉÍÉ) ÆÏÒÍÁÔÁÍÉ rpm[23]" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÚÁ×ÉÓÉÍÏÓÔÉ ÐÁËÅÔÁ" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÁÒÈÉÔÅËÔÕÒÕ ÐÁËÅÔÁ" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1322,17 +1322,17 @@ msgstr " msgid "lookup i18N strings in specfile catalog" msgstr "ÉÓËÁÔØ ÓÔÒÏËÉ I18N × ËÁÔÁÌÏÇÅ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ" -#: build/spec.c:238 +#: build/spec.c:233 #, c-format msgid "line %d: Bad number: %s\n" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÏÅ ÞÉÓÌÏ: %s\n" -#: build/spec.c:244 +#: build/spec.c:239 #, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÏÅ ÞÉÓÌÏ no%s: %d\n" -#: build/spec.c:307 +#: build/spec.c:302 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÏÅ ÞÉÓÌÏ %s: %s\n" @@ -1378,57 +1378,57 @@ msgstr " msgid " failed - " msgstr "ÎÅ ÕÄÁÌÏÓØ - " -#: lib/depends.c:162 +#: lib/depends.c:163 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/depends.c:394 +#: lib/depends.c:395 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:422 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s YES (rpmrc provides)\n" -#: lib/depends.c:438 +#: lib/depends.c:439 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s YES (rpmlib provides)\n" -#: lib/depends.c:467 +#: lib/depends.c:468 #, fuzzy msgid "(db files)" msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" -#: lib/depends.c:480 +#: lib/depends.c:481 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s YES (db provides)\n" -#: lib/depends.c:493 +#: lib/depends.c:494 #, fuzzy msgid "(db package)" msgstr "ÎÅÔ ÐÁËÅÔÏ×\n" -#: lib/depends.c:851 +#: lib/depends.c:852 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:973 +#: lib/depends.c:974 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n" #. Record all relations. -#: lib/depends.c:1207 +#: lib/depends.c:1208 msgid "========== recording tsort relations\n" msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" #. T4. Scan for zeroes. -#: lib/depends.c:1308 +#: lib/depends.c:1309 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" @@ -1476,72 +1476,72 @@ msgstr "" msgid "(not an OpenPGP signature)" msgstr "ÐÒÏÐÕÓÔÉÔØ ×ÓÅ PGP-ÐÏÄÐÉÓÉ" -#: lib/fs.c:77 +#: lib/fs.c:73 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() ÎÅ ×ÏÚ×ÒÁÔÉÌ ÚÎÁÞÅÎÉÅ ÒÁÚÍÅÒÁ fugger: %s\n" -#: lib/fs.c:92 +#: lib/fs.c:88 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl() ÎÅ ×ÏÚ×ÒÁÔÉÌ ÚÎÁÞÅÎÉÅ ÒÁÚÍÅÒÁ fugger: %s\n" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, c-format msgid "failed to stat %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï %s: %s\n" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: lib/fs.c:330 +#: lib/fs.c:326 #, c-format msgid "file %s is on an unknown device\n" msgstr "ÆÁÊÌ %s - ÎÁ ÎÅÉÚ×ÅÓÔÎÏÍ ÕÓÔÒÏÊÓÔ×Å\n" -#: lib/fsm.c:338 +#: lib/fsm.c:339 #, fuzzy msgid "========== Directories not explictly included in package:\n" msgstr "========= ëÁÔÁÌÏÇÉ, ËÏÔÏÒÙÅ ÎÅ ×ËÌÀÞÅÎÙ × ÐÁËÅÔ Ñ×ÎÏ:\n" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "ËÁÔÁÌÏÇ %s ÓÏÚÄÁÎ Ó ÐÒÁ×ÁÍÉ ÄÏÓÔÕÐÁ %04o.\n" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "ÆÁÊÌ ÁÒÈÉ×Á %s ÎÅ ÎÁÊÄÅÎ × ÓÐÉÓËÅ ÆÁÊÌÏ× ÚÁÇÏÌÏ×ËÁ\n" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, c-format msgid "%s saved as %s\n" msgstr "%s ÓÏÈÒÁÎÅÎ ËÁË %s\n" -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ %s: ËÁÔÁÌÏÇ ÎÅ ÐÕÓÔ\n" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ %s: %s\n" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, c-format msgid "%s created as %s\n" msgstr "%s ÓÏÚÄÁÎ ËÁË %s\n" @@ -1562,7 +1562,7 @@ msgid "error creating temporary file %s\n" msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ %s\n" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1576,122 +1576,127 @@ msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ÐÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ÐÁËÅÔÙ ×ÅÒÓÉÉ <= 4\n" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: ÏÛÉÂËÁ rpmReadSignature\n" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "%s: ðÏÄÐÉÓØ ÎÅÄÏÓÔÕÐÎÁ\n" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: ÏÛÉÂËÁ readLead\n" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: ÏÛÉÂËÁ Fread: %s\n" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 #, fuzzy msgid "print macro expansion of EXPR" msgstr "×Ù×ÅÓÔÉ ÚÎÁÞÅÎÉÅ ÍÁËÒÏÓÁ <ÉÍÑ>+" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 #, fuzzy msgid "read instead of default file(s)" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ÆÁÊÌ:...> ×ÍÅÓÔÏ ÍÁËÒÏÆÁÊÌÁ(Ï×) ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "ÚÁÐÒÅÔÉÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÅ libio(3) API" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 #, fuzzy msgid "send stdout to CMD" msgstr "ÐÏÓÌÁÔØ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ × " -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 #, fuzzy msgid "use ROOT as top level directory" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ËÁÔÁÌÏÇ> ËÁË ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "ÏÔÏÂÒÁÚÉÔØ ÉÚ×ÅÓÔÎÙÅ ËÌÀÞÉ ÚÁÐÒÏÓÁ" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "ÐÏËÁÚÁÔØ ÔÅËÕÝÅÅ ÚÎÁÞÅÎÉÅ rpmrc É ÍÁËÒÏÓÏ×" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "×Ù×ÏÄÉÔØ ÍÉÎÉÍÕÍ ÓÏÏÂÝÅÎÉÊ" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "×Ù×ÏÄÉÔØ ÂÏÌÅÅ ÄÅÔÁÌØÎÙÅ ÓÏÏÂÝÅÎÉÑ" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "×Ù×ÅÓÔÉ ÎÏÍÅÒ ×ÅÒÓÉÉ ÜÔÏÊ ÐÒÇÒÁÍÍÙ" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 #, fuzzy msgid "debug payload file state machine" msgstr "ÏÔÌÁÄËÁ ÍÁÛÉÎÙ ÓÏÓÔÏÑÎÉÑ ÆÁÊÌÏ×" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "ÏÔÌÁÄËÁ ÐÒÏÔÏËÏÌÁ ÐÏÔÏËÁ ÄÁÎÎÙÈ" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 #, fuzzy msgid "debug option/argument processing" msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ÐÒÉ ÏÂÒÁÂÏÔËÅ ÁÒÇÕÍÅÎÔÏ× (%d) :-(\n" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +#, fuzzy +msgid "debug package state machine" +msgstr "ÏÔÌÁÄËÁ ÍÁÛÉÎÙ ÓÏÓÔÏÑÎÉÑ ÆÁÊÌÏ×" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "ÏÔÌÁÄËÁ ÐÒÏÃÅÓÓÁ ××ÏÄÁ/×Ù×ÏÄÁ rpmio" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "ÏÔÌÁÄËÁ ÏÂÒÁÂÏÔËÉ URL ËÜÛ" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2116,74 +2121,89 @@ msgstr " #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "ôÉÐ ÄÁÎÎÙÈ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n" -#: lib/psm.c:443 +#: lib/psm.c:446 msgid "source package expected, binary found\n" msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉÞÎÙÊ ÐÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ\n" -#: lib/psm.c:562 +#: lib/psm.c:565 msgid "source package contains no .spec file\n" msgstr "ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ\n" -#: lib/psm.c:682 -#, fuzzy, c-format -msgid "%s: running %s scriptlet\n" -msgstr "%s: ×ÙÐÏÌÎÑÅÔÓÑ ÓÃÅÎÁÒÉÊ %s (ÅÓÌÉ ÅÓÔØ)\n" +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:983 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" -msgstr "ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, waitpid() ×ÏÚ×ÒÁÔÉÌ %s\n" +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" +msgstr "" -#: lib/psm.c:859 +#: lib/psm.c:991 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" +msgstr "" + +#: lib/psm.c:1153 +#, c-format +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" +msgstr "" + +#: lib/psm.c:1176 +#, fuzzy, c-format +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" +msgstr "%s: ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ %s (%d), %s-%s-%s ÐÒÏÐÕÓËÁÅÔÓÑ\n" + +#: lib/psm.c:1182 +#, fuzzy, c-format +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, ËÏÄ ×ÏÚ×ÒÁÔÁ %d\n" -#: lib/psm.c:1188 +#: lib/psm.c:1586 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s ÓÏÄÅÒÖÉÔ %d ÆÁÊÌÏ×, test = %d\n" -#: lib/psm.c:1310 +#: lib/psm.c:1709 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ %s (%d), %s-%s-%s ÐÒÏÐÕÓËÁÅÔÓÑ\n" -#: lib/psm.c:1420 +#: lib/psm.c:1819 #, fuzzy msgid "Unable to reload signature header\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÚÁÇÒÕÚÉÔØ ÚÁÇÏÌÏ×ÏË ÐÏÄÐÉÓÉ.\n" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, c-format msgid "user %s does not exist - using root\n" msgstr "ÐÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, c-format msgid "group %s does not exist - using root\n" msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "ÒÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n" -#: lib/psm.c:1524 +#: lib/psm.c:1923 msgid " on file " msgstr " ÎÁ ÆÁÊÌÅ " -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, c-format msgid "%s failed: %s\n" msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n" @@ -2351,7 +2371,7 @@ msgstr " msgid "%s: Fwrite failed: %s\n" msgstr "%s: ÏÛÉÂËÁ Fwrite: %s\n" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "ÚÁÄÁÎÎÙÊ ÁÒÇÕÍÅÎÔ ÎÅ Ñ×ÌÑÅÔÓÑ ÐÁËÅÔÏÍ RPM\n" @@ -2381,52 +2401,52 @@ msgstr "%s: msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: ÏÛÉÂËÁ rpmWriteSignature: %s\n" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: ÏÛÉÂËÁ readLead\n" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: ÏÛÉÂËÁ readLead\n" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: ÏÛÉÂËÁ readLead\n" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: ðÏÄÐÉÓÉ ÎÅÔ (RPM v1.0)\n" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "îå ïë" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 msgid " (MISSING KEYS:" msgstr " (ïôóõôóô÷õàô ëìàþé:" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr " (îåô äï÷åòéñ ë ëìàþáí:" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "ïë" @@ -2798,17 +2818,17 @@ msgstr " msgid "Please contact rpm-list@redhat.com\n" msgstr "ó×ÑÖÉÔÅÓØ Ó rpm-list@redhat.com\n" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, c-format msgid "Cannot expand %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÒÁÓËÒÙÔØ %s\n" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ %s, ÚÎÁÞÅÎÉÅ HOME ÓÌÉÛËÏÍ ×ÅÌÉËÏ.\n" -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ: %s.\n" @@ -2871,111 +2891,111 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "ðÏÄÐÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁÐÏÌÎÅÎÉÅ(%d)\n" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, c-format msgid "Could not exec %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ %s: %s\n" -#: lib/signature.c:356 +#: lib/signature.c:357 msgid "pgp failed\n" msgstr "ÏÛÉÂËÁ pgp\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 msgid "pgp failed to write signature\n" msgstr "ÏÛÉÂËÁ pgp ÐÒÉ ÚÁÐÉÓÉ ÐÏÄÐÉÓÉ\n" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "òÁÚÍÅÒ ÐÏÄÐÉÓÉ PGP: %d\n" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 msgid "unable to read the signature\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÐÏÄÐÉÓØ\n" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "ðÏÌÕÞÅÎÏ %d ÂÁÊÔ ÐÏÄÐÉÓÉ PGP\n" -#: lib/signature.c:470 +#: lib/signature.c:472 msgid "gpg failed\n" msgstr "ÏÛÉÂËÁ gpg\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 msgid "gpg failed to write signature\n" msgstr "ÏÛÉÂËÁ gpg ÐÒÉ ÚÁÐÉÓÉ ÐÏÄÐÉÓÉ\n" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "òÁÚÍÅÒ ÐÏÄÐÉÓÉ GPG: %d\n" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "ðÏÌÕÞÅÎÏ %d ÂÁÊÔ ÐÏÄÐÉÓÉ GPG\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "îÅ×ÅÒÎÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ %%_signature × ÍÁËÒÏÆÁÊÌÅ\n" -#: lib/signature.c:808 +#: lib/signature.c:811 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_gpg_name\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ\n" -#: lib/signature.c:823 +#: lib/signature.c:826 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_pgp_name\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ\n" -#: lib/signature.c:872 +#: lib/signature.c:875 #, fuzzy msgid "Header+Payload size: " msgstr "úÁÇÏÌÏ×ÏË ÓÌÉÛËÏÍ ×ÅÌÉË" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 #, fuzzy msgid "Header SHA1 digest: " msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ SHA1 ÚÁÇÏÌÏ×ËÁ ÐÁËÅÔÁ" -#: lib/signature.c:1044 +#: lib/signature.c:1047 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "ÐÒÏÐÕÓÔÉÔØ ×ÓÅ MD5-ÐÏÄÐÉÓÉ" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 #, fuzzy msgid "V3 DSA signature: " msgstr "ðÏÄÐÉÓÉ ÎÅÔ\n" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "ëÏÎÔÒ. ÓÕÍÍÁ MD5 ÐÏ×ÒÅÖÄÅÎÁ: îå ðïääåòöé÷áåôóñ\n" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "ðÏÄÐÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁÐÏÌÎÅÎÉÅ(%d)\n" @@ -2999,7 +3019,7 @@ msgstr " #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3012,7 +3032,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3020,24 +3040,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, fuzzy, c-format msgid "missing %c %s" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ %s" -#: lib/verify.c:398 +#: lib/verify.c:393 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: " @@ -3230,154 +3242,154 @@ msgstr " msgid "cannot open %s index\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s\n" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 msgid "no dbpath has been set\n" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, fuzzy, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: ÐÏÌÕÞÅÎ ÐÏ×ÒÅÖÄÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË #%u, ÐÒÏÐÕÓËÁÅÔÓÑ.\n" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÚÁÇÏÌÏ×ÏË × 0x%x\n" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, c-format msgid "removing %d entries from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n" -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "ÏÛÉÂËÁ(%d) ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s\n" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "ÏÛÉÂËÁ(%d) ÒÅÚÅÒ×ÉÒÏ×ÁÎÉÑ ÐÁÍÑÔÉ ÄÌÑ ÏÂÒÁÚÁ ÎÏ×ÏÇÏ ÐÁËÅÔÁ\n" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ \"%s\" × ÉÎÄÅËÓ %s.\n" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, c-format msgid "adding %d entries to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ × ÉÎÄÅËÓ %s\n" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s ÐÏÓÌÅ ÕÓÐÅÛÎÏÇÏ ÚÁ×ÅÒÛÅÎÉÑ ÐÅÒÅÉÎÄÅËÁÃÉÉ ÂÁÚÙ × db3.\n" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÅÔÓÑ ÂÁÚÁ ÄÁÎÎÙÈ %s × %s\n" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "temporary database %s already exists\n" msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, c-format msgid "creating directory %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, c-format msgid "creating directory %s: %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, c-format msgid "opening old database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, c-format msgid "opening new database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÎÏ×ÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %u × ÂÁÚÅ ÄÁÎÎÙÈ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÅÔÓÑ.\n" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, c-format msgid "cannot add record originally at %u\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %u)\n" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÁÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÎÁ ÎÏ×ÕÀ!\n" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "ÆÁÊÌÙ × %s ÚÁÍÅÎÑÀÔÓÑ ÆÁÊÌÁÍÉ ÉÚ %s ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, c-format msgid "removing directory %s\n" msgstr "ÕÄÁÌÑÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n" @@ -3739,6 +3751,14 @@ msgid "DIRECTORY" msgstr "" #, fuzzy +#~ msgid "%s: running %s scriptlet\n" +#~ msgstr "%s: ×ÙÐÏÌÎÑÅÔÓÑ ÓÃÅÎÁÒÉÊ %s (ÅÓÌÉ ÅÓÔØ)\n" + +#~ msgid "" +#~ "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +#~ msgstr "ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, waitpid() ×ÏÚ×ÒÁÔÉÌ %s\n" + +#, fuzzy #~ msgid "%s: base64 encode failed.\n" #~ msgstr "%s: ÏÛÉÂËÁ readLead\n" diff --git a/po/sk.po b/po/sk.po index 4c21ed7..533d7ba 100644 --- a/po/sk.po +++ b/po/sk.po @@ -109,7 +109,7 @@ msgstr "" msgid "%s: %s\n" msgstr "súbor %s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "RPM verzia %s\n" @@ -528,52 +528,52 @@ msgstr "S msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1565 +#: build/files.c:1564 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Súbor nesúhlasí s prefixom (%s): %s." -#: build/files.c:1589 +#: build/files.c:1588 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Súbor nebol nájdený: %s" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Chybný vlastník/skupina: %s\n" -#: build/files.c:1645 +#: build/files.c:1644 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Súbor %4d: 0%o %s.%s\t %s\n" -#: build/files.c:1762 +#: build/files.c:1761 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "Súbor potrebuje na zaèiatku \"/\": %s" -#: build/files.c:1785 +#: build/files.c:1784 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "riadok %d: V %s sú vy¾adované verzie: %s" -#: build/files.c:1800 +#: build/files.c:1799 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Súbor nebol nájdený: %s" -#: build/files.c:1864 +#: build/files.c:1863 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "chybe: nie je mo¾né otvori» %%files súbor: %s" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "riadok: %s" -#: build/files.c:2262 +#: build/files.c:2261 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "súbor %s: %s\n" @@ -765,7 +765,7 @@ msgstr "Nie je mo msgid "Could not open %s: %s\n" msgstr "Otvorenie %s zlyhalo\n" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" @@ -795,7 +795,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:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "Zapísané: %s\n" @@ -1290,19 +1290,19 @@ msgstr "neoverova msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "neoverova» závislosti balíka" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "neoverova» architektúru balíka" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1340,17 +1340,17 @@ msgstr "predefinova msgid "lookup i18N strings in specfile catalog" msgstr "pre preklad re»azcov pou¾i» katalóg správ spec-súborov" -#: build/spec.c:238 +#: build/spec.c:233 #, fuzzy, c-format msgid "line %d: Bad number: %s\n" msgstr "riadok %d: Chybné èíslo: %s" -#: build/spec.c:244 +#: build/spec.c:239 #, fuzzy, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "riadok %d: Chybné no%s èíslo: %d" -#: build/spec.c:307 +#: build/spec.c:302 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "riadok %d: Chybné %s èíslo: %s\n" @@ -1494,71 +1494,71 @@ msgstr "(nie je msgid "(not an OpenPGP signature)" msgstr "vynecha» akékoµvek PGP podpisy" -#: lib/fs.c:77 +#: lib/fs.c:73 #, fuzzy, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() nevrátil veµkos» fuggeru: %s" -#: lib/fs.c:92 +#: lib/fs.c:88 #, fuzzy, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl() nevrátil veµkos» fuggeru: %s" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, fuzzy, c-format msgid "failed to stat %s: %s\n" msgstr "nepodarilo sa zisti» stav %s: %s" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" -#: lib/fs.c:330 +#: lib/fs.c:326 #, fuzzy, c-format msgid "file %s is on an unknown device\n" msgstr "súbor %s sa nachádza na neznámom zariadení" -#: lib/fsm.c:338 +#: lib/fsm.c:339 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, fuzzy, c-format msgid "%10d %s\n" msgstr "riadok %d: %s" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "varovanie: %s uchovaný ako %s" -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "nie je mo¾né odstráni» %s - adresár nie je prázdny" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "rmdir %s zlyhalo: %s" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "varovanie: %s vytvorené ako %s" @@ -1579,7 +1579,7 @@ msgid "error creating temporary file %s\n" msgstr "chyba pri vytváraní doèasného súboru %s" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1595,121 +1595,126 @@ msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "táto verzia RPM podporuje iba balíky s hlavným èíslom <= 3" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature zlyhalo\n" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "%s: Podpis nie je k dispozícii\n" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead zlyhalo\n" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: readLead zlyhalo\n" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 #, fuzzy msgid "print macro expansion of EXPR" msgstr "vypísa» verziu pou¾ívaného rpm" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 msgid "read instead of default file(s)" msgstr "" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 #, fuzzy msgid "send stdout to CMD" msgstr "posla» ¹tandardný výstup do " -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 #, fuzzy msgid "use ROOT as top level directory" msgstr "pou¾i» ako adresár najvy¹¹ej úrovne" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "vypísa» verziu pou¾ívaného rpm" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 #, fuzzy msgid "debug payload file state machine" msgstr "chybný stav súboru: %s" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 #, fuzzy msgid "debug option/argument processing" msgstr "Vnútorná chyba pri spracovaní argumentu (%d) :-(\n" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +#, fuzzy +msgid "debug package state machine" +msgstr "chybný stav súboru: %s" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2165,76 +2170,91 @@ msgstr "vytvori #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "Typ údajov %d nie je podorovaný\n" -#: lib/psm.c:443 +#: lib/psm.c:446 #, fuzzy msgid "source package expected, binary found\n" msgstr "oèakávaný zdrojový balík, nájdený binárny" -#: lib/psm.c:562 +#: lib/psm.c:565 #, fuzzy msgid "source package contains no .spec file\n" msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor" -#: lib/psm.c:682 -#, fuzzy, c-format -msgid "%s: running %s scriptlet\n" -msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n" +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" + +#: lib/psm.c:983 +#, c-format +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" +msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:991 +#, c-format +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" +msgstr "" + +#: lib/psm.c:1153 +#, c-format +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" +msgstr "" + +#: lib/psm.c:1176 #, fuzzy, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" -msgstr "vykonanie skriptu zlyhalo" +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" +msgstr "%s vynechané - prenos zlyhal - %s\n" -#: lib/psm.c:859 +#: lib/psm.c:1182 #, fuzzy, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1188 +#: lib/psm.c:1586 #, 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:1310 +#: lib/psm.c:1709 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1420 +#: lib/psm.c:1819 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Nie je mo¾né preèíta» ikonu: %s" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ije sa root" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalenie archívu zlyhalo%s%s: %s" -#: lib/psm.c:1524 +#: lib/psm.c:1923 msgid " on file " msgstr " pre súbor " -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s zlyhalo" @@ -2404,7 +2424,7 @@ msgstr "vykonanie zlyhalo\n" msgid "%s: Fwrite failed: %s\n" msgstr "%s: readLead zlyhalo\n" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "argument nie je RPM balík\n" @@ -2434,52 +2454,52 @@ msgstr "%s: readLead zlyhalo\n" msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmReadSignature zlyhalo\n" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLead zlyhalo\n" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLead zlyhalo\n" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead zlyhalo\n" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Podpis nie je k dispozícii (v1.0 RPM)\n" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "NIE JE V PORIADKU" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 msgid " (MISSING KEYS:" msgstr " (CHÝBAJÚCE K¥ÚÈE):" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr " (NEDÔVERUJE SA K¥ÚÈOM: " -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "V PORIADKU" @@ -2849,17 +2869,17 @@ msgstr "Nezn msgid "Please contact rpm-list@redhat.com\n" msgstr "Kontaktujte prosím rpm-list@redhat.com\n" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, fuzzy, c-format msgid "Cannot expand %s\n" msgstr "Nie je mo¾né expandova» %s" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, fuzzy, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Nie je mo¾né otvori» %s pre èítanie: %s." @@ -2922,116 +2942,116 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "Veµkos» podpisu: %d\n" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Nie je mo¾né spusti» %s" -#: lib/signature.c:356 +#: lib/signature.c:357 #, fuzzy msgid "pgp failed\n" msgstr "pgp zlyhalo" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 #, fuzzy msgid "pgp failed to write signature\n" msgstr "pgp sa nepodarilo zapísa» podpis" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "Veµkos» PGP podpisu: %d\n" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 #, fuzzy msgid "unable to read the signature\n" msgstr "nie je mo¾né preèíta» podpis" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Preèítaný PGP podpis obsahuje %d bajtov\n" -#: lib/signature.c:470 +#: lib/signature.c:472 #, fuzzy msgid "gpg failed\n" msgstr "gpg zlyhalo" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 #, fuzzy msgid "gpg failed to write signature\n" msgstr "gpg sa nepodarilo zapísa» podpis" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "Veµkos» GPG podpisu: %d\n" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Preèítaný GPG podpis obsahuje %d bajtov\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, fuzzy, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "Chybná ¹pecifikácia %%_signature v makro-súbore.\n" -#: lib/signature.c:808 +#: lib/signature.c:811 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Musíte nastavi» \"%%gpg_name\" vo va¹om makro-súbore" -#: lib/signature.c:823 +#: lib/signature.c:826 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Musíte nastavi» \"%%pgp_name\" vo va¹om makro-súbore" -#: lib/signature.c:872 +#: lib/signature.c:875 #, fuzzy msgid "Header+Payload size: " msgstr "Priveµká hlavièka" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 #, fuzzy msgid "Header SHA1 digest: " msgstr "zobrazi» súbory v balíku" -#: lib/signature.c:1044 +#: lib/signature.c:1047 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "vynecha» akékoµvek MD5 podpisy" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 #, fuzzy msgid "V3 DSA signature: " msgstr "Podpis nie je k dispozícii\n" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Doplnenie podpisu: %d\n" @@ -3055,7 +3075,7 @@ msgstr "vytv #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3068,7 +3088,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3076,24 +3096,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, fuzzy, c-format msgid "missing %c %s" msgstr "chýbajúce %s\n" -#: lib/verify.c:398 +#: lib/verify.c:393 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: " @@ -3286,155 +3298,155 @@ msgstr "nie je mo msgid "cannot open %s index\n" msgstr "nie je mo¾né otvori» %s\n" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 #, fuzzy msgid "no dbpath has been set\n" msgstr "nebola nastavená ¾iadna dbpath" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "chyba pri naèítaní záznamu %s z %s" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "chyba pri zápise záznamu %s do %s" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "chyba pri naèítaní záznamu %s z %s" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuje sa index skupín\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuje sa index názvov\n" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "chyba pri naèítaní záznamu %s z %s" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "chyba pri zápise záznamu %s do %s" -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "chyba pri odstraòovaní záznamu %s z %s" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "chyba pri hµadaní balíka %s\n" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "chyba pri zápise záznamu %s do %s" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "nebola nastavená ¾iadna dbpath" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "znovu sa vytvára databáza v adresári %s\n" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "doèasná databáza %s u¾ existuje" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otvára sa stará databáza\n" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otvára sa nová databáza\n" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "záznam èíslo %d v databáze je chybný -- bol vynechaný" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "nie je mo¾né prida» záznam pôvodne na %d" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "nepodarilo sa znovu vytvori» databázu; zostáva pôvodná\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "nepodarilo sa nahradi» starú databázu novou!\n" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "nahradí súbory v %s súbormi z %s kvôli obnove" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nepodarilo sa odstráni» adresár %s: %s\n" @@ -3799,6 +3811,15 @@ msgid "DIRECTORY" msgstr "" #, fuzzy +#~ msgid "%s: running %s scriptlet\n" +#~ msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n" + +#, fuzzy +#~ msgid "" +#~ "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +#~ msgstr "vykonanie skriptu zlyhalo" + +#, fuzzy #~ msgid "%s: base64 encode failed.\n" #~ msgstr "%s: readLead zlyhalo\n" @@ -4886,10 +4907,6 @@ msgstr "" #~ msgstr "vykonávajú sa predin¹talaèné skripty (ak existujú)\n" #, fuzzy -#~ msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" -#~ msgstr "%s vynechané - prenos zlyhal - %s\n" - -#, fuzzy #~ msgid "removal of %s failed: %s\n" #~ msgstr "odstránenie %s zlyhalo: %s" diff --git a/po/sl.po b/po/sl.po index c338545..84a7096 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,7 +1,7 @@ # -*- 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.314 2002/08/14 14:48:17 jbj Exp $ +# $Id: sl.po,v 1.315 2002/08/19 22:27:55 jbj Exp $ # msgid "" msgstr "" @@ -114,7 +114,7 @@ msgstr "" msgid "%s: %s\n" msgstr "datoteka %s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "RPM razlièica %s\n" @@ -527,52 +527,52 @@ msgstr "Datoteka je navedena dvakrat: %s" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Simbolna povezava ka¾e na BuildRoot: %s -> %s" -#: build/files.c:1565 +#: build/files.c:1564 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Datoteka se ne ujema s predpono (%s): %s" -#: build/files.c:1589 +#: build/files.c:1588 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Datoteke ni mogoèe najti: %s" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Neobstojeè lastnik/skupina: %s\n" -#: build/files.c:1645 +#: build/files.c:1644 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Datoteka: %4d: %07o %s.%s\t %s\n" -#: build/files.c:1762 +#: build/files.c:1761 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "Datoteki manjka uvodni \"/\": %s" -#: build/files.c:1785 +#: build/files.c:1784 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "vrstica %d: Razlièica ni dovoljena: %s" -#: build/files.c:1800 +#: build/files.c:1799 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Datoteke ni mo¾no najti z raz¹iritvijo metaznakov v imenu: %s" -#: build/files.c:1864 +#: build/files.c:1863 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Datoteke %s iz %%files ni mo¾no odpreti: %s" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "vrstica: %s" -#: build/files.c:2262 +#: build/files.c:2261 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "Po¹kodovana datoteka: %s: %s" @@ -764,7 +764,7 @@ msgstr "Ikone %s ni mo msgid "Could not open %s: %s\n" msgstr "Ni mo¾no odpreti %s: %s\n" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ni mo¾no zapisati paketa: %s" @@ -794,7 +794,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:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1294,19 +1294,19 @@ msgstr "brez preverjanja soodvisnosti paketa" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "brez preverjanja soodvisnosti paketa" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "brez preverjanja arhitekture paketa" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1342,17 +1342,17 @@ msgstr "brez upo msgid "lookup i18N strings in specfile catalog" msgstr "upo¹tevanje internacionalizirana sporoèila v katalogu spec" -#: build/spec.c:238 +#: build/spec.c:233 #, fuzzy, c-format msgid "line %d: Bad number: %s\n" msgstr "vrstica %d: Napaèno ¹tevilo: %s" -#: build/spec.c:244 +#: build/spec.c:239 #, fuzzy, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "vrstica %d: Napaèno ¹tevilo no%s: %d" -#: build/spec.c:307 +#: build/spec.c:302 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "vrstica %d: Napaèno ¹tevilo %s: %s\n" @@ -1497,71 +1497,71 @@ msgstr "(ni msgid "(not an OpenPGP signature)" msgstr "preskoèi vse podpise PGP" -#: lib/fs.c:77 +#: lib/fs.c:73 #, fuzzy, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() ni uspe¹no vrnila velikosti fugger: %s" -#: lib/fs.c:92 +#: lib/fs.c:88 #, fuzzy, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl() ni uspe¹no vrnila velikosti fugger: %s" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, fuzzy, c-format msgid "failed to stat %s: %s\n" msgstr "status %s ni na voljo: %s" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" -#: lib/fs.c:330 +#: lib/fs.c:326 #, fuzzy, c-format msgid "file %s is on an unknown device\n" msgstr "datoteka %s se nahaja na neznani napravi" -#: lib/fsm.c:338 +#: lib/fsm.c:339 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, fuzzy, c-format msgid "%10d %s\n" msgstr "vrstica %d: %s" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "opozorilo: %s shranjen kot %s" -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "ni mo¾no odstraniti %s - imenik ni prazen" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "odstranitev imenika %s je bila neuspe¹na: %s" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "odpiranje %s je bilo neuspe¹no: %s\n" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "opozorilo: %s ustvarjen kot %s" @@ -1582,7 +1582,7 @@ msgid "error creating temporary file %s\n" msgstr "napaka pri ustvarjanju zaèasne datoteke %s" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1598,121 +1598,126 @@ msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <=4" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature je bil neuspe¹en\n" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "%s: Podpis ni na voljo\n" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead je bil neuspe¹en\n" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: branje Fread je bilo neuspe¹no: %s\n" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 #, fuzzy msgid "print macro expansion of EXPR" msgstr "uporabljana razlièica rpm" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 msgid "read instead of default file(s)" msgstr "" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 #, fuzzy msgid "send stdout to CMD" msgstr "standardni izhod preusmerjen na " -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 #, fuzzy msgid "use ROOT as top level directory" msgstr "uporabi za korenski imenik" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "prika¾i znane znaèke za poizvedovanje" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "prika¾i konèni rpmrc in nastavitev makra" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "razlièica rpm, ki jo uporabljate" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 #, fuzzy msgid "debug payload file state machine" msgstr "okvarjeno stanje datoteke: %s" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 #, fuzzy msgid "debug option/argument processing" msgstr "Notranja napaka pri obdelavi argumentov (%d) :-\n" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +#, fuzzy +msgid "debug package state machine" +msgstr "okvarjeno stanje datoteke: %s" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2165,76 +2170,91 @@ msgstr "izdelava podpisa PGP/GPG" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "Tip podatkov %d ni podprt\n" -#: lib/psm.c:443 +#: lib/psm.c:446 #, fuzzy msgid "source package expected, binary found\n" msgstr "prièakovan je bil izvorni paket, najden binarni" -#: lib/psm.c:562 +#: lib/psm.c:565 #, fuzzy msgid "source package contains no .spec file\n" msgstr "izvorni paket ne vsebuje datoteke .spec" -#: lib/psm.c:682 -#, fuzzy, c-format -msgid "%s: running %s scriptlet\n" -msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n" +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" + +#: lib/psm.c:983 +#, c-format +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" +msgstr "" + +#: lib/psm.c:991 +#, c-format +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" +msgstr "" + +#: lib/psm.c:1153 +#, c-format +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" +msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:1176 #, fuzzy, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" -msgstr "skript se ni uspe¹no izvedel" +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" +msgstr "preskoèeno - %s - prenos neuspe¹en - %s\n" -#: lib/psm.c:859 +#: lib/psm.c:1182 #, fuzzy, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "skript se ni uspe¹no izvedel" -#: lib/psm.c:1188 +#: lib/psm.c:1586 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "paket: %s-%s-%s datoteke test = %d\n" -#: lib/psm.c:1310 +#: lib/psm.c:1709 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1420 +#: lib/psm.c:1819 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Ikone %s ni mo¾no prebrati: %s" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "uporabnik %s ne obstaja - uporabljam root" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s ne obstaja - uporabljam root" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, 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:1524 +#: lib/psm.c:1923 msgid " on file " msgstr " za datoteko " -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s neuspe¹en" @@ -2404,7 +2424,7 @@ msgstr "makeTempFile je bil neuspe msgid "%s: Fwrite failed: %s\n" msgstr "%s: pisanje Fwrite je bilo neuspe¹no: %s\n" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "navedeni argument ni paket RPM\n" @@ -2434,52 +2454,52 @@ msgstr "%s: writeLead je bil neuspe msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature je bilo neuspe¹no: %s\n" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLead je bil neuspe¹en\n" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLead je bil neuspe¹en\n" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead je bil neuspe¹en\n" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Podpis ni na voljo (RPM v1.0)\n" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "NI DOBRO" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 msgid " (MISSING KEYS:" msgstr " (MANJKAJOÈI KLJUÈI:" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr " (NEPREVERJENI KLJUÈI:" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "V REDU" @@ -2852,17 +2872,17 @@ msgstr "Neznan sistem: %s\n" msgid "Please contact rpm-list@redhat.com\n" msgstr "Prosimo, pi¹ite na rpm-list@redhat.com\n" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, fuzzy, c-format msgid "Cannot expand %s\n" msgstr "Ni mo¾no raz¹iriti %s" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, fuzzy, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "Ni mo¾no prebrati %s, HOME je prevelik." -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, fuzzy, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "%s ni mo¾no odpreti za branje: %s." @@ -2925,116 +2945,116 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "Dol¾. podpisa : %d\n" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Ni mo¾no izvesti %s: %s" -#: lib/signature.c:356 +#: lib/signature.c:357 #, fuzzy msgid "pgp failed\n" msgstr "pgp je bil neuspe¹en" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 #, fuzzy msgid "pgp failed to write signature\n" msgstr "pgp je bil neuspe¹en pri zapisu podpisa" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "Dol¾. podpisa PGP: %d\n" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 #, fuzzy msgid "unable to read the signature\n" msgstr "branje podpisa je bilo neuspe¹no" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Prebrano %d bajtov podpisa PGP\n" -#: lib/signature.c:470 +#: lib/signature.c:472 #, fuzzy msgid "gpg failed\n" msgstr "gpg je bil neuspe¹en" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 #, fuzzy msgid "gpg failed to write signature\n" msgstr "gpg je boil neuspe¹en pri zapisu podpisa" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "Dol¾. podpisa GnuPG: %d\n" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Prebrano %d bajtov podpisa GnuPG\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, fuzzy, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "Neveljaven %%_signature v makro-datoteki.\n" -#: lib/signature.c:808 +#: lib/signature.c:811 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\"" -#: lib/signature.c:823 +#: lib/signature.c:826 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\"" -#: lib/signature.c:872 +#: lib/signature.c:875 #, fuzzy msgid "Header+Payload size: " msgstr "Glava je predolga" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 #, fuzzy msgid "Header SHA1 digest: " msgstr "brez preverjanja datotek v paketu" -#: lib/signature.c:1044 +#: lib/signature.c:1047 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "preskoèi vse podpise MD5" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 #, fuzzy msgid "V3 DSA signature: " msgstr "Podpis manjka\n" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Dol¾. polnila : %d\n" @@ -3058,7 +3078,7 @@ msgstr "izklju #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3071,7 +3091,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3079,24 +3099,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, fuzzy, c-format msgid "missing %c %s" msgstr "manjka %s\n" -#: lib/verify.c:398 +#: lib/verify.c:393 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: " @@ -3291,157 +3303,157 @@ msgstr "ni mo msgid "cannot open %s index\n" msgstr "ni mo¾no odpreti kazala %s:" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath ni nastavljena" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "napaka(%d) pri pisanju zapisa %s v %s" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: ni mo¾no prebrati glave pri 0x%x" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstranjevanje \"%s\" iz kazala %s.\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstranjevanje %d vnosov iz kazala %s\n" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "napaka(%d) pri pisanju zapisa %s v %s" -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "napaka(%d) pri brisanju zapisa %s iz %s" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "napaka(%d) pri iskanju paketa %s\n" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "dodajanje \"%s\" v kazalo %s.\n" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "dodajanje %d vnosov v kazalo %s.\n" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "napaka(%d) pri pisanju zapisa %s v %s" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "dbpath ni nastavljena" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "zaèasna podatkovna zbirka %s ¾e obstaja" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "odpiranje stare podatkovne zbirke\n" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "zapis ¹t. %d v zbirki je po¹kodovan -- preskoèeno." -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "zapisa ni mo¾no dodati na %d" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ponovna izgradnja podatkovne zbirke je bila neuspe¹na; stara ostaja na\n" "istem mestu\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspe¹na!\n" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "poskus povrnitve z nadomestitvijo datotek v %s z datotekami v %s" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "odstranjevanje imenika: %s\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspe¹na odstranitev imenika %s: %s\n" @@ -3806,6 +3818,15 @@ msgid "DIRECTORY" msgstr "" #, fuzzy +#~ msgid "%s: running %s scriptlet\n" +#~ msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n" + +#, fuzzy +#~ msgid "" +#~ "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +#~ msgstr "skript se ni uspe¹no izvedel" + +#, fuzzy #~ msgid "%s: base64 encode failed.\n" #~ msgstr "%s: readLead je bil neuspe¹en\n" @@ -4912,10 +4933,6 @@ msgstr "" #~ msgstr "poganjanje prednamestitvenih skript (èe obstajajo)\n" #, fuzzy -#~ msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" -#~ msgstr "preskoèeno - %s - prenos neuspe¹en - %s\n" - -#, fuzzy #~ msgid "removal of %s failed: %s\n" #~ msgstr "odstranitev %s je bila neuspe¹na: %s" diff --git a/po/sr.po b/po/sr.po index df733c9..7fe02bf 100644 --- a/po/sr.po +++ b/po/sr.po @@ -107,7 +107,7 @@ msgstr "" msgid "%s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "RPM verzija %s\n" @@ -518,52 +518,52 @@ msgstr "Neuspelo msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1565 +#: build/files.c:1564 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Neuspelo èitanje %s: %s." -#: build/files.c:1589 +#: build/files.c:1588 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Datoteka nije pronaðena na serveru" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1645 +#: build/files.c:1644 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/files.c:1762 +#: build/files.c:1761 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "preme¹tanja moraju poèeti znakom '/'" -#: build/files.c:1785 +#: build/files.c:1784 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "paket %s nije naveden u %s" -#: build/files.c:1800 +#: build/files.c:1799 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Datoteka nije pronaðena na serveru" -#: build/files.c:1864 +#: build/files.c:1863 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/files.c:2262 +#: build/files.c:2261 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "neuspelo otvaranje %s: %s" @@ -754,7 +754,7 @@ msgstr "Ne mogu da upi msgid "Could not open %s: %s\n" msgstr "neuspelo otvaranje %s\n" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ne mogu da upi¹em %s" @@ -784,7 +784,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:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1279,19 +1279,19 @@ msgstr "nemoj proveravati zavisnosti paketa" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "nemoj proveravati zavisnosti paketa" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "nemoj proveravati arhitekturu paketa" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1328,17 +1328,17 @@ msgstr "" msgid "lookup i18N strings in specfile catalog" msgstr "" -#: build/spec.c:238 +#: build/spec.c:233 #, fuzzy, c-format msgid "line %d: Bad number: %s\n" msgstr "pogre¹an broj paketa: %s\n" -#: build/spec.c:244 +#: build/spec.c:239 #, fuzzy, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "pogre¹an broj paketa: %s\n" -#: build/spec.c:307 +#: build/spec.c:302 #, fuzzy, c-format msgid "line %d: Bad %s number: %s\n" msgstr "pogre¹an broj paketa: %s\n" @@ -1484,71 +1484,71 @@ msgstr "(nije broj)" msgid "(not an OpenPGP signature)" msgstr "preskoèi sve PGP potpise" -#: lib/fs.c:77 +#: lib/fs.c:73 #, fuzzy, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() nije vratio 'fugger' velièinu: %s" -#: lib/fs.c:92 +#: lib/fs.c:88 #, fuzzy, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl() nije vratio 'fugger' velièinu: %s" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, fuzzy, c-format msgid "failed to stat %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/fs.c:330 +#: lib/fs.c:326 #, c-format msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:338 +#: lib/fsm.c:339 msgid "========== Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, fuzzy, c-format msgid "%10d %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "ne mogu da uklonim %s - direktorijum nije prazan" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "neuspela komanda rmdir %s: %s" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "Ne mogu da otvorim datoteku %s: " @@ -1569,7 +1569,7 @@ msgid "error creating temporary file %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1585,120 +1585,125 @@ msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: Neuspelo 'rpmReadSignature'\n" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "%s: Potpis nije na raspolaganju\n" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 #, fuzzy msgid "print macro expansion of EXPR" msgstr "napi¹i verziju rpm-a koja se koristi" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 msgid "read instead of default file(s)" msgstr "" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 #, fuzzy msgid "send stdout to CMD" msgstr "po¹alji standardni izlaz u " -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 #, fuzzy msgid "use ROOT as top level directory" msgstr "koristi kao direktorijum najvi¹eg nivoa" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "napi¹i verziju rpm-a koja se koristi" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 #, fuzzy msgid "debug payload file state machine" msgstr "neuspelo otvaranje %s: %s" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 msgid "debug option/argument processing" msgstr "" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +#, fuzzy +msgid "debug package state machine" +msgstr "neuspelo otvaranje %s: %s" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2158,75 +2163,90 @@ msgstr "napravi PGP potpis" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:443 +#: lib/psm.c:446 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:562 +#: lib/psm.c:565 #, fuzzy msgid "source package contains no .spec file\n" msgstr "upit nad paketom koji ima " -#: lib/psm.c:682 -#, fuzzy, c-format -msgid "%s: running %s scriptlet\n" -msgstr "nemoj izvr¹iti nijednu fazu" +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" + +#: lib/psm.c:983 +#, c-format +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" +msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:991 +#, c-format +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" +msgstr "" + +#: lib/psm.c:1153 +#, c-format +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" +msgstr "" + +#: lib/psm.c:1176 #, fuzzy, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" -msgstr "neuspelo izvr¹avanje skripta" +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" +msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n" -#: lib/psm.c:859 +#: lib/psm.c:1182 #, fuzzy, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "neuspelo izvr¹avanje skripta" -#: lib/psm.c:1188 +#: lib/psm.c:1586 #, 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:1310 +#: lib/psm.c:1709 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1420 +#: lib/psm.c:1819 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Ne mogu da upi¹em %s" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/psm.c:1524 +#: lib/psm.c:1923 msgid " on file " msgstr "" -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "PGP omanuo" @@ -2397,7 +2417,7 @@ msgstr "%s: Neuspelo otvaranje\n" msgid "%s: Fwrite failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "gre¹ka: èini se da %s nije RPM paket\n" @@ -2427,53 +2447,53 @@ msgstr "%s: Neuspeo 'readLead'\n" msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: Neuspelo 'rpmReadSignature'\n" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 #, fuzzy msgid " (MISSING KEYS:" msgstr " (NEDOSTAJUÆI KLJUÈEVI)" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr "" -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr "" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "" @@ -2842,17 +2862,17 @@ msgstr "" msgid "Please contact rpm-list@redhat.com\n" msgstr "" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, fuzzy, c-format msgid "Cannot expand %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, fuzzy, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Ne mogu da otvorim %s za èitanje: %s" @@ -2917,115 +2937,115 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Ne mogu da izvr¹im PGP" -#: lib/signature.c:356 +#: lib/signature.c:357 #, fuzzy msgid "pgp failed\n" msgstr "PGP omanuo" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 #, fuzzy msgid "pgp failed to write signature\n" msgstr "PGP nije uspeo da zapi¹e potpis" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 #, fuzzy msgid "unable to read the signature\n" msgstr "ne mogu da proèitam potpis" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:470 +#: lib/signature.c:472 #, fuzzy msgid "gpg failed\n" msgstr "PGP omanuo" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 #, fuzzy msgid "gpg failed to write signature\n" msgstr "PGP nije uspeo da zapi¹e potpis" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:808 +#: lib/signature.c:811 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci" -#: lib/signature.c:823 +#: lib/signature.c:826 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci" -#: lib/signature.c:872 +#: lib/signature.c:875 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 #, fuzzy msgid "Header SHA1 digest: " msgstr "instaliraj paket" -#: lib/signature.c:1044 +#: lib/signature.c:1047 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "preskoèi sve MD5 potpise" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 #, fuzzy msgid "V3 DSA signature: " msgstr "%s: Potpis nije na raspolaganju\n" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -3049,7 +3069,7 @@ msgstr "gre #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3062,7 +3082,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3070,24 +3090,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, fuzzy, c-format msgid "missing %c %s" msgstr "nedostaje { posle %" -#: lib/verify.c:398 +#: lib/verify.c:393 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "Nezadovoljene meðuzavisnosti za %s-%s-%s: " @@ -3281,154 +3293,154 @@ msgstr "Ne mogu da otvorim datoteku %s: " msgid "cannot open %s index\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath nije odreðen" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "gre¹ka kod uzimanja sloga %s iz %s" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "ne mogu da proèitam zaglavlje na %d za proveru" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "gre¹ka kod uzimanja sloga %s iz %s" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "gre¹ka kod uzimanja sloga %s iz %s" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "gre¹ka kod potrage za paketom %s\n" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "dbpath nije odreðen" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "privremena baza podataka %s veæ postoji" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "slog broj %d u bazi podataka je neispravan -- preskaèem ga" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "ne mogu da dodam slog originalno na %d" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspelo otvaranje %s: %s" @@ -3800,6 +3812,15 @@ msgid "DIRECTORY" msgstr "" #, fuzzy +#~ msgid "%s: running %s scriptlet\n" +#~ msgstr "nemoj izvr¹iti nijednu fazu" + +#, fuzzy +#~ msgid "" +#~ "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +#~ msgstr "neuspelo izvr¹avanje skripta" + +#, fuzzy #~ msgid "%s: base64 encode failed.\n" #~ msgstr "%s: Neuspeo 'readLead'\n" @@ -4641,10 +4662,6 @@ msgstr "" #~ msgstr "preimenovanje %s u %s nije uspelo: %s" #, fuzzy -#~ msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n" -#~ msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n" - -#, fuzzy #~ msgid "removal of %s failed: %s\n" #~ msgstr "uklanjanje %s nije uspelo: %s" diff --git a/po/sv.po b/po/sv.po index c088da3..c02d740 100644 --- a/po/sv.po +++ b/po/sv.po @@ -107,7 +107,7 @@ msgstr "Gemensamma flaggor f msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "RPM version %s\n" @@ -510,52 +510,52 @@ msgstr "Filen uppr msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Symbolisk länk pekar på BuildRoot: %s -> %s\n" -#: build/files.c:1565 +#: build/files.c:1564 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Filen matchar inte prefixet (%s): %s\n" -#: build/files.c:1589 +#: build/files.c:1588 #, c-format msgid "File not found: %s\n" msgstr "Filen hittades inte: %s\n" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Felaktig ägare/grupp: %s\n" -#: build/files.c:1645 +#: build/files.c:1644 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Fil%5d: %07o %s.%s\t %s\n" -#: build/files.c:1762 +#: build/files.c:1761 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "Filen behöver inledande \"/\": %s\n" -#: build/files.c:1785 +#: build/files.c:1784 #, c-format msgid "Glob not permitted: %s\n" msgstr "Matchning inte tillåtet: %s\n" -#: build/files.c:1800 +#: build/files.c:1799 #, c-format msgid "File not found by glob: %s\n" msgstr "Hittade ingen fil vid matchningen: %s\n" -#: build/files.c:1864 +#: build/files.c:1863 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Kunde inte öppna %%files-fil %s: %s\n" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "rad: %s\n" -#: build/files.c:2262 +#: build/files.c:2261 #, c-format msgid "Bad file: %s: %s\n" msgstr "Felaktig fil: %s: %s\n" @@ -742,7 +742,7 @@ msgstr "Kan inte l msgid "Could not open %s: %s\n" msgstr "Kunde inte öppna %s: %s\n" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunde inte skriva paket: %s\n" @@ -772,7 +772,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:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1259,18 +1259,18 @@ msgstr "verifiera inte byggberoenden" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "generera pakethuvud(en) kompatibla med (äldre) rpm[23]-paketering" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 msgid "don't verify package digest(s)" msgstr "verifiera inte paketkontrollsummor" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "verifiera inte paketarkitektur" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 msgid "don't verify package signature(s)" msgstr "verifiera inte paketsignatur(er)" @@ -1303,17 +1303,17 @@ msgstr " msgid "lookup i18N strings in specfile catalog" msgstr "slå upp översatta strängar i specfilkatalog" -#: build/spec.c:238 +#: build/spec.c:233 #, c-format msgid "line %d: Bad number: %s\n" msgstr "rad %d: Felaktigt tal: %s\n" -#: build/spec.c:244 +#: build/spec.c:239 #, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "rad %d: Felaktigt no%s-tal: %d\n" -#: build/spec.c:307 +#: build/spec.c:302 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "rad %d: Felaktigt %s-tal: %s\n" @@ -1359,52 +1359,52 @@ msgstr "Ingen arkivfilen i huvud" msgid " failed - " msgstr " misslyckades - " -#: lib/depends.c:162 +#: lib/depends.c:163 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "paket %s är redan tillagt, ersäetter med %s\n" -#: lib/depends.c:394 +#: lib/depends.c:395 msgid "(cached)" msgstr "(cachad)" -#: lib/depends.c:421 +#: lib/depends.c:422 msgid "(rpmrc provides)" msgstr "(rpmrc tillhandahåller)" -#: lib/depends.c:438 +#: lib/depends.c:439 msgid "(rpmlib provides)" msgstr "(rpmlib tillhandahåller)" -#: lib/depends.c:467 +#: lib/depends.c:468 msgid "(db files)" msgstr "(db-filer)" -#: lib/depends.c:480 +#: lib/depends.c:481 msgid "(db provides)" msgstr "(db tillhandahåller)" -#: lib/depends.c:493 +#: lib/depends.c:494 msgid "(db package)" msgstr "(db-paket)" -#: lib/depends.c:851 +#: lib/depends.c:852 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "ignorera paketnamnsrelation(er) [%d]\t%s -> %s\n" -#: lib/depends.c:973 +#: lib/depends.c:974 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tar bort %s \"%s\" från tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1207 +#: lib/depends.c:1208 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1308 +#: lib/depends.c:1309 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" @@ -1452,71 +1452,71 @@ msgstr "(inte en klick)" msgid "(not an OpenPGP signature)" msgstr "Gammal PGP-signatur\n" -#: lib/fs.c:77 +#: lib/fs.c:73 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() kunde inte returnera storlek: %s\n" -#: lib/fs.c:92 +#: lib/fs.c:88 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl() kunde inte returnera monteringspunkter: %s\n" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, c-format msgid "failed to stat %s: %s\n" msgstr "kunde inte ta status på %s: %s\n" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" -#: lib/fs.c:330 +#: lib/fs.c:326 #, c-format msgid "file %s is on an unknown device\n" msgstr "filen %s är på en okänd enhet\n" -#: lib/fsm.c:338 +#: lib/fsm.c:339 msgid "========== Directories not explictly included in package:\n" msgstr "========== Kataloger ej uttryckligen inkluderade i paketet:\n" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, c-format msgid "%10d %s\n" msgstr "%10d %s\n" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "katalog %s skapad med rättigheter %04o.\n" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "arkivfil %s fanns inte i huvudets fillista\n" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, c-format msgid "%s saved as %s\n" msgstr "%s sparades som %s\n" -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s rmdir av %s misslyckades: Katalogen är inte tom\n" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir av %s misslyckades: %s\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s unlink av %s misslyckades: %s\n" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, c-format msgid "%s created as %s\n" msgstr "%s skapades som %s\n" @@ -1537,7 +1537,7 @@ msgid "error creating temporary file %s\n" msgstr "fel när tämporärfil %s skapades\n" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "endast V3-signaturer kan verifieras, hoppar över V%u-signatur" @@ -1551,121 +1551,126 @@ msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "endast paket med huvudnummer <= 4 stöds av denna version av RPM\n" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature misslyckades\n" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ingen signatur tillgänglig\n" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, c-format msgid "%s: headerRead failed\n" msgstr "%s: headerRead misslyckades\n" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread misslyckades: %s\n" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 #, fuzzy msgid "predefine MACRO with value EXPR" msgstr "definiera MAKRO till värdet UTTR" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "'MAKRO UTTR'" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "definiera MAKRO till värdet UTTR" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 msgid "print macro expansion of EXPR" msgstr "skriv ut makroexpansion av UTTR" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "'UTTR'" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 msgid "read instead of default file(s)" msgstr "läs istället för standardfil(er)" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "deaktivera användningen av libio(3)-API:et" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 #, fuzzy msgid "send stdout to CMD" msgstr "skicka standard ut till " -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 #, fuzzy msgid "use ROOT as top level directory" msgstr "använd som toppkatalog" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "visa kända frågetaggar" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "visa slutliga rpmrc- och makrokonfigurationer" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "visa mindre detaljerad utdata" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "visa mer detaljerad utdata" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "visa vilken version av rpm som används" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 #, fuzzy msgid "debug payload file state machine" msgstr "felsök filtillståndsmaskin" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "felsök protokolldataström" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 #, fuzzy msgid "debug option/argument processing" msgstr "Internt fel i argumenthantering (%d) :-(\n" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +#, fuzzy +msgid "debug package state machine" +msgstr "felsök filtillståndsmaskin" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "felsök rpmio I/O" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "felsök cache-hanteringen av URL:ar" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "%s: flaggtabell felkonfigurerad (%d)\n" @@ -2079,75 +2084,89 @@ msgstr "generera signatur" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "Datatyp %d stöds inte\n" -#: lib/psm.c:443 +#: lib/psm.c:446 msgid "source package expected, binary found\n" msgstr "källpaket förväntades, fann binärpaket\n" -#: lib/psm.c:562 +#: lib/psm.c:565 msgid "source package contains no .spec file\n" msgstr "källpaket innehåller ingen .spec-fil\n" -#: lib/psm.c:682 +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" + +#: lib/psm.c:983 #, c-format -msgid "%s: running %s scriptlet\n" -msgstr "%s: kör %s-skript\n" +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" +msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:991 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -"körning av %s-skript från %s-%s-%s misslyckades, waitpid returnerade %s\n" -#: lib/psm.c:859 +#: lib/psm.c:1153 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" +msgstr "" + +#: lib/psm.c:1176 +#, fuzzy, c-format +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" +msgstr "%s: %s-skript misslyckades (%d), hoppar över %s\n" + +#: lib/psm.c:1182 +#, fuzzy, c-format +msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "körning av %s-skript från %s-%s-%s misslyckades, slutstatus %d\n" -#: lib/psm.c:1188 +#: lib/psm.c:1586 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s har %d filer, test = %d\n" -#: lib/psm.c:1310 +#: lib/psm.c:1709 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: %s-skript misslyckades (%d), hoppar över %s\n" -#: lib/psm.c:1420 +#: lib/psm.c:1819 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Kan inte läsa om signaturhuvud.\n" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, c-format msgid "user %s does not exist - using root\n" msgstr "användare %s finns inte - använder root\n" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, c-format msgid "group %s does not exist - using root\n" msgstr "grupp %s finns inte - använder root\n" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "uppackning av arkiv misslyckades%s%s: %s\n" -#: lib/psm.c:1524 +#: lib/psm.c:1923 msgid " on file " msgstr " vid fil " -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s misslyckades på fil %s: %s\n" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, c-format msgid "%s failed: %s\n" msgstr "%s misslyckades: %s\n" @@ -2312,7 +2331,7 @@ msgstr "makeTempFile misslyckades\n" msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite misslyckades: %s\n" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "%s: inte en publik nyckel med skal.\n" @@ -2342,52 +2361,52 @@ msgstr "%s: writeLead misslyckades: %s\n" msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature misslyckades: %s\n" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, c-format msgid "%s: import read failed.\n" msgstr "%s: importläsning misslyckades.\n" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "%s: inte en publik nyckel med skal.\n" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: importläsning misslyckades.\n" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: headerGetEntry misslyckades\n" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Ingen signatur tillgänglig (v1.0 RPM)\n" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "EJ OK" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 msgid " (MISSING KEYS:" msgstr " (SAKNADE NYCKLAR:" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr " (EJ BETRODDA NYCKLAR:" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "OK" @@ -2756,17 +2775,17 @@ msgstr "Ok msgid "Please contact rpm-list@redhat.com\n" msgstr "Var vänlig kontakta rpm-list@redhat.com\n" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, c-format msgid "Cannot expand %s\n" msgstr "Kan inte expandera %s\n" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "Kan inte läsa %s, HOME är för stor.\n" -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Kan inte öppna %s för läsning: %s.\n" @@ -2830,107 +2849,107 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, c-format msgid "Could not exec %s: %s\n" msgstr "Kunde inte köra %s: %s\n" -#: lib/signature.c:356 +#: lib/signature.c:357 msgid "pgp failed\n" msgstr "pgp misslyckades\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 msgid "pgp failed to write signature\n" msgstr "pgp misslyckades att skriva en signatur\n" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "PGP signaturstorlek: %d\n" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 msgid "unable to read the signature\n" msgstr "kan inte läsa signaturen\n" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Fick %d byte PGP-signatur\n" -#: lib/signature.c:470 +#: lib/signature.c:472 msgid "gpg failed\n" msgstr "gpg misslyckades\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 msgid "gpg failed to write signature\n" msgstr "gpg kunde inte skriva signatur\n" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "GPG-signaturstorlek: %d\n" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Fick %d byte GPG-signatur\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "Felaktig %%_signature-spec i makrofil\n" -#: lib/signature.c:808 +#: lib/signature.c:811 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Du måste sätta \"%%_gpg_name\" i din makrofil\n" -#: lib/signature.c:823 +#: lib/signature.c:826 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Du måste sätta \"%%_pgp_name\" i din makrofil\n" -#: lib/signature.c:872 +#: lib/signature.c:875 msgid "Header+Payload size: " msgstr "Huvud+laststorlek: " -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "MD5-summa: " -#: lib/signature.c:969 +#: lib/signature.c:972 msgid "Header SHA1 digest: " msgstr "Huvudets SHA1-summa: " -#: lib/signature.c:1044 +#: lib/signature.c:1047 msgid "V3 RSA/MD5 signature: " msgstr "V3 RSA/MD5-signatur: " -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "Huvud " -#: lib/signature.c:1162 +#: lib/signature.c:1165 msgid "V3 DSA signature: " msgstr "V3 DSA-signatur: " -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "Verifiera signatur: FELAKTIGA PARAMETRAR\n" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "Trasig MD5-summa: STÖDS EJ\n" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Signatur: OKÄND (%d)\n" @@ -2954,7 +2973,7 @@ msgstr "hoppar #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2967,7 +2986,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2975,24 +2994,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, fuzzy, c-format msgid "missing %c %s" msgstr "saknas %s" -#: lib/verify.c:398 +#: lib/verify.c:393 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "Ouppfyllda beroenden för %s: " @@ -3182,153 +3193,153 @@ msgstr "kan inte msgid "cannot open %s index\n" msgstr "kan inte öppna %s-indexet\n" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 msgid "no dbpath has been set\n" msgstr "ingen dbpath har satts\n" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "fel(%d) när \"%s\"-poster hämtades från %s-indexet\n" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "fel(%d) när post nr. %d sparades i %s\n" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, fuzzy, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: skadad huvudinstans #%u hämtad, hoppar över.\n" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: kan inte läsa huvud vid 0x%x\n" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "fel(%d) när huvudpost nr. %d för %s skulle tas bort\n" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "tar bort \"%s\" från %s-indexet.\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, c-format msgid "removing %d entries from %s index.\n" msgstr "tar bort %d poster från %s-indexet.\n" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "fel(%d) när \"%s\"-poster från %s-indexet sattes\n" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "fel(%d) när post \"%s\" sparades i %s\n" -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "fel(%d) när post \"%s\" togs bort från %s\n" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "fel(%d) vid allokering av ny paketinstans\n" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "lägger till \"%s\" till %s-indexet.\n" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, c-format msgid "adding %d entries to %s index.\n" msgstr "lägger till %d poster till %s-indexet.\n" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "fel(%d) när post %s sparades i %s\n" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "tar bort %s efter lyckad db3-ombyggnad.\n" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "ingen dbpath har satts" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, c-format msgid "rebuilding database %s into %s\n" msgstr "bygger om databas %s till %s\n" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "temporary database %s already exists\n" msgstr "tillfällig databas %s existerar redan\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, c-format msgid "creating directory %s\n" msgstr "skapar katalog %s\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, c-format msgid "creating directory %s: %s\n" msgstr "skapar katalog %s: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, c-format msgid "opening old database with dbapi %d\n" msgstr "öppnar gammal databas med dbapi %d\n" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, c-format msgid "opening new database with dbapi %d\n" msgstr "öppnar ny databas med dbapi %d\n" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "post nummer %u i databasen är felaktig -- hoppar över.\n" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, c-format msgid "cannot add record originally at %u\n" msgstr "kan inte lägga till post ursprungligen vid %u\n" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "kunde inte ersätta gammal databas med ny databas!\n" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "byt ut filer i %s med filer från %s för att återställa" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, c-format msgid "removing directory %s\n" msgstr "tar bort katalog %s\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunde inte ta bort katalogen %s: %s\n" @@ -3686,6 +3697,14 @@ msgstr "" msgid "DIRECTORY" msgstr "" +#~ msgid "%s: running %s scriptlet\n" +#~ msgstr "%s: kör %s-skript\n" + +#~ 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" + #~ msgid "%s: base64 encode failed.\n" #~ msgstr "%s: base64-kodning misslyckades.\n" diff --git a/po/tr.po b/po/tr.po index 569f419..1a60cd7 100644 --- a/po/tr.po +++ b/po/tr.po @@ -110,7 +110,7 @@ msgstr "T msgid "%s: %s\n" msgstr "dosya %s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:89 +#: rpmqv.c:129 lib/poptALL.c:92 #, c-format msgid "RPM version %s\n" msgstr "RPM Sürüm %s\n" @@ -520,52 +520,52 @@ msgstr "Dosya iki kere g msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Sembolik bað BuildRoot gösteriyor: %s -> %s\n" -#: build/files.c:1565 +#: build/files.c:1564 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Dosya önek (%s) ile uyumsuz: %s\n" -#: build/files.c:1589 +#: build/files.c:1588 #, c-format msgid "File not found: %s\n" msgstr "Dosya bulunamadý: %s\n" -#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 +#: build/files.c:1631 build/files.c:2273 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Kullanýcý/grup hatalý: %s\n" -#: build/files.c:1645 +#: build/files.c:1644 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Dosya %4d: %07o %s.%s\t %s\n" -#: build/files.c:1762 +#: build/files.c:1761 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "Dosya \"/\" ile içermeli: %s\n" -#: build/files.c:1785 +#: build/files.c:1784 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "satýr %d: Dosya adý uygun deðil: %s\n" -#: build/files.c:1800 +#: build/files.c:1799 #, c-format msgid "File not found by glob: %s\n" msgstr "Dosya glob tarafýndan bulunamadý: %s\n" -#: build/files.c:1864 +#: build/files.c:1863 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "%%files dosya %s dosyasýnda açýlamadý: %s\n" -#: build/files.c:1875 build/pack.c:156 +#: build/files.c:1874 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "satýr: %s\n" -#: build/files.c:2262 +#: build/files.c:2261 #, c-format msgid "Bad file: %s: %s\n" msgstr "Dosya hatalý: %s: %s\n" @@ -756,7 +756,7 @@ msgstr "%s'den ba msgid "Could not open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: build/pack.c:629 lib/psm.c:1407 +#: build/pack.c:629 lib/psm.c:1806 #, c-format msgid "Unable to write package: %s\n" msgstr "paket yazýlamadý: %s\n" @@ -786,7 +786,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:710 lib/psm.c:1713 +#: build/pack.c:710 lib/psm.c:2112 #, c-format msgid "Wrote: %s\n" msgstr "Yazýldý: %s\n" @@ -1282,19 +1282,19 @@ msgstr "paket ba msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "paket baþlýklarýný (eski) rpm[23] paketleme ile uyumlu üretir" -#: build/poptBT.c:229 lib/poptALL.c:210 lib/poptI.c:265 lib/poptI.c:272 +#: build/poptBT.c:229 lib/poptALL.c:213 lib/poptI.c:265 lib/poptI.c:272 #: lib/poptQV.c:329 lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "paket baðýmlýlýklarý doðrulanmaz" -#: build/poptBT.c:231 lib/poptALL.c:212 lib/poptI.c:267 lib/poptI.c:274 +#: build/poptBT.c:231 lib/poptALL.c:215 lib/poptI.c:267 lib/poptI.c:274 #: lib/poptQV.c:332 lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "paket mimarisi denetlenmez" -#: build/poptBT.c:233 lib/poptALL.c:218 lib/poptI.c:269 lib/poptI.c:276 +#: build/poptBT.c:233 lib/poptALL.c:221 lib/poptI.c:269 lib/poptI.c:276 #: lib/poptQV.c:335 lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1328,17 +1328,17 @@ msgstr "hedef platforma zorlar" msgid "lookup i18N strings in specfile catalog" msgstr "spec dosyasýndaki i18n iletilerine bakar" -#: build/spec.c:238 +#: build/spec.c:233 #, c-format msgid "line %d: Bad number: %s\n" msgstr "satýr %d: Numara hatalý: %s\n" -#: build/spec.c:244 +#: build/spec.c:239 #, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "satýr %d: Hatalý no%s numarasý: %d\n" -#: build/spec.c:307 +#: build/spec.c:302 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "satýr %d: Hatalý %s numarasý: %s\n" @@ -1384,57 +1384,57 @@ msgstr "" msgid " failed - " msgstr " baþarýsýz - " -#: lib/depends.c:162 +#: lib/depends.c:163 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "%s zaten kurulu" -#: lib/depends.c:394 +#: lib/depends.c:395 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:422 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s EVET (rpmrc saðlar)\n" -#: lib/depends.c:438 +#: lib/depends.c:439 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s EVET (rpmlib saðlar)\n" -#: lib/depends.c:467 +#: lib/depends.c:468 #, fuzzy msgid "(db files)" msgstr "db dosyasý %s hatalý\n" -#: lib/depends.c:480 +#: lib/depends.c:481 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s EVET (db saðlar)\n" -#: lib/depends.c:493 +#: lib/depends.c:494 #, fuzzy msgid "(db package)" msgstr "paket yok\n" -#: lib/depends.c:851 +#: lib/depends.c:852 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:973 +#: lib/depends.c:974 #, 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:1207 +#: lib/depends.c:1208 msgid "========== recording tsort relations\n" msgstr "========== tsort baðýntýlarý kaydediliyor\n" #. T4. Scan for zeroes. -#: lib/depends.c:1308 +#: lib/depends.c:1309 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1484,72 +1484,72 @@ msgstr "(bir say msgid "(not an OpenPGP signature)" msgstr "tüm PGP imzalarýný atlar" -#: lib/fs.c:77 +#: lib/fs.c:73 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() sonuçlanan hatalý boyut nedeniyle baþarýsýz: %s\n" -#: lib/fs.c:92 +#: lib/fs.c:88 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl() sonuçlanan hatalý baðlantý yerleri nedeniyle baþarýsýz: %s\n" -#: lib/fs.c:112 lib/fs.c:197 lib/fs.c:307 +#: lib/fs.c:108 lib/fs.c:193 lib/fs.c:303 #, c-format msgid "failed to stat %s: %s\n" msgstr "stat %s baþarýsýz: %s\n" -#: lib/fs.c:155 rpmio/url.c:523 +#: lib/fs.c:151 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/fs.c:330 +#: lib/fs.c:326 #, c-format msgid "file %s is on an unknown device\n" msgstr "%s dosyasýnýn bulunduðu aygýt anlaþýlamadý\n" -#: lib/fsm.c:338 +#: lib/fsm.c:339 #, fuzzy msgid "========== Directories not explictly included in package:\n" msgstr "========= Pakette bulunmayan dizinler:\n" -#: lib/fsm.c:340 +#: lib/fsm.c:341 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1241 +#: lib/fsm.c:1242 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "%s dizin %04o izinleriyle oluþturuldu.\n" -#: lib/fsm.c:1539 +#: lib/fsm.c:1540 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1668 lib/fsm.c:1804 +#: lib/fsm.c:1669 lib/fsm.c:1805 #, c-format msgid "%s saved as %s\n" msgstr "%s %s olarak kaydedildi\n" -#: lib/fsm.c:1830 +#: lib/fsm.c:1831 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s / %s dizin silinemedi - Dizin boþ deðil\n" -#: lib/fsm.c:1836 +#: lib/fsm.c:1837 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s / %s dizinin silinmesi baþarýsýz: %s\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1847 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s / %s bað kaldýrýlamadý: %s\n" -#: lib/fsm.c:1866 +#: lib/fsm.c:1867 #, c-format msgid "%s created as %s\n" msgstr "%s %s olarak oluþturuldu\n" @@ -1570,7 +1570,7 @@ msgid "error creating temporary file %s\n" msgstr "%s geçici dosyasý oluþturulurken hata\n" #: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 -#: lib/package.c:739 lib/rpmchecksig.c:784 +#: lib/package.c:739 lib/rpmchecksig.c:786 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1586,122 +1586,127 @@ msgstr "" "RPM'nin bu sürümünde sadece ilk sürüm rakamý <= 4 olan paketler " "destekleniyor\n" -#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705 +#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:707 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature baþarýsýz\n" -#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710 +#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:712 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ýmza bulundurmuyor\n" -#: lib/package.c:651 lib/rpmchecksig.c:603 +#: lib/package.c:651 lib/rpmchecksig.c:605 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead baþarýsýz\n" -#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:634 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread baþarýsýz: %s\n" -#: lib/poptALL.c:197 +#: lib/poptALL.c:200 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:198 lib/poptALL.c:201 +#: lib/poptALL.c:201 lib/poptALL.c:204 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:200 +#: lib/poptALL.c:203 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:203 +#: lib/poptALL.c:206 #, fuzzy msgid "print macro expansion of EXPR" msgstr "+ için makro açýlýmýný gösterir" -#: lib/poptALL.c:204 +#: lib/poptALL.c:207 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229 +#: lib/poptALL.c:209 lib/poptALL.c:228 lib/poptALL.c:232 #, fuzzy msgid "read instead of default file(s)" msgstr "öntanýmlý makro dosyasý yerine okunur" -#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230 +#: lib/poptALL.c:210 lib/poptALL.c:229 lib/poptALL.c:233 msgid "" msgstr "" -#: lib/poptALL.c:215 lib/poptALL.c:249 +#: lib/poptALL.c:218 lib/poptALL.c:252 msgid "disable use of libio(3) API" msgstr "libio(3) API kullanýmýný iptal eder" -#: lib/poptALL.c:221 +#: lib/poptALL.c:224 #, fuzzy msgid "send stdout to CMD" msgstr "standart çýktýyý 'a gönderir" -#: lib/poptALL.c:222 +#: lib/poptALL.c:225 msgid "CMD" msgstr "" -#: lib/poptALL.c:233 +#: lib/poptALL.c:236 #, fuzzy msgid "use ROOT as top level directory" msgstr "Üst düzey dizin olarak kullanýlýr" -#: lib/poptALL.c:234 +#: lib/poptALL.c:237 msgid "ROOT" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:240 msgid "display known query tags" msgstr "tanýmlanmýþ sorgulama etiketlerini gösterir" -#: lib/poptALL.c:239 +#: lib/poptALL.c:242 msgid "display final rpmrc and macro configuration" msgstr "son rpmrc ve makro yapýlandýrmasýný gösterir" -#: lib/poptALL.c:241 +#: lib/poptALL.c:244 msgid "provide less detailed output" msgstr "daha az ayrýntýlý çýktý saðlar" -#: lib/poptALL.c:243 +#: lib/poptALL.c:246 msgid "provide more detailed output" msgstr "daha ayrýntýlý çýktý saðlar" -#: lib/poptALL.c:245 +#: lib/poptALL.c:248 msgid "print the version of rpm being used" msgstr "Kullanýlan RPM sürümünü verir" -#: lib/poptALL.c:258 +#: lib/poptALL.c:261 #, fuzzy msgid "debug payload file state machine" msgstr "hata ayýklama dosyasý durum motoru" -#: lib/poptALL.c:260 +#: lib/poptALL.c:263 msgid "debug protocol data stream" msgstr "protokol veri akýþýnda hata kontrolu" -#: lib/poptALL.c:263 +#: lib/poptALL.c:266 #, fuzzy msgid "debug option/argument processing" msgstr "(%d) argümaný iþlenirken iç hata oluþtu :-(\n" -#: lib/poptALL.c:274 +#: lib/poptALL.c:269 +#, fuzzy +msgid "debug package state machine" +msgstr "hata ayýklama dosyasý durum motoru" + +#: lib/poptALL.c:279 msgid "debug rpmio I/O" msgstr "rpmio G/Ç hata kontrolu" -#: lib/poptALL.c:282 +#: lib/poptALL.c:287 msgid "debug URL cache handling" msgstr "URL arabellek kullanýmý hata kontrolu" #. @-nullpass@ -#: lib/poptALL.c:353 +#: lib/poptALL.c:358 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2131,74 +2136,89 @@ msgstr "imza #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:250 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "%d veri türü desteklenmiyor\n" -#: lib/psm.c:443 +#: lib/psm.c:446 msgid "source package expected, binary found\n" msgstr "kaynak paketi gerekirken çalýþtýrýlabilir paketi bulundu\n" -#: lib/psm.c:562 +#: lib/psm.c:565 msgid "source package contains no .spec file\n" msgstr "kaynak paketi .spec dosyasý içermiyor\n" -#: lib/psm.c:682 -#, fuzzy, c-format -msgid "%s: running %s scriptlet\n" -msgstr "%s: %s betiði çalýþtýrýlýyor (varsa)\n" +#: lib/psm.c:906 +#, c-format +msgid "%s: waitpid(%d) rc %d status %x\n" +msgstr "" -#: lib/psm.c:852 +#: lib/psm.c:983 #, 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" +msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" +msgstr "" -#: lib/psm.c:859 +#: lib/psm.c:991 #, c-format -msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" +msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" +msgstr "" + +#: lib/psm.c:1153 +#, c-format +msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" +msgstr "" + +#: lib/psm.c:1176 +#, fuzzy, c-format +msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" +msgstr "%s: %s betiði baþarýsýz (%d), %s-%s-%s atlanýyor\n" + +#: lib/psm.c:1182 +#, fuzzy, c-format +msgid "%s(%s-%s-%s) scriptlet 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:1188 +#: lib/psm.c:1586 #, 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:1310 +#: lib/psm.c:1709 #, 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:1420 +#: lib/psm.c:1819 #, fuzzy msgid "Unable to reload signature header\n" msgstr "%s'den baþlýk okunamadý: %s\n" -#: lib/psm.c:1466 +#: lib/psm.c:1865 #, c-format msgid "user %s does not exist - using root\n" msgstr "kullanýcý %s yok - root kullanýlacak\n" -#: lib/psm.c:1475 +#: lib/psm.c:1874 #, c-format msgid "group %s does not exist - using root\n" msgstr "grup %s yok - root kullanýlacak\n" -#: lib/psm.c:1523 +#: lib/psm.c:1922 #, 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:1524 +#: lib/psm.c:1923 msgid " on file " msgstr " dosyada " -#: lib/psm.c:1721 +#: lib/psm.c:2120 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/psm.c:1724 +#: lib/psm.c:2123 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s baþarýsýz\n" @@ -2366,7 +2386,7 @@ msgstr "makeTempFile ba msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite baþarýsýz: %s\n" -#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:691 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "argüman bir RPM paketi deðil\n" @@ -2396,52 +2416,52 @@ msgstr "%s: writeLead ba msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature baþarýsýz: %s\n" -#: lib/rpmchecksig.c:556 +#: lib/rpmchecksig.c:557 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLead baþarýsýz\n" -#: lib/rpmchecksig.c:561 +#: lib/rpmchecksig.c:562 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: lib/rpmchecksig.c:568 +#: lib/rpmchecksig.c:569 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLead baþarýsýz\n" -#: lib/rpmchecksig.c:617 +#: lib/rpmchecksig.c:619 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead baþarýsýz\n" -#: lib/rpmchecksig.c:695 +#: lib/rpmchecksig.c:697 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Ýmza bulundurmuyor (v1.0 RPM)\n" -#: lib/rpmchecksig.c:950 +#: lib/rpmchecksig.c:952 msgid "NOT OK" msgstr "TAMAM DEÐÝL" -#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965 +#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 msgid " (MISSING KEYS:" msgstr " (EKSÝK ANAHTARLAR:" -#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967 +#: lib/rpmchecksig.c:955 lib/rpmchecksig.c:969 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968 +#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 msgid " (UNTRUSTED KEYS:" msgstr " (GÜVENCESÝZ ANAHTARLAR:" -#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970 +#: lib/rpmchecksig.c:958 lib/rpmchecksig.c:972 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:964 +#: lib/rpmchecksig.c:966 msgid "OK" msgstr "Tamam" @@ -2812,17 +2832,17 @@ msgstr "Bilinmeyen sistem: %s\n" msgid "Please contact rpm-list@redhat.com\n" msgstr "Lütfen rpm-list@redhat.com listesine üye olun\n" -#: lib/rpmrc.c:1756 +#: lib/rpmrc.c:1762 #, c-format msgid "Cannot expand %s\n" msgstr "%s geniþletilemiyor\n" -#: lib/rpmrc.c:1761 +#: lib/rpmrc.c:1767 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "%s okunamýyor, EV çok büyük\n" -#: lib/rpmrc.c:1778 +#: lib/rpmrc.c:1784 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "%s okuma eriþimi için açýlamadý: %s.\n" @@ -2884,111 +2904,111 @@ msgid "Signature: size(%d)+pad(%d)\n" msgstr "Ýmza: boyut(%d)+iz(%d)\n" #. @=boundsread@ -#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732 -#: lib/signature.c:771 +#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735 +#: lib/signature.c:774 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "%s icra edilemedi: %s\n" -#: lib/signature.c:356 +#: lib/signature.c:357 msgid "pgp failed\n" msgstr "pgp hata verdi\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:363 +#: lib/signature.c:364 msgid "pgp failed to write signature\n" msgstr "pgp imzasýnýn yazýlmasý baþarýsýz\n" -#: lib/signature.c:369 +#: lib/signature.c:370 #, c-format msgid "PGP sig size: %d\n" msgstr "PGP imza uzunluðu: %d\n" #. @=boundswrite@ -#: lib/signature.c:387 lib/signature.c:501 +#: lib/signature.c:388 lib/signature.c:503 msgid "unable to read the signature\n" msgstr "imza okunamadý\n" -#: lib/signature.c:392 +#: lib/signature.c:393 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "GPG imzasýnýn %d baytý alýndý\n" -#: lib/signature.c:470 +#: lib/signature.c:472 msgid "gpg failed\n" msgstr "gpg hata verdi\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:477 +#: lib/signature.c:479 msgid "gpg failed to write signature\n" msgstr "imzanýn yazýlmasý sýrasýnda gpg hata verdi\n" -#: lib/signature.c:483 +#: lib/signature.c:485 #, c-format msgid "GPG sig size: %d\n" msgstr "GPG imza uzunluðu: %d\n" -#: lib/signature.c:506 +#: lib/signature.c:508 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "GPG imzasýnýn %d baytý alýndý\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:776 lib/signature.c:831 +#: lib/signature.c:779 lib/signature.c:834 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "Makro dosyasýnda %%_signature spec geçersiz\n" -#: lib/signature.c:808 +#: lib/signature.c:811 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Makro dosyanýzda \"%%_pgp_name\" tanýmlanmýþ olmalý\n" -#: lib/signature.c:823 +#: lib/signature.c:826 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Makro dosyanýzda \"%%_pgp_name\" belirtmelisiniz\n" -#: lib/signature.c:872 +#: lib/signature.c:875 #, fuzzy msgid "Header+Payload size: " msgstr "Baþlýk çok uzun" -#: lib/signature.c:913 +#: lib/signature.c:916 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:969 +#: lib/signature.c:972 #, fuzzy msgid "Header SHA1 digest: " msgstr "Baþlýk SHA1 özümlemesi doðrulanmaz" -#: lib/signature.c:1044 +#: lib/signature.c:1047 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "tüm MD5 imzalarýný atlar" -#: lib/signature.c:1161 +#: lib/signature.c:1164 msgid "Header " msgstr "" -#: lib/signature.c:1162 +#: lib/signature.c:1165 #, fuzzy msgid "V3 DSA signature: " msgstr "Ýmza yok\n" -#: lib/signature.c:1241 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1268 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1272 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Ýmza: boyut(%d)+iz(%d)\n" @@ -3012,7 +3032,7 @@ msgstr "%s dizini d #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1024 +#: lib/transaction.c:1021 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3025,7 +3045,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1105 +#: lib/transaction.c:1102 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3033,24 +3053,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1180 +#: lib/transaction.c:1177 msgid "computing file dispositions\n" msgstr "" -#. =============================================== -#. * Install and remove packages. -#. -#: lib/transaction.c:1389 -#, c-format -msgid "install/erase %d elements\n" -msgstr "" - -#: lib/verify.c:291 +#: lib/verify.c:286 #, fuzzy, c-format msgid "missing %c %s" msgstr "eksik %s" -#: lib/verify.c:398 +#: lib/verify.c:393 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "%s-%s-%s için tatmin edici olmayan baðýmlýlýklar: " @@ -3240,155 +3252,155 @@ msgstr "%s indeksi db%d - %s (%d) kullanarak a msgid "cannot open %s index\n" msgstr "%s indeksi açýlamadý\n" -#: rpmdb/rpmdb.c:950 +#: rpmdb/rpmdb.c:949 msgid "no dbpath has been set\n" msgstr "belirtilmiþ bir dbpath deðeri yok\n" -#: rpmdb/rpmdb.c:1224 rpmdb/rpmdb.c:1353 rpmdb/rpmdb.c:1404 rpmdb/rpmdb.c:2369 -#: rpmdb/rpmdb.c:2480 rpmdb/rpmdb.c:3209 +#: rpmdb/rpmdb.c:1223 rpmdb/rpmdb.c:1352 rpmdb/rpmdb.c:1403 rpmdb/rpmdb.c:2368 +#: rpmdb/rpmdb.c:2479 rpmdb/rpmdb.c:3208 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n" -#: rpmdb/rpmdb.c:1640 rpmdb/rpmdb.c:2262 rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:1639 rpmdb/rpmdb.c:2261 rpmdb/rpmdb.c:3011 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1650 +#: rpmdb/rpmdb.c:1649 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n" -#: rpmdb/rpmdb.c:2289 +#: rpmdb/rpmdb.c:2288 #, fuzzy, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: bozuk baþlýk örneði #%u alýndý, atlanýyor.\n" -#: rpmdb/rpmdb.c:2568 +#: rpmdb/rpmdb.c:2567 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%x de baþlýk okunamadý\n" -#: rpmdb/rpmdb.c:2631 +#: rpmdb/rpmdb.c:2630 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n" -#: rpmdb/rpmdb.c:2746 +#: rpmdb/rpmdb.c:2745 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "\"%s\" %s indeksinden siliniyor.\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2749 #, c-format msgid "removing %d entries from %s index.\n" msgstr "%d girdi %s indeksinden siliniyor.\n" -#: rpmdb/rpmdb.c:2778 +#: rpmdb/rpmdb.c:2777 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n" -#: rpmdb/rpmdb.c:2799 +#: rpmdb/rpmdb.c:2798 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n" -#: rpmdb/rpmdb.c:2809 +#: rpmdb/rpmdb.c:2808 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "hata(%d) %s kaydýn %s dosyasýndan silinmesi\n" -#: rpmdb/rpmdb.c:2958 +#: rpmdb/rpmdb.c:2957 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "yeni paket örneðini tutma hatasý(%d)\n" -#: rpmdb/rpmdb.c:3184 +#: rpmdb/rpmdb.c:3183 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "\"%s\" %s indeksine ekleniyor.\n" -#: rpmdb/rpmdb.c:3188 +#: rpmdb/rpmdb.c:3187 #, c-format msgid "adding %d entries to %s index.\n" msgstr "%d girdi %s indeksine ekleniyor.\n" -#: rpmdb/rpmdb.c:3228 +#: rpmdb/rpmdb.c:3227 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3626 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "baþarýlý db3 yeniden oluþturma ertesinde %s kaldýrýlýyor\n" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3664 msgid "no dbpath has been set" msgstr "belirtilmiþ bir dbpath yok" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3696 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%s veritabaný %s içinde yeniden oluþturuluyor\n" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "temporary database %s already exists\n" msgstr "geçici veritabaný %s zaten mevcut\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3706 #, c-format msgid "creating directory %s\n" msgstr "%s dizini oluþturuluyor\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3708 #, c-format msgid "creating directory %s: %s\n" msgstr "%s dizini oluþturuluyor: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3715 #, c-format msgid "opening old database with dbapi %d\n" msgstr "eski veritabaný dbapi %d ile açýlýyor\n" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3728 #, c-format msgid "opening new database with dbapi %d\n" msgstr "yeni veritabaný dbapi %d ile açýlýyor\n" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3757 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "veritabanýndaki %u. kayýt hatalý -- atlanýyor\n" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3797 #, c-format msgid "cannot add record originally at %u\n" msgstr "kayýt özgün olarak %u e eklenemedi\n" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3815 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "veritabaný yeniden oluþturulamadý: mevcut veritabaný deðiþmeden\n" "yerinde býrakýldý\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3823 msgid "failed to replace old database with new database!\n" msgstr "eski veritabanýnýn yenisiyle deðiþtirilirmesi baþarýsýz!\n" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3825 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "kurtarmak için %s içindeki dosyalar %s deki dosyalarla deðiþtiriliyor" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3835 #, c-format msgid "removing directory %s\n" msgstr "%s dizini siliniyor\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3837 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s dizininin silinmesi baþarýsýz: %s\n" @@ -3750,6 +3762,14 @@ msgid "DIRECTORY" msgstr "" #, fuzzy +#~ msgid "%s: running %s scriptlet\n" +#~ msgstr "%s: %s betiði çalýþtýrýlýyor (varsa)\n" + +#~ 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" + +#, fuzzy #~ msgid "%s: base64 encode failed.\n" #~ msgstr "%s: readLead baþarýsýz\n" diff --git a/python/rpmfi-py.c b/python/rpmfi-py.c index dec9e10..6899177 100644 --- a/python/rpmfi-py.c +++ b/python/rpmfi-py.c @@ -369,7 +369,7 @@ rpmfi_dealloc(/*@only@*/ /*@null@*/ rpmfiObject * s) /*@modifies s @*/ { if (s) { - s->fi = rpmfiFree(s->fi, 1); + s->fi = rpmfiFree(s->fi); PyMem_DEL(s); } } @@ -504,6 +504,7 @@ hdr_fiFromHeader(PyObject * s, PyObject * args) { hdrObject * ho = (hdrObject *)s; PyObject * to = NULL; + rpmts ts = NULL; /* XXX FIXME: fiFromHeader should be a ts method. */ rpmTag tagN = RPMTAG_BASENAMES; int scareMem = 0; @@ -516,5 +517,5 @@ hdr_fiFromHeader(PyObject * s, PyObject * args) return NULL; } } - return rpmfi_Wrap( rpmfiNew(NULL, NULL, hdrGetHeader(ho), tagN, scareMem) ); + return rpmfi_Wrap( rpmfiNew(ts, hdrGetHeader(ho), tagN, scareMem) ); } diff --git a/python/rpmts-py.c b/python/rpmts-py.c index c413f3d..1f5c731 100644 --- a/python/rpmts-py.c +++ b/python/rpmts-py.c @@ -182,12 +182,12 @@ static void rpmtsAddAvailableElement(rpmts ts, Header h, { int scareMem = 0; rpmds provides = rpmdsNew(h, RPMTAG_PROVIDENAME, scareMem); - rpmfi fi = rpmfiNew(ts, NULL, h, RPMTAG_BASENAMES, scareMem); + rpmfi fi = rpmfiNew(ts, h, RPMTAG_BASENAMES, scareMem); /* XXX FIXME: return code RPMAL_NOMATCH is error */ (void) rpmalAdd(&ts->availablePackages, RPMAL_NOMATCH, key, provides, fi); - fi = rpmfiFree(fi, 1); + fi = rpmfiFree(fi); provides = rpmdsFree(provides); if (_rpmts_debug < 0) diff --git a/rpm.spec.in b/rpm.spec.in index efb3308..bcd5188 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -17,7 +17,7 @@ Name: rpm %define version @VERSION@ Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 0.81 +Release: 0.82 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Copyright: GPL @@ -519,6 +519,18 @@ fi %{__prefix}/include/popt.h %changelog +* Mon Aug 19 2002 Jeff Johnson 4.1-0.82 +- add --with-efence to configure, check install/upgrade with efence. +- beecrypt: short hex string conversion overflows target buffer. +- mark "successors only" packages in transaction. +- reap scriptlets with SIGCHLD handler. +- rename PSM_t to rpmpsm, add methods and refcounts to manage. +- remove %%configure/%%makeinstall from arch-os/macros, default is OK. +- don't export MALLOC_CHECK_ to scriptlets. +- squeaky clean memory leak checking. +- always malloc rpmfi structure, refcounts are correct in rpmtsRun(). +- skip redundant /sbin/ldconfig scripts on upgrade (if possible). + * Thu Aug 15 2002 Jeff Johnson 4.1-0.81 - rollback: re-create empty transaction set for multiple rollbacks. - fix: %%basename typo (Dmitry V. Levin). diff --git a/rpmdb/header.c b/rpmdb/header.c index e16782f..c2c3aaf 100644 --- a/rpmdb/header.c +++ b/rpmdb/header.c @@ -2665,6 +2665,8 @@ static char * formatValue(sprintfTag tag, Header h, count = 1; type = RPM_STRING_TYPE; data = "(none)"; + } else { + datafree = extCache[tag->extNum].freeit; } /*@=boundswrite@*/ } else { @@ -2682,7 +2684,8 @@ static char * formatValue(sprintfTag tag, Header h, if (tag->arrayCount) { /*@-observertrans -modobserver@*/ - data = headerFreeData(data, type); + if (datafree) + data = headerFreeData(data, type); /*@=observertrans =modobserver@*/ countBuf = count; @@ -3016,7 +3019,7 @@ allocateExtensionCache(const headerSprintfExtension extensions) } /*@-sizeoftype@*/ - return xcalloc(i, sizeof(struct extensionCache)); + return xcalloc(i, sizeof(struct extensionCache_s)); /*@=sizeoftype@*/ } diff --git a/rpmdb/header_internal.h b/rpmdb/header_internal.h index f9e0198..de79b09 100644 --- a/rpmdb/header_internal.h +++ b/rpmdb/header_internal.h @@ -68,8 +68,8 @@ struct headerToken { /** \ingroup header */ -typedef /*@abstract@*/ struct sprintfTag * sprintfTag; -struct sprintfTag { +typedef /*@abstract@*/ struct sprintfTag_s * sprintfTag; +struct sprintfTag_s { /*@null@*/ headerTagTagFunction ext; /*!< if NULL tag element is invalid */ int extNum; int_32 tag; @@ -82,8 +82,8 @@ struct sprintfTag { /** \ingroup header */ -typedef /*@abstract@*/ struct extensionCache * extensionCache; -struct extensionCache { +typedef /*@abstract@*/ struct extensionCache_s * extensionCache; +struct extensionCache_s { int_32 type; int_32 count; int avail; @@ -108,7 +108,7 @@ struct sprintfToken { /*@only@*/ sprintfToken format; int numTokens; } array; - struct sprintfTag tag; + struct sprintfTag_s tag; struct { /*@dependent@*/ char * string; int len; @@ -118,7 +118,7 @@ struct sprintfToken { int numIfTokens; /*@only@*/ /*@null@*/ sprintfToken elseFormat; int numElseTokens; - struct sprintfTag tag; + struct sprintfTag_s tag; } cond; } u; }; diff --git a/rpmdb/legacy.c b/rpmdb/legacy.c index 2c1fd3f..b88cfbb 100644 --- a/rpmdb/legacy.c +++ b/rpmdb/legacy.c @@ -126,6 +126,7 @@ static int open_dso(const char * path, /*@null@*/ pid_t * pidp, /*@null@*/ size_ if (!poptParseArgvString(cmd, &ac, &av)) { av[ac-1] = path; av[ac] = NULL; + unsetenv("MALLOC_CHECK_"); xx = execve(av[0], (char *const *)av+1, environ); } _exit(127); diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c index f79523a..f9ebd53 100644 --- a/rpmdb/rpmdb.c +++ b/rpmdb/rpmdb.c @@ -663,7 +663,7 @@ static void handler(int signum) /*@=incondefs@*/ /** - * Enable all signal handlers + * Enable all signal handlers. */ static int enableSignals(void) /*@globals caught, satbl, fileSystem @*/ @@ -726,7 +726,7 @@ static int checkSignals(void) } /** - * Disable all signal handlers + * Disable all signal handlers. */ static int disableSignals(void) /*@globals satbl, fileSystem @*/ @@ -748,7 +748,6 @@ static int disableSignals(void) return sigprocmask(SIG_SETMASK, &oldMask, NULL); } - /** * Block all signals, returning previous signal mask. */ @@ -3279,7 +3278,7 @@ static struct skipDir_s { static int skipDir(const char * dn) /*@*/ { - struct skipDir_s * sd = skipDirs;; + struct skipDir_s * sd = skipDirs; int dnlen; dnlen = strlen(dn); diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c index 81c086a..3ad3771 100644 --- a/rpmio/rpmio.c +++ b/rpmio/rpmio.c @@ -3152,6 +3152,7 @@ int Fcntl(FD_t fd, int op, void *lip) /* =============================================================== */ /* Helper routines that may be generally useful. */ +/*@-bounds@*/ int rpmioMkpath(const char * path, mode_t mode, uid_t uid, gid_t gid) { char * d, * de; @@ -3200,6 +3201,7 @@ int rpmioMkpath(const char * path, mode_t mode, uid_t uid, gid_t gid) path, mode); return rc; } +/*@=bounds@*/ /*@-boundswrite@*/ int rpmioSlurp(const char * fn, const byte ** bp, ssize_t * blenp)