From de0ff3b553d9f1b44c73b378637544ed6092df1e Mon Sep 17 00:00:00 2001 From: jbj Date: Sun, 4 Aug 2002 16:55:55 +0000 Subject: [PATCH] - resurrect --rollback. - renumber the callback types to be an orthogonal bit mask. - provide repackage progress callbacks, compression is slow. CVS patchset: 5597 CVS date: 2002/08/04 16:55:55 --- CHANGES | 3 + lib/fsm.c | 24 ++--- lib/psm.c | 20 +++- lib/rpmcli.h | 21 +++- lib/rpmfi.c | 1 + lib/rpmfi.h | 1 + lib/rpminstall.c | 173 +++++++++++++++++++++---------- lib/transaction.c | 20 +++- po/cs.po | 276 ++++++++++++++++++++++++++------------------------ po/da.po | 278 ++++++++++++++++++++++++++------------------------ po/de.po | 284 +++++++++++++++++++++++++++------------------------ po/en_RN.po | 275 +++++++++++++++++++++++++------------------------ po/es.po | 275 +++++++++++++++++++++++++------------------------ po/eu_ES.po | 275 +++++++++++++++++++++++++------------------------ po/fi.po | 284 +++++++++++++++++++++++++++------------------------ po/fr.po | 285 +++++++++++++++++++++++++++------------------------ po/gl.po | 275 +++++++++++++++++++++++++------------------------ po/hu.po | 275 +++++++++++++++++++++++++------------------------ po/id.po | 275 +++++++++++++++++++++++++------------------------ po/is.po | 276 ++++++++++++++++++++++++++------------------------ po/it.po | 275 +++++++++++++++++++++++++------------------------ po/ja.po | 285 ++++++++++++++++++++++++++------------------------- po/ko.po | 286 +++++++++++++++++++++++++++------------------------ po/no.po | 278 ++++++++++++++++++++++++++------------------------ po/pl.po | 285 ++++++++++++++++++++++++++------------------------- po/pt.po | 286 +++++++++++++++++++++++++++------------------------ po/pt_BR.po | 284 +++++++++++++++++++++++++++------------------------ po/ro.po | 275 +++++++++++++++++++++++++------------------------ po/rpm.pot | 275 +++++++++++++++++++++++++------------------------ po/ru.po | 286 +++++++++++++++++++++++++++------------------------ po/sk.po | 285 ++++++++++++++++++++++++++------------------------- po/sl.po | 287 +++++++++++++++++++++++++++------------------------- po/sr.po | 284 +++++++++++++++++++++++++++------------------------ po/sv.po | 283 +++++++++++++++++++++++++++------------------------ po/tr.po | 278 ++++++++++++++++++++++++++------------------------ po/uk.po | 275 +++++++++++++++++++++++++------------------------ po/wa.po | 275 +++++++++++++++++++++++++------------------------ po/zh.po | 275 +++++++++++++++++++++++++------------------------ po/zh_CN.GB2312.po | 275 +++++++++++++++++++++++++------------------------ python/rpmmodule.c | 4 + python/rpmts-py.c | 1 + rpm.spec.in | 8 +- rpmio/rpmmessages.h | 29 +++--- 43 files changed, 4724 insertions(+), 4246 deletions(-) diff --git a/CHANGES b/CHANGES index 2543ca8..9609440 100644 --- a/CHANGES +++ b/CHANGES @@ -209,6 +209,9 @@ - check header blobs on export (i.e. rpmdbAdd()). - enable iterator header blob checks for install/erase modes. - python: _vsflags_up2date macro to configure verify signature flags. + - resurrect --rollback. + - renumber the callback types to be an orthogonal bit mask. + - provide repackage progress callbacks, compression is slow. 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/lib/fsm.c b/lib/fsm.c index 4f0e48d..df96b60 100644 --- a/lib/fsm.c +++ b/lib/fsm.c @@ -524,10 +524,11 @@ int fsmSetup(FSM_t fsm, fileStage goal, } fsm->iter = mapInitIterator(ts, fi); - if (fsm->goal == FSM_PKGINSTALL) { + if (fsm->goal == FSM_PKGINSTALL || fsm->goal == FSM_PKGBUILD) { void * ptr; + fi->archivePos = 0; ptr = rpmtsNotify(ts, fi->te, - RPMCALLBACK_INST_START, 0, fi->archiveSize); + RPMCALLBACK_INST_START, fi->archivePos, fi->archiveSize); } /*@-boundswrite@*/ @@ -808,7 +809,6 @@ static int writeFile(/*@special@*/ FSM_t fsm, int writeData) const char * opath = fsm->opath; struct stat * st = &fsm->sb; struct stat * ost = &fsm->osb; - size_t pos = fdGetCpioPos(fsm->cfd); char * symbuf = NULL; int left; int xx; @@ -923,13 +923,6 @@ static int writeFile(/*@special@*/ FSM_t fsm, int writeData) rc = fsmStage(fsm, FSM_PAD); if (rc) goto exit; - { const rpmts ts = fsmGetTs(fsm); - rpmfi fi = fsmGetFi(fsm); - size_t size = (fdGetCpioPos(fsm->cfd) - pos); - void * ptr; - ptr = rpmtsNotify(ts, fi->te, RPMCALLBACK_INST_PROGRESS, size, size); - } - rc = 0; exit: @@ -1430,6 +1423,9 @@ int fsmStage(FSM_t fsm, fileStage stage) /*@loopbreak@*/ break; } + /* Notify on success. */ + (void) fsmStage(fsm, FSM_NOTIFY); + if (fsmStage(fsm, FSM_FINI)) /*@loopbreak@*/ break; } @@ -1741,8 +1737,12 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break; rpmts ts = fsmGetTs(fsm); rpmfi fi = fsmGetFi(fsm); void * ptr; - ptr = rpmtsNotify(ts, fi->te, RPMCALLBACK_INST_PROGRESS, - fdGetCpioPos(fsm->cfd), fi->archiveSize); + unsigned int archivePos = fdGetCpioPos(fsm->cfd); + if (archivePos > fi->archivePos) { + fi->archivePos = archivePos; + ptr = rpmtsNotify(ts, fi->te, RPMCALLBACK_INST_PROGRESS, + fi->archivePos, fi->archiveSize); + } } break; case FSM_UNDO: diff --git a/lib/psm.c b/lib/psm.c index 473817b..32e649b 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -21,6 +21,8 @@ #define _RPMTE_INTERNAL #include "rpmte.h" + +#define _RPMTS_INTERNAL /* XXX ts->notify */ #include "rpmts.h" #include "rpmlead.h" /* writeLead proto */ @@ -1509,6 +1511,12 @@ psm->te->h = headerLink(fi->h); if (!rc) rc = psmStage(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); + if (rc) { rpmError(RPMERR_CPIO, _("unpacking of archive failed%s%s: %s\n"), @@ -1525,10 +1533,6 @@ psm->te->h = headerLink(fi->h); break; } - psm->what = RPMCALLBACK_INST_PROGRESS; - psm->amount = (fi->archiveSize ? fi->archiveSize : 100); - psm->total = psm->amount; - xx = psmStage(psm, PSM_NOTIFY); } if (psm->goal == PSM_PKGERASE) { int fc = rpmfiFC(fi); @@ -1583,6 +1587,12 @@ psm->te->h = headerLink(fi->h); errno = saveerrno; /*@=mods@*/ + /* 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); + fi->action = action; fi->actions = actions; } @@ -1698,7 +1708,7 @@ psm->te->h = headerLink(fi->h); } if (psm->goal == PSM_PKGSAVE) { - if (!rc) { + if (!rc && ts && ts->notify == NULL) { rpmMessage(RPMMESS_VERBOSE, _("Wrote: %s\n"), (psm->pkgURL ? psm->pkgURL : "???")); } diff --git a/lib/rpmcli.h b/lib/rpmcli.h index 1ebf5e4..875df09 100644 --- a/lib/rpmcli.h +++ b/lib/rpmcli.h @@ -462,10 +462,19 @@ extern struct poptOption rpmBuildPoptTable[]; /* --- install/upgrade/erase modes */ /*@unchecked@*/ -extern int packagesTotal; +extern int rpmcliPackagesTotal; +/*@unchecked@*/ +extern int rpmcliHashesCurrent; +/*@unchecked@*/ +extern int rpmcliHashesTotal; +/*@unchecked@*/ +extern int rpmcliProgressCurrent; +/*@unchecked@*/ +extern int rpmcliProgressTotal; /** \ingroup rpmcli - * The rpm CLI generic transaction callback. + * The rpm CLI generic transaction callback handler. + * @todo Remove headerSprintf() from the progress callback. * @deprecated Transaction callback arguments need to change, so don't rely on * this routine in the rpmcli API. * @@ -483,8 +492,12 @@ extern int packagesTotal; const unsigned long total, /*@null@*/ fnpyKey key, /*@null@*/ void * data) - /*@globals fileSystem, internalState @*/ - /*@modifies fileSystem, internalState @*/; + /*@globals rpmcliHashesCurrent, + rpmcliProgressCurrent, rpmcliProgressTotal, + fileSystem, internalState @*/ + /*@modifies rpmcliHashesCurrent, + rpmcliProgressCurrent, rpmcliProgressTotal, + fileSystem, internalState @*/; /** \ingroup rpmcli * Install source rpm package. diff --git a/lib/rpmfi.c b/lib/rpmfi.c index f9e3a1d..686ebcd 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -1026,6 +1026,7 @@ rpmfi rpmfiNew(rpmts ts, rpmfi fi, /* 0 means unknown */ xx = hge(h, RPMTAG_ARCHIVESIZE, NULL, (void **) &uip, NULL); + fi->archivePos = 0; fi->archiveSize = (xx ? *uip : 0); if (!hge(h, RPMTAG_BASENAMES, NULL, (void **) &fi->bnl, &fi->fc)) { diff --git a/lib/rpmfi.h b/lib/rpmfi.h index 4237d47..da112b4 100644 --- a/lib/rpmfi.h +++ b/lib/rpmfi.h @@ -118,6 +118,7 @@ struct rpmfi_s { int astriplen; int striplen; + unsigned int archivePos; unsigned int archiveSize; mode_t dperms; /*!< Directory perms (0755) if not mapped. */ mode_t fperms; /*!< File perms (0644) if not mapped. */ diff --git a/lib/rpminstall.c b/lib/rpminstall.c index 5c6a896..7b866d8 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -24,52 +24,60 @@ /*@access IDT @*/ /*@unchecked@*/ -static int hashesPrinted = 0; - +int rpmcliPackagesTotal = 0; +/*@unchecked@*/ +int rpmcliHashesCurrent = 0; /*@unchecked@*/ -int packagesTotal = 0; +int rpmcliHashesTotal = 0; /*@unchecked@*/ -static int progressTotal = 0; +int rpmcliProgressCurrent = 0; /*@unchecked@*/ -static int progressCurrent = 0; +int rpmcliProgressTotal = 0; /** + * Print a CLI progress bar. + * @todo Unsnarl isatty(STDOUT_FILENO) from the control flow. + * @param amount current + * @param total final */ static void printHash(const unsigned long amount, const unsigned long total) - /*@globals hashesPrinted, progressCurrent, fileSystem @*/ - /*@modifies hashesPrinted, progressCurrent, fileSystem @*/ + /*@globals rpmcliHashesCurrent, rpmcliProgressCurrent, fileSystem @*/ + /*@modifies rpmcliHashesCurrent, rpmcliProgressCurrent, fileSystem @*/ { int hashesNeeded; - int hashesTotal = 50; - if (isatty (STDOUT_FILENO)) - hashesTotal = 44; + rpmcliHashesTotal = (isatty (STDOUT_FILENO) ? 44 : 50); - if (hashesPrinted != hashesTotal) { - hashesNeeded = hashesTotal * (total ? (((float) amount) / total) : 1); - while (hashesNeeded > hashesPrinted) { + if (rpmcliHashesCurrent != rpmcliHashesTotal) { + float pct = (total ? (((float) amount) / total) : 1); + hashesNeeded = rpmcliHashesTotal * pct; + while (hashesNeeded > rpmcliHashesCurrent) { if (isatty (STDOUT_FILENO)) { int i; - for (i = 0; i < hashesPrinted; i++) (void) putchar ('#'); - for (; i < hashesTotal; i++) (void) putchar (' '); - fprintf(stdout, "(%3d%%)", - (int)(100 * (total ? (((float) amount) / total) : 1))); - for (i = 0; i < (hashesTotal + 6); i++) (void) putchar ('\b'); + for (i = 0; i < rpmcliHashesCurrent; i++) + (void) putchar ('#'); + for (; i < rpmcliHashesTotal; i++) + (void) putchar (' '); + fprintf(stdout, "(%3d%%)", (int)(100 * pct)); + for (i = 0; i < (rpmcliHashesTotal + 6); i++) + (void) putchar ('\b'); } else fprintf(stdout, "#"); - hashesPrinted++; + rpmcliHashesCurrent++; } (void) fflush(stdout); - hashesPrinted = hashesNeeded; - if (hashesPrinted == hashesTotal) { + if (rpmcliHashesCurrent == rpmcliHashesTotal) { int i; - progressCurrent++; + rpmcliProgressCurrent++; if (isatty(STDOUT_FILENO)) { - for (i = 1; i < hashesPrinted; i++) (void) putchar ('#'); - fprintf(stdout, " [%3d%%]", (int)(100 * (progressTotal ? - (((float) progressCurrent) / progressTotal) : 1))); + for (i = 1; i < rpmcliHashesCurrent; i++) + (void) putchar ('#'); + pct = (rpmcliProgressTotal + ? (((float) rpmcliProgressCurrent) / rpmcliProgressTotal) + : 1); + fprintf(stdout, " [%3d%%]", (int)(100 * pct)); } fprintf(stdout, "\n"); } @@ -83,9 +91,9 @@ void * rpmShowProgress(/*@null@*/ const void * arg, const unsigned long total, /*@null@*/ fnpyKey key, /*@null@*/ void * data) - /*@globals hashesPrinted, progressCurrent, progressTotal, + /*@globals rpmcliHashesCurrent, rpmcliProgressCurrent, rpmcliProgressTotal, fileSystem @*/ - /*@modifies hashesPrinted, progressCurrent, progressTotal, + /*@modifies rpmcliHashesCurrent, rpmcliProgressCurrent, rpmcliProgressTotal, fileSystem @*/ { /*@-castexpose@*/ @@ -124,14 +132,19 @@ void * rpmShowProgress(/*@null@*/ const void * arg, break; case RPMCALLBACK_INST_START: - hashesPrinted = 0; +#if 0 +if (_hash_debug) +fprintf(stderr, "--- INST_START: %p %lu:%lu %p %p\n", arg, amount, total, key, data); +#endif + rpmcliHashesCurrent = 0; if (h == NULL || !(flags & INSTALL_LABEL)) break; + /* @todo Remove headerSprintf() on a progress callback. */ if (flags & INSTALL_HASH) { s = headerSprintf(h, "%{NAME}", rpmTagTable, rpmHeaderFormats, NULL); if (isatty (STDOUT_FILENO)) - fprintf(stdout, "%4d:%-23.23s", progressCurrent + 1, s); + fprintf(stdout, "%4d:%-23.23s", rpmcliProgressCurrent + 1, s); else fprintf(stdout, "%-28.28s", s); (void) fflush(stdout); @@ -157,9 +170,9 @@ void * rpmShowProgress(/*@null@*/ const void * arg, break; case RPMCALLBACK_TRANS_START: - hashesPrinted = 0; - progressTotal = 1; - progressCurrent = 0; + rpmcliHashesCurrent = 0; + rpmcliProgressTotal = 1; + rpmcliProgressCurrent = 0; if (!(flags & INSTALL_LABEL)) break; if (flags & INSTALL_HASH) @@ -172,16 +185,56 @@ void * rpmShowProgress(/*@null@*/ const void * arg, case RPMCALLBACK_TRANS_STOP: if (flags & INSTALL_HASH) printHash(1, 1); /* Fixes "preparing..." progress bar */ - progressTotal = packagesTotal; - progressCurrent = 0; + rpmcliProgressTotal = rpmcliPackagesTotal; + rpmcliProgressCurrent = 0; + break; + + case RPMCALLBACK_REPACKAGE_START: + rpmcliHashesCurrent = 0; + rpmcliProgressTotal = total; + rpmcliProgressCurrent = 0; + if (!(flags & INSTALL_LABEL)) + break; + if (flags & INSTALL_HASH) + fprintf(stdout, "%-28s\n", _("Repackaging...")); + else + fprintf(stdout, "%s\n", _("Repackaging erased files...")); + (void) fflush(stdout); + break; + + case RPMCALLBACK_REPACKAGE_PROGRESS: + if (amount && (flags & INSTALL_HASH)) + printHash(1, 1); /* Fixes "preparing..." progress bar */ + break; + + case RPMCALLBACK_REPACKAGE_STOP: + rpmcliProgressTotal = total; + rpmcliProgressCurrent = total; + if (flags & INSTALL_HASH) + printHash(1, 1); /* Fixes "preparing..." progress bar */ + rpmcliProgressTotal = rpmcliPackagesTotal; + rpmcliProgressCurrent = 0; + if (!(flags & INSTALL_LABEL)) + break; + if (flags & INSTALL_HASH) + fprintf(stdout, "%-28s\n", _("Upgrading...")); + else + fprintf(stdout, "%s\n", _("Upgrading packages...")); + (void) fflush(stdout); break; case RPMCALLBACK_UNINST_PROGRESS: + break; case RPMCALLBACK_UNINST_START: + break; case RPMCALLBACK_UNINST_STOP: + break; case RPMCALLBACK_UNPACK_ERROR: + break; case RPMCALLBACK_CPIO_ERROR: - /* ignore */ + break; + case RPMCALLBACK_UNKNOWN: + default: break; } @@ -573,7 +626,7 @@ restart: if (eiu->numRPMS && !stopInstall) { - packagesTotal = eiu->numRPMS + eiu->numSRPMS; + rpmcliPackagesTotal = eiu->numRPMS + eiu->numSRPMS; rpmMessage(RPMMESS_DEBUG, _("installing binary packages\n")); @@ -949,15 +1002,10 @@ int rpmRollback(rpmts ts, /*@unused@*/ struct rpmInstallArguments_s * ia, const char ** argv) { -#ifdef NOTYET - rpmdb db = NULL; - rpmts ts = NULL; - rpmps ps; int ifmask= (INSTALL_UPGRADE|INSTALL_FRESHEN|INSTALL_INSTALL|INSTALL_ERASE); unsigned thistid = 0xffffffff; unsigned prevtid; time_t tid; -#endif IDTX itids = NULL; IDTX rtids = NULL; IDT rp; @@ -965,12 +1013,28 @@ int rpmRollback(rpmts ts, IDT ip; int niids = 0; int rc = 0; + int vsflags, ovsflags; + int numAdded; + int numRemoved; + rpmps ps; if (argv != NULL && *argv != NULL) { rc = -1; goto exit; } + vsflags = rpmExpandNumeric("%{?_vsflags_erase}"); + if (ia->qva_flags & VERIFY_DIGEST) + vsflags |= _RPMTS_VSF_NODIGESTS; + if (ia->qva_flags & VERIFY_SIGNATURE) + vsflags |= _RPMTS_VSF_NOSIGNATURES; + if (ia->qva_flags & VERIFY_HDRCHK) + vsflags |= _RPMTS_VSF_NOHDRCHK; + vsflags |= _RPMTS_VSF_VERIFY_LEGACY; + ovsflags = rpmtsSetVerifySigFlags(ts, (vsflags & ~_RPMTS_VSF_VERIFY_LEGACY)); + + (void) rpmtsSetFlags(ts, ia->transFlags); + itids = IDTXload(ts, RPMTAG_INSTALLTID); if (itids != NULL) { ip = itids->idt; @@ -997,20 +1061,19 @@ int rpmRollback(rpmts ts, globstr = _free(globstr); } -#ifdef NOTYET - { int notifyFlags; + { int notifyFlags, xx; notifyFlags = ia->installInterfaceFlags | (rpmIsVerbose() ? INSTALL_LABEL : 0 ); xx = rpmtsSetNotifyCallback(ts, rpmShowProgress, (void *) ((long)notifyFlags)); } - (void) rpmtsSetFlags(ts, ia->transFlags); - /* Run transactions until rollback goal is achieved. */ do { prevtid = thistid; rc = 0; - packagesTotal = 0; + rpmcliPackagesTotal = 0; + numAdded = 0; + numRemoved = 0; ia->installInterfaceFlags &= ~ifmask; /* Find larger of the remaining install/erase transaction id's. */ @@ -1034,7 +1097,8 @@ int rpmRollback(rpmts ts, if (rc != 0) goto exit; - packagesTotal++; + numAdded++; + rpmcliPackagesTotal++; if (!(ia->installInterfaceFlags & ifmask)) ia->installInterfaceFlags |= INSTALL_UPGRADE; @@ -1054,11 +1118,14 @@ int rpmRollback(rpmts ts, rpmMessage(RPMMESS_DEBUG, "\t--- rpmdb instance #%u\n", ip->instance); - rc = rpmtsAddEraseElement(ts, ip->instance); + rc = rpmtsAddEraseElement(ts, ip->h, ip->instance); if (rc != 0) goto exit; - packagesTotal++; + numRemoved++; +#ifdef NOTYET /* XXX don't count erasures yet */ + rpmcliPackagesTotal++; +#endif if (!(ia->installInterfaceFlags & ifmask)) ia->installInterfaceFlags |= INSTALL_ERASE; @@ -1073,12 +1140,13 @@ int rpmRollback(rpmts ts, } /* Anything to do? */ - if (packagesTotal <= 0) + if (rpmcliPackagesTotal <= 0) break; tid = (time_t)thistid; - rpmMessage(RPMMESS_DEBUG, _("rollback %d packages to %s"), - packagesTotal, ctime(&tid)); + rpmMessage(RPMMESS_NORMAL, + _("Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"), + numAdded, numRemoved, ctime(&tid), tid); rc = rpmtsCheck(ts); ps = rpmtsProblems(ts); @@ -1117,7 +1185,6 @@ int rpmRollback(rpmts ts, } } while (1); -#endif exit: diff --git a/lib/transaction.c b/lib/transaction.c index c38aaa9..c84229d 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -967,6 +967,8 @@ int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet) PSM_t psm = memset(alloca(sizeof(*psm)), 0, sizeof(*psm)); rpmtsi pi; rpmte p; rpmtsi qi; rpmte q; + int numAdded; + int numRemoved; int xx; /* FIXME: what if the same package is included in ts twice? */ @@ -1101,6 +1103,7 @@ rpmMessage(RPMMESS_DEBUG, _("sanity checking %d elments\n"), rpmtsNElements(ts)) * worth the trouble though. */ rpmMessage(RPMMESS_DEBUG, _("computing %d file fingerprints\n"), totalFileCount); + numAdded = numRemoved = 0; pi = rpmtsiInit(ts); while ((p = rpmtsiNext(pi, 0)) != NULL) { int fc; @@ -1112,12 +1115,14 @@ rpmMessage(RPMMESS_DEBUG, _("computing %d file fingerprints\n"), totalFileCount) /*@-branchstate@*/ switch (rpmteType(p)) { case TR_ADDED: + numAdded++; fi->record = 0; /* Skip netshared paths, not our i18n files, and excluded docs */ if (fc > 0) skipFiles(ts, fi); /*@switchbreak@*/ break; case TR_REMOVED: + numRemoved++; fi->record = rpmteDBOffset(p); /*@switchbreak@*/ break; } @@ -1338,8 +1343,9 @@ rpmMessage(RPMMESS_DEBUG, _("computing file dispositions\n")); /* =============================================== * Save removed files before erasing. */ -rpmMessage(RPMMESS_DEBUG, _("repackage about-to-be-erased packages\n")); if (rpmtsFlags(ts) & (RPMTRANS_FLAG_DIRSTASH | RPMTRANS_FLAG_REPACKAGE)) { + int progress; + progress = 0; pi = rpmtsiInit(ts); while ((p = rpmtsiNext(pi, 0)) != NULL) { fi = rpmtsiFi(pi); @@ -1349,6 +1355,14 @@ rpmMessage(RPMMESS_DEBUG, _("repackage about-to-be-erased packages\n")); case TR_REMOVED: if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_REPACKAGE)) /*@switchbreak@*/ break; + if (!progress) + NOTIFY(ts, (NULL, RPMCALLBACK_REPACKAGE_START, + 7, numRemoved, NULL, ts->notifyData)); + + NOTIFY(ts, (NULL, RPMCALLBACK_REPACKAGE_PROGRESS, progress, + numRemoved, NULL, ts->notifyData)); + progress++; + psm->te = p; psm->fi = rpmfiLink(fi, "tsRepackage"); /* XXX TR_REMOVED needs CPIO_MAP_{ABSOLUTE,ADDDOT} CPIO_ALL_HARDLINKS */ @@ -1363,6 +1377,10 @@ rpmMessage(RPMMESS_DEBUG, _("repackage about-to-be-erased packages\n")); } } pi = rpmtsiFree(pi); + if (progress) { + NOTIFY(ts, (NULL, RPMCALLBACK_REPACKAGE_STOP, 7, numRemoved, + NULL, ts->notifyData)); + } } /* =============================================== diff --git a/po/cs.po b/po/cs.po index 9c14e2c..7be1c9f 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -423,192 +423,192 @@ msgstr "&& a || nen msgid "syntax error in expression\n" msgstr "chyba syntaxe ve výrazu\n" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK selhal: %s\n" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "Chybí '(' v %s %s\n" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "Chybí ')' v %s(%s\n" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "Neplatný %s token: %s\n" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "Chybìjící %s v %s %s\n" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "Následuje neprázdný znak %s(): %s\n" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "©patná syntaxe: %s(%s)\n" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "©patná práva spec: %s(%s)\n" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "©patná práva adresáøe: %s(%s)\n" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "Neobvyklá délka locale: \"%.*s\" v %%lang(%s)\n" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "Duplicitní locale %.*s v %%lang(%s)\n" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "Dosa¾en limit pro %%docdir\n" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "Jen jeden parametr pro %%docdir\n" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "Dva soubory na jednom øádku: %s\n" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "Soubor musí zaèínat na \"/\": %s\n" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "Nelze míchat speciální %%doc s ostatnímí formami: %s\n" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "Soubor uveden dvakrát: %s\n" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Symbolická linka ukazuje na BuildRoot: %s -> %s\n" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Soubor nesouhlasí s prefixem (%s): %s\n" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "Soubor nenalezen: %s\n" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "©patný vlastník/skupina: %s\n" -#: build/files.c:1641 +#: build/files.c:1645 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Soubor %4d: %07o %s.%s\t %s\n" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "Soubor potøebuje úvodní \"/\": %s\n" -#: build/files.c:1781 +#: build/files.c:1785 #, c-format msgid "Glob not permitted: %s\n" msgstr "Glob není dovolen: %s\n" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "Soubor nenalezen globem: %s\n" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Nemohu otevøít %%files soubor %s: %s\n" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "øádek: %s\n" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "©patný soubor: %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "Nemohu spustit %s: %s\n" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "Nemohu provést fork %s: %s\n" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "%s selhalo\n" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "Nemohu zapsat v¹echna data do %s\n" -#: build/files.c:2584 +#: build/files.c:2590 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Hledám %s: (pou¾it %s)...\n" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "Selhalo vyhledání %s:\n" -#: build/files.c:2764 +#: build/files.c:2772 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "rozbalování archívu selhalo %s%s: %s\n" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Zpracovávám soubory: %s-%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:1404 +#: build/pack.c:629 lib/psm.c:1406 #, 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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "Zapsáno: %s\n" @@ -1505,17 +1505,17 @@ msgstr "========= Adres msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "vytvoøen adresáø %s s právy %04o.\n" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "%s ulo¾eno jako %s\n" @@ -2109,74 +2109,74 @@ msgstr "generovat PGP/GPG podpis" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 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:440 +#: lib/psm.c:442 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:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "zdrojový balíèek neobsahuje .spec soubor\n" -#: lib/psm.c:679 +#: lib/psm.c:681 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: spou¹tím %s skript(y) (pokud existují)\n" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "provedení skripletu %s z %s-%s-%s selhalo, návratový kód byl: %s\n" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "provedení %s skripletu z %s-%s-%s selhalo, návratový kód: %d\n" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, 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:1307 +#: lib/psm.c:1309 #, 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:1417 +#: lib/psm.c:1419 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Nemohu pøeèíst hlavièku z %s: %s\n" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, 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:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ita skupina root\n" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalování archívu selhalo %s%s: %s\n" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr " na souboru " -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s selhalo\n" @@ -2230,8 +2230,8 @@ msgstr "bal msgid "can't query %s: %s\n" msgstr "nemohu provést dotaz %s: %s\n" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "otevøení %s selhalo: %s\n" @@ -2245,7 +2245,7 @@ msgstr "dotaz na %s se nezda msgid "old format source packages cannot be queried\n" msgstr "nelze provést dotaz na zdrojové balíèky starého formátu\n" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, fuzzy, c-format msgid "%s: not a package manifest: %s\n" msgstr "¾ádný balíèek neaktivuje %s\n" @@ -2314,7 +2314,7 @@ msgstr "z msgid "record %u could not be read\n" msgstr "záznam %u nelze pøeèíst\n" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "balíèek %s není nainstalován\n" @@ -2418,15 +2418,15 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "NE " -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "ANO" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2435,13 +2435,13 @@ msgstr "" "Závislost \"B\" potøebuje období (pøedpokládáno stejné jako \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" @@ -2481,95 +2481,112 @@ msgstr "Prov msgid "relocating directory %s to %s\n" msgstr "nemohu provést dotaz %s: %s\n" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 #, fuzzy msgid "Preparing packages for installation..." msgstr "nezadány ¾ádné balíèky pro instalaci" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +#, fuzzy +msgid "Upgrading packages..." +msgstr "aktualizace balíèku" + +#: lib/rpminstall.c:368 #, fuzzy, c-format msgid "Retrieving %s\n" msgstr "RPM verze %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, fuzzy, c-format msgid " ... as %s\n" msgstr "%s ulo¾eno jako %s\n" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "cesta %s v balíèku %s není pøemístitelná" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "neinstalován " -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "vytvoøení zdrojového a binárního balíèku z " -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "chybné závislosti pøi sestavování:\n" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 #, fuzzy msgid "installing binary packages\n" msgstr "nainstalovat balíèek" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, fuzzy, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "Polo¾ka %s musí být v balíèku pøítomna: %s\n" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, fuzzy, c-format msgid "Installing %s\n" msgstr "øádek: %s\n" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -2961,7 +2978,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2974,7 +2991,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2982,21 +2999,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -3070,22 +3080,22 @@ msgstr "sd msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3199,153 +3209,153 @@ msgstr "nemohu otev msgid "cannot open %s index\n" msgstr "nemohu otevøít RPM databázi v %s\n" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, 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:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, 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:2784 +#: rpmdb/rpmdb.c:2799 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, 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:2816 +#: rpmdb/rpmdb.c:2831 #, 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:2837 +#: rpmdb/rpmdb.c:2852 #, 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:2847 +#: rpmdb/rpmdb.c:2862 #, 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:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, 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:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, 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:3724 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "nemohu provést dotaz %s: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Nelze pøejmenovat %s na %s: %m\n" diff --git a/po/da.po b/po/da.po index c523cf0..0b7cf96 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -418,192 +418,192 @@ msgstr "&& og || underst msgid "syntax error in expression\n" msgstr "syntaksfejl i udtryk\n" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK-fejl: %s\n" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "Manglende '(' i %s %s\n" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "Manglende ')' i %s %s\n" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "Ugyldigt %s-symbol: %s\n" -#: build/files.c:509 +#: build/files.c:511 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "Manglende '(' i %s %s\n" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "Ikke-mellemrum efterfølger %s(): %s\n" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "Ugyldig syntaks: %s(%s)\n" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "Ugyldig tilstandsangivelse: %s(%s)\n" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "Ugyldig dirmode-spec: %s(%s)\n" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "Anormal locale-længde: \"%.*s\" i %%lang(%s)\n" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "Dobbelt locale %.*s i %%lang(%s)\n" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "Træfningsgrænse for %%docdir\n" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "Kun et parameter for %%docdir\n" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "To filer på én linie: %s\n" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "Fil skal begynde med \"/\": %s\n" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "Kan ikke blande special-%%doc med andre former: %s\n" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "Fil angivet to gange: %s\n" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Symbolsk lænke peger på BuildRoot: %s -> %s\n" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Fil passer ikke til præfiks (%s): %s\n" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "Fil ikke fundet: %s\n" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Ugyldig ejer/gruppe: %s\n" -#: build/files.c:1641 +#: build/files.c:1645 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Fil %4d: %07o %s.%s\t %s\n" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "Fil kræver foranstillet \"/\": %s\n" -#: build/files.c:1781 +#: build/files.c:1785 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "linie %d: Filnavn ikke tilladt: %s\n" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "Fil ikke fundet med glob: %s\n" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Kunne ikke åbne '%%files'-fil %s: %s\n" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "linie: %s\n" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ugyldig fil: %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "Kunne ikke udføre %s: %s\n" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "Kunne ikke fraspalte ny proces til %s: %s\n" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "%s mislykkedes\n" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "kunne ikke skrive alle data til %s\n" -#: build/files.c:2584 +#: build/files.c:2590 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Finder %s: (benytter %s)...\n" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "Kunne ikke finde %s:\n" -#: build/files.c:2764 +#: build/files.c:2772 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "udpakning af arkiv mislykkedes%s%s: %s\n" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Gennemløber filer: %s-%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:1404 +#: build/pack.c:629 lib/psm.c:1406 #, 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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1503,17 +1503,17 @@ msgstr "" msgid "%10d %s\n" msgstr "linie %d: %s\n" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "%s gemt som %s\n" @@ -2122,76 +2122,76 @@ msgstr "gener #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 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:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær fundet\n" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "kildepakke indeholder ingen .spec-fil\n" -#: lib/psm.c:679 +#: lib/psm.c:681 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "kører postinstallations-skript (hvis det findes)\n" -#: lib/psm.c:849 +#: lib/psm.c:851 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" "kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" "kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "pakke: %s-%s-%s filer test = %d\n" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Kunne ikke læse hoved fra %s: %s\n" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "bruger %s eksisterer ikke - bruger root\n" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "gruppe %s eksisterer ikke - bruger root\n" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "udpakning af arkiv mislykkedes%s%s: %s\n" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr " for fil " -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s mislykkedes\n" @@ -2245,8 +2245,8 @@ msgstr "pakke har hverken filejerskabs- eller id-lister\n" msgid "can't query %s: %s\n" msgstr "kunne ikke forespørge %s: %s\n" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "åbning af %s mislykkedes %s\n" @@ -2260,7 +2260,7 @@ msgstr "foresp msgid "old format source packages cannot be queried\n" msgstr "pakke med gammelt kildeformat kan ikke forespørges\n" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, fuzzy, c-format msgid "%s: not a package manifest: %s\n" msgstr "ingen pakker udløser %s\n" @@ -2329,7 +2329,7 @@ msgstr "pakkens post-nummer: %u\n" msgid "record %u could not be read\n" msgstr "post %d kunne ikke læses\n" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "pakken %s er ikke installeret\n" @@ -2432,16 +2432,16 @@ msgstr ")" msgid "OK" msgstr "O.K." -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 #, fuzzy msgid "NO " msgstr "IKKE O.K." -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2450,13 +2450,13 @@ msgstr "" "\"B\"-afhængighed kræver en epoke (antager samme som \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" @@ -2495,93 +2495,112 @@ msgstr "omrokerer %s til %s\n" msgid "relocating directory %s to %s\n" msgstr "omrokerer kataloget %s til %s\n" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "Forbereder..." -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "Forbereder pakker til installation..." -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +#, fuzzy +msgid "Repackaging..." +msgstr "Forbereder..." + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +#, fuzzy +msgid "Upgrading..." +msgstr "Forbereder..." + +#: lib/rpminstall.c:222 +#, fuzzy +msgid "Upgrading packages..." +msgstr "opgradér pakke" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "Modtager %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr " ... som %s\n" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "overspringer %s - overførsel mislykkedes - %s\n" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "pakke %s kan ikke omrokeres\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "fejl ved læsning fra filen %s\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "filen %s kræver en nyere version af RPM\n" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s kunne ikke installeres\n" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "fandt %d kilde- og %d binærpakker\n" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "afhængighedskrav, der ikke kunne imødekommes:\n" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "installerer binærpakker\n" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "kunne ikke åbne fil %s: %s\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" angiver flere pakker\n" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -2969,7 +2988,7 @@ msgstr "ekskluderer kataloget %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2982,7 +3001,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2990,21 +3009,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -3077,22 +3089,22 @@ msgstr "delt" msgid "locked db index %s/%s\n" msgstr "låste db-index %s/%s\n" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, fuzzy, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "ukendt db-tilvalg: \"%s\" ignoreret\n" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s har ugyldig talværdi, overspringes\n" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s har for stor eller lille 'long'-værdi, overspringes\n" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s har for stor eller lille heltalsværdi, overspringes\n" @@ -3207,157 +3219,157 @@ msgstr "kan ikke msgid "cannot open %s index\n" msgstr "kan ikke åbne '%s'-indeks\n" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "der er ikke sat nogen dbpath\n" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, 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:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, 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:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, 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:2669 +#: rpmdb/rpmdb.c:2684 #, 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:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "fjerner \"%s\" fra %s-indekset.\n" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "fjerne %d indgange fra %s-indekset.\n" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, 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:2837 +#: rpmdb/rpmdb.c:2852 #, 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:2847 +#: rpmdb/rpmdb.c:2862 #, 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:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "fejl(%d) under allokering af ny pakkeinstans\n" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" "tilføjer \"%s\" til '%s'-indekset.\n" "\n" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "tilføjer %d indgange til '%s'-indekset.\n" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, 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:3642 #, 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:3680 msgid "no dbpath has been set" msgstr "der ikke sat nogen dbpath" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "genopbygger database %s over i %s\n" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "den midlertidige database %s eksisterer allerede\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "" "opretter kataloget %s\n" "\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "opretter kataloget %s: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, 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:3744 #, 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:3773 #, 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:3813 #, 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:3831 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:3839 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:3841 #, 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:3851 #, c-format msgid "removing directory %s\n" msgstr "fjerner kataloget %s\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunne ikke fjerne katalog %s: %s\n" diff --git a/po/de.po b/po/de.po index e1b2199..a0ff5ef 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -486,197 +486,197 @@ msgstr "" msgid "syntax error in expression\n" msgstr "? im Ausdruck erwartet" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, fuzzy, c-format msgid "Missing '(' in %s %s\n" msgstr "fehlende { nach %{" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, fuzzy, c-format msgid "Missing ')' in %s(%s\n" msgstr "fehlender ':' bei %s:%d" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, fuzzy, c-format msgid "Invalid %s token: %s\n" msgstr "ungültige Paket-Nummer: %s\n" -#: build/files.c:509 +#: build/files.c:511 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "fehlende { nach %{" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" # , c-format -#: build/files.c:604 +#: build/files.c:606 #, fuzzy, c-format msgid "Bad syntax: %s(%s)\n" msgstr "Lesen von %s fehlgeschlagen: %s." # , c-format -#: build/files.c:614 +#: build/files.c:616 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "Lesen von %s fehlgeschlagen: %s." # , c-format -#: build/files.c:626 +#: build/files.c:628 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "Lesen von %s fehlgeschlagen: %s." -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" # , c-format #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, fuzzy, c-format msgid "Two files on one line: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/files.c:1007 +#: build/files.c:1009 #, fuzzy, c-format msgid "File must begin with \"/\": %s\n" msgstr "Verschiebungen müssen mit einem »/« beginnen" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" # , c-format -#: build/files.c:1172 +#: build/files.c:1174 #, fuzzy, c-format msgid "File listed twice: %s\n" msgstr "Lesen von %s fehlgeschlagen: %s." -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" # , c-format -#: build/files.c:1561 +#: build/files.c:1565 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Lesen von %s fehlgeschlagen: %s." -#: build/files.c:1585 +#: build/files.c:1589 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Datei auf dem Server nicht gefunden" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" # , c-format -#: build/files.c:1641 +#: build/files.c:1645 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/files.c:1758 +#: build/files.c:1762 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "Verschiebungen müssen mit einem »/« beginnen" -#: build/files.c:1781 +#: build/files.c:1785 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" -#: build/files.c:1796 +#: build/files.c:1800 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Datei auf dem Server nicht gefunden" -#: build/files.c:1860 +#: build/files.c:1864 #, 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:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: build/files.c:2258 +#: build/files.c:2262 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "Konnte pgp nicht durchführen" -#: build/files.c:2338 +#: build/files.c:2342 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "Konnte Signatur-Ziel (»sigtarget«) nicht lesen" -#: build/files.c:2422 +#: build/files.c:2426 #, fuzzy, c-format msgid "%s failed\n" msgstr "pgp fehlgeschlagen" # , c-format -#: build/files.c:2426 +#: build/files.c:2430 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "anlegen von %s fehlgeschlagen\n" # , c-format -#: build/files.c:2584 +#: build/files.c:2590 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "anlegen von %s fehlgeschlagen\n" -#: build/files.c:2764 +#: build/files.c:2772 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" @@ -684,7 +684,7 @@ msgid "" msgstr "" # , c-format -#: build/files.c:2809 +#: build/files.c:2820 #, fuzzy, c-format msgid "Processing files: %s-%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:1404 +#: build/pack.c:629 lib/psm.c:1406 #, 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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1638,17 +1638,17 @@ msgstr "" msgid "%10d %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "kann Datei %s nicht öffnen: " @@ -2280,78 +2280,78 @@ msgstr "PGP-Signatur generieren" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 #, fuzzy msgid "source package contains no .spec file\n" msgstr "Anfrage nach Paket, das die Datei besitzt" -#: lib/psm.c:679 +#: lib/psm.c:681 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "Keine Stufen ausführen" -#: lib/psm.c:849 +#: lib/psm.c:851 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "Ausführung des Skripts fehlgeschlagen" -#: lib/psm.c:856 +#: lib/psm.c:858 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "Ausführung des Skripts fehlgeschlagen" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" # , c-format -#: lib/psm.c:1417 +#: lib/psm.c:1419 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Nicht möglich %s zu schreiben" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp fehlgeschlagen" @@ -2407,8 +2407,8 @@ msgstr "Paket hat keinen Namen" msgid "can't query %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" @@ -2422,7 +2422,7 @@ msgstr "Anfrage von %s fehlgeschlagen\n" msgid "old format source packages cannot be queried\n" msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, fuzzy, c-format msgid "%s: not a package manifest: %s\n" msgstr "kein Paket triggert %s\n" @@ -2495,7 +2495,7 @@ msgstr "ung msgid "record %u could not be read\n" msgstr "Eintrag %d konnte nicht gelesen werden\n" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" @@ -2600,28 +2600,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" @@ -2663,97 +2663,114 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" msgid "relocating directory %s to %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 #, fuzzy msgid "Preparing packages for installation..." msgstr "Es wurden keine Pakete für die Installation angegeben" +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +#, fuzzy +msgid "Upgrading packages..." +msgstr "Paket installieren" + # , c-format -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "Hole %s heraus\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "Fehler: %s kann nicht installiert werden\n" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 #, fuzzy msgid "installing binary packages\n" msgstr "Paket installieren" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" bezeichnet mehrere Pakete\n" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "Installiere %s\n" -#: lib/rpminstall.c:1080 -#, fuzzy, c-format -msgid "rollback %d packages to %s" -msgstr "Es wurden keine Pakete für die Deinstallation angegeben" +#: lib/rpminstall.c:1148 +#, c-format +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" +msgstr "" #: lib/rpmlead.c:53 #, fuzzy, c-format @@ -3151,7 +3168,7 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3164,7 +3181,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3172,21 +3189,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -3259,22 +3269,22 @@ msgstr "geteilt" msgid "locked db index %s/%s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3392,160 +3402,160 @@ msgstr "kann Datei %s nicht msgid "cannot open %s index\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 #, fuzzy msgid "no dbpath has been set\n" msgstr "»dbpath« ist nicht gesetzt" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "Fehler beim Eintrag %s von %s" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "Fehler bei Schreiben des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, 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:2669 +#: rpmdb/rpmdb.c:2684 #, 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:2784 +#: rpmdb/rpmdb.c:2799 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" # FIXME -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "Fehler beim Eintrag %s von %s" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, 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:2847 +#: rpmdb/rpmdb.c:2862 #, 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:2996 +#: rpmdb/rpmdb.c:3011 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # FIXME -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, 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:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "»dbpath« ist nicht gesetzt" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, 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:3722 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, 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:3744 #, 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:3773 #, 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:3813 #, 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:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, 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:3853 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -3831,6 +3841,10 @@ msgstr "%s: msgid "%s: read manifest failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" +#, fuzzy +#~ msgid "rollback %d packages to %s" +#~ msgstr "Es wurden keine Pakete für die Deinstallation angegeben" + # , c-format #, fuzzy #~ msgid "h#%7u: %s" diff --git a/po/en_RN.po b/po/en_RN.po index 3f58eca..7ce339f 100644 --- a/po/en_RN.po +++ b/po/en_RN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -408,192 +408,192 @@ msgstr "" msgid "syntax error in expression\n" msgstr "" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1641 +#: build/files.c:1645 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1781 +#: build/files.c:1785 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2584 +#: build/files.c:2590 #, c-format msgid "Finding %s: %s\n" msgstr "" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2764 +#: build/files.c:2772 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -732,7 +732,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:629 lib/psm.c:1404 +#: build/pack.c:629 lib/psm.c:1406 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -762,7 +762,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:710 lib/psm.c:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1465,17 +1465,17 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "" @@ -2042,73 +2042,73 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:679 +#: lib/psm.c:681 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2161,8 +2161,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2176,7 +2176,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, c-format msgid "%s: not a package manifest: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2346,28 +2346,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2406,92 +2406,108 @@ msgstr "" msgid "relocating directory %s to %s\n" msgstr "" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +msgid "Upgrading packages..." +msgstr "" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -2871,7 +2887,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2884,7 +2900,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2892,21 +2908,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -2979,22 +2988,22 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3107,153 +3116,153 @@ msgstr "" msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/es.po b/po/es.po index 3f58eca..7ce339f 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -408,192 +408,192 @@ msgstr "" msgid "syntax error in expression\n" msgstr "" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1641 +#: build/files.c:1645 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1781 +#: build/files.c:1785 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2584 +#: build/files.c:2590 #, c-format msgid "Finding %s: %s\n" msgstr "" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2764 +#: build/files.c:2772 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -732,7 +732,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:629 lib/psm.c:1404 +#: build/pack.c:629 lib/psm.c:1406 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -762,7 +762,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:710 lib/psm.c:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1465,17 +1465,17 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "" @@ -2042,73 +2042,73 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:679 +#: lib/psm.c:681 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2161,8 +2161,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2176,7 +2176,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, c-format msgid "%s: not a package manifest: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2346,28 +2346,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2406,92 +2406,108 @@ msgstr "" msgid "relocating directory %s to %s\n" msgstr "" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +msgid "Upgrading packages..." +msgstr "" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -2871,7 +2887,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2884,7 +2900,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2892,21 +2908,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -2979,22 +2988,22 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3107,153 +3116,153 @@ msgstr "" msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/eu_ES.po b/po/eu_ES.po index 3f58eca..7ce339f 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -408,192 +408,192 @@ msgstr "" msgid "syntax error in expression\n" msgstr "" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1641 +#: build/files.c:1645 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1781 +#: build/files.c:1785 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2584 +#: build/files.c:2590 #, c-format msgid "Finding %s: %s\n" msgstr "" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2764 +#: build/files.c:2772 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -732,7 +732,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:629 lib/psm.c:1404 +#: build/pack.c:629 lib/psm.c:1406 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -762,7 +762,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:710 lib/psm.c:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1465,17 +1465,17 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "" @@ -2042,73 +2042,73 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:679 +#: lib/psm.c:681 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2161,8 +2161,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2176,7 +2176,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, c-format msgid "%s: not a package manifest: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2346,28 +2346,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2406,92 +2406,108 @@ msgstr "" msgid "relocating directory %s to %s\n" msgstr "" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +msgid "Upgrading packages..." +msgstr "" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -2871,7 +2887,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2884,7 +2900,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2892,21 +2908,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -2979,22 +2988,22 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3107,153 +3116,153 @@ msgstr "" msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 036ff3e..c8779c3 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -431,192 +431,192 @@ msgstr "" msgid "syntax error in expression\n" msgstr "odotin '?'-merkkiä ilmauksessa" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, fuzzy, c-format msgid "Missing '(' in %s %s\n" msgstr "puuttuva '{' '%':n jälkeen" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, fuzzy, c-format msgid "Missing ')' in %s(%s\n" msgstr "puuttuva ':', %s:%d" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, fuzzy, c-format msgid "Invalid %s token: %s\n" msgstr "virheellinen paketin numero: %s\n" -#: build/files.c:509 +#: build/files.c:511 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "puuttuva '{' '%':n jälkeen" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, fuzzy, c-format msgid "Bad syntax: %s(%s)\n" msgstr "En voi lukea %s: %s." -#: build/files.c:614 +#: build/files.c:616 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "En voi lukea %s: %s." -#: build/files.c:626 +#: build/files.c:628 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "En voi lukea %s: %s." -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, fuzzy, c-format msgid "Two files on one line: %s\n" msgstr "en voinut avata %s: %s" -#: build/files.c:1007 +#: build/files.c:1009 #, fuzzy, c-format msgid "File must begin with \"/\": %s\n" msgstr "siirtojen pitää alkaa /-merkillä" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1172 +#: build/files.c:1174 #, fuzzy, c-format msgid "File listed twice: %s\n" msgstr "En voi lukea %s: %s." -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "En voi lukea %s: %s." -#: build/files.c:1585 +#: build/files.c:1589 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Tiedostoa ei löytynyt palvelimelta" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1641 +#: build/files.c:1645 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "en voinut avata %s: %s" -#: build/files.c:1758 +#: build/files.c:1762 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "siirtojen pitää alkaa /-merkillä" -#: build/files.c:1781 +#: build/files.c:1785 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: build/files.c:1796 +#: build/files.c:1800 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Tiedostoa ei löytynyt palvelimelta" -#: build/files.c:1860 +#: build/files.c:1864 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "en voinut avata %s: %s" -#: build/files.c:2258 +#: build/files.c:2262 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "en voinut avata %s: %s" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "En voinut ajaa pgp:tä" -#: build/files.c:2338 +#: build/files.c:2342 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "En voinut ajaa pgp:tä" -#: build/files.c:2422 +#: build/files.c:2426 #, fuzzy, c-format msgid "%s failed\n" msgstr "pgp epäonnistui" -#: build/files.c:2426 +#: build/files.c:2430 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "%s:n luonti epäonnistui\n" -#: build/files.c:2584 +#: build/files.c:2590 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "en voinut avata %s: %s" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "%s:n luonti epäonnistui\n" -#: build/files.c:2764 +#: build/files.c:2772 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "virhe etsittäessä pakettia %s\n" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "en voinut avata %s: %s" @@ -759,7 +759,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:1404 +#: build/pack.c:629 lib/psm.c:1406 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "%s:n kirjoitus ei onnistu" @@ -789,7 +789,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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1523,17 +1523,17 @@ msgstr "" msgid "%10d %s\n" msgstr "en voinut avata %s: %s" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "en voinut avata tiedostoa %s: " @@ -2161,75 +2161,75 @@ msgstr "generoi PGP-allekirjoitus" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 #, fuzzy msgid "source package contains no .spec file\n" msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/psm.c:679 +#: lib/psm.c:681 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "älä suorita mitään vaiheita" -#: lib/psm.c:849 +#: lib/psm.c:851 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "skriptin ajo epäonnistui" -#: lib/psm.c:856 +#: lib/psm.c:858 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "skriptin ajo epäonnistui" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, 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:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 #, fuzzy msgid "Unable to reload signature header\n" msgstr "%s:n kirjoitus ei onnistu" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp epäonnistui" @@ -2285,8 +2285,8 @@ msgstr "paketilla ei ole nime msgid "can't query %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" @@ -2300,7 +2300,7 @@ msgstr "%s:n kysely ei onnistunut\n" msgid "old format source packages cannot be queried\n" msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, fuzzy, c-format msgid "%s: not a package manifest: %s\n" msgstr "mikään paketti ei laukaise %s:a\n" @@ -2370,7 +2370,7 @@ msgstr "virheellinen paketin numero: %s\n" msgid "record %u could not be read\n" msgstr "tietuetta %d ei voitu lukea\n" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" @@ -2474,28 +2474,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paketti %s ei ole %s:ssä" @@ -2534,96 +2534,113 @@ msgstr "virhe luotaessa hakemistoa %s: %s" msgid "relocating directory %s to %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 #, fuzzy msgid "Preparing packages for installation..." msgstr "asennukselle ei määritelty paketteja" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +#, fuzzy +msgid "Upgrading packages..." +msgstr "asenna paketti" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "Haen: %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "virhe: %s ei voida asentaa\n" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "puuttuvat riippuvuudet:\n" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 #, fuzzy msgid "installing binary packages\n" msgstr "asenna paketti" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" määrittää useita paketteja\n" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "Asennan: %s\n" -#: lib/rpminstall.c:1080 -#, fuzzy, c-format -msgid "rollback %d packages to %s" -msgstr "poistolle ei määritelty paketteja" +#: lib/rpminstall.c:1148 +#, c-format +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" +msgstr "" #: lib/rpmlead.c:53 #, fuzzy, c-format @@ -3014,7 +3031,7 @@ msgstr "virhe luotaessa hakemistoa %s: %s" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3027,7 +3044,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3035,21 +3052,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -3122,22 +3132,22 @@ msgstr "jaettua" msgid "locked db index %s/%s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3254,154 +3264,154 @@ msgstr "en voinut avata tiedostoa %s: " msgid "cannot open %s index\n" msgstr "virhe: en voi avata %s\n" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath ei ole asetettu" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, 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:2669 +#: rpmdb/rpmdb.c:2684 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "virhe etsittäessä pakettia %s\n" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, 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:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "dbpath ei ole asetettu" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, 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:3722 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, 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:3813 #, 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:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "en voinut avata %s: %s" @@ -3686,6 +3696,10 @@ msgid "%s: read manifest failed: %s\n" msgstr "%s: readLead epäonnistui\n" #, fuzzy +#~ msgid "rollback %d packages to %s" +#~ msgstr "poistolle ei määritelty paketteja" + +#, fuzzy #~ msgid "h#%7u: %s" #~ msgstr "en voinut avata %s: %s" diff --git a/po/fr.po b/po/fr.po index 05fbf02..4b8fc81 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -455,192 +455,192 @@ msgstr "" msgid "syntax error in expression\n" msgstr "" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, fuzzy, c-format msgid "Invalid %s token: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, fuzzy, c-format msgid "Bad syntax: %s(%s)\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:614 +#: build/files.c:616 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:626 +#: build/files.c:628 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, fuzzy, c-format msgid "Two files on one line: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1007 +#: build/files.c:1009 #, fuzzy, c-format msgid "File must begin with \"/\": %s\n" msgstr "les arguments de --root (-r) doivent commencer par un /" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1172 +#: build/files.c:1174 #, fuzzy, c-format msgid "File listed twice: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1585 +#: build/files.c:1589 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1641 +#: build/files.c:1645 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1758 +#: build/files.c:1762 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "les arguments de --root (-r) doivent commencer par un /" -#: build/files.c:1781 +#: build/files.c:1785 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1796 +#: build/files.c:1800 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: build/files.c:1860 +#: build/files.c:1864 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:2258 +#: build/files.c:2262 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "impossible d'ouvrir: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:2338 +#: build/files.c:2342 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:2422 +#: build/files.c:2426 #, fuzzy, c-format msgid "%s failed\n" msgstr "La construction a chou.\n" -#: build/files.c:2426 +#: build/files.c:2430 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:2584 +#: build/files.c:2590 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:2764 +#: build/files.c:2772 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "La construction a chou.\n" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -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:1404 +#: build/pack.c:629 lib/psm.c:1406 #, 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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1550,17 +1550,17 @@ msgstr "" msgid "%10d %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -2202,76 +2202,76 @@ msgstr " --sign - genre une signature PGP" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 #, fuzzy msgid "source package contains no .spec file\n" msgstr "" " -f + - interroge le package qui appartient " -#: lib/psm.c:679 +#: lib/psm.c:681 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, 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:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 #, fuzzy msgid "Unable to reload signature header\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "La construction a chou.\n" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "La construction a chou.\n" @@ -2327,8 +2327,8 @@ msgstr "aucun package n'a t spcifi pour l'installation" msgid "can't query %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "La construction a chou.\n" @@ -2342,7 +2342,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, fuzzy, c-format msgid "%s: not a package manifest: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2412,7 +2412,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2515,28 +2515,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2575,95 +2575,113 @@ msgstr "impossible d'ouvrir: %s\n" msgid "relocating directory %s to %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 #, fuzzy msgid "Preparing packages for installation..." msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +#, fuzzy +msgid "Upgrading packages..." +msgstr "" +" -p + - interroge le package (non install) " + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1080 -#, fuzzy, c-format -msgid "rollback %d packages to %s" -msgstr "aucun package n'a t spcifi pour la dsinstallation" +#: lib/rpminstall.c:1148 +#, c-format +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" +msgstr "" #: lib/rpmlead.c:53 #, fuzzy, c-format @@ -3050,7 +3068,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3063,7 +3081,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3071,21 +3089,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -3158,22 +3169,22 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3290,153 +3301,153 @@ msgstr "impossible d'ouvrir: %s\n" msgid "cannot open %s index\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, 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:2669 +#: rpmdb/rpmdb.c:2684 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, 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:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -3711,6 +3722,10 @@ msgid "%s: read manifest failed: %s\n" msgstr "impossible d'ouvrir: %s\n" #, fuzzy +#~ msgid "rollback %d packages to %s" +#~ msgstr "aucun package n'a t spcifi pour la dsinstallation" + +#, fuzzy #~ msgid "h#%7u: %s" #~ msgstr "impossible d'ouvrir: %s\n" diff --git a/po/gl.po b/po/gl.po index f459a42..52312a3 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -403,192 +403,192 @@ msgstr "" msgid "syntax error in expression\n" msgstr "" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1641 +#: build/files.c:1645 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1781 +#: build/files.c:1785 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2584 +#: build/files.c:2590 #, c-format msgid "Finding %s: %s\n" msgstr "" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2764 +#: build/files.c:2772 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -727,7 +727,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:629 lib/psm.c:1404 +#: build/pack.c:629 lib/psm.c:1406 #, 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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1460,17 +1460,17 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "" @@ -2037,73 +2037,73 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:679 +#: lib/psm.c:681 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2156,8 +2156,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2171,7 +2171,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, c-format msgid "%s: not a package manifest: %s\n" msgstr "" @@ -2240,7 +2240,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2341,28 +2341,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2401,92 +2401,108 @@ msgstr "" msgid "relocating directory %s to %s\n" msgstr "" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +msgid "Upgrading packages..." +msgstr "" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -2866,7 +2882,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2879,7 +2895,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2887,21 +2903,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -2974,22 +2983,22 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3102,153 +3111,153 @@ msgstr "" msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index 3f58eca..7ce339f 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -408,192 +408,192 @@ msgstr "" msgid "syntax error in expression\n" msgstr "" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1641 +#: build/files.c:1645 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1781 +#: build/files.c:1785 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2584 +#: build/files.c:2590 #, c-format msgid "Finding %s: %s\n" msgstr "" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2764 +#: build/files.c:2772 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -732,7 +732,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:629 lib/psm.c:1404 +#: build/pack.c:629 lib/psm.c:1406 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -762,7 +762,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:710 lib/psm.c:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1465,17 +1465,17 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "" @@ -2042,73 +2042,73 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:679 +#: lib/psm.c:681 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2161,8 +2161,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2176,7 +2176,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, c-format msgid "%s: not a package manifest: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2346,28 +2346,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2406,92 +2406,108 @@ msgstr "" msgid "relocating directory %s to %s\n" msgstr "" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +msgid "Upgrading packages..." +msgstr "" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -2871,7 +2887,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2884,7 +2900,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2892,21 +2908,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -2979,22 +2988,22 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3107,153 +3116,153 @@ msgstr "" msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/id.po b/po/id.po index 3f58eca..7ce339f 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -408,192 +408,192 @@ msgstr "" msgid "syntax error in expression\n" msgstr "" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1641 +#: build/files.c:1645 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1781 +#: build/files.c:1785 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2584 +#: build/files.c:2590 #, c-format msgid "Finding %s: %s\n" msgstr "" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2764 +#: build/files.c:2772 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -732,7 +732,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:629 lib/psm.c:1404 +#: build/pack.c:629 lib/psm.c:1406 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -762,7 +762,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:710 lib/psm.c:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1465,17 +1465,17 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "" @@ -2042,73 +2042,73 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:679 +#: lib/psm.c:681 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2161,8 +2161,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2176,7 +2176,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, c-format msgid "%s: not a package manifest: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2346,28 +2346,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2406,92 +2406,108 @@ msgstr "" msgid "relocating directory %s to %s\n" msgstr "" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +msgid "Upgrading packages..." +msgstr "" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -2871,7 +2887,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2884,7 +2900,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2892,21 +2908,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -2979,22 +2988,22 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3107,153 +3116,153 @@ msgstr "" msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/is.po b/po/is.po index f0addc9..cc809d7 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -406,192 +406,192 @@ msgstr "" msgid "syntax error in expression\n" msgstr "" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "vantar '(' í %s %s\n" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "vantar ')' í %s %s\n" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "Ógilt %s tákn: %s\n" -#: build/files.c:509 +#: build/files.c:511 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "vantar '(' í %s %s\n" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "Tvær skrár á einni línu: %s\n" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "Skráin er tvítekin: %s\n" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "Skráin fannst ekki: %s\n" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1641 +#: build/files.c:1645 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Skrá %s: %s\n" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1781 +#: build/files.c:1785 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "Gat ekki opnað PreUn skrá: %s\n" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "Skráin fannst ekki með 'glob': %s\n" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Gat ekki opnað %%files skrána %s: %s\n" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "lína: %s\n" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ógild skrá %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "Gat ekki keyrt %s: %s\n" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "Gat ekki búið til undirferli (fork) %s: %s\n" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "%s brást\n" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "gat ekki ritað öll gögn í %s\n" -#: build/files.c:2584 +#: build/files.c:2590 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Skrá %s: %s\n" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "gat ekki fundið %s:\n" -#: build/files.c:2764 +#: build/files.c:2772 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -734,7 +734,7 @@ msgstr "Get ekki lesi msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:629 lib/psm.c:1404 +#: build/pack.c:629 lib/psm.c:1406 #, 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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "Skrifaði: %s\n" @@ -1473,17 +1473,17 @@ msgstr "" msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "%s vistað sem %s\n" @@ -2062,74 +2062,74 @@ msgstr "b #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "pakkinn inniheldur enga .spec skrá\n" -#: lib/psm.c:679 +#: lib/psm.c:681 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Get ekki lesið haus úr %s: %s\n" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "gat ekki opnað %s: %s\n" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s brást\n" @@ -2182,8 +2182,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2197,7 +2197,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, fuzzy, c-format msgid "%s: not a package manifest: %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" @@ -2266,7 +2266,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2367,28 +2367,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" @@ -2427,93 +2427,110 @@ msgstr "%5d f msgid "relocating directory %s to %s\n" msgstr "%5d færa %s -> %s\n" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +#, fuzzy +msgid "Upgrading packages..." +msgstr "uppfæra pakka" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "gat ekki útbúið pakkaskilyrði:\n" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -2894,7 +2911,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2907,7 +2924,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2915,21 +2932,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -3002,22 +3012,22 @@ msgstr "deildann" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3130,153 +3140,153 @@ msgstr "get ekki opna msgid "cannot open %s index\n" msgstr "get ekki opnað %s index\n" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/it.po b/po/it.po index 3f58eca..7ce339f 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -408,192 +408,192 @@ msgstr "" msgid "syntax error in expression\n" msgstr "" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1641 +#: build/files.c:1645 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1781 +#: build/files.c:1785 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2584 +#: build/files.c:2590 #, c-format msgid "Finding %s: %s\n" msgstr "" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2764 +#: build/files.c:2772 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -732,7 +732,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:629 lib/psm.c:1404 +#: build/pack.c:629 lib/psm.c:1406 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -762,7 +762,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:710 lib/psm.c:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1465,17 +1465,17 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "" @@ -2042,73 +2042,73 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:679 +#: lib/psm.c:681 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2161,8 +2161,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2176,7 +2176,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, c-format msgid "%s: not a package manifest: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2346,28 +2346,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2406,92 +2406,108 @@ msgstr "" msgid "relocating directory %s to %s\n" msgstr "" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +msgid "Upgrading packages..." +msgstr "" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -2871,7 +2887,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2884,7 +2900,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2892,21 +2908,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -2979,22 +2988,22 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3107,153 +3116,153 @@ msgstr "" msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index a24ce73..6865d78 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -448,192 +448,192 @@ msgstr "&& msgid "syntax error in expression\n" msgstr "¼°Ãæ¤Çʸˡ¥¨¥é¡¼" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK ¼ºÇÔ: %s\n" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, fuzzy, c-format msgid "Missing '(' in %s %s\n" msgstr "%s %s ¤Ç '('¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, fuzzy, c-format msgid "Missing ')' in %s(%s\n" msgstr "')' ¤¬¤¢¤ê¤Þ¤»¤ó %s(%s " -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, fuzzy, c-format msgid "Invalid %s token: %s\n" msgstr "̵¸ú¤Ê %s ¤Î¥È¡¼¥¯¥ó: %s" -#: build/files.c:509 +#: build/files.c:511 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "%s %s ¤Ç '('¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: build/files.c:566 +#: build/files.c:568 #, fuzzy, c-format msgid "Non-white space follows %s(): %s\n" msgstr "%s() ¤Ë³¤¯¶õÇò¤¬¤¢¤ê¤Þ¤»¤ó: %s" -#: build/files.c:604 +#: build/files.c:606 #, fuzzy, c-format msgid "Bad syntax: %s(%s)\n" msgstr "ÉÔÀµ¤Êʸˡ: %s(%s)" -#: build/files.c:614 +#: build/files.c:616 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "ÉÔÀµ¤Ê¥â¡¼¥É¥¹¥Ú¥Ã¥¯: %s(%s)" -#: build/files.c:626 +#: build/files.c:628 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "ÉÔÀµ¤Ê¥Ç¥£¥ì¥¯¥È¥ê¥â¡¼¥É¥¹¥Ú¥Ã¥¯: %s(%s)" -#: build/files.c:784 +#: build/files.c:786 #, fuzzy, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "°Û¾ï¤Ê¥í¥«¡¼¥ëĹ: \"%.*s\" %%lang(%s)" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, fuzzy, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "Ê£¿ô¤Î¥í¥«¡¼¥ë %.*s %%lang(%s)" -#: build/files.c:958 +#: build/files.c:960 #, fuzzy, c-format msgid "Hit limit for %%docdir\n" msgstr "%%docdir ¤Î¸Â³¦¤Ë㤷¤Þ¤·¤¿" -#: build/files.c:964 +#: build/files.c:966 #, fuzzy, c-format msgid "Only one arg for %%docdir\n" msgstr "%%docdir ¤Î°ú¿ô¤Ï1¤Ä¤Î¤ß¤Ç¤¹" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, fuzzy, c-format msgid "Two files on one line: %s\n" msgstr "1¹Ô¤Ë2¤Ä¤Î¥Õ¥¡¥¤¥ë: %s" -#: build/files.c:1007 +#: build/files.c:1009 #, fuzzy, c-format msgid "File must begin with \"/\": %s\n" msgstr "¥Õ¥¡¥¤¥ë¤Ï \"/\" ¤«¤é»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó: %s" -#: build/files.c:1020 +#: build/files.c:1022 #, fuzzy, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "¾¤Î¥Õ¥©¡¼¥à¤ÇÆÃÊÌ¤Ê %%doc ¤òº®¤¼¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó: %s" -#: build/files.c:1172 +#: build/files.c:1174 #, fuzzy, c-format msgid "File listed twice: %s\n" msgstr "¥Õ¥¡¥¤¥ë¤¬2²óɽµ­¤µ¤ì¤Æ¤¤¤Þ¤¹: %s" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "¥Õ¥¡¥¤¥ë¤Ï prefix (%s) ¤È°ìÃפ·¤Þ¤»¤ó: %s" -#: build/files.c:1585 +#: build/files.c:1589 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "ÉÔÀµ¤Ê½êÍ­¼Ô/¥°¥ë¡¼¥×: %s\n" -#: build/files.c:1641 +#: build/files.c:1645 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "¥Õ¥¡¥¤¥ë %4d: %07o %s.%s\t %s\n" -#: build/files.c:1758 +#: build/files.c:1762 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "¥Õ¥¡¥¤¥ë¤ÏÀèƬ¤Ë \"/\" ¤¬É¬ÍפǤ¹: %s" -#: build/files.c:1781 +#: build/files.c:1785 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "%d ¹ÔÌÜ: ¥Ð¡¼¥¸¥ç¥ó¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s" -#: build/files.c:1796 +#: build/files.c:1800 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó(by glob): %s" -#: build/files.c:1860 +#: build/files.c:1864 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "%%files ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "¹ÔÌÜ: %s" -#: build/files.c:2258 +#: build/files.c:2262 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "%s ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: build/files.c:2338 +#: build/files.c:2342 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "%s ¤ò fork ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: build/files.c:2422 +#: build/files.c:2426 #, fuzzy, c-format msgid "%s failed\n" msgstr "%s ¼ºÇÔ" -#: build/files.c:2426 +#: build/files.c:2430 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "Á´¤Æ¤Î¥Ç¡¼¥¿¤ò %s ¤Ë½ñ¤¯¤³¤È¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: build/files.c:2584 +#: build/files.c:2590 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "%s ¤òõ¤·¤Æ¤¤¤Þ¤¹: (%s ¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹)...\n" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "%s ¤ò¸«¤Ä¤±¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿:" -#: build/files.c:2764 +#: build/files.c:2772 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷Ãæ\n" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "¥Õ¥¡¥¤¥ë¤Î½èÍýÃæ: %s-%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:1404 +#: build/pack.c:629 lib/psm.c:1406 #, 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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "½ñ¤­¹þ¤ßÃæ: %s\n" @@ -1548,17 +1548,17 @@ msgstr "" msgid "%10d %s\n" msgstr "%d ¹ÔÌÜ: %s" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆÊݸ¤µ¤ì¤Þ¤¹" @@ -2198,77 +2198,77 @@ msgstr "PGP/GPG #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "¥Ç¡¼¥¿¥¿¥¤¥× %d ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: lib/psm.c:440 +#: lib/psm.c:442 #, fuzzy msgid "source package expected, binary found\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Þ¤¹¡¢¥Ð¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: lib/psm.c:559 +#: lib/psm.c:561 #, fuzzy msgid "source package contains no .spec file\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó" -#: lib/psm.c:679 +#: lib/psm.c:681 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "¥Ý¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n" -#: lib/psm.c:849 +#: lib/psm.c:851 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:856 +#: lib/psm.c:858 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 #, fuzzy msgid "Unable to reload signature header\n" msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s" -#: lib/psm.c:1515 +#: lib/psm.c:1523 #, fuzzy msgid " on file " msgstr "¥Õ¥¡¥¤¥ë¾å" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s ¼ºÇÔ" @@ -2323,8 +2323,8 @@ msgstr " msgid "can't query %s: %s\n" msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Þ¤»¤ó: %s\n" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" @@ -2338,7 +2338,7 @@ msgstr "%s msgid "old format source packages cannot be queried\n" msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, fuzzy, c-format msgid "%s: not a package manifest: %s\n" msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" @@ -2408,7 +2408,7 @@ msgstr " msgid "record %u could not be read\n" msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" @@ -2513,15 +2513,15 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2530,13 +2530,13 @@ msgstr "" "\"B\" ¤Î°Í¸À­¤Ï epoch ¤òɬÍפȤ·¤Þ¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" @@ -2575,94 +2575,112 @@ msgstr "%s msgid "relocating directory %s to %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 #, fuzzy msgid "Preparing packages for installation..." msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +#, fuzzy +msgid "Repackaging erased files..." +msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë¥Õ¥¡¥¤¥ë¤¬Í­¤ê¤Þ¤»¤ó\n" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +#, fuzzy +msgid "Upgrading packages..." +msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "%s ¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "%s ¤È¤·¤Æ...\n" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s ¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹ - žÁ÷¼ºÇÔ - %s\n" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Þ¤»¤ó" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤«¤é¤ÎÆɤ߹þ¤ß¥¨¥é¡¼ " -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¤è¤ê¿·¤·¤¤ RPM ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹\n" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó\n" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿\n" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "°Í¸À­¤Î·çÇ¡:\n" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¤ÏÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -3063,7 +3081,7 @@ msgstr " #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3076,7 +3094,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3084,22 +3102,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -#, fuzzy -msgid "repackage about-to-be-erased packages\n" -msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ï°ì¤Ä¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸!\n" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -3172,22 +3182,22 @@ msgstr " msgid "locked db index %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3303,156 +3313,156 @@ msgstr "%s msgid "cannot open %s index\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Þ¤¹" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ­¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤­´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤­´¹¤¨¤Þ¤¹" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n" @@ -3738,6 +3748,10 @@ msgid "%s: read manifest failed: %s\n" msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #, fuzzy +#~ msgid "repackage about-to-be-erased packages\n" +#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ï°ì¤Ä¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸!\n" + +#, fuzzy #~ msgid "h#%7u: %s" #~ msgstr "¥Õ¥¡¥¤¥ë %s: %s\n" @@ -4702,9 +4716,6 @@ msgstr "%s: Fread #~ msgid "removing conflict index for %s\n" #~ msgstr "%s ÍѤΠconfilict ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#~ msgid "package has no files\n" -#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë¥Õ¥¡¥¤¥ë¤¬Í­¤ê¤Þ¤»¤ó\n" - #, fuzzy #~ msgid "Unable to stat icon: %s" #~ msgstr "¥¢¥¤¥³¥ó¤Î¾õÂÖ¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó: %s" diff --git a/po/ko.po b/po/ko.po index 5ed3285..d165536 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -417,192 +417,192 @@ msgstr "'&&' msgid "syntax error in expression\n" msgstr "Ç¥Çö½Ä¿¡¼­ ±¸¹® ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK ½ÇÆÐ: %s\n" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "%s %s¿¡ '(' °¡ ¾ø½À´Ï´Ù\n" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "%s(%s¿¡ ')' °¡ ¾ø½À´Ï´Ù\n" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "ºÎÀûÇÕÇÑ %s ÅäÅ«: %s\n" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "%2$s %3$s¿¡ %1$s °¡ ¾ø½À´Ï´Ù\n" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "%s() ´ÙÀ½¿¡ °ø¹éÀÌ ¾øÀ½: %s\n" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "À߸øµÈ ±¸¹®: %s(%s)\n" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "À߸øµÈ ¸ðµå spec: %s(%s)\n" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "À߸øµÈ dir¸ðµå spec: %s(%s)\n" -#: build/files.c:784 +#: build/files.c:786 #, fuzzy, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "ºñÁ¤»óÀûÀÎ ·ÎÄÉÀÏ ±æÀÌ: %%lang(%2$s)¿¡ \"%1$.*s\"\n" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, fuzzy, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "%%lang(%2$s)¿¡ Áߺ¹µÈ ·ÎÄÉÀÏ %1$.*s°¡ Á¸ÀçÇÕ´Ï´Ù\n" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "%%docdirÀÇ ÇÑ°è°¡ ÃÊ°úµÇ¾ú½À´Ï´Ù\n" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "%%docdir¿¡ ÇϳªÀÇ Àμö¸¸ ÁöÁ¤ÇÒ ¼ö ÀÖ½À´Ï´Ù\n" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "ÇϳªÀÇ Çà¿¡ µÎ°³ÀÇ ÆÄÀÏÀÌ Á¸ÀçÇÔ: %s\n" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "ÆÄÀÏÀº ¹Ýµå½Ã \"/\" ·Î ½ÃÀÛÇؾßÇÔ: %s\n" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "ƯÁ¤ %%docÀ» ´Ù¸¥ Çü½Ä°ú ÇÔ²² »ç¿ëÇÒ ¼ö ¾øÀ½: %s\n" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "ÆÄÀÏ ¸ñ·ÏÀÌ Áߺ¹µÊ: %s\n" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "BuildRoot¿¡ ½Éº¼¸¯¸µÅ©ÇÔ: %s -> %s\n" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "ÆÄÀÏÀÌ prefix (%s)¿Í ÀÏÄ¡ÇÏÁö ¾ÊÀ½: %s\n" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "ÆÄÀÏÀ» ãÀ» ¼ö ¾øÀ½: %s\n" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "À߸øµÈ ¼ÒÀ¯ÀÚ/±×·ì: %s\n" -#: build/files.c:1641 +#: build/files.c:1645 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "ÆÄÀÏ%5d: %07o %s.%s\t %s\n" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "ÆÄÀÏÀº \"/\" ·Î ½ÃÀÛÇؾßÇÔ: %s\n" -#: build/files.c:1781 +#: build/files.c:1785 #, c-format msgid "Glob not permitted: %s\n" msgstr "GlobÀ» »ç¿ëÇÒ ¼ö ¾øÀ½: %s\n" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "globÀ¸·Î ÆÄÀÏÀ» ãÀ» ¼ö ¾øÀ½: %s\n" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "%s ÆÄÀÏÀÇ %%files¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "Çà: %s\n" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "À߸øµÈ ÆÄÀÏ: %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "%s(À»)¸¦ ½ÇÇàÇÒ ¼ö ¾øÀ½: %s\n" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "%s(À»)¸¦ fork ÇÒ ¼ö ¾øÀ½: %s\n" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "%s(ÀÌ)°¡ ½ÇÆÐÇß½À´Ï´Ù\n" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "%s¿¡ ¸ðµç ÀڷḦ ±â·ÏÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" -#: build/files.c:2584 +#: build/files.c:2590 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "%s(À»)¸¦ ã´Â Áß: (%s »ç¿ë)...\n" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "%s(À»)¸¦ ã´Âµ¥ ½ÇÆÐÇÔ:\n" -#: build/files.c:2764 +#: build/files.c:2772 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆÐÇÔ%s%s: %s\n" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "ÆÄÀÏ Ã³¸® Áß: %s-%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:1404 +#: build/pack.c:629 lib/psm.c:1406 #, 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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "ÀÛ¼º: %s\n" @@ -1489,17 +1489,17 @@ msgstr "========= msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "%2$04oÀÇ Çã°¡±Ç(perms)À» °¡Áø %1$s µð·ºÅ丮°¡ »ý¼ºµÇ¾ú½À´Ï´Ù.\n" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "Çì´õ ÆÄÀÏ ¸ñ·Ï¿¡¼­ ¾ÆÄ«À̺ê ÆÄÀÏ %s(À»)¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "%s(ÀÌ)°¡ %s(À¸)·Î ÀúÀåµÇ¾ú½À´Ï´Ù\n" @@ -2093,79 +2093,79 @@ msgstr " #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "%d µ¥ÀÌÅÍ À¯ÇüÀº »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "¼Ò½º ÆÐÅ°Áö°¡ ÇÊ¿äÇϸç, ¹ÙÀ̳ʸ®°¡ °Ë»öµÇ¾ú½À´Ï´Ù\n" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "¼Ò½º ÆÐÅ°Áö¿¡ .spec ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/psm.c:679 +#: lib/psm.c:681 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÕ´Ï´Ù (ÀÖÀ» °æ¿ì)\n" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" "%2$s-%3$s-%4$sÀÇ %1$s ½ºÅ©¸³Æ²¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù, waitpid°¡ %5" "$s(À»)¸¦ ¹ÝȯÇÏ¿´½À´Ï´Ù\n" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" "%2$s-%3$s-%4$sÀÇ %1$s ½ºÅ©¸³Æ²¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù, Á¾·á »óȲ %5" "$d\n" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s¿¡ %dÀÇ ÆÄÀÏÀÌ ÀÖ½À´Ï´Ù, Å×½ºÆ® = %d\n" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" "%s: %s ½ºÅ©¸³Æ²¸´(scriptlet)ÀÌ ½ÇÆÐÇß½À´Ï´Ù (%d), %s-%s-%s(À»)¸¦ »ý·«ÇÕ´Ï´Ù\n" -#: lib/psm.c:1417 +#: lib/psm.c:1419 #, fuzzy msgid "Unable to reload signature header\n" msgstr "¼­¸í(signature) Çì´õ¸¦ ´Ù½Ã Àоî¿Ã ¼ö ¾ø½À´Ï´Ù.\n" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆÐÇÔ%s%s: %s\n" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr " ´ÙÀ½ ÆÄÀÏÀÇ " -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%2$s ÆÄÀÏÀÇ %1$s(ÀÌ)°¡ ½ÇÆÐÇÔ: %3$s\n" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, c-format msgid "%s failed: %s\n" msgstr "%s(ÀÌ)°¡ ½ÇÆÐÇÔ: %s\n" @@ -2219,8 +2219,8 @@ msgstr " msgid "can't query %s: %s\n" msgstr "%s(À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "%s(À»)¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %s\n" @@ -2234,7 +2234,7 @@ msgstr "%s( msgid "old format source packages cannot be queried\n" msgstr "ÀÌÀü Çü½ÄÀÇ ¼Ò½º ÆÐÅ°Áö´Â ÁúÀÇÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, fuzzy, c-format msgid "%s: not a package manifest: %s\n" msgstr "%s(¿Í)°ú ÀÏÄ¡ÇÏ´Â ÆÐÅ°Áö°¡ ¾øÀ½: %s\n" @@ -2304,7 +2304,7 @@ msgstr " msgid "record %u could not be read\n" msgstr "±â·Ï(record) ¹øÈ£ %u(Àº)´Â ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "%s ÆÐÅ°Áö°¡ ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" @@ -2407,15 +2407,15 @@ msgstr ")" msgid "OK" msgstr "È®ÀÎ" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "¾Æ´Ï¿À" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "¿¹" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2424,13 +2424,13 @@ msgstr "" "\"B\" ÀÇÁ¸¼ºÀº Áß¿ä½Ã µÇ´Â °Í(epoch)À» ÇÊ¿ä·Î ÇÕ´Ï´Ù (\"A\" ·Î °¡Á¤ÇÕ´Ï´Ù)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä»çÇ×(³»¿ª)ÀÌ ¸¸Á·ÇÏÁö ¾ÊÀ½: %s\n" @@ -2469,94 +2469,113 @@ msgstr "%s( msgid "relocating directory %s to %s\n" msgstr "%s µð·ºÅ丮¸¦ %s(À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "Áغñ Áß..." -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "¼³Ä¡ÇÒ ÆÐÅ°Áö¸¦ ÁغñÇÏ°í ÀÖ½À´Ï´Ù..." -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +#, fuzzy +msgid "Repackaging..." +msgstr "Áغñ Áß..." + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +#, fuzzy +msgid "Upgrading..." +msgstr "Áغñ Áß..." + +#: lib/rpminstall.c:222 +#, fuzzy +msgid "Upgrading packages..." +msgstr "ÆÐÅ°Áö¸¦ ¾÷±×·¹À̵å ÇÕ´Ï´Ù" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "%s(À»)¸¦ º¹±¸ÇÕ´Ï´Ù\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr " ... %s(À¸)·Î\n" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s(À»)¸¦ »ý·«ÇÕ´Ï´Ù - Àü¼Û(transfer)¿¡ ½ÇÆÐÇÔ - %s\n" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "%s ÆÐÅ°Áö´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "%s ÆÄÀÏÀ» Àд µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "%s ÆÄÀÏÀº ÃֽŠ¹öÀüÀÇ RPMÀ» ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s(Àº)´Â ¼³Ä¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%dÀÇ ¼Ò½º¿Í %dÀÇ ¹ÙÀ̳ʸ® ÆÐÅ°Áö°¡ °Ë»öµÇ¾ú½À´Ï´Ù\n" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆÐÇÔ:\n" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "¹ÙÀ̳ʸ® ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "%s ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¿©·¯°³ÀÇ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "%s(À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "%s(À»)¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:1080 -#, fuzzy, c-format -msgid "rollback %d packages to %s" -msgstr "(+%d,-%d) ÆÐÅ°Áö¸¦ %sÀ¸·Î ·Ñ¹é(rollback)ÇÕ´Ï´Ù" +#: lib/rpminstall.c:1148 +#, c-format +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" +msgstr "" #: lib/rpmlead.c:53 #, c-format @@ -2946,7 +2965,7 @@ msgstr "%s #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2959,7 +2978,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2967,21 +2986,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -3054,22 +3066,22 @@ msgstr " msgid "locked db index %s/%s\n" msgstr "Àá±ÝµÈ db À妽º %s/%s\n" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "ÀÎÁõµÇÁö ¾ÊÀº db ¿É¼Ç: \"%s\"(À»)¸¦ ¹«½ÃÇÕ´Ï´Ù.\n" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s(Àº)´Â ºÎÀûÇÕÇÑ ¼öÄ¡ °ªÀÔ´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s(Àº)´Â ³Ê¹« Å©°Å³ª ³Ê¹« ÀûÀº Á¤¼ö(long) °ªÀÔ´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s(Àº)´Â ³Ê¹« Å©°Å³ª ³Ê¹« ÀûÀº Á¤¼ö(int) °ªÀÔ´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n" @@ -3186,157 +3198,157 @@ msgstr "db%2$d( msgid "cannot open %s index\n" msgstr "%s À妽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" "%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, fuzzy, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: ¼Õ»óµÈ Çì´õ #%u(ÀÌ)°¡ º¹±¸(retrieved)µÇ¾ú½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%xÀÇ Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, 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:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "%2$s À妽º¿¡¼­ \"%1$s\"(À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "%2$s À妽º¿¡¼­ %1$d Ç׸ñµé(entries)À» »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" "%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "%3$s¿¡¼­ %2$s ·¹Äڵ带 »èÁ¦ÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "»õ·Î¿î ÆÐÅ°Áö¸¦ ¹èÄ¡ÇÏ´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%2$s À妽º¿¡ \"%1$s\"(À»)¸¦ Ãß°¡ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "%2$s À妽º¿¡ %1$d Ç׸ñµé(entries)À» Ãß°¡ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, 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:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "db3¸¦ À籸ÃàÇÑ ÈÄ¿¡ %s(À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%2$s¿¡ %1$s µ¥ÀÌÅͺ£À̽º¸¦ À籸Ãà ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "Àӽà µ¥ÀÌÅͺ£À̽º %s(ÀÌ)°¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÔ: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "dbapi %d·Î ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "dbapi %d·Î »õ·Î¿î µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "µ¥ÀÌÅͺ£À̽ºÀÇ ·¹ÄÚµå ¹øÈ£ %u(ÀÌ)°¡ À߸øµÇ¾ú½À´Ï´Ù -- »ý·«ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "%u¿¡ óÀ½ºÎÅÍ ·¹Äڵ带 Ãß°¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "µ¥ÀÌÅͺ£À̽º¸¦ À籸ÃàÇϴµ¥ ½ÇÆÐÇÔ: ¿øº» µ¥ÀÌÅͺ£À̽º´Â ±×´ë·Î À¯ÁöµË´Ï´Ù\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ »õ·Î¿î µ¥ÀÌÅͺ£À̽º·Î ±³Ã¼Çϴµ¥ ½ÇÆÐÇß½À´Ï´Ù!\n" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, 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:3851 #, c-format msgid "removing directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆÐÇÔ: %s\n" @@ -3612,6 +3624,10 @@ msgid "%s: read manifest failed: %s\n" msgstr "%s: Àдµ¥ ½ÇÆÐÇß½À´Ï´Ù: %s\n" #, fuzzy +#~ msgid "rollback %d packages to %s" +#~ msgstr "(+%d,-%d) ÆÐÅ°Áö¸¦ %sÀ¸·Î ·Ñ¹é(rollback)ÇÕ´Ï´Ù" + +#, fuzzy #~ msgid "h#%7u: %s" #~ msgstr "%s: %s\n" diff --git a/po/no.po b/po/no.po index e67efca..bb163fd 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -417,192 +417,192 @@ msgstr "&& og || ikke st msgid "syntax error in expression\n" msgstr "syntaksfeil i uttrykk\n" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIDSJEKK feil: %s\n" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "Mangler '(' i %s %s\n" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "Mangler ')' i %s(%s\n" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "Ugyldig %s-tegn: %s\n" -#: build/files.c:509 +#: build/files.c:511 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "Mangler '(' i %s %s\n" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "To filer på én linje: %s\n" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "Filen må begynne med \"/\": %s\n" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "Kan ikke blande spesiell %%doc med andre skjema: %s\n" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "Fil listet to ganger: %s\n" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Symbolsk lenke peker til BuildRoot: %s -> %s\n" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "Fil ikke funnet: %s\n" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Ugyldig eier/gruppe: %s\n" -#: build/files.c:1641 +#: build/files.c:1645 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Fil %s: %s\n" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1781 +#: build/files.c:1785 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "linje %d: Filnavn ikke tillatt: %s\n" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "Installerer %s\n" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ugyldig fil %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "Kunne ikke kjøre %s: %s\n" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "%s feilet\n" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "kunne ikke skrive alle data til %s\n" -#: build/files.c:2584 +#: build/files.c:2590 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Fil %s: %s\n" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "Klarte ikke å finne %s:\n" -#: build/files.c:2764 +#: build/files.c:2772 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "ingen pakke utløser %s\n" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -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:1404 +#: build/pack.c:629 lib/psm.c:1406 #, 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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1488,17 +1488,17 @@ msgstr "" msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "%s lagret som %s\n" @@ -2088,74 +2088,74 @@ msgstr "generer signatur" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 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:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær funnet\n" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "kildepakke inneholder ikke en .spec-fil\n" -#: lib/psm.c:679 +#: lib/psm.c:681 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kjører %s-skript (hvis noen)\n" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s feilet\n" @@ -2209,8 +2209,8 @@ msgstr "pakken har verken fileier eller id-lister\n" msgid "can't query %s: %s\n" msgstr "kan ikke spørre på %s: %s\n" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "feil under åpning av %s: %s\n" @@ -2224,7 +2224,7 @@ msgstr "sp msgid "old format source packages cannot be queried\n" msgstr "kildepakker i gammelt format kan ikke spørres\n" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, fuzzy, c-format msgid "%s: not a package manifest: %s\n" msgstr "ingen pakke utløser %s\n" @@ -2293,7 +2293,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "pakke %s er ikke installert\n" @@ -2394,28 +2394,28 @@ msgstr "" msgid "OK" msgstr "OK" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "NEI" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "JA" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s er i konflikt: %s\n" @@ -2454,93 +2454,112 @@ msgstr "relokerer %s til %s\n" msgid "relocating directory %s to %s\n" msgstr "relokerer katalog %s til %s\n" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "Forbereder..." -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "Forbereder pakker for installasjon..." -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +#, fuzzy +msgid "Repackaging..." +msgstr "Forbereder..." + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +#, fuzzy +msgid "Upgrading..." +msgstr "Forbereder..." + +#: lib/rpminstall.c:222 +#, fuzzy +msgid "Upgrading packages..." +msgstr "oppgrader pakke(r)" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "Henter %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr " ... som %s\n" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "hopper over %s - overføring feilet - %s\n" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "pakke %s kan ikke relokeres\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "feil under lesing fra fil %s\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "fil %s trenger en nyere versjon av RPM\n" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "fant %d kilde- og %d binærpakker\n" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "feilede avhengigheter:\n" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "installerer binærpakker\n" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" spesifiserer flere pakker\n" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "kan ikke åpne %s: %s\n" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -2924,7 +2943,7 @@ msgstr "ekskluderer katalog %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2937,7 +2956,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2945,21 +2964,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -3032,22 +3044,22 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3160,153 +3172,153 @@ msgstr "kan ikke msgid "cannot open %s index\n" msgstr "kan ikke åpne %s indeks\n" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, 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:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, 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:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, 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:2837 +#: rpmdb/rpmdb.c:2852 #, 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:2847 +#: rpmdb/rpmdb.c:2862 #, 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:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, 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:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index 445a368..41b14c3 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -439,192 +439,192 @@ msgstr "&& i || nie jest wspierane dla msgid "syntax error in expression\n" msgstr "b³±d sk³adni w wyra¿eniu" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK nie powiod³o siê: %s\n" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, fuzzy, c-format msgid "Missing '(' in %s %s\n" msgstr "Brak '(' w %s %s" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, fuzzy, c-format msgid "Missing ')' in %s(%s\n" msgstr "Brak ')' w %s(%s" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, fuzzy, c-format msgid "Invalid %s token: %s\n" msgstr "B³êdny znak %s: %s" -#: build/files.c:509 +#: build/files.c:511 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "Brak '(' w %s %s" -#: build/files.c:566 +#: build/files.c:568 #, fuzzy, c-format msgid "Non-white space follows %s(): %s\n" msgstr "Brak bia³ego znaku po %s(): %s" -#: build/files.c:604 +#: build/files.c:606 #, fuzzy, c-format msgid "Bad syntax: %s(%s)\n" msgstr "B³êdna sk³adnia: %s(%s)" -#: build/files.c:614 +#: build/files.c:616 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "B³êdne okre¶lenie trybu: %s(%s)" -#: build/files.c:626 +#: build/files.c:628 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "B³êdne okre¶lenie dirmode: %s(%s)" -#: build/files.c:784 +#: build/files.c:786 #, fuzzy, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "Niespotykana d³ugo¶æ okre¶lenia lokalizacji \"%.*s\" w %%lang(%s)" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, fuzzy, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "Powtórzone okre¶lenie lokalizacji %.*s w %%lang(%s)" -#: build/files.c:958 +#: build/files.c:960 #, fuzzy, c-format msgid "Hit limit for %%docdir\n" msgstr "Limit trafieñ dla %%docdir" -#: build/files.c:964 +#: build/files.c:966 #, fuzzy, c-format msgid "Only one arg for %%docdir\n" msgstr "Tylko jeden argument dla %%docdir" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, fuzzy, c-format msgid "Two files on one line: %s\n" msgstr "Dwa pliki w jedenj linii: %s" -#: build/files.c:1007 +#: build/files.c:1009 #, fuzzy, c-format msgid "File must begin with \"/\": %s\n" msgstr "Plik musi siê zaczynaæ od \"/\": %s" -#: build/files.c:1020 +#: build/files.c:1022 #, fuzzy, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "Nie mo¿na mieszaæ specjalnej %%doc z innymi formami: %s" -#: build/files.c:1172 +#: build/files.c:1174 #, fuzzy, c-format msgid "File listed twice: %s\n" msgstr "Plik podany dwukrotnie: %s" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Plik nie zgadza siê z prefiksem (%s): %s" -#: build/files.c:1585 +#: build/files.c:1589 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Nie znaleziono pliku: %s" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "B³êdny u¿ytkownik/grupa: %s\n" -#: build/files.c:1641 +#: build/files.c:1645 #, 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:1758 +#: build/files.c:1762 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "Plik musi siê zaczynaæ od \"/\": %s" -#: build/files.c:1781 +#: build/files.c:1785 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "linia %d: Wersja niedozwolona: %s" -#: build/files.c:1796 +#: build/files.c:1800 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Nie znaleziono pliku: %s" -#: build/files.c:1860 +#: build/files.c:1864 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Nie mo¿na otworzyæ %%files pliku: %s" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "linia: %s" -#: build/files.c:2258 +#: build/files.c:2262 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "plik %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "Nie mo¿na uruchomiæ %s" -#: build/files.c:2338 +#: build/files.c:2342 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "Nie mo¿na wykonaæ fork na %s" -#: build/files.c:2422 +#: build/files.c:2426 #, fuzzy, c-format msgid "%s failed\n" msgstr "%s nie powiod³o siê" -#: build/files.c:2426 +#: build/files.c:2430 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "zapisanie wszystkich danych do %s nie powiod³o siê" -#: build/files.c:2584 +#: build/files.c:2590 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Wyszukiwanie wymaganych zasobów...\n" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "Wyszukiwanie nie powiod³o siê" -#: build/files.c:2764 +#: build/files.c:2772 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "poszukiwanie pakietu %s\n" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Przetwarzanie plików: %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:1404 +#: build/pack.c:629 lib/psm.c:1406 #, 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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1530,17 +1530,17 @@ msgstr "" msgid "%10d %s\n" msgstr "linia %d: %s" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "ostrze¿enie: %s zapisany jako %s" @@ -2163,76 +2163,76 @@ msgstr "generuj sygnatur #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 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:440 +#: lib/psm.c:442 #, fuzzy msgid "source package expected, binary found\n" msgstr "spodziewany pakiet ¼ród³owy a nie binarny" -#: lib/psm.c:559 +#: lib/psm.c:561 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pakiet ¼ród³owy nie zawiera pliku .spec" -#: lib/psm.c:679 +#: lib/psm.c:681 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n" -#: lib/psm.c:849 +#: lib/psm.c:851 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "wykonanie skryptu nie powiod³o siê" -#: lib/psm.c:856 +#: lib/psm.c:858 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "wykonanie skryptu nie powiod³o siê" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, 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:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Nie mo¿na odczytaæ ikony: %s" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, 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:1472 +#: lib/psm.c:1474 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s nie istnieje - u¿yto grupy root" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, 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:1515 +#: lib/psm.c:1523 msgid " on file " msgstr " na pliku " -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s nie powiod³o siê" @@ -2287,8 +2287,8 @@ msgstr "pakiet nie ma ani w msgid "can't query %s: %s\n" msgstr "nie mo¿na odwi±zaæ %s: %s\n" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "otwarcie %s nie powiod³o siê: %s\n" @@ -2302,7 +2302,7 @@ msgstr "odpytywanie %s nie powiod msgid "old format source packages cannot be queried\n" msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, fuzzy, c-format msgid "%s: not a package manifest: %s\n" msgstr "¿aden pakiet nie zahacza %s\n" @@ -2372,7 +2372,7 @@ msgstr "numer rekordu pakietu: %d\n" msgid "record %u could not be read\n" msgstr "nie mo¿na odczytaæ rekordu %d\n" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" @@ -2475,29 +2475,29 @@ msgstr ")" msgid "OK" msgstr "OK" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 #, fuzzy msgid "NO " msgstr "NIE DOBRZE" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" @@ -2536,94 +2536,112 @@ msgstr "przesuwanie %s do %s\n" msgid "relocating directory %s to %s\n" msgstr "przesuwanie %s do %s\n" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 #, fuzzy msgid "Preparing packages for installation..." msgstr "nie podano nazw plików do zainstalowania" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +#, fuzzy +msgid "Repackaging erased files..." +msgstr "pakiet nie ma plików\n" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +#, fuzzy +msgid "Upgrading packages..." +msgstr " --upgrade " + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "¦ci±ganie %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "... jako %s\n" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s pomijany - transmisja %s nie powiod³a siê\n" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "pakiet %s nie jest przesuwalny\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "b³±d czytania z pliku %s\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "plik %s wymaga nowszej wersji RPM\n" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie mo¿e byæ zainstalowany\n" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "znaleziono %d pakietów ¼ród³owych i %d binarnych\n" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "niespe³nione zale¿no¶ci:\n" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "instalacja pakietów binarnych\n" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie mo¿na otworzyæ pliku %s: %s" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" okre¶la wiele pakietów\n" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie mo¿na otworzyæ %s\n" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "Instalacja %s\n" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -3016,7 +3034,7 @@ msgstr "tworzenie katalogu: %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3029,7 +3047,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3037,22 +3055,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -#, fuzzy -msgid "repackage about-to-be-erased packages\n" -msgstr "ten pakiet jest pakietem w wersji jeden!\n" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -3125,22 +3135,22 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3256,155 +3266,155 @@ msgstr "nie mo msgid "cannot open %s index\n" msgstr "nie mo¿na otworzyæ %s\n" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 #, fuzzy msgid "no dbpath has been set\n" msgstr "¶cie¿ka bazy danych nie zosta³a podana" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "b³±d pobierania rekordu %s z %s" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "b³±d zapisywania rekordu %s do %s" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, 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:2669 +#: rpmdb/rpmdb.c:2684 #, 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:2784 +#: rpmdb/rpmdb.c:2799 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "usuwanie indeksu grupy\n" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "usuwanie indeksu nazw\n" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "b³±d pobierania rekordu %s z %s" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "b³±d zapisywania rekordu %s do %s" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "b³±d usuwania rekordu %s z %s" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "b³±d szukania pakietu %s\n" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, 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:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "¶cie¿ka bazy danych nie zosta³a podana" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, 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:3716 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "tymczasowa baza danych %s ju¿ istnieje" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otwieranie starej bazy danych\n" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otwieranie nowej bazy danych\n" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, 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:3813 #, 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:3831 #, 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:3839 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:3841 #, 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:3851 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n" @@ -3682,6 +3692,10 @@ msgid "%s: read manifest failed: %s\n" msgstr "%s: readLead nie powiod³o siê\n" #, fuzzy +#~ msgid "repackage about-to-be-erased packages\n" +#~ msgstr "ten pakiet jest pakietem w wersji jeden!\n" + +#, fuzzy #~ msgid "h#%7u: %s" #~ msgstr "plik %s: %s\n" @@ -5165,9 +5179,6 @@ msgstr "%s: readLead nie powiod #~ msgid "removing conflict index for %s\n" #~ msgstr "usuwanie indeksu konfliktów dla %s\n" -#~ msgid "package has no files\n" -#~ msgstr "pakiet nie ma plików\n" - #~ msgid "cannot create %s" #~ msgstr "nie mo¿na utworzyæ %s" diff --git a/po/pt.po b/po/pt.po index 73fdf2b..cda4195 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: 2002-02-14 10:51+0000\n" "Last-Translator: José Nuno Coelho Sanarra Pires \n" "Language-Team: pt %s\n" msgstr "A 'symlink' aponta para a BuildRoot: %s -> %s\n" -#: build/files.c:1561 +#: build/files.c:1565 #, 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:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "Ficheiro não encontrado: %s\n" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Dono/grupo inválido: %s\n" -#: build/files.c:1641 +#: build/files.c:1645 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Ficheiro%5d: %07o %s.%s\t %s\n" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "O ficheiro precisa de começar por \"/\": %s\n" -#: build/files.c:1781 +#: build/files.c:1785 #, c-format msgid "Glob not permitted: %s\n" msgstr "Glob não permitido: %s\n" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "Ficheiro não encontrado pelo glob: %s\n" -#: build/files.c:1860 +#: build/files.c:1864 #, 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:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "linha: %s\n" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ficheiro inválido: %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "Não consegui executar o %s: %s\n" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "Não consegui executar à parte o %s: %s\n" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "O %s falhou\n" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "não consegui escrever todos os dados em %s\n" -#: build/files.c:2584 +#: build/files.c:2590 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "A procurar o %s: (usando o %s)...\n" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "Não consegui encontrar o %s:\n" -#: build/files.c:2764 +#: build/files.c:2772 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "a abertura do pacote falhou%s%s: %s\n" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "A processar os ficheiros: %s-%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:1404 +#: build/pack.c:629 lib/psm.c:1406 #, 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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "Gravei: %s\n" @@ -1504,19 +1504,19 @@ msgstr "========= Directorias n msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "directoria %s criada com as permissões %04o.\n" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, 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:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "%s gravado como %s\n" @@ -2107,76 +2107,76 @@ msgstr "gerar a assinatura" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 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:440 +#: lib/psm.c:442 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:559 +#: lib/psm.c:561 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:679 +#: lib/psm.c:681 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: a correr os scripts(s) %s (se existirem)\n" -#: lib/psm.c:849 +#: lib/psm.c:851 #, 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" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s 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:1185 +#: lib/psm.c:1187 #, 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:1307 +#: lib/psm.c:1309 #, 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:1417 +#: lib/psm.c:1419 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Não consegui reler o cabeçalho do assinatura.\n" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, 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:1472 +#: lib/psm.c:1474 #, 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:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "a abertura do pacote falhou%s%s: %s\n" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr " no ficheiro " -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s falhou no ficheiro %s: %s\n" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, c-format msgid "%s failed: %s\n" msgstr "%s falhou: %s\n" @@ -2230,8 +2230,8 @@ msgstr "o pacote nem tem um dono do ficheiro ou as listas de IDs\n" msgid "can't query %s: %s\n" msgstr "não consigo pesquisar o %s: %s\n" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "o acesso ao %s falhou: %s\n" @@ -2246,7 +2246,7 @@ msgid "old format source packages cannot be queried\n" msgstr "" "os pacotes com código-fonte no formato antigo não podem ser pesquisados\n" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, fuzzy, c-format msgid "%s: not a package manifest: %s\n" msgstr "nenhum pacote coincide com %s: %s\n" @@ -2315,7 +2315,7 @@ msgstr "n msgid "record %u could not be read\n" msgstr "o registo %u não pôde ser lido\n" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "o pacote %s não está instalado\n" @@ -2418,15 +2418,15 @@ msgstr ")" msgid "OK" msgstr "OK" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "NÃO" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "SIM" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2435,13 +2435,13 @@ msgstr "" "A dependência \"B\" precisa duma época (assumindo a mesma que \"A\")\n" "\t %s\tB %s\n" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "o pacote %s tem requisitos não satisfeitos: %s\n" @@ -2480,94 +2480,113 @@ msgstr "a mudar o %s para %s\n" msgid "relocating directory %s to %s\n" msgstr "a mudar a directoria %s para %s\n" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "A preparar..." -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "A preparar os pacotes para a instalação..." -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +#, fuzzy +msgid "Repackaging..." +msgstr "A preparar..." + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +#, fuzzy +msgid "Upgrading..." +msgstr "A preparar..." + +#: lib/rpminstall.c:222 +#, fuzzy +msgid "Upgrading packages..." +msgstr "actualizar pacote(s)" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "A obter o %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr " ... como %s\n" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "a ignorar o %s - a transferência falhou - %s\n" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "o pacote %s não pode ser mudado de sítio\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "erro ao ler do ficheiros %s\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "o %s precisa duma versão mais recente do RPM\n" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "o %s não pode ser instalado\n" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "encontrados %d pacotes com código-fonte e %d binários\n" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "dependências falhadas:\n" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "a instalar os pacotes binários\n" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "não consigo aceder ao ficheiro %s: %s\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "o \"%s\" especifica vários pacotes\n" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "não consigo aceder ao %s: %s\n" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "A instalar o %s\n" -#: lib/rpminstall.c:1080 -#, fuzzy, c-format -msgid "rollback %d packages to %s" -msgstr "a efectuar o 'rollback' (+%d,-%d) pacotes para %s" +#: lib/rpminstall.c:1148 +#, c-format +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" +msgstr "" #: lib/rpmlead.c:53 #, c-format @@ -2956,7 +2975,7 @@ msgstr "a excluir a directoria %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2969,7 +2988,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2977,21 +2996,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -3064,22 +3076,22 @@ msgstr "partilhado" msgid "locked db index %s/%s\n" msgstr "tranquei o índice do db %s/%s\n" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "opção do db desconhecida: \"%s\" ignorada.\n" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "O %s tem um valor numérico inválido, foi ignorado\n" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "O %s tem um valor demasiado elevado ou pequeno, foi ignorado\n" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "O %s tem um valor inteiro demasiado elevado ou pequeno, foi ignorado\n" @@ -3194,154 +3206,154 @@ msgstr "n msgid "cannot open %s index\n" msgstr "não consigo abrir o índice do %s\n" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "não foi definido o dbpath\n" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, 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:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, 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:2330 +#: rpmdb/rpmdb.c:2345 #, 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:2606 +#: rpmdb/rpmdb.c:2621 #, 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:2669 +#: rpmdb/rpmdb.c:2684 #, 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:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "a remover o \"%s\" do índice %s.\n" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "a remover %d registos do índice %s.\n" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, 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:2837 +#: rpmdb/rpmdb.c:2852 #, 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:2847 +#: rpmdb/rpmdb.c:2862 #, 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:2996 +#: rpmdb/rpmdb.c:3011 #, 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:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "a adicionar o \"%s\" ao índice %s.\n" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "a adicionar %d registos ao índice %s.\n" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, 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:3642 #, 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:3680 msgid "no dbpath has been set" msgstr "não foi definido o dbpath" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, 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:3716 #, 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:3722 #, c-format msgid "creating directory %s\n" msgstr "a criar a directoria %s\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "a criar a directoria %s: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, 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:3744 #, 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:3773 #, 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:3813 #, 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:3831 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:3839 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:3841 #, 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:3851 #, c-format msgid "removing directory %s\n" msgstr "a remover a directoria %s\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "falhou a remoção da directoria %s: %s\n" @@ -3616,6 +3628,10 @@ msgid "%s: read manifest failed: %s\n" msgstr "%s: a leitura do manifesto falhou: %s\n" #, fuzzy +#~ msgid "rollback %d packages to %s" +#~ msgstr "a efectuar o 'rollback' (+%d,-%d) pacotes para %s" + +#, fuzzy #~ msgid "h#%7u: %s" #~ msgstr "%s: %s\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index bb10200..2e48482 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" #: build.c:40 #, fuzzy @@ -464,209 +464,209 @@ msgstr "" msgid "syntax error in expression\n" msgstr "" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" # , c-format -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, fuzzy, c-format msgid "Invalid %s token: %s\n" msgstr "No consegui abrir: %s\n" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" # , c-format -#: build/files.c:604 +#: build/files.c:606 #, fuzzy, c-format msgid "Bad syntax: %s(%s)\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format -#: build/files.c:614 +#: build/files.c:616 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format -#: build/files.c:626 +#: build/files.c:628 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" # , c-format #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, fuzzy, c-format msgid "Two files on one line: %s\n" msgstr "No consegui abrir: %s\n" -#: build/files.c:1007 +#: build/files.c:1009 #, fuzzy, c-format msgid "File must begin with \"/\": %s\n" msgstr "argumentos para o --dbpath devem comear com uma /" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" # , c-format -#: build/files.c:1172 +#: build/files.c:1174 #, fuzzy, c-format msgid "File listed twice: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" # , c-format -#: build/files.c:1561 +#: build/files.c:1565 #, 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:1585 +#: build/files.c:1589 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "no foi passado pacote para desinstalao" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" # , c-format -#: build/files.c:1641 +#: build/files.c:1645 #, 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:1758 +#: build/files.c:1762 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "argumentos para o --dbpath devem comear com uma /" # , c-format -#: build/files.c:1781 +#: build/files.c:1785 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "No consegui abrir: %s\n" -#: build/files.c:1796 +#: build/files.c:1800 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "no foi passado pacote para desinstalao" # , c-format -#: build/files.c:1860 +#: build/files.c:1864 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 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:2258 +#: build/files.c:2262 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format -#: build/files.c:2338 +#: build/files.c:2342 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: build/files.c:2422 +#: build/files.c:2426 #, fuzzy, c-format msgid "%s failed\n" msgstr "Construo falhou.\n" # , c-format -#: build/files.c:2426 +#: build/files.c:2430 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "No consegui abrir o pipe tar: %s\n" # , c-format -#: build/files.c:2584 +#: build/files.c:2590 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "No consegui abrir o pipe tar: %s\n" -#: build/files.c:2764 +#: build/files.c:2772 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "instale pacote" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -828,7 +828,7 @@ msgid "Could not open %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:629 lib/psm.c:1404 +#: build/pack.c:629 lib/psm.c:1406 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "No consegui abrir: %s\n" @@ -863,7 +863,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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1645,18 +1645,18 @@ msgstr "" msgid "%10d %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" # , c-format -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "No consegui abrir: %s\n" @@ -2290,77 +2290,77 @@ msgstr "gere assinatura PGP" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pesquise o pacote ao qual pertence" -#: lib/psm.c:679 +#: lib/psm.c:681 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "no execute nenhum estgio" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "no foi passado pacote para instalao" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" # , c-format -#: lib/psm.c:1417 +#: lib/psm.c:1419 #, fuzzy msgid "Unable to reload signature header\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "Construo falhou.\n" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "Construo falhou.\n" @@ -2417,8 +2417,8 @@ msgstr "no foi passado pacote para instalao" msgid "can't query %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "Construo falhou.\n" @@ -2432,7 +2432,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, fuzzy, c-format msgid "%s: not a package manifest: %s\n" msgstr "no foram passados pacotes para assinatura" @@ -2503,7 +2503,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "no foi passado pacote para instalao" @@ -2613,28 +2613,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "no foi passado pacote para instalao" @@ -2700,15 +2700,32 @@ msgstr "No consegui abrir: %s\n" msgid "relocating directory %s to %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 #, fuzzy msgid "Preparing packages for installation..." msgstr "no foi passado pacote para instalao" +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +#, fuzzy +msgid "Upgrading packages..." +msgstr "instale pacote" + # "Project-Id-Version: rpm-2.5.3\n" # "PO-Revision-Date: 1997-09-11 14:00 MET DST\n" # "Last-Translator: Arnaldo Carvalho de Melo \n" @@ -2717,89 +2734,89 @@ msgstr "no foi passado pacote para instalao" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:368 #, fuzzy, c-format msgid "Retrieving %s\n" msgstr "RPM verso %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "no foi passado pacote para instalao" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "no foi passado pacote para instalao" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "lista dependncias do pacote" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 #, fuzzy msgid "installing binary packages\n" msgstr "instale pacote" # , c-format -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" # , c-format -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1080 -#, fuzzy, c-format -msgid "rollback %d packages to %s" -msgstr "no foi passado pacote para desinstalao" +#: lib/rpminstall.c:1148 +#, c-format +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" +msgstr "" # , c-format #: lib/rpmlead.c:53 @@ -3206,7 +3223,7 @@ msgstr "RPM verso %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3219,7 +3236,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3227,21 +3244,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -3314,22 +3324,22 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3448,154 +3458,154 @@ msgstr "No consegui abrir: %s\n" msgid "cannot open %s index\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" # , c-format -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "no foi passado pacote para desinstalao" # , c-format -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "no foi passado pacote para instalao" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, 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:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, 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:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, 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:3744 #, 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:3773 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" @@ -3608,13 +3618,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:3851 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "RPM verso %s\n" # , c-format -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "No consegui abrir: %s\n" @@ -3893,6 +3903,10 @@ msgstr "No consegui abrir: %s\n" msgid "%s: read manifest failed: %s\n" msgstr "No consegui abrir: %s\n" +#, fuzzy +#~ msgid "rollback %d packages to %s" +#~ msgstr "no foi passado pacote para desinstalao" + # , c-format #, fuzzy #~ msgid "h#%7u: %s" diff --git a/po/ro.po b/po/ro.po index 1df524f..19c38d1 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -403,192 +403,192 @@ msgstr "" msgid "syntax error in expression\n" msgstr "" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1641 +#: build/files.c:1645 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1781 +#: build/files.c:1785 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2584 +#: build/files.c:2590 #, c-format msgid "Finding %s: %s\n" msgstr "" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2764 +#: build/files.c:2772 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -727,7 +727,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:629 lib/psm.c:1404 +#: build/pack.c:629 lib/psm.c:1406 #, 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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1460,17 +1460,17 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "" @@ -2037,73 +2037,73 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:679 +#: lib/psm.c:681 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2156,8 +2156,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2171,7 +2171,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, c-format msgid "%s: not a package manifest: %s\n" msgstr "" @@ -2240,7 +2240,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2341,28 +2341,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2401,92 +2401,108 @@ msgstr "" msgid "relocating directory %s to %s\n" msgstr "" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +msgid "Upgrading packages..." +msgstr "" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -2866,7 +2882,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2879,7 +2895,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2887,21 +2903,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -2974,22 +2983,22 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3102,153 +3111,153 @@ msgstr "" msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 74bf2b8..b900139 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -409,192 +409,192 @@ msgstr "" msgid "syntax error in expression\n" msgstr "" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1641 +#: build/files.c:1645 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1781 +#: build/files.c:1785 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2584 +#: build/files.c:2590 #, c-format msgid "Finding %s: %s\n" msgstr "" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2764 +#: build/files.c:2772 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -733,7 +733,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:629 lib/psm.c:1404 +#: build/pack.c:629 lib/psm.c:1406 #, 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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1466,17 +1466,17 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "" @@ -2043,73 +2043,73 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:679 +#: lib/psm.c:681 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2162,8 +2162,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2177,7 +2177,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, c-format msgid "%s: not a package manifest: %s\n" msgstr "" @@ -2246,7 +2246,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2347,28 +2347,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2407,92 +2407,108 @@ msgstr "" msgid "relocating directory %s to %s\n" msgstr "" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +msgid "Upgrading packages..." +msgstr "" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -2872,7 +2888,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2885,7 +2901,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2893,21 +2909,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -2980,22 +2989,22 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3108,153 +3117,153 @@ msgstr "" msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 2259595..cd50f85 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: 2002-04-09 16:44-0400\n" "Last-Translator: Eugene Kanter, \n" "Language-Team: Black Cat Linux Team \n" @@ -429,192 +429,192 @@ msgstr "&& msgid "syntax error in expression\n" msgstr "ÓÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ × ×ÙÒÁÖÅÎÉÉ\n" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "ïÛÉÂËÁ TIMECHECK: %s\n" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "ïÔÓÕÔÓÔ×ÕÅÔ '(' × %s %s\n" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ')' × %s(%s\n" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "îÅ×ÅÒÎÙÊ ÔÏËÅÎ %s: %s\n" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "ïÔÓÕÔÓÔ×ÕÅÔ %s × %s %s\n" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "îÅ ÐÒÏÂÅÌ ÓÌÅÄÕÅÔ ÐÏÓÌÅ %s(): %s\n" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "îÅ×ÅÒÎÙÊ ÓÉÎÔÁËÓÉÓ: %s(%s)\n" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "îÅ×ÅÒÎÙÅ ÐÒÁ×Á: %s(%s)\n" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "îÅ×ÅÒÎÙÅ ÐÒÁ×Á ÎÁ ËÁÔÁÌÏÇ %s(%s)\n" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "îÅÏÂÙÞÎÁÑ ÄÌÉÎÁ locale: \"%.*s\" × %%lang(%s)\n" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "äÕÂÌÉËÁÔ locale %.*s × %%lang(%s)\n" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "ìÉÍÉÔ ÄÌÑ %%docdir ÐÒÅ×ÙÛÅÎ\n" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "ôÏÌØËÏ ÏÄÉÎ ÁÒÇÕÍÅÎÔ ÄÌÑ %%docdir\n" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "ä×Á ÆÁÊÌÁ × ÏÄÎÏÊ ÓÔÒÏËÅ: %s\n" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "æÁÊÌ ÄÏÌÖÅÎ ÎÁÞÉÎÁÔØÓÑ Ó \"/\": %s\n" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "îÅÌØÚÑ ÓÍÅÛÉ×ÁÔØ ÓÐÅÃ. %%doc Ó ÄÒÕÇÉÍÉ ÆÏÒÍÁÍÉ: %s\n" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "æÁÊÌ ÕËÁÚÁÎ Ä×ÁÖÄÙ: %s\n" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "óÉÍ×ÏÌÉÞÅÓËÁÑ ÓÓÙÌËÁ ÕËÁÚÙ×ÁÅÔ ÎÁ BuildRoot: %s -> %s\n" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "æÁÊÌ ÎÅ ÓÏÏÔ×ÅÔÓÔÕÅÔ ÐÒÅÆÉËÓÕ (%s): %s\n" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s\n" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "îÅ×ÅÒÎÁÑ ÐÁÒÁ ×ÌÁÄÅÌÅÃ/ÇÒÕÐÐÁ: %s\n" -#: build/files.c:1641 +#: build/files.c:1645 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "æÁÊÌ%5d: %07o %s.%s\t %s\n" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "æÁÊÌ ÄÏÌÖÅÎ ÎÁÞÉÎÁÔØÓÑ Ó \"/\": %s\n" -#: build/files.c:1781 +#: build/files.c:1785 #, c-format msgid "Glob not permitted: %s\n" msgstr "Glob ÎÅ ÒÁÚÒÅÛÁÀÔÓÑ: %s\n" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s\n" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %%files %s: %s\n" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "ÓÔÒÏËÁ: %s\n" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "îÅ×ÅÒÎÙÊ ÆÁÊÌ %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ %s: %s\n" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "óÂÏÊ ×ÅÔ×ÌÅÎÉÑ %s: %s\n" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "%s ÎÅ ÕÄÁÌÏÓØ\n" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "ÚÁÐÉÓØ ×ÓÅÈ ÄÁÎÎÙÈ × %s ÎÅ ÕÄÁÌÁÓØ\n" -#: build/files.c:2584 +#: build/files.c:2590 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "ðÏÉÓË %s (ÉÓÐÏÌØÚÕÑ %s): ...\n" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %s:\n" -#: build/files.c:2764 +#: build/files.c:2772 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "ÒÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "ïÂÒÁÂÁÔÙ×ÁÀÔÓÑ ÆÁÊÌÙ: %s-%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:1404 +#: build/pack.c:629 lib/psm.c:1406 #, 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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "úÁÐÉÓÁÎ: %s\n" @@ -1511,17 +1511,17 @@ msgstr "========= msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "ËÁÔÁÌÏÇ %s ÓÏÚÄÁÎ Ó ÐÒÁ×ÁÍÉ ÄÏÓÔÕÐÁ %04o.\n" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "ÆÁÊÌ ÁÒÈÉ×Á %s ÎÅ ÎÁÊÄÅÎ × ÓÐÉÓËÅ ÆÁÊÌÏ× ÚÁÇÏÌÏ×ËÁ\n" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "%s ÓÏÈÒÁÎÅÎ ËÁË %s\n" @@ -2112,74 +2112,74 @@ msgstr " #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "ôÉÐ ÄÁÎÎÙÈ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉÞÎÙÊ ÐÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ\n" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ\n" -#: lib/psm.c:679 +#: lib/psm.c:681 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: ×ÙÐÏÌÎÑÅÔÓÑ ÓÃÅÎÁÒÉÊ %s (ÅÓÌÉ ÅÓÔØ)\n" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, waitpid() ×ÏÚ×ÒÁÔÉÌ %s\n" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, ËÏÄ ×ÏÚ×ÒÁÔÁ %d\n" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s ÓÏÄÅÒÖÉÔ %d ÆÁÊÌÏ×, test = %d\n" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ %s (%d), %s-%s-%s ÐÒÏÐÕÓËÁÅÔÓÑ\n" -#: lib/psm.c:1417 +#: lib/psm.c:1419 #, fuzzy msgid "Unable to reload signature header\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÚÁÇÒÕÚÉÔØ ÚÁÇÏÌÏ×ÏË ÐÏÄÐÉÓÉ.\n" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "ÐÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "ÒÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr " ÎÁ ÆÁÊÌÅ " -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, c-format msgid "%s failed: %s\n" msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n" @@ -2233,8 +2233,8 @@ msgstr " msgid "can't query %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÒÏÓÉÔØ %s: %s\n" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" @@ -2248,7 +2248,7 @@ msgstr " msgid "old format source packages cannot be queried\n" msgstr "ÚÁÐÒÏÓÙ Ë ÉÓÈÏÄÎÙÍ ÐÁËÅÔÁÍ × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, fuzzy, c-format msgid "%s: not a package manifest: %s\n" msgstr "ÎÉ ÏÄÉÎ ÐÁËÅÔ ÎÅ ÐÏÄÈÏÄÉÔ Ë %s: %s\n" @@ -2317,7 +2317,7 @@ msgstr " msgid "record %u could not be read\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÚÁÐÉÓØ %u\n" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" @@ -2420,15 +2420,15 @@ msgstr ")" msgid "OK" msgstr "ïë" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "îåT" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "äá" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2437,13 +2437,13 @@ msgstr "" "ÄÌÑ ÚÁ×ÉÓÉÍÏÓÔÉ \"B\" ÎÕÖÎÏ ÕËÁÚÁÔØ \"epoch\" (ÔÁË ÖÅ ËÁË ÄÌÑ \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "ÐÁËÅÔ %s ÓÏÄÅÒÖÉÔ ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÔÒÅÂÏ×ÁÎÉÑ: %s\n" @@ -2482,94 +2482,113 @@ msgstr " msgid "relocating directory %s to %s\n" msgstr "ÐÅÒÅÍÅÝÁÅÔÓÑ ËÁÔÁÌÏÇ %s × %s\n" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "ðÏÄÇÏÔÏ×ËÁ..." -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× ÄÌÑ ÕÓÔÁÎÏ×ËÉ..." -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +#, fuzzy +msgid "Repackaging..." +msgstr "ðÏÄÇÏÔÏ×ËÁ..." + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +#, fuzzy +msgid "Upgrading..." +msgstr "ðÏÄÇÏÔÏ×ËÁ..." + +#: lib/rpminstall.c:222 +#, fuzzy +msgid "Upgrading packages..." +msgstr "ÏÂÎÏ×ÉÔØ ÐÁËÅÔ(Ù)" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "úÁÇÒÕÖÁÅÔÓÑ %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr " ... ËÁË %s\n" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s ÐÒÏÐÕÓËÁÅÔÓÑ - ÏÛÉÂËÁ ÐÅÒÅÄÁÞÉ - %s\n" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "ÐÁËÅÔ %s - ÎÅ ÐÅÒÅÍÅÝÁÅÍÙÊ\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "ÄÌÑ ÆÁÊÌÁ %s ÎÅÏÂÈÏÄÉÍÁ ÂÏÌÅÅ ÎÏ×ÁÑ ×ÅÒÓÉÑ RPM\n" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÂÉÎÁÒÎÙÅ ÐÁËÅÔÙ\n" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s: %s\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s\n" -#: lib/rpminstall.c:1080 -#, fuzzy, c-format -msgid "rollback %d packages to %s" -msgstr "ÏÔËÁÔÉÔØ (+%d,-%d) ÐÁËÅÔÙ Ë %s" +#: lib/rpminstall.c:1148 +#, c-format +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" +msgstr "" #: lib/rpmlead.c:53 #, c-format @@ -2955,7 +2974,7 @@ msgstr " #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2968,7 +2987,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2976,21 +2995,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -3063,22 +3075,22 @@ msgstr " msgid "locked db index %s/%s\n" msgstr "ÚÁÂÌÏËÉÒÏ×ÁÎ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "ÎÅÏÐÏÚÎÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÂÁÚÙ ÄÁÎÎÙÈ: \"%s\" ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ\n" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "ÎÅ×ÅÒÎÏÅ ÞÉÓÌÏ×ÏÅ ÚÎÁÞÅÎÉÅ %s, ÐÒÏÐÕÝÅÎÏ\n" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s ÉÍÅÅÔ ÓÌÉÛËÏÍ ÍÁÌÕÀ ÉÌÉ ÓÌÉÛËÏÍ ÂÏÌØÛÕÀ ×ÅÌÉÞÉÎÕ long, ÐÒÏÐÕÝÅÎÏ\n" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3194,154 +3206,154 @@ msgstr " msgid "cannot open %s index\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s\n" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, fuzzy, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: ÐÏÌÕÞÅÎ ÐÏ×ÒÅÖÄÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË #%u, ÐÒÏÐÕÓËÁÅÔÓÑ.\n" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÚÁÇÏÌÏ×ÏË × 0x%x\n" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "ÏÛÉÂËÁ(%d) ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s\n" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "ÏÛÉÂËÁ(%d) ÒÅÚÅÒ×ÉÒÏ×ÁÎÉÑ ÐÁÍÑÔÉ ÄÌÑ ÏÂÒÁÚÁ ÎÏ×ÏÇÏ ÐÁËÅÔÁ\n" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ \"%s\" × ÉÎÄÅËÓ %s.\n" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ × ÉÎÄÅËÓ %s\n" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s ÐÏÓÌÅ ÕÓÐÅÛÎÏÇÏ ÚÁ×ÅÒÛÅÎÉÑ ÐÅÒÅÉÎÄÅËÁÃÉÉ ÂÁÚÙ × db3.\n" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÅÔÓÑ ÂÁÚÁ ÄÁÎÎÙÈ %s × %s\n" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÎÏ×ÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %u × ÂÁÚÅ ÄÁÎÎÙÈ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÅÔÓÑ.\n" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %u)\n" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÁÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÎÁ ÎÏ×ÕÀ!\n" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "ÆÁÊÌÙ × %s ÚÁÍÅÎÑÀÔÓÑ ÆÁÊÌÁÍÉ ÉÚ %s ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, c-format msgid "removing directory %s\n" msgstr "ÕÄÁÌÑÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n" @@ -3616,6 +3628,10 @@ msgid "%s: read manifest failed: %s\n" msgstr "%s: ÏÛÉÂËÁ ÞÔÅÎÉÑ ÓÐÉÓËÁ ÆÁÊÌÏ×: %s\n" #, fuzzy +#~ msgid "rollback %d packages to %s" +#~ msgstr "ÏÔËÁÔÉÔØ (+%d,-%d) ÐÁËÅÔÙ Ë %s" + +#, fuzzy #~ msgid "h#%7u: %s" #~ msgstr "%s: %s\n" diff --git a/po/sk.po b/po/sk.po index 469720f..cbe106c 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -436,192 +436,192 @@ msgstr "&& a || nie s msgid "syntax error in expression\n" msgstr "chyba syntaxe vo výraze" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "chyba PREKROÈENIA ÈASU: %s\n" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, fuzzy, c-format msgid "Missing '(' in %s %s\n" msgstr "chýbajúce %s\n" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, fuzzy, c-format msgid "Missing ')' in %s(%s\n" msgstr "chýbajúca ':' na %s:%d" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, fuzzy, c-format msgid "Invalid %s token: %s\n" msgstr "Chybný %s prvok: %s" -#: build/files.c:509 +#: build/files.c:511 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "chýbajúce %s\n" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, fuzzy, c-format msgid "Bad syntax: %s(%s)\n" msgstr "Chybná %s() syntax: %s" -#: build/files.c:614 +#: build/files.c:616 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "Chybná ¹pecifikácia práv %s(): %s" -#: build/files.c:626 +#: build/files.c:628 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "Chybná ¹pecifikácia práv adresára %s(): %s" -#: build/files.c:784 +#: build/files.c:786 #, fuzzy, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "Iba jeden záznam v %%lang(): %s" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, fuzzy, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "Iba jeden záznam v %%lang(): %s" -#: build/files.c:958 +#: build/files.c:960 #, fuzzy, c-format msgid "Hit limit for %%docdir\n" msgstr "Dosiahnutý limit pre %%docdir" -#: build/files.c:964 +#: build/files.c:966 #, fuzzy, c-format msgid "Only one arg for %%docdir\n" msgstr "Iba jeden argument pre %%docdir" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, fuzzy, c-format msgid "Two files on one line: %s\n" msgstr "Dva súbory na riadku: %s" -#: build/files.c:1007 +#: build/files.c:1009 #, fuzzy, c-format msgid "File must begin with \"/\": %s\n" msgstr "Súbory musia zaèína» znakom \"/\": %s" -#: build/files.c:1020 +#: build/files.c:1022 #, fuzzy, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "Nie je mo¾né mie¹a» ¹peciálne %%doc s inými formami: %s" -#: build/files.c:1172 +#: build/files.c:1174 #, fuzzy, c-format msgid "File listed twice: %s\n" msgstr "Súbor zadaný dvakrát: %s." -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Súbor nesúhlasí s prefixom (%s): %s." -#: build/files.c:1585 +#: build/files.c:1589 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Súbor nebol nájdený: %s" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Chybný vlastník/skupina: %s\n" -#: build/files.c:1641 +#: build/files.c:1645 #, 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:1758 +#: build/files.c:1762 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "Súbor potrebuje na zaèiatku \"/\": %s" -#: build/files.c:1781 +#: build/files.c:1785 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "riadok %d: V %s sú vy¾adované verzie: %s" -#: build/files.c:1796 +#: build/files.c:1800 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Súbor nebol nájdený: %s" -#: build/files.c:1860 +#: build/files.c:1864 #, 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:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "riadok: %s" -#: build/files.c:2258 +#: build/files.c:2262 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "súbor %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "Nie je mo¾né spusti» %s" -#: build/files.c:2338 +#: build/files.c:2342 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "Nie je mo¾né vytvori» proces %s" -#: build/files.c:2422 +#: build/files.c:2426 #, fuzzy, c-format msgid "%s failed\n" msgstr "%s zlyhalo" -#: build/files.c:2426 +#: build/files.c:2430 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "nepodarilo sa zapísa» v¹etky dáta do %s" -#: build/files.c:2584 +#: build/files.c:2590 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Zis»ujú sa po¾adované vlastnosti...\n" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "Nepodarilo sa zisti» poskytované vlastnosti" -#: build/files.c:2764 +#: build/files.c:2772 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "vyhµadáva sa balík %s\n" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Spracovávajú sa súbory: %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:1404 +#: build/pack.c:629 lib/psm.c:1406 #, 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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "Zapísané: %s\n" @@ -1528,17 +1528,17 @@ msgstr "" msgid "%10d %s\n" msgstr "riadok %d: %s" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "varovanie: %s uchovaný ako %s" @@ -2161,76 +2161,76 @@ msgstr "vytvori #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 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:440 +#: lib/psm.c:442 #, fuzzy msgid "source package expected, binary found\n" msgstr "oèakávaný zdrojový balík, nájdený binárny" -#: lib/psm.c:559 +#: lib/psm.c:561 #, fuzzy msgid "source package contains no .spec file\n" msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor" -#: lib/psm.c:679 +#: lib/psm.c:681 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n" -#: lib/psm.c:849 +#: lib/psm.c:851 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:856 +#: lib/psm.c:858 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, 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:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Nie je mo¾né preèíta» ikonu: %s" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ije sa root" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalenie archívu zlyhalo%s%s: %s" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr " pre súbor " -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s zlyhalo" @@ -2285,8 +2285,8 @@ msgstr "bal msgid "can't query %s: %s\n" msgstr "zmazanie %s zlyhalo: %s\n" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" @@ -2300,7 +2300,7 @@ msgstr "ot msgid "old format source packages cannot be queried\n" msgstr "nie je mo¾né pýta» sa zdrojových balíkov v starom formáte\n" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, fuzzy, c-format msgid "%s: not a package manifest: %s\n" msgstr "¾iadny z balíkov nespú¹»a %s\n" @@ -2370,7 +2370,7 @@ msgstr "po msgid "record %u could not be read\n" msgstr "záznam %d nie je mo¾né preèíta»\n" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "balík %s nie je nain¹talovaný\n" @@ -2473,29 +2473,29 @@ msgstr ")" msgid "OK" msgstr "V PORIADKU" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 #, fuzzy msgid "NO " msgstr "NIE JE V PORIADKU" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" @@ -2534,94 +2534,112 @@ msgstr "pres msgid "relocating directory %s to %s\n" msgstr "presúva sa %s do %s\n" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 #, fuzzy msgid "Preparing packages for installation..." msgstr "neboli zadané ¾iadne balíky pre in¹taláciu" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +#, fuzzy +msgid "Repackaging erased files..." +msgstr "balík neobsahuje ¾iadne súbory\n" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +#, fuzzy +msgid "Upgrading packages..." +msgstr " --upgrade " + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "Prená¹a sa %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "... ako %s\n" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s vynechané - prenos zlyhal - %s\n" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "chyba pri vytváraní doèasného súboru %s" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie je mo¾né nain¹talova»\n" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "nájdených %d zdrojových a %d binárnych balíkov\n" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "nevyrie¹ené závislosti:\n" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "in¹talujú sa binárne balíky\n" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie je mo¾né otvori» súbor %s: %s" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¹pecifikuje viac balíkov\n" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie je mo¾né otvori» %s\n" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "In¹taluje sa %s\n" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -3012,7 +3030,7 @@ msgstr "vytv #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3025,7 +3043,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3033,22 +3051,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -#, fuzzy -msgid "repackage about-to-be-erased packages\n" -msgstr "balík je verzie jedna!\n" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -3121,22 +3131,22 @@ msgstr "zdie msgid "locked db index %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3252,155 +3262,155 @@ msgstr "nie je mo msgid "cannot open %s index\n" msgstr "nie je mo¾né otvori» %s\n" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 #, fuzzy msgid "no dbpath has been set\n" msgstr "nebola nastavená ¾iadna dbpath" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, 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:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, 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:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, 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:2669 +#: rpmdb/rpmdb.c:2684 #, 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:2784 +#: rpmdb/rpmdb.c:2799 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuje sa index skupín\n" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuje sa index názvov\n" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, 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:2837 +#: rpmdb/rpmdb.c:2852 #, 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:2847 +#: rpmdb/rpmdb.c:2862 #, 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:2996 +#: rpmdb/rpmdb.c:3011 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "chyba pri hµadaní balíka %s\n" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, 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:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "nebola nastavená ¾iadna dbpath" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, 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:3716 #, 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:3722 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, 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:3744 #, 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:3773 #, 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:3813 #, 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:3831 #, 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:3839 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:3841 #, 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:3851 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nepodarilo sa odstráni» adresár %s: %s\n" @@ -3678,6 +3688,10 @@ msgid "%s: read manifest failed: %s\n" msgstr "%s: readLead zlyhalo\n" #, fuzzy +#~ msgid "repackage about-to-be-erased packages\n" +#~ msgstr "balík je verzie jedna!\n" + +#, fuzzy #~ msgid "h#%7u: %s" #~ msgstr "súbor %s: %s\n" @@ -5191,9 +5205,6 @@ msgstr "%s: readLead zlyhalo\n" #~ msgid "removing conflict index for %s\n" #~ msgstr "odstraòuje sa index kolízií pre %s\n" -#~ msgid "package has no files\n" -#~ msgstr "balík neobsahuje ¾iadne súbory\n" - #, fuzzy #~ msgid "cannot create %s" #~ msgstr "nie je mo¾né zapísa» do %s: " diff --git a/po/sl.po b/po/sl.po index 26537a3..1251856 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin , 2000. -# $Id: sl.po,v 1.300 2002/08/02 21:52:32 jbj Exp $ +# $Id: sl.po,v 1.301 2002/08/04 16:56:58 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -435,192 +435,192 @@ msgstr "&& in || nista podprta za nize" msgid "syntax error in expression\n" msgstr "napaka v sklanji izraza" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK neuspe¹en: %s\n" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, fuzzy, c-format msgid "Missing '(' in %s %s\n" msgstr "Manjkajoèi ,(` v %s %s" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, fuzzy, c-format msgid "Missing ')' in %s(%s\n" msgstr "Manjkajoèi ,)` v %s(%s" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, fuzzy, c-format msgid "Invalid %s token: %s\n" msgstr "Neveljaven ¾eton %s: %s" -#: build/files.c:509 +#: build/files.c:511 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "Manjkajoèi ,(` v %s %s" -#: build/files.c:566 +#: build/files.c:568 #, fuzzy, c-format msgid "Non-white space follows %s(): %s\n" msgstr "Neprazen znak sledi %s(): %s" -#: build/files.c:604 +#: build/files.c:606 #, fuzzy, c-format msgid "Bad syntax: %s(%s)\n" msgstr "Nepravilna skladnja: %s(%s)" -#: build/files.c:614 +#: build/files.c:616 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "Nepravilno doloèilo naèina: %s(%s)" -#: build/files.c:626 +#: build/files.c:628 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "Nepravilno doloèilo naèina imenika: %s(%s)" -#: build/files.c:784 +#: build/files.c:786 #, fuzzy, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "Nenavadna dol¾ina za locale: \"%.s\" pri %%lang(%s)" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, fuzzy, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "Podvojeni locale %.*s za %%lang(%s)" -#: build/files.c:958 +#: build/files.c:960 #, fuzzy, c-format msgid "Hit limit for %%docdir\n" msgstr "Dosegli smo omejitev za %%docdir" -#: build/files.c:964 +#: build/files.c:966 #, fuzzy, c-format msgid "Only one arg for %%docdir\n" msgstr "Za %%docdir je podan samo en argument" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, fuzzy, c-format msgid "Two files on one line: %s\n" msgstr "Dve datoteki v eni vrstici: %s" -#: build/files.c:1007 +#: build/files.c:1009 #, fuzzy, c-format msgid "File must begin with \"/\": %s\n" msgstr "Ime datoteke se mora zaèeti z \"/\": %s" -#: build/files.c:1020 +#: build/files.c:1022 #, fuzzy, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "Posebnih %%doc ni mo¾no me¹ati z ostalimi oblikami: %s" -#: build/files.c:1172 +#: build/files.c:1174 #, fuzzy, c-format msgid "File listed twice: %s\n" msgstr "Datoteka je navedena dvakrat: %s" -#: build/files.c:1316 +#: build/files.c:1318 #, fuzzy, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Simbolna povezava ka¾e na BuildRoot: %s -> %s" -#: build/files.c:1561 +#: build/files.c:1565 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Datoteka se ne ujema s predpono (%s): %s" -#: build/files.c:1585 +#: build/files.c:1589 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Datoteke ni mogoèe najti: %s" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Neobstojeè lastnik/skupina: %s\n" -#: build/files.c:1641 +#: build/files.c:1645 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Datoteka: %4d: %07o %s.%s\t %s\n" -#: build/files.c:1758 +#: build/files.c:1762 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "Datoteki manjka uvodni \"/\": %s" -#: build/files.c:1781 +#: build/files.c:1785 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "vrstica %d: Razlièica ni dovoljena: %s" -#: build/files.c:1796 +#: build/files.c:1800 #, 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:1860 +#: build/files.c:1864 #, 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:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "vrstica: %s" -#: build/files.c:2258 +#: build/files.c:2262 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "Po¹kodovana datoteka: %s: %s" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "Ni mo¾no izvesti %s: %s" -#: build/files.c:2338 +#: build/files.c:2342 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "Vejitev %s ni mo¾na: %s" -#: build/files.c:2422 +#: build/files.c:2426 #, fuzzy, c-format msgid "%s failed\n" msgstr "%s neuspe¹en" -#: build/files.c:2426 +#: build/files.c:2430 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "pisanje podatkov v %s je bilo neuspe¹no" -#: build/files.c:2584 +#: build/files.c:2590 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Iskanje %s: (z uporabo %s)...\n" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "Neuspe¹no iskanje %s:" -#: build/files.c:2764 +#: build/files.c:2772 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "i¹èemo paket %s\n" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Obdeloavnje datotek: %s-%s-%s\n" @@ -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:1404 +#: build/pack.c:629 lib/psm.c:1406 #, 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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1531,17 +1531,17 @@ msgstr "" msgid "%10d %s\n" msgstr "vrstica %d: %s" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "opozorilo: %s shranjen kot %s" @@ -2161,76 +2161,76 @@ msgstr "izdelava podpisa PGP/GPG" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 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:440 +#: lib/psm.c:442 #, fuzzy msgid "source package expected, binary found\n" msgstr "prièakovan je bil izvorni paket, najden binarni" -#: lib/psm.c:559 +#: lib/psm.c:561 #, fuzzy msgid "source package contains no .spec file\n" msgstr "izvorni paket ne vsebuje datoteke .spec" -#: lib/psm.c:679 +#: lib/psm.c:681 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n" -#: lib/psm.c:849 +#: lib/psm.c:851 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "skript se ni uspe¹no izvedel" -#: lib/psm.c:856 +#: lib/psm.c:858 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "skript se ni uspe¹no izvedel" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "paket: %s-%s-%s datoteke test = %d\n" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Ikone %s ni mo¾no prebrati: %s" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "uporabnik %s ne obstaja - uporabljam root" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s ne obstaja - uporabljam root" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, 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:1515 +#: lib/psm.c:1523 msgid " on file " msgstr " za datoteko " -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s neuspe¹en" @@ -2285,8 +2285,8 @@ msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id" msgid "can't query %s: %s\n" msgstr "ni mo¾no poizvedeti o %s: %s\n" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "odpiranje %s je bilo neuspe¹no: %s\n" @@ -2300,7 +2300,7 @@ msgstr "poizvedba po %s je bila neuspe msgid "old format source packages cannot be queried\n" msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, fuzzy, c-format msgid "%s: not a package manifest: %s\n" msgstr "noben paket ne pro¾i %s\n" @@ -2370,7 +2370,7 @@ msgstr " msgid "record %u could not be read\n" msgstr "zapisa %d ni mo¾no prebrati\n" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "paket %s ni name¹èen\n" @@ -2473,16 +2473,16 @@ msgstr ")" msgid "OK" msgstr "V REDU" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 #, fuzzy msgid "NO " msgstr "NI DOBRO" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2491,13 +2491,13 @@ msgstr "" "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" @@ -2536,94 +2536,112 @@ msgstr "premikanje %s v %s\n" msgid "relocating directory %s to %s\n" msgstr "premiokanje imenika %s v %s\n" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 #, fuzzy msgid "Preparing packages for installation..." msgstr "paketi za namestitev niso navedeni" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +#, fuzzy +msgid "Repackaging erased files..." +msgstr "paket ne vsebuje datotek\n" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +#, fuzzy +msgid "Upgrading packages..." +msgstr " --upgrade " + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "Prena¹anje %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr " ... kot %s\n" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "preskoèeno - %s - prenos neuspe¹en - %s\n" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "paketa %s ni mo¾no premakniti\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "napaka pri branju iz datoteke %s\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "datoteka %s zahteva novej¹o razlièico RPM\n" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s ni mo¾no namestiti\n" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "najdeno %d izvornih in %d binarnih paketov\n" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "neuspe¹ne soodvisnosti:\n" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "name¹èanje binarnih paketov\n" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "ni mo¾no odpreti datoteke %s: %s\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" doloèa veè paketov\n" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "ni mo¾no odpreti %s: %s\n" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "Name¹èanje %s\n" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -3015,7 +3033,7 @@ msgstr "izklju #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, 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:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3036,22 +3054,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -#, fuzzy -msgid "repackage about-to-be-erased packages\n" -msgstr "paket je paket razlièica ena!\n" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -3124,22 +3134,22 @@ msgstr "skupno" msgid "locked db index %s/%s\n" msgstr "zaklenjeno db kazalo %s/%s\n" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, fuzzy, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "dbiSetConfig: neprepoznana izbira db: \"%s\" prezrto\n" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s ima neveljavno ¹tevilèno vrednost, prezrto\n" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s ima preveliko ali premajhno dolgo (long) vrednost, prezrto\n" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3257,157 +3267,157 @@ msgstr "ni mo msgid "cannot open %s index\n" msgstr "ni mo¾no odpreti kazala %s:" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath ni nastavljena" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, 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:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "napaka(%d) pri pisanju zapisa %s v %s" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, 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:2669 +#: rpmdb/rpmdb.c:2684 #, 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:2784 +#: rpmdb/rpmdb.c:2799 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstranjevanje \"%s\" iz kazala %s.\n" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstranjevanje %d vnosov iz kazala %s\n" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, 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:2837 +#: rpmdb/rpmdb.c:2852 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "napaka(%d) pri pisanju zapisa %s v %s" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "napaka(%d) pri brisanju zapisa %s iz %s" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "napaka(%d) pri iskanju paketa %s\n" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "dodajanje \"%s\" v kazalo %s.\n" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "dodajanje %d vnosov v kazalo %s.\n" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, 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:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "dbpath ni nastavljena" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, 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:3716 #, 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:3722 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "odpiranje stare podatkovne zbirke\n" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, 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:3773 #, 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:3813 #, 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:3831 #, 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:3839 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:3841 #, 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:3851 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "odstranjevanje imenika: %s\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspe¹na odstranitev imenika %s: %s\n" @@ -3685,6 +3695,10 @@ msgid "%s: read manifest failed: %s\n" msgstr "%s: branje Fread je bilo neuspe¹no: %s\n" #, fuzzy +#~ msgid "repackage about-to-be-erased packages\n" +#~ msgstr "paket je paket razlièica ena!\n" + +#, fuzzy #~ msgid "h#%7u: %s" #~ msgstr "datoteka %s: %s\n" @@ -5316,9 +5330,6 @@ msgstr "%s: branje Fread je bilo neuspe #~ msgid "removing conflict index for %s\n" #~ msgstr "odstranjujemo seznam sporov za %s\n" -#~ msgid "package has no files\n" -#~ msgstr "paket ne vsebuje datotek\n" - #~ msgid "Unable to stat icon: %s" #~ msgstr "Podatki o ikoni niso dosegljivi: %s" diff --git a/po/sr.po b/po/sr.po index b5d7844..7a559dd 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -424,192 +424,192 @@ msgstr "" msgid "syntax error in expression\n" msgstr "oèekivan znak ? u izrazu" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, fuzzy, c-format msgid "Missing '(' in %s %s\n" msgstr "nedostaje { posle %" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, fuzzy, c-format msgid "Missing ')' in %s(%s\n" msgstr "nedostaje ':' na %s:%d" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, fuzzy, c-format msgid "Invalid %s token: %s\n" msgstr "pogre¹an broj paketa: %s\n" -#: build/files.c:509 +#: build/files.c:511 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "nedostaje { posle %" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, fuzzy, c-format msgid "Bad syntax: %s(%s)\n" msgstr "Neuspelo èitanje %s: %s." -#: build/files.c:614 +#: build/files.c:616 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "Neuspelo èitanje %s: %s." -#: build/files.c:626 +#: build/files.c:628 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "Neuspelo èitanje %s: %s." -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, fuzzy, c-format msgid "Two files on one line: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/files.c:1007 +#: build/files.c:1009 #, fuzzy, c-format msgid "File must begin with \"/\": %s\n" msgstr "preme¹tanja moraju poèeti znakom '/'" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1172 +#: build/files.c:1174 #, fuzzy, c-format msgid "File listed twice: %s\n" msgstr "Neuspelo èitanje %s: %s." -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Neuspelo èitanje %s: %s." -#: build/files.c:1585 +#: build/files.c:1589 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Datoteka nije pronaðena na serveru" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1641 +#: build/files.c:1645 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/files.c:1758 +#: build/files.c:1762 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "preme¹tanja moraju poèeti znakom '/'" -#: build/files.c:1781 +#: build/files.c:1785 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "paket %s nije naveden u %s" -#: build/files.c:1796 +#: build/files.c:1800 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Datoteka nije pronaðena na serveru" -#: build/files.c:1860 +#: build/files.c:1864 #, 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:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/files.c:2258 +#: build/files.c:2262 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "neuspelo otvaranje %s: %s" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "Ne mogu da izvr¹im PGP" -#: build/files.c:2338 +#: build/files.c:2342 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "Ne mogu da proèitam 'sigtarget'" -#: build/files.c:2422 +#: build/files.c:2426 #, fuzzy, c-format msgid "%s failed\n" msgstr "PGP omanuo" -#: build/files.c:2426 +#: build/files.c:2430 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "neuspelo kreiranje %s\n" -#: build/files.c:2584 +#: build/files.c:2590 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "neuspelo kreiranje %s\n" -#: build/files.c:2764 +#: build/files.c:2772 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "gre¹ka potrage za paketom %s\n" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "neuspelo otvaranje %s: %s" @@ -752,7 +752,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:1404 +#: build/pack.c:629 lib/psm.c:1406 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ne mogu da upi¹em %s" @@ -782,7 +782,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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1516,17 +1516,17 @@ msgstr "" msgid "%10d %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "Ne mogu da otvorim datoteku %s: " @@ -2152,75 +2152,75 @@ msgstr "napravi PGP potpis" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 #, fuzzy msgid "source package contains no .spec file\n" msgstr "upit nad paketom koji ima " -#: lib/psm.c:679 +#: lib/psm.c:681 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/psm.c:849 +#: lib/psm.c:851 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "neuspelo izvr¹avanje skripta" -#: lib/psm.c:856 +#: lib/psm.c:858 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "neuspelo izvr¹avanje skripta" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, 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:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Ne mogu da upi¹em %s" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "PGP omanuo" @@ -2276,8 +2276,8 @@ msgstr "paket nema imena" msgid "can't query %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" @@ -2291,7 +2291,7 @@ msgstr "upit nad %s neuspeo\n" msgid "old format source packages cannot be queried\n" msgstr "Upit se ne mo¾e izvesti nad izvorni paketima u starom formatu\n" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, fuzzy, c-format msgid "%s: not a package manifest: %s\n" msgstr "nijedan paket ne aktivira %s\n" @@ -2361,7 +2361,7 @@ msgstr "pogre msgid "record %u could not be read\n" msgstr "ne mogu da proèitam slog %d\n" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" @@ -2465,28 +2465,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s nije naveden u %s" @@ -2525,96 +2525,113 @@ msgstr "gre msgid "relocating directory %s to %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 #, fuzzy msgid "Preparing packages for installation..." msgstr "nedostaje paket za instalaciju" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +#, fuzzy +msgid "Upgrading packages..." +msgstr "instaliraj paket" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "Pribavljam %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "paket %s nije instaliran\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "gre¹ka: %s se ne mo¾e instalirati\n" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "lo¹e meðuzavisnosti:\n" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 #, fuzzy msgid "installing binary packages\n" msgstr "instaliraj paket" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" odreðuje vi¹e paketa\n" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "Instaliram %s\n" -#: lib/rpminstall.c:1080 -#, fuzzy, c-format -msgid "rollback %d packages to %s" -msgstr "neodstaje paket za deinstalaciju" +#: lib/rpminstall.c:1148 +#, c-format +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" +msgstr "" #: lib/rpmlead.c:53 #, fuzzy, c-format @@ -3005,7 +3022,7 @@ msgstr "gre #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -3018,7 +3035,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3026,21 +3043,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -3113,22 +3123,22 @@ msgstr "deljeno" msgid "locked db index %s/%s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3245,154 +3255,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:947 +#: rpmdb/rpmdb.c:960 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath nije odreðen" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, 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:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, 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:2669 +#: rpmdb/rpmdb.c:2684 #, 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:2784 +#: rpmdb/rpmdb.c:2799 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, 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:2837 +#: rpmdb/rpmdb.c:2852 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "gre¹ka kod potrage za paketom %s\n" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, 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:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "dbpath nije odreðen" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, 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:3716 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "privremena baza podataka %s veæ postoji" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, 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:3744 #, 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:3773 #, 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:3813 #, 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:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspelo otvaranje %s: %s" @@ -3677,6 +3687,10 @@ msgid "%s: read manifest failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" #, fuzzy +#~ msgid "rollback %d packages to %s" +#~ msgstr "neodstaje paket za deinstalaciju" + +#, fuzzy #~ msgid "h#%7u: %s" #~ msgstr "neuspelo otvaranje %s: %s" diff --git a/po/sv.po b/po/sv.po index 371c5ba..3581149 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.1\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: 2002-07-11 22:49+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -418,192 +418,192 @@ msgstr "&& och || st msgid "syntax error in expression\n" msgstr "syntaxfel i uttryck\n" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK-fel: %s\n" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "Saknad \"(\" i %s %s\n" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "Saknad \")\" i %s(%s\n" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "Ogiltig %s token: %s\n" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "Saknad %s i %s %s\n" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "Annat än blanktecken följer på %s(): %s\n" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "Felaktig syntax: %s(%s)\n" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "Felaktig rättighetsspecifikation: %s(%s)\n" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "Felaktig specifikation av katalogrättigheter: %s(%s)\n" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "Ovanlig lokallängd: \"%.*s\" i %%lang(%s)\n" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "Duplicerad lokal %.*s i %%lang(%s)\n" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "Slog i gränsen för %%docdir\n" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "Endast ett argument till %%docdir\n" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "Två filer på en rad: %s\n" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "Filnamn måste börja med \"/\": %s\n" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "Kan inte blanda special %%doc med andra former: %s\n" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "Filen uppräknad två gånger: %s\n" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Symbolisk länk pekar på BuildRoot: %s -> %s\n" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Filen matchar inte prefixet (%s): %s\n" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "Filen hittades inte: %s\n" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Felaktig ägare/grupp: %s\n" -#: build/files.c:1641 +#: build/files.c:1645 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Fil%5d: %07o %s.%s\t %s\n" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "Filen behöver inledande \"/\": %s\n" -#: build/files.c:1781 +#: build/files.c:1785 #, c-format msgid "Glob not permitted: %s\n" msgstr "Matchning inte tillåtet: %s\n" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "Hittade ingen fil vid matchningen: %s\n" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Kunde inte öppna %%files-fil %s: %s\n" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "rad: %s\n" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "Felaktig fil: %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "Kunde inte köra %s: %s\n" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "Kunde inte grena %s: %s\n" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "%s misslyckades\n" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "kunde inte skriva all data till %s\n" -#: build/files.c:2584 +#: build/files.c:2590 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Letar upp %s: (använder %s)...\n" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "Misslyckades med att hitta %s:\n" -#: build/files.c:2764 +#: build/files.c:2772 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "uppackning av arkiv misslyckades%s%s: %s\n" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Bearbetar filer: %s-%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:1404 +#: build/pack.c:629 lib/psm.c:1406 #, 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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1486,17 +1486,17 @@ msgstr "========== Kataloger ej uttryckligen inkluderade i paketet:\n" msgid "%10d %s\n" msgstr "%10d %s\n" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "katalog %s skapad med rättigheter %04o.\n" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, 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:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "%s sparades som %s\n" @@ -2074,75 +2074,75 @@ msgstr "generera signatur" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 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:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "källpaket förväntades, fann binärpaket\n" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "källpaket innehåller ingen .spec-fil\n" -#: lib/psm.c:679 +#: lib/psm.c:681 #, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kör %s-skript\n" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" "körning av %s-skript från %s-%s-%s misslyckades, waitpid returnerade %s\n" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "körning av %s-skript från %s-%s-%s misslyckades, slutstatus %d\n" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s har %d filer, test = %d\n" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: %s-skript misslyckades (%d), hoppar över %s\n" -#: lib/psm.c:1417 +#: lib/psm.c:1419 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Kan inte läsa om signaturhuvud.\n" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "användare %s finns inte - använder root\n" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "grupp %s finns inte - använder root\n" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "uppackning av arkiv misslyckades%s%s: %s\n" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr " vid fil " -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s misslyckades på fil %s: %s\n" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, c-format msgid "%s failed: %s\n" msgstr "%s misslyckades: %s\n" @@ -2195,8 +2195,8 @@ msgstr "paketet har varken fil msgid "can't query %s: %s\n" msgstr "kan inte fråga %s: %s\n" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "misslyckades med att öppna %s: %s\n" @@ -2210,7 +2210,7 @@ msgstr "fr msgid "old format source packages cannot be queried\n" msgstr "källpaket i gammalt format går inte att fråga om\n" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, c-format msgid "%s: not a package manifest: %s\n" msgstr "%s: inte en paketlastspecifikation: %s\n" @@ -2279,7 +2279,7 @@ msgstr "paketpost nummer: %u\n" msgid "record %u could not be read\n" msgstr "post %u kunde inte läsas\n" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" @@ -2380,15 +2380,15 @@ msgstr ")" msgid "OK" msgstr "OK" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "NEJ " -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "JA" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2397,13 +2397,13 @@ msgstr "" "\"B\"-beroendet behöver en epok (antar samma som \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s har ouppfyllda %s: %s\n" @@ -2442,93 +2442,112 @@ msgstr "flyttar %s till %s\n" msgid "relocating directory %s to %s\n" msgstr "flyttar katalogen %s till %s\n" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "Förbereder..." -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "Förbereder paket för installation ..." -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +#, fuzzy +msgid "Repackaging..." +msgstr "Förbereder..." + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +#, fuzzy +msgid "Upgrading..." +msgstr "Förbereder..." + +#: lib/rpminstall.c:222 +#, fuzzy +msgid "Upgrading packages..." +msgstr "uppgradera paket" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "Hämtar %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr " ... som %s\n" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "hoppar över %s - överföring misslyckades - %s\n" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "paket %s är inte relokerbart\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "fel vid läsning från fil %s\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "filen %s behöver en nyare version av RPM\n" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s kan inte installeras\n" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "hittade %d käll- och %d binärpaket\n" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "Ouppfyllda beroenden:\n" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr " Föreslagna lösningar:\n" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "installerar binärpaket\n" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "kan inte öppna filen %s: %s\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" anger flera paket\n" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "Installerar %s\n" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" -msgstr "återställer %d paket till %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" +msgstr "" #: lib/rpmlead.c:53 #, c-format @@ -2909,7 +2928,7 @@ msgstr "hoppar #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2922,7 +2941,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2930,21 +2949,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -3017,22 +3029,22 @@ msgstr "delat" msgid "locked db index %s/%s\n" msgstr "låste db-index %s/%s\n" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "okänd db-flagga: \"%s\" ignorerad\n" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s har ogiltigt ogiltigt numeriskt värde, hoppar över\n" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s har för stort eller för litet \"long\"-värde, hoppar över\n" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s har för stort eller för litet heltalsvärde, hoppar över\n" @@ -3145,153 +3157,153 @@ msgstr "kan inte msgid "cannot open %s index\n" msgstr "kan inte öppna %s-indexet\n" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "ingen dbpath har satts\n" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, 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:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, 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:2330 +#: rpmdb/rpmdb.c:2345 #, fuzzy, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: skadad huvudinstans #%u hämtad, hoppar över.\n" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, 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:2669 +#: rpmdb/rpmdb.c:2684 #, 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:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "tar bort \"%s\" från %s-indexet.\n" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "tar bort %d poster från %s-indexet.\n" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, 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:2837 +#: rpmdb/rpmdb.c:2852 #, 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:2847 +#: rpmdb/rpmdb.c:2862 #, 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:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "fel(%d) vid allokering av ny paketinstans\n" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "lägger till \"%s\" till %s-indexet.\n" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "lägger till %d poster till %s-indexet.\n" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, 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:3642 #, 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:3680 msgid "no dbpath has been set" msgstr "ingen dbpath har satts" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "bygger om databas %s till %s\n" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "tillfällig databas %s existerar redan\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "skapar katalog %s\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "skapar katalog %s: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, 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:3744 #, 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:3773 #, 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:3813 #, 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:3831 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:3839 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:3841 #, 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:3851 #, c-format msgid "removing directory %s\n" msgstr "tar bort katalog %s\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunde inte ta bort katalogen %s: %s\n" @@ -3562,6 +3574,9 @@ msgstr "%s: cacheoperation misslyckades: ec %d.\n" msgid "%s: read manifest failed: %s\n" msgstr "%s: läsning av paketlista misslyckades: %s\n" +#~ msgid "rollback %d packages to %s" +#~ msgstr "återställer %d paket till %s" + #, fuzzy #~ msgid "h#%7u: %s" #~ msgstr "%s: %s\n" diff --git a/po/tr.po b/po/tr.po index bc19d80..47072da 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -428,192 +428,192 @@ msgstr "&& ve || dizgelerde desteklenmez\n" msgid "syntax error in expression\n" msgstr "ifadede sözdizimi hatasý\n" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK baþarýsýz: %s\n" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "%s içinde '(' yok: %s\n" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "%s içinde ')' yok: (%s\n" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "Andaç %s geçersiz: %s\n" -#: build/files.c:509 +#: build/files.c:511 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "%s içinde '(' yok: %s\n" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "%s() boþluksuz yazýlmýþ: %s\n" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "Sözdizimi hatasý: %s(%s)\n" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "mode spec hatalý: %s(%s)\n" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "dirmode spec hatalý: %s(%s)\n" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "yerel uzunluðu hatalý: \"%.*s\" (%%lang(%s))\n" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "%.*s yereli %%lang(%s) içinde tekrarlanmýþ\n" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "%%docdir için hit sýnýrý\n" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "%%docdir için sadece tek argüman\n" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "Bir satýrda 2 dosya: %s\n" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "Dosya \"/\" ile baþlamalý: %s\n" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "Özel %%doc ile diðer formlar karýþtýrýlamaz: %s\n" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "Dosya iki kere gösterildi: %s\n" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Sembolik bað BuildRoot gösteriyor: %s -> %s\n" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Dosya önek (%s) ile uyumsuz: %s\n" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "Dosya bulunamadý: %s\n" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Kullanýcý/grup hatalý: %s\n" -#: build/files.c:1641 +#: build/files.c:1645 #, fuzzy, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "Dosya %4d: %07o %s.%s\t %s\n" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "Dosya \"/\" ile içermeli: %s\n" -#: build/files.c:1781 +#: build/files.c:1785 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "satýr %d: Dosya adý uygun deðil: %s\n" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "Dosya glob tarafýndan bulunamadý: %s\n" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "%%files dosya %s dosyasýnda açýlamadý: %s\n" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "satýr: %s\n" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "Dosya hatalý: %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "%s icra edilemedi: %s\n" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "%s ayrýlamadý: %s\n" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "%s baþarýsýz\n" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "tüm veri %s içine yazýlamadý\n" -#: build/files.c:2584 +#: build/files.c:2590 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "%s aranýyor: (%s kullanarak)...\n" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "%s bulunamadý:\n" -#: build/files.c:2764 +#: build/files.c:2772 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "arþiv paketi açýlýrken baþarýsýz%s%s: %s\n" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Ýþlenen dosyalar: %s-%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:1404 +#: build/pack.c:629 lib/psm.c:1406 #, 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:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "Yazýldý: %s\n" @@ -1519,17 +1519,17 @@ msgstr "========= Pakette bulunmayan dizinler:\n" msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "%s dizin %04o izinleriyle oluþturuldu.\n" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "%s %s olarak kaydedildi\n" @@ -2127,74 +2127,74 @@ msgstr "imza #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 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:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "kaynak paketi gerekirken çalýþtýrýlabilir paketi bulundu\n" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "kaynak paketi .spec dosyasý içermiyor\n" -#: lib/psm.c:679 +#: lib/psm.c:681 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s betiði çalýþtýrýlýyor (varsa)\n" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "%s betiðinin %s-%s-%s'den icrasý baþarýsýz, waitpid sonucu %s\n" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "%s betiðinin %s-%s-%s'den icrasý baþarýsýz, çýkýþta durum %d\n" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, 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:1307 +#: lib/psm.c:1309 #, 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:1417 +#: lib/psm.c:1419 #, fuzzy msgid "Unable to reload signature header\n" msgstr "%s'den baþlýk okunamadý: %s\n" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "kullanýcý %s yok - root kullanýlacak\n" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "grup %s yok - root kullanýlacak\n" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, 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:1515 +#: lib/psm.c:1523 msgid " on file " msgstr " dosyada " -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s baþarýsýz\n" @@ -2248,8 +2248,8 @@ msgstr "paket ne dosya sahibi ne de kimlik listesi i msgid "can't query %s: %s\n" msgstr "%s sorgulanamýyor: %s\n" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "%s açýlamadý: %s\n" @@ -2263,7 +2263,7 @@ msgstr "%s 'nin sorgulamas msgid "old format source packages cannot be queried\n" msgstr "eski biçem kaynak paketleri sorgulanamaz\n" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, fuzzy, c-format msgid "%s: not a package manifest: %s\n" msgstr "%s tetikleyen paket yok\n" @@ -2332,7 +2332,7 @@ msgstr "paket kay msgid "record %u could not be read\n" msgstr "%u. kayýt okunamadý\n" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "%s paketi kurulu deðil\n" @@ -2435,15 +2435,15 @@ msgstr ")" msgid "OK" msgstr "Tamam" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "HAYIR " -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "EVET" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2452,13 +2452,13 @@ msgstr "" "\"B\" baðýmlýlýðý bir dönemsellik gerektirir (tabii ki \"A\" da)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s-%s-%s gereksinimi tatmin edici deðil: %s\n" @@ -2497,93 +2497,112 @@ msgstr "%s %s'e konumlan msgid "relocating directory %s to %s\n" msgstr "%s dizini %s de yeniden konumlanýyor\n" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "Hazýrlanýyor..." -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "Kurulacak paketler hazýrlanýyor..." -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +#, fuzzy +msgid "Repackaging..." +msgstr "Hazýrlanýyor..." + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +#, fuzzy +msgid "Upgrading..." +msgstr "Hazýrlanýyor..." + +#: lib/rpminstall.c:222 +#, fuzzy +msgid "Upgrading packages..." +msgstr "paket günceller" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "%s alýnýyor\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "... %s olarak\n" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s atlanýyor - aktarým baþarýsýz - %s\n" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "%s paketi yeniden konumlandýrýlamaz\n" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "%s dosyasýndan okuma hatalý\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "%s dosyasý RPM'nin daha yeni bir sürümünü gerektiriyor\n" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s yüklenemedi\n" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "baðýmlýlýklarda hata; gerekli paketler:\n" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "icra edilebilir paketleri kuruluyor\n" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "%s dosyasý açýlamadý: %s\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" birden fazla paketi tanýmlýyor\n" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "%s kuruluyor\n" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -2968,7 +2987,7 @@ msgstr "%s dizini d #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, 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:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2989,21 +3008,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -3076,22 +3088,22 @@ msgstr "payla msgid "locked db index %s/%s\n" msgstr "kilitli db endeks %s/%s\n" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "tanýnmayan db seçeneði: \"%s\" yoksayýldý\n" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s geçersiz sayýsal deðer içeriyor, atlandý\n" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s ya çok büyük ya da çok küçük 'long' deðer içeriyor, atlandý\n" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s ya çok büyük ya da çok küçük 'integer' deðer içeriyor, atlandý\n" @@ -3204,155 +3216,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:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "belirtilmiþ bir dbpath deðeri yok\n" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, 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:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, 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:2330 +#: rpmdb/rpmdb.c:2345 #, 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:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%x de baþlýk okunamadý\n" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, 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:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "\"%s\" %s indeksinden siliniyor.\n" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "%d girdi %s indeksinden siliniyor.\n" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, 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:2837 +#: rpmdb/rpmdb.c:2852 #, 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:2847 +#: rpmdb/rpmdb.c:2862 #, 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:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "yeni paket örneðini tutma hatasý(%d)\n" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "\"%s\" %s indeksine ekleniyor.\n" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "%d girdi %s indeksine ekleniyor.\n" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, 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:3642 #, 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:3680 msgid "no dbpath has been set" msgstr "belirtilmiþ bir dbpath yok" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, 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:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "geçici veritabaný %s zaten mevcut\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "%s dizini oluþturuluyor\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "%s dizini oluþturuluyor: %s\n" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, 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:3744 #, 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:3773 #, 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:3813 #, 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:3831 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:3839 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:3841 #, 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:3851 #, c-format msgid "removing directory %s\n" msgstr "%s dizini siliniyor\n" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s dizininin silinmesi baþarýsýz: %s\n" diff --git a/po/uk.po b/po/uk.po index 3f58eca..7ce339f 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -408,192 +408,192 @@ msgstr "" msgid "syntax error in expression\n" msgstr "" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1641 +#: build/files.c:1645 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1781 +#: build/files.c:1785 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2584 +#: build/files.c:2590 #, c-format msgid "Finding %s: %s\n" msgstr "" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2764 +#: build/files.c:2772 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -732,7 +732,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:629 lib/psm.c:1404 +#: build/pack.c:629 lib/psm.c:1406 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -762,7 +762,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:710 lib/psm.c:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1465,17 +1465,17 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "" @@ -2042,73 +2042,73 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:679 +#: lib/psm.c:681 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2161,8 +2161,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2176,7 +2176,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, c-format msgid "%s: not a package manifest: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2346,28 +2346,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2406,92 +2406,108 @@ msgstr "" msgid "relocating directory %s to %s\n" msgstr "" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +msgid "Upgrading packages..." +msgstr "" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -2871,7 +2887,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2884,7 +2900,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2892,21 +2908,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -2979,22 +2988,22 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3107,153 +3116,153 @@ msgstr "" msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/wa.po b/po/wa.po index 3f58eca..7ce339f 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -408,192 +408,192 @@ msgstr "" msgid "syntax error in expression\n" msgstr "" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1641 +#: build/files.c:1645 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1781 +#: build/files.c:1785 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2584 +#: build/files.c:2590 #, c-format msgid "Finding %s: %s\n" msgstr "" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2764 +#: build/files.c:2772 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -732,7 +732,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:629 lib/psm.c:1404 +#: build/pack.c:629 lib/psm.c:1406 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -762,7 +762,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:710 lib/psm.c:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1465,17 +1465,17 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "" @@ -2042,73 +2042,73 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:679 +#: lib/psm.c:681 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2161,8 +2161,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2176,7 +2176,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, c-format msgid "%s: not a package manifest: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2346,28 +2346,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2406,92 +2406,108 @@ msgstr "" msgid "relocating directory %s to %s\n" msgstr "" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +msgid "Upgrading packages..." +msgstr "" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -2871,7 +2887,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2884,7 +2900,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2892,21 +2908,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -2979,22 +2988,22 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3107,153 +3116,153 @@ msgstr "" msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/zh.po b/po/zh.po index 3f58eca..7ce339f 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -408,192 +408,192 @@ msgstr "" msgid "syntax error in expression\n" msgstr "" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1641 +#: build/files.c:1645 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1781 +#: build/files.c:1785 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2584 +#: build/files.c:2590 #, c-format msgid "Finding %s: %s\n" msgstr "" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2764 +#: build/files.c:2772 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -732,7 +732,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:629 lib/psm.c:1404 +#: build/pack.c:629 lib/psm.c:1406 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -762,7 +762,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:710 lib/psm.c:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1465,17 +1465,17 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "" @@ -2042,73 +2042,73 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:679 +#: lib/psm.c:681 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2161,8 +2161,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2176,7 +2176,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, c-format msgid "%s: not a package manifest: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2346,28 +2346,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2406,92 +2406,108 @@ msgstr "" msgid "relocating directory %s to %s\n" msgstr "" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +msgid "Upgrading packages..." +msgstr "" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -2871,7 +2887,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2884,7 +2900,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2892,21 +2908,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -2979,22 +2988,22 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3107,153 +3116,153 @@ msgstr "" msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 3f58eca..7ce339f 100644 --- a/po/zh_CN.GB2312.po +++ b/po/zh_CN.GB2312.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-02 17:50-0400\n" +"POT-Creation-Date: 2002-08-04 11:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -408,192 +408,192 @@ msgstr "" msgid "syntax error in expression\n" msgstr "" -#: build/files.c:286 +#: build/files.c:288 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:350 build/files.c:550 build/files.c:746 +#: build/files.c:352 build/files.c:552 build/files.c:748 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:361 build/files.c:680 build/files.c:757 +#: build/files.c:363 build/files.c:682 build/files.c:759 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" -#: build/files.c:399 build/files.c:705 +#: build/files.c:401 build/files.c:707 #, c-format msgid "Invalid %s token: %s\n" msgstr "" -#: build/files.c:509 +#: build/files.c:511 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:566 +#: build/files.c:568 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:604 +#: build/files.c:606 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:614 +#: build/files.c:616 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:626 +#: build/files.c:628 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:784 +#: build/files.c:786 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:795 +#: build/files.c:797 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:958 +#: build/files.c:960 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:964 +#: build/files.c:966 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:992 +#: build/files.c:994 #, c-format msgid "Two files on one line: %s\n" msgstr "" -#: build/files.c:1007 +#: build/files.c:1009 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:1020 +#: build/files.c:1022 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1172 +#: build/files.c:1174 #, c-format msgid "File listed twice: %s\n" msgstr "" -#: build/files.c:1316 +#: build/files.c:1318 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1561 +#: build/files.c:1565 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1585 +#: build/files.c:1589 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1628 build/files.c:2270 build/parsePrep.c:50 +#: build/files.c:1632 build/files.c:2274 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1641 +#: build/files.c:1645 #, c-format msgid "File%5d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1758 +#: build/files.c:1762 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1781 +#: build/files.c:1785 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1796 +#: build/files.c:1800 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1860 +#: build/files.c:1864 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1871 build/pack.c:156 +#: build/files.c:1875 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2258 +#: build/files.c:2262 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2333 +#: build/files.c:2337 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2338 +#: build/files.c:2342 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2422 +#: build/files.c:2426 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2426 +#: build/files.c:2430 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2584 +#: build/files.c:2590 #, c-format msgid "Finding %s: %s\n" msgstr "" -#: build/files.c:2614 build/files.c:2628 +#: build/files.c:2620 build/files.c:2634 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2764 +#: build/files.c:2772 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "" -#: build/files.c:2782 +#: build/files.c:2790 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2809 +#: build/files.c:2820 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -732,7 +732,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:629 lib/psm.c:1404 +#: build/pack.c:629 lib/psm.c:1406 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -762,7 +762,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:710 lib/psm.c:1702 +#: build/pack.c:710 lib/psm.c:1712 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1465,17 +1465,17 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1242 +#: lib/fsm.c:1235 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1537 +#: lib/fsm.c:1533 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1664 lib/fsm.c:1796 +#: lib/fsm.c:1660 lib/fsm.c:1796 #, c-format msgid "%s saved as %s\n" msgstr "" @@ -2042,73 +2042,73 @@ msgstr "" #. @=boundsread@ #. @-modfilesys@ -#: lib/psm.c:244 rpmdb/header.c:386 rpmdb/header_internal.c:164 +#: lib/psm.c:246 rpmdb/header.c:386 rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/psm.c:440 +#: lib/psm.c:442 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:561 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:679 +#: lib/psm.c:681 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:849 +#: lib/psm.c:851 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:856 +#: lib/psm.c:858 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1185 +#: lib/psm.c:1187 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1307 +#: lib/psm.c:1309 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1417 +#: lib/psm.c:1419 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1463 +#: lib/psm.c:1465 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1472 +#: lib/psm.c:1474 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1514 +#: lib/psm.c:1522 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1515 +#: lib/psm.c:1523 msgid " on file " msgstr "" -#: lib/psm.c:1710 +#: lib/psm.c:1720 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1713 +#: lib/psm.c:1723 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2161,8 +2161,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499 -#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 +#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2176,7 +2176,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:512 +#: lib/query.c:609 lib/rpminstall.c:565 #, c-format msgid "%s: not a package manifest: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:680 +#: lib/query.c:907 lib/rpminstall.c:733 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2346,28 +2346,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "NO " msgstr "" -#: lib/rpmds.c:475 lib/rpmds.c:645 +#: lib/rpmds.c:477 lib/rpmds.c:647 msgid "YES" msgstr "" -#: lib/rpmds.c:611 +#: lib/rpmds.c:613 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:644 +#: lib/rpmds.c:646 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:668 +#: lib/rpmds.c:670 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2406,92 +2406,108 @@ msgstr "" msgid "relocating directory %s to %s\n" msgstr "" -#: lib/rpminstall.c:166 +#: lib/rpminstall.c:179 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:168 +#: lib/rpminstall.c:181 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:315 +#: lib/rpminstall.c:199 +msgid "Repackaging..." +msgstr "" + +#: lib/rpminstall.c:201 +msgid "Repackaging erased files..." +msgstr "" + +#: lib/rpminstall.c:220 +msgid "Upgrading..." +msgstr "" + +#: lib/rpminstall.c:222 +msgid "Upgrading packages..." +msgstr "" + +#: lib/rpminstall.c:368 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:328 +#: lib/rpminstall.c:381 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:332 +#: lib/rpminstall.c:385 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:423 +#: lib/rpminstall.c:476 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:473 +#: lib/rpminstall.c:526 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:532 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156 +#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:527 +#: lib/rpminstall.c:580 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086 +#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:548 tools/rpmgraph.c:208 +#: lib/rpminstall.c:601 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:578 +#: lib/rpminstall.c:631 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:602 +#: lib/rpminstall.c:655 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:736 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:742 +#: lib/rpminstall.c:795 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:748 +#: lib/rpminstall.c:801 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1080 +#: lib/rpminstall.c:1148 #, c-format -msgid "rollback %d packages to %s" +msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" #: lib/rpmlead.c:53 @@ -2871,7 +2887,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1022 +#: lib/transaction.c:1024 #, c-format msgid "sanity checking %d elments\n" msgstr "" @@ -2884,7 +2900,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1103 +#: lib/transaction.c:1105 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -2892,21 +2908,14 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1175 +#: lib/transaction.c:1180 msgid "computing file dispositions\n" msgstr "" #. =============================================== -#. * Save removed files before erasing. -#. -#: lib/transaction.c:1341 -msgid "repackage about-to-be-erased packages\n" -msgstr "" - -#. =============================================== #. * Install and remove packages. #. -#: lib/transaction.c:1371 +#: lib/transaction.c:1389 #, c-format msgid "install/erase %d elements\n" msgstr "" @@ -2979,22 +2988,22 @@ msgstr "" msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:324 +#: rpmdb/dbconfig.c:327 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:364 +#: rpmdb/dbconfig.c:367 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:373 +#: rpmdb/dbconfig.c:376 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:382 +#: rpmdb/dbconfig.c:385 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3107,153 +3116,153 @@ msgstr "" msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:947 +#: rpmdb/rpmdb.c:960 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410 -#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:1269 rpmdb/rpmdb.c:1402 rpmdb/rpmdb.c:1452 rpmdb/rpmdb.c:2425 +#: rpmdb/rpmdb.c:2533 rpmdb/rpmdb.c:3262 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050 +#: rpmdb/rpmdb.c:1695 rpmdb/rpmdb.c:2318 rpmdb/rpmdb.c:3065 msgid "rpmdb: skipping" msgstr "" -#: rpmdb/rpmdb.c:1690 +#: rpmdb/rpmdb.c:1705 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2330 +#: rpmdb/rpmdb.c:2345 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2606 +#: rpmdb/rpmdb.c:2621 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2669 +#: rpmdb/rpmdb.c:2684 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2784 +#: rpmdb/rpmdb.c:2799 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2803 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2816 +#: rpmdb/rpmdb.c:2831 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2837 +#: rpmdb/rpmdb.c:2852 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2847 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2996 +#: rpmdb/rpmdb.c:3011 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3222 +#: rpmdb/rpmdb.c:3237 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3241 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3281 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3627 +#: rpmdb/rpmdb.c:3642 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3665 +#: rpmdb/rpmdb.c:3680 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3697 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3701 +#: rpmdb/rpmdb.c:3716 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3724 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3716 +#: rpmdb/rpmdb.c:3731 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3729 +#: rpmdb/rpmdb.c:3744 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3758 +#: rpmdb/rpmdb.c:3773 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3798 +#: rpmdb/rpmdb.c:3813 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3816 +#: rpmdb/rpmdb.c:3831 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3839 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3826 +#: rpmdb/rpmdb.c:3841 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3851 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3838 +#: rpmdb/rpmdb.c:3853 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/python/rpmmodule.c b/python/rpmmodule.c index d7e47ce..54d38fb 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -581,6 +581,7 @@ void initrpm(void) REGISTER_ENUM(RPMPROB_FILTER_DISKSPACE); REGISTER_ENUM(RPMPROB_FILTER_DISKNODES); + REGISTER_ENUM(RPMCALLBACK_UNKNOWN); REGISTER_ENUM(RPMCALLBACK_INST_PROGRESS); REGISTER_ENUM(RPMCALLBACK_INST_START); REGISTER_ENUM(RPMCALLBACK_INST_OPEN_FILE); @@ -591,6 +592,9 @@ void initrpm(void) REGISTER_ENUM(RPMCALLBACK_UNINST_PROGRESS); REGISTER_ENUM(RPMCALLBACK_UNINST_START); REGISTER_ENUM(RPMCALLBACK_UNINST_STOP); + REGISTER_ENUM(RPMCALLBACK_REPACKAGE_PROGRESS); + REGISTER_ENUM(RPMCALLBACK_REPACKAGE_START); + REGISTER_ENUM(RPMCALLBACK_REPACKAGE_STOP); REGISTER_ENUM(RPMCALLBACK_UNPACK_ERROR); REGISTER_ENUM(RPMCALLBACK_CPIO_ERROR); diff --git a/python/rpmts-py.c b/python/rpmts-py.c index 65f53e6..2f63a12 100644 --- a/python/rpmts-py.c +++ b/python/rpmts-py.c @@ -11,6 +11,7 @@ #endif #include +#include #include "header-py.h" #include "rpmdb-py.h" diff --git a/rpm.spec.in b/rpm.spec.in index a2d602d..aaa13a1 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.67 +Release: 0.68 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Copyright: GPL @@ -517,6 +517,11 @@ fi %{__prefix}/include/popt.h %changelog +* Sun Aug 4 2002 Jeff Johnson 4.1-0.68 +- resurrect --rollback. +- renumber the callback types to be an orthogonal bit mask. +- provide repackage progress callbacks, compression is slow. + * Fri Aug 2 2002 Jeff Johnson 4.1-0.67 - fix: identify athlon with 3DNOWEXT as "athlon", not "i786" (#70539). - fix: repair --root with --verify (#70527). @@ -526,7 +531,6 @@ fi - enable iterator header blob checks for install/erase modes. - python: _vsflags_up2date macro to configure verify signature flags. - * Thu Aug 1 2002 Jeff Johnson 4.1-0.63 - add check-files to rpm-build manifest. - python: methods to disable all new features for benchmarking. diff --git a/rpmio/rpmmessages.h b/rpmio/rpmmessages.h index fe0d0c9..5bad9a6 100644 --- a/rpmio/rpmmessages.h +++ b/rpmio/rpmmessages.h @@ -36,20 +36,25 @@ typedef /*@abstract@*/ const void * fnpyKey; /*@=redef@*/ /** + * Bit(s) to identify progress callbacks. */ typedef enum rpmCallbackType_e { - RPMCALLBACK_INST_PROGRESS, - RPMCALLBACK_INST_START, - RPMCALLBACK_INST_OPEN_FILE, - RPMCALLBACK_INST_CLOSE_FILE, - RPMCALLBACK_TRANS_PROGRESS, - RPMCALLBACK_TRANS_START, - RPMCALLBACK_TRANS_STOP, - RPMCALLBACK_UNINST_PROGRESS, - RPMCALLBACK_UNINST_START, - RPMCALLBACK_UNINST_STOP, - RPMCALLBACK_UNPACK_ERROR, - RPMCALLBACK_CPIO_ERROR + RPMCALLBACK_UNKNOWN = 0, + RPMCALLBACK_INST_PROGRESS = (1 << 0), + RPMCALLBACK_INST_START = (1 << 1), + RPMCALLBACK_INST_OPEN_FILE = (1 << 2), + RPMCALLBACK_INST_CLOSE_FILE = (1 << 3), + RPMCALLBACK_TRANS_PROGRESS = (1 << 4), + RPMCALLBACK_TRANS_START = (1 << 5), + RPMCALLBACK_TRANS_STOP = (1 << 6), + RPMCALLBACK_UNINST_PROGRESS = (1 << 7), + RPMCALLBACK_UNINST_START = (1 << 8), + RPMCALLBACK_UNINST_STOP = (1 << 9), + RPMCALLBACK_REPACKAGE_PROGRESS = (1 << 10), + RPMCALLBACK_REPACKAGE_START = (1 << 11), + RPMCALLBACK_REPACKAGE_STOP = (1 << 12), + RPMCALLBACK_UNPACK_ERROR = (1 << 13), + RPMCALLBACK_CPIO_ERROR = (1 << 14) } rpmCallbackType; /** -- 2.7.4