summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Doxyfile.in2
-rw-r--r--lib/Makefile.am4
-rw-r--r--lib/depends.c215
-rw-r--r--lib/depends.h79
-rw-r--r--lib/psm.c13
-rw-r--r--lib/rpmte.c2
-rw-r--r--lib/rpmts.c223
-rw-r--r--lib/rpmts.h102
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/cs.po272
-rw-r--r--po/da.po272
-rw-r--r--po/de.po274
-rw-r--r--po/fi.po274
-rw-r--r--po/fr.po262
-rw-r--r--po/gl.po254
-rw-r--r--po/is.po258
-rw-r--r--po/ja.po274
-rw-r--r--po/ko.po272
-rw-r--r--po/no.po269
-rw-r--r--po/pl.po274
-rw-r--r--po/pt.po272
-rw-r--r--po/pt_BR.po276
-rw-r--r--po/ro.po254
-rw-r--r--po/rpm.pot254
-rw-r--r--po/ru.po272
-rw-r--r--po/sk.po274
-rw-r--r--po/sl.po276
-rw-r--r--po/sr.po274
-rw-r--r--po/sv.po272
-rw-r--r--po/tr.po272
-rw-r--r--popt/po/cs.po131
-rw-r--r--popt/po/da.po131
-rw-r--r--popt/po/de.po91
-rw-r--r--popt/po/es.po131
-rw-r--r--popt/po/eu_ES.po91
-rw-r--r--popt/po/fi.po91
-rw-r--r--popt/po/fr.po91
-rw-r--r--popt/po/gl.po131
-rw-r--r--popt/po/hu.po91
-rw-r--r--popt/po/id.po91
-rw-r--r--popt/po/is.po131
-rw-r--r--popt/po/it.po91
-rw-r--r--popt/po/ja.po91
-rw-r--r--popt/po/ko.po131
-rw-r--r--popt/po/no.po131
-rw-r--r--popt/po/pl.po91
-rw-r--r--popt/po/popt.pot91
-rw-r--r--popt/po/pt.po131
-rw-r--r--popt/po/pt_BR.po91
-rw-r--r--popt/po/ro.po106
-rw-r--r--popt/po/ru.po131
-rw-r--r--popt/po/sk.po91
-rw-r--r--popt/po/sl.po91
-rw-r--r--popt/po/sr.po91
-rw-r--r--popt/po/sv.po131
-rw-r--r--popt/po/tr.po131
-rw-r--r--popt/po/uk.po91
-rw-r--r--popt/po/wa.po91
-rw-r--r--popt/po/zh.po91
-rw-r--r--popt/po/zh_CN.GB2312.po91
60 files changed, 3813 insertions, 5664 deletions
diff --git a/Doxyfile.in b/Doxyfile.in
index a5a6bb003..07df067e6 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -385,6 +385,8 @@ INPUT = \
@top_srcdir@/lib/rpmrc.c \
@top_srcdir@/lib/rpmte.c \
@top_srcdir@/lib/rpmte.h \
+ @top_srcdir@/lib/rpmts.c \
+ @top_srcdir@/lib/rpmts.h \
@top_srcdir@/lib/rpmvercmp.c \
@top_srcdir@/lib/signature.c \
@top_srcdir@/lib/signature.h \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3d17c0e39..50a8a6f44 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -18,7 +18,7 @@ pkginc_HEADERS = \
misc.h rpmcli.h rpmlib.h stringbuf.h
noinst_HEADERS = \
cpio.h depends.h fsm.h manifest.h psm.h \
- rpmal.h rpmds.h rpmfi.h rpmlead.h rpmte.h signature.h
+ rpmal.h rpmds.h rpmfi.h rpmlead.h rpmte.h rpmts.h signature.h
mylibpaths = \
-L$(top_builddir)/lib \
@@ -35,7 +35,7 @@ librpm_la_SOURCES = \
manifest.c misc.c package.c \
problems.c poptI.c poptQV.c psm.c query.c \
rpmal.c rpmchecksig.c rpmds.c rpmfi.c rpminstall.c \
- rpmlead.c rpmlibprov.c rpmrc.c rpmte.c rpmvercmp.c \
+ rpmlead.c rpmlibprov.c rpmrc.c rpmte.c rpmts.c rpmvercmp.c \
signature.c stringbuf.c transaction.c \
verify.c
librpm_la_LDFLAGS = -release @VERSION@
diff --git a/lib/depends.c b/lib/depends.c
index 12b0d0265..eb7a232de 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -5,8 +5,8 @@
#include "system.h"
#include <rpmlib.h>
-#include <rpmmacro.h> /* XXX rpmtsOpenDB() needs rpmGetPath */
-#include <rpmpgp.h> /* XXX rpmtransFree() needs pgpFreeDig */
+
+#include <rpmmacro.h> /* XXX rpmExpand("%{_dependency_whiteout}" */
#define _NEED_TEITERATOR 1
#include "depends.h"
@@ -37,9 +37,6 @@ struct orderListIndex_s {
int _cacheDependsRC = 1;
/*@unchecked@*/
-int _ts_debug = 0;
-
-/*@unchecked@*/
static int _tso_debug = 0;
/*@observer@*/ /*@unchecked@*/
@@ -51,151 +48,6 @@ const char *rpmEVR = VERSION;
/*@unchecked@*/
int rpmFLAGS = RPMSENSE_EQUAL;
-rpmTransactionSet XrpmtsUnlink(rpmTransactionSet ts, const char * msg, const char * fn, unsigned ln)
-{
-/*@-modfilesystem@*/
-if (_ts_debug)
-fprintf(stderr, "--> ts %p -- %d %s at %s:%u\n", ts, ts->nrefs, msg, fn, ln);
-/*@=modfilesystem@*/
- ts->nrefs--;
- return NULL;
-}
-
-rpmTransactionSet XrpmtsLink(rpmTransactionSet ts, const char * msg, const char * fn, unsigned ln)
-{
- ts->nrefs++;
-/*@-modfilesystem@*/
-if (_ts_debug)
-fprintf(stderr, "--> ts %p ++ %d %s at %s:%u\n", ts, ts->nrefs, msg, fn, ln);
-/*@=modfilesystem@*/
- /*@-refcounttrans@*/ return ts; /*@=refcounttrans@*/
-}
-
-int rpmtsCloseDB(rpmTransactionSet ts)
-{
- int rc = 0;
-
- if (ts->rpmdb != NULL) {
- rc = rpmdbClose(ts->rpmdb);
- ts->rpmdb = NULL;
- }
- return rc;
-}
-
-int rpmtsOpenDB(rpmTransactionSet ts, int dbmode)
-{
- int rc = 0;
-
- if (ts->rpmdb != NULL && ts->dbmode == dbmode)
- return 0;
-
- (void) rpmtsCloseDB(ts);
-
- /* XXX there's a lock race here. */
-
- ts->dbmode = dbmode;
- rc = rpmdbOpen(ts->rootDir, &ts->rpmdb, ts->dbmode, 0644);
- if (rc) {
- const char * dn;
- /*@-globs -mods@*/ /* FIX: rpmGlobalMacroContext for an error? shrug */
- dn = rpmGetPath(ts->rootDir, "%{_dbpath}", NULL);
- /*@=globs =mods@*/
- rpmMessage(RPMMESS_ERROR,
- _("cannot open Packages database in %s\n"), dn);
- dn = _free(dn);
- }
- return rc;
-}
-
-rpmdbMatchIterator rpmtsInitIterator(const rpmTransactionSet ts, int rpmtag,
- const void * keyp, size_t keylen)
-{
- return rpmdbInitIterator(ts->rpmdb, rpmtag, keyp, keylen);
-}
-
-char * hGetNEVR(Header h, const char ** np)
-{
- const char * n, * v, * r;
- char * NVR, * t;
-
- (void) headerNVR(h, &n, &v, &r);
- NVR = t = xcalloc(1, strlen(n) + strlen(v) + strlen(r) + sizeof("--"));
- t = stpcpy(t, n);
- t = stpcpy(t, "-");
- t = stpcpy(t, v);
- t = stpcpy(t, "-");
- t = stpcpy(t, r);
- if (np)
- *np = n;
- return NVR;
-}
-
-rpmTransactionSet rpmtransCreateSet(rpmdb db, const char * rootDir)
-{
- rpmTransactionSet ts;
- int rootLen;
-
- /*@-branchstate@*/
- if (!rootDir) rootDir = "";
- /*@=branchstate@*/
-
- ts = xcalloc(1, sizeof(*ts));
- ts->filesystemCount = 0;
- ts->filesystems = NULL;
- ts->di = NULL;
- if (db != NULL) {
- ts->rpmdb = rpmdbLink(db, "tsCreate");
- /*@-type@*/ /* FIX: silly wrapper */
- ts->dbmode = db->db_mode;
- /*@=type@*/
- } else {
- ts->rpmdb = NULL;
- ts->dbmode = O_RDONLY;
- }
- ts->scriptFd = NULL;
- ts->id = (int_32) time(NULL);
- ts->delta = 5;
-
- ts->numRemovedPackages = 0;
- ts->allocedRemovedPackages = ts->delta;
- ts->removedPackages = xcalloc(ts->allocedRemovedPackages,
- sizeof(*ts->removedPackages));
-
- /* This canonicalizes the root */
- rootLen = strlen(rootDir);
- if (!(rootLen && rootDir[rootLen - 1] == '/')) {
- char * t;
-
- t = alloca(rootLen + 2);
- *t = '\0';
- (void) stpcpy( stpcpy(t, rootDir), "/");
- rootDir = t;
- }
-
- ts->rootDir = (rootDir != NULL ? xstrdup(rootDir) : xstrdup(""));
- ts->currDir = NULL;
- ts->chrootDone = 0;
-
- ts->numAddedPackages = 0;
- ts->addedPackages = alCreate(ts->delta);
-
- ts->numAvailablePackages = 0;
- ts->availablePackages = alCreate(ts->delta);
-
- ts->orderAlloced = ts->delta;
- ts->orderCount = 0;
-/*@-type -abstract@*/
- ts->order = xcalloc(ts->orderAlloced, sizeof(*ts->order));
-/*@=type =abstract@*/
-
- ts->sig = NULL;
- ts->dig = NULL;
-
- ts->nrefs = 0;
-
- return rpmtsLink(ts, "tsCreate");
-}
-
/**
* Compare removed package instances (qsort/bsearch).
* @param a 1st instance address
@@ -461,63 +313,6 @@ int rpmtransRemovePackage(rpmTransactionSet ts, Header h, int dboffset)
return removePackage(ts, h, dboffset, RPMAL_NOMATCH);
}
-/*@-nullstate@*/ /* FIX: better annotations */
-void rpmtransClean(rpmTransactionSet ts)
-{
- if (ts) {
- HFD_t hfd = headerFreeData;
- if (ts->sig != NULL)
- ts->sig = hfd(ts->sig, ts->sigtype);
- if (ts->dig != NULL)
- ts->dig = pgpFreeDig(ts->dig);
- }
-}
-
-rpmTransactionSet rpmtransFree(rpmTransactionSet ts)
-{
- if (ts) {
- teIterator pi; transactionElement p;
- int oc;
-
- (void) rpmtsUnlink(ts, "tsCreate");
-
- /*@-usereleased@*/
- if (ts->nrefs > 0)
- return NULL;
-
- for (pi = teInitIterator(ts), oc = 0; (p = teNextIterator(pi)) != NULL; oc++) {
-/*@-type -unqualifiedtrans @*/
- ts->order[oc] = teFree(ts->order[oc]);
-/*@=type =unqualifiedtrans @*/
- }
- pi = teFreeIterator(pi);
-/*@-type +voidabstract @*/
- ts->order = _free(ts->order);
-/*@=type =voidabstract @*/
-
- ts->addedPackages = alFree(ts->addedPackages);
- ts->availablePackages = alFree(ts->availablePackages);
- ts->di = _free(ts->di);
- ts->removedPackages = _free(ts->removedPackages);
- if (ts->scriptFd != NULL) {
- ts->scriptFd =
- fdFree(ts->scriptFd, "rpmtransSetScriptFd (rpmtransFree");
- ts->scriptFd = NULL;
- }
- ts->rootDir = _free(ts->rootDir);
- ts->currDir = _free(ts->currDir);
-
- rpmtransClean(ts);
-
- (void) rpmtsCloseDB(ts);
-
- /*@-refcounttrans@*/ ts = _free(ts); /*@=refcounttrans@*/
- /*@=usereleased@*/
- }
- return NULL;
-}
-/*@=nullstate@*/
-
/**
* Check key for an unsatisfied dependency.
* @todo Eliminate rpmrc provides.
@@ -882,8 +677,10 @@ static int checkDependentConflicts(rpmTransactionSet ts, const char * key)
}
struct badDeps_s {
-/*@observer@*/ /*@owned@*/ /*@null@*/ const char * pname;
-/*@observer@*/ /*@dependent@*/ /*@null@*/ const char * qname;
+/*@observer@*/ /*@owned@*/ /*@null@*/
+ const char * pname;
+/*@observer@*/ /*@dependent@*/ /*@null@*/
+ const char * qname;
};
#ifdef DYING
diff --git a/lib/depends.h b/lib/depends.h
index 94a657525..87b58fb3e 100644
--- a/lib/depends.h
+++ b/lib/depends.h
@@ -18,86 +18,12 @@
extern int _cacheDependsRC;
/*@=exportlocal@*/
-/*@unchecked@*/
-/*@-exportlocal@*/
-extern int _ts_debug;
-/*@=exportlocal@*/
-
-/** \ingroup rpmdep
- * The set of packages to be installed/removed atomically.
- */
-struct rpmTransactionSet_s {
- rpmtransFlags transFlags; /*!< Bit(s) to control operation. */
-/*@observer@*/ /*@null@*/
- rpmCallbackFunction notify; /*!< Callback function. */
-/*@observer@*/ /*@null@*/
- rpmCallbackData notifyData; /*!< Callback private data. */
-/*@refcounted@*/ /*@null@*/
- rpmProblemSet probs; /*!< Current problems in transaction. */
- rpmprobFilterFlags ignoreSet;
- /*!< Bits to filter current problems. */
-
- int filesystemCount; /*!< No. of mounted filesystems. */
-/*@dependent@*/
- const char ** filesystems; /*!< Mounted filesystem names. */
-/*@only@*/
- struct diskspaceInfo * di; /*!< Per filesystem disk/inode usage. */
-
- int dbmode; /*!< Database open mode. */
-/*@refcounted@*/ /*@null@*/
- rpmdb rpmdb; /*!< Database handle. */
-/*@only@*/
- hashTable ht; /*!< Fingerprint hash table. */
-
-/*@only@*/ /*@null@*/
- int * removedPackages; /*!< Set of packages being removed. */
- int numRemovedPackages; /*!< No. removed package instances. */
- int allocedRemovedPackages; /*!< Size of removed packages array. */
-
-/*@only@*/
- availableList addedPackages;/*!< Set of packages being installed. */
- int numAddedPackages; /*!< No. added package instances. */
-
-/*@only@*/
- availableList availablePackages;
- /*!< Universe of available packages. */
- int numAvailablePackages; /*!< No. available package instances. */
-
-/*@owned@*/
- transactionElement * order; /*!< Packages sorted by dependencies. */
- int orderCount; /*!< No. of transaction elements. */
- int orderAlloced; /*!< No. of allocated transaction elements. */
-
- int chrootDone; /*!< Has chroot(2) been been done? */
-/*@only@*/
- const char * rootDir; /*!< Path to top of install tree. */
-/*@only@*/
- const char * currDir; /*!< Current working directory. */
-/*@null@*/
- FD_t scriptFd; /*!< Scriptlet stdout/stderr. */
- int delta; /*!< Delta for reallocation. */
- int_32 id; /*!< Transaction id. */
-
- int verify_legacy; /*!< Verify legacy signatures? */
- int nodigests; /*!< Verify digests? */
- int nosignatures; /*!< Verify signatures? */
-
-/*@observer@*/ /*@dependent@*/ /*@null@*/
- const char * fn; /*!< Current package fn. */
- int_32 sigtag; /*!< Current package signature tag. */
- int_32 sigtype; /*!< Current package signature data type. */
-/*@null@*/ const void * sig; /*!< Current package signature. */
- int_32 siglen; /*!< Current package signature length. */
-/*@null@*/
- struct pgpDig_s * dig; /*!< Current signature/pubkey parametrs. */
-
-/*@refs@*/ int nrefs; /*!< Reference count. */
-
-};
+#include "rpmts.h"
/* XXX FIXME: rpmTransactionSet not opaque */
#include "rpmte.h"
+#ifdef DYING
#ifdef __cplusplus
extern "C" {
#endif
@@ -114,5 +40,6 @@ extern "C" {
#ifdef __cplusplus
}
#endif
+#endif
#endif /* H_DEPENDS */
diff --git a/lib/psm.c b/lib/psm.c
index ce13e67b5..859c05667 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -764,7 +764,7 @@ static int runScript(PSM_t psm, Header h,
xx = Fclose(fd);
{ const char * sn = fn;
- if (!ts->chrootDone &&
+ if (!ts->chrootDone && ts->rootDir != NULL &&
!(ts->rootDir[0] == '/' && ts->rootDir[1] == '\0'))
{
sn += strlen(ts->rootDir)-1;
@@ -1827,13 +1827,10 @@ assert(psm->mi == NULL);
rc = chroot(".");
/*@=superuser@*/
psm->chrootDone = ts->chrootDone = 0;
- if (ts->rpmdb != NULL) ts->rpmdb->db_chrootDone = 0;
-#ifdef DYING
- /*@-mods@*/
- chroot_prefix = NULL;
- /*@=mods@*/
-#endif
- xx = chdir(ts->currDir);
+ if (ts->rpmdb != NULL)
+ ts->rpmdb->db_chrootDone = 0;
+ if (ts->currDir != NULL) /* XXX can't happen */
+ xx = chdir(ts->currDir);
}
break;
case PSM_SCRIPT: /* Run current package scriptlets. */
diff --git a/lib/rpmte.c b/lib/rpmte.c
index de23243f3..7c3974370 100644
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -1,6 +1,6 @@
/** \ingroup rpmdep
* \file lib/rpmte.c
- * Routine to handle a transactionElement.
+ * Routine(s) to handle a transactionElement.
*/
#include "system.h"
diff --git a/lib/rpmts.c b/lib/rpmts.c
new file mode 100644
index 000000000..fbffec528
--- /dev/null
+++ b/lib/rpmts.c
@@ -0,0 +1,223 @@
+/** \ingroup rpmdep
+ * \file lib/rpmts.c
+ * Routine(s) to handle an rpmTransactionSet.
+ */
+#include "system.h"
+
+#include <rpmlib.h>
+#include <rpmmacro.h> /* XXX rpmtsOpenDB() needs rpmGetPath */
+#include <rpmpgp.h> /* XXX rpmtransFree() needs pgpFreeDig */
+
+#define _NEED_TEITERATOR 1
+#include "depends.h"
+
+#include "rpmdb.h" /* XXX stealing db->db_mode. */
+
+#include "debug.h"
+
+/*@access rpmTransactionSet @*/
+
+/*@unchecked@*/
+int _ts_debug = 0;
+
+rpmTransactionSet XrpmtsUnlink(rpmTransactionSet ts, const char * msg, const char * fn, unsigned ln)
+{
+/*@-modfilesystem@*/
+if (_ts_debug)
+fprintf(stderr, "--> ts %p -- %d %s at %s:%u\n", ts, ts->nrefs, msg, fn, ln);
+/*@=modfilesystem@*/
+ ts->nrefs--;
+ return NULL;
+}
+
+rpmTransactionSet XrpmtsLink(rpmTransactionSet ts, const char * msg, const char * fn, unsigned ln)
+{
+ ts->nrefs++;
+/*@-modfilesystem@*/
+if (_ts_debug)
+fprintf(stderr, "--> ts %p ++ %d %s at %s:%u\n", ts, ts->nrefs, msg, fn, ln);
+/*@=modfilesystem@*/
+ /*@-refcounttrans@*/ return ts; /*@=refcounttrans@*/
+}
+
+int rpmtsCloseDB(rpmTransactionSet ts)
+{
+ int rc = 0;
+
+ if (ts->rpmdb != NULL) {
+ rc = rpmdbClose(ts->rpmdb);
+ ts->rpmdb = NULL;
+ }
+ return rc;
+}
+
+int rpmtsOpenDB(rpmTransactionSet ts, int dbmode)
+{
+ int rc = 0;
+
+ if (ts->rpmdb != NULL && ts->dbmode == dbmode)
+ return 0;
+
+ (void) rpmtsCloseDB(ts);
+
+ /* XXX there's a lock race here. */
+
+ ts->dbmode = dbmode;
+ rc = rpmdbOpen(ts->rootDir, &ts->rpmdb, ts->dbmode, 0644);
+ if (rc) {
+ const char * dn;
+ /*@-globs -mods@*/ /* FIX: rpmGlobalMacroContext for an error? shrug */
+ dn = rpmGetPath(ts->rootDir, "%{_dbpath}", NULL);
+ /*@=globs =mods@*/
+ rpmMessage(RPMMESS_ERROR,
+ _("cannot open Packages database in %s\n"), dn);
+ dn = _free(dn);
+ }
+ return rc;
+}
+
+rpmdbMatchIterator rpmtsInitIterator(const rpmTransactionSet ts, int rpmtag,
+ const void * keyp, size_t keylen)
+{
+ return rpmdbInitIterator(ts->rpmdb, rpmtag, keyp, keylen);
+}
+
+char * hGetNEVR(Header h, const char ** np)
+{
+ const char * n, * v, * r;
+ char * NVR, * t;
+
+ (void) headerNVR(h, &n, &v, &r);
+ NVR = t = xcalloc(1, strlen(n) + strlen(v) + strlen(r) + sizeof("--"));
+ t = stpcpy(t, n);
+ t = stpcpy(t, "-");
+ t = stpcpy(t, v);
+ t = stpcpy(t, "-");
+ t = stpcpy(t, r);
+ if (np)
+ *np = n;
+ return NVR;
+}
+
+void rpmtransClean(rpmTransactionSet ts)
+{
+ if (ts) {
+ HFD_t hfd = headerFreeData;
+ if (ts->sig != NULL)
+ ts->sig = hfd(ts->sig, ts->sigtype);
+ if (ts->dig != NULL)
+ ts->dig = pgpFreeDig(ts->dig);
+ }
+}
+
+rpmTransactionSet rpmtransFree(rpmTransactionSet ts)
+{
+ if (ts) {
+ teIterator pi; transactionElement p;
+ int oc;
+
+ (void) rpmtsUnlink(ts, "tsCreate");
+
+ /*@-usereleased@*/
+ if (ts->nrefs > 0)
+ return NULL;
+
+ (void) rpmtsCloseDB(ts);
+
+ for (pi = teInitIterator(ts), oc = 0; (p = teNextIterator(pi)) != NULL; oc++) {
+/*@-type -unqualifiedtrans @*/
+ ts->order[oc] = teFree(ts->order[oc]);
+/*@=type =unqualifiedtrans @*/
+ }
+ pi = teFreeIterator(pi);
+/*@-type +voidabstract @*/ /* FIX: double indirection */
+ ts->order = _free(ts->order);
+/*@=type =voidabstract @*/
+
+ ts->addedPackages = alFree(ts->addedPackages);
+ ts->availablePackages = alFree(ts->availablePackages);
+ ts->di = _free(ts->di);
+ ts->removedPackages = _free(ts->removedPackages);
+ if (ts->scriptFd != NULL) {
+ ts->scriptFd =
+ fdFree(ts->scriptFd, "rpmtransSetScriptFd (rpmtransFree");
+ ts->scriptFd = NULL;
+ }
+ ts->rootDir = _free(ts->rootDir);
+ ts->currDir = _free(ts->currDir);
+
+/*@-nullstate@*/ /* FIX: partial annotations */
+ rpmtransClean(ts);
+/*@=nullstate@*/
+
+ /*@-refcounttrans@*/ ts = _free(ts); /*@=refcounttrans@*/
+ /*@=usereleased@*/
+ }
+ return NULL;
+}
+
+rpmTransactionSet rpmtransCreateSet(rpmdb db, const char * rootDir)
+{
+ rpmTransactionSet ts;
+ int rootLen;
+
+ /*@-branchstate@*/
+ if (!rootDir) rootDir = "";
+ /*@=branchstate@*/
+
+ ts = xcalloc(1, sizeof(*ts));
+ ts->filesystemCount = 0;
+ ts->filesystems = NULL;
+ ts->di = NULL;
+ if (db != NULL) {
+ ts->rpmdb = rpmdbLink(db, "tsCreate");
+ /*@-type@*/ /* FIX: silly wrapper */
+ ts->dbmode = db->db_mode;
+ /*@=type@*/
+ } else {
+ ts->rpmdb = NULL;
+ ts->dbmode = O_RDONLY;
+ }
+ ts->scriptFd = NULL;
+ ts->id = (int_32) time(NULL);
+ ts->delta = 5;
+
+ ts->numRemovedPackages = 0;
+ ts->allocedRemovedPackages = ts->delta;
+ ts->removedPackages = xcalloc(ts->allocedRemovedPackages,
+ sizeof(*ts->removedPackages));
+
+ /* This canonicalizes the root */
+ rootLen = strlen(rootDir);
+ if (!(rootLen && rootDir[rootLen - 1] == '/')) {
+ char * t;
+
+ t = alloca(rootLen + 2);
+ *t = '\0';
+ (void) stpcpy( stpcpy(t, rootDir), "/");
+ rootDir = t;
+ }
+
+ ts->rootDir = (rootDir != NULL ? xstrdup(rootDir) : xstrdup(""));
+ ts->currDir = NULL;
+ ts->chrootDone = 0;
+
+ ts->numAddedPackages = 0;
+ ts->addedPackages = alCreate(ts->delta);
+
+ ts->numAvailablePackages = 0;
+ ts->availablePackages = alCreate(ts->delta);
+
+ ts->orderAlloced = ts->delta;
+ ts->orderCount = 0;
+/*@-type -abstract@*/
+ ts->order = xcalloc(ts->orderAlloced, sizeof(*ts->order));
+/*@=type =abstract@*/
+
+ ts->sig = NULL;
+ ts->dig = NULL;
+
+ ts->nrefs = 0;
+
+ return rpmtsLink(ts, "tsCreate");
+}
diff --git a/lib/rpmts.h b/lib/rpmts.h
new file mode 100644
index 000000000..1b31e9b6a
--- /dev/null
+++ b/lib/rpmts.h
@@ -0,0 +1,102 @@
+#ifndef H_RPMTS
+#define H_RPMTS
+
+/** \ingroup rpmdep rpmtrans
+ * \file lib/rpmts.h
+ * Structures and prototypes used for an rpmTransactionSet
+ */
+
+/*@unchecked@*/
+/*@-exportlocal@*/
+extern int _ts_debug;
+/*@=exportlocal@*/
+
+/** \ingroup rpmdep
+ * The set of packages to be installed/removed atomically.
+ */
+struct rpmTransactionSet_s {
+ rpmtransFlags transFlags; /*!< Bit(s) to control operation. */
+/*@observer@*/ /*@null@*/
+ rpmCallbackFunction notify; /*!< Callback function. */
+/*@observer@*/ /*@null@*/
+ rpmCallbackData notifyData; /*!< Callback private data. */
+/*@refcounted@*/ /*@null@*/
+ rpmProblemSet probs; /*!< Current problems in transaction. */
+ rpmprobFilterFlags ignoreSet;
+ /*!< Bits to filter current problems. */
+
+ int filesystemCount; /*!< No. of mounted filesystems. */
+/*@dependent@*/
+ const char ** filesystems; /*!< Mounted filesystem names. */
+/*@only@*/
+ struct diskspaceInfo * di; /*!< Per filesystem disk/inode usage. */
+
+ int dbmode; /*!< Database open mode. */
+/*@refcounted@*/ /*@null@*/
+ rpmdb rpmdb; /*!< Database handle. */
+/*@only@*/
+ hashTable ht; /*!< Fingerprint hash table. */
+
+/*@only@*/ /*@null@*/
+ int * removedPackages; /*!< Set of packages being removed. */
+ int numRemovedPackages; /*!< No. removed package instances. */
+ int allocedRemovedPackages; /*!< Size of removed packages array. */
+
+/*@only@*/
+ availableList addedPackages;/*!< Set of packages being installed. */
+ int numAddedPackages; /*!< No. added package instances. */
+
+/*@only@*/
+ availableList availablePackages;
+ /*!< Universe of available packages. */
+ int numAvailablePackages; /*!< No. available package instances. */
+
+/*@owned@*/
+ transactionElement * order; /*!< Packages sorted by dependencies. */
+ int orderCount; /*!< No. of transaction elements. */
+ int orderAlloced; /*!< No. of allocated transaction elements. */
+
+ int chrootDone; /*!< Has chroot(2) been been done? */
+/*@only@*/ /*@null@*/
+ const char * rootDir; /*!< Path to top of install tree. */
+/*@only@*/ /*@null@*/
+ const char * currDir; /*!< Current working directory. */
+/*@null@*/
+ FD_t scriptFd; /*!< Scriptlet stdout/stderr. */
+ int delta; /*!< Delta for reallocation. */
+ int_32 id; /*!< Transaction id. */
+
+ int verify_legacy; /*!< Verify legacy signatures? */
+ int nodigests; /*!< Verify digests? */
+ int nosignatures; /*!< Verify signatures? */
+
+/*@observer@*/ /*@dependent@*/ /*@null@*/
+ const char * fn; /*!< Current package fn. */
+ int_32 sigtag; /*!< Current package signature tag. */
+ int_32 sigtype; /*!< Current package signature data type. */
+/*@null@*/ const void * sig; /*!< Current package signature. */
+ int_32 siglen; /*!< Current package signature length. */
+/*@null@*/
+ struct pgpDig_s * dig; /*!< Current signature/pubkey parametrs. */
+
+/*@refs@*/ int nrefs; /*!< Reference count. */
+
+};
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Return (malloc'd) header name-version-release string.
+ * @param h header
+ * @retval np name tag value
+ * @return name-version-release string
+ */
+/*@only@*/ char * hGetNEVR(Header h, /*@out@*/ const char ** np )
+ /*@modifies *np @*/;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_RPMTS */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c5399e5a7..d81ec1d57 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -44,6 +44,7 @@ lib/rpminstall.c
lib/rpmlead.c
lib/rpmrc.c
lib/rpmte.c
+lib/rpmts.c
lib/rpmvercmp.c
lib/signature.c
lib/stringbuf.c
diff --git a/po/cs.po b/po/cs.po
index 5cf6e0adb..868ef7963 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-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"PO-Revision-Date: 2001-07-24 10:02+0100\n"
"Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -113,7 +113,7 @@ msgstr "<pøík>"
msgid "use <dir> as the top level directory"
msgstr "pou¾ít <adr> jako adresáø nejvy¹¹í úrovnì"
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr "<adresáø>"
@@ -417,23 +417,23 @@ msgstr "pro sestavení nezadány ¾ádné tar soubory"
msgid "no packages given for erase"
msgstr "k podepsání nezadány ¾ádné balíèky"
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr "nezadány ¾ádné balíèky pro instalaci"
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr "k dotazu nezadány ¾ádné parametry"
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr "pro kontrolu nezadány ¾ádné balíèky"
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr "neoèekávané parametry pro --querytags "
-#: rpmqv.c:1140
+#: rpmqv.c:1137
#, fuzzy
msgid "no arguments given"
msgstr "k dotazu nezadány ¾ádné parametry"
@@ -1433,75 +1433,70 @@ msgstr ""
msgid " failed - "
msgstr "selhal - "
-#: lib/depends.c:104
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "nemohu otevøít databázi balíèkù v %s\n"
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "balíèek %s je ji¾ nainstalován"
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s ANO (rpmrc poskytuje)\n"
-#: lib/depends.c:609
+#: lib/depends.c:404
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s ANO (rpmlib poskytuje)\n"
-#: lib/depends.c:630
+#: lib/depends.c:425
#, fuzzy
msgid "(db files)"
msgstr "¹patný db soubor %s\n"
-#: lib/depends.c:642
+#: lib/depends.c:437
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s ANO (db poskytuje)\n"
-#: lib/depends.c:655
+#: lib/depends.c:450
#, fuzzy
msgid "(db package)"
msgstr "¾ádné balíèky\n"
-#: lib/depends.c:694
+#: lib/depends.c:489
#, fuzzy, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "NO "
msgstr "NE "
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr "ANO"
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n"
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr "========== ukládání tsort relací\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1509,20 +1504,20 @@ msgid ""
msgstr ""
"========== tsorting balíèkù (poøadí, #pøedchùdce, #následovník, hloubka)\n"
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n"
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr "SMYÈKA:\n"
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr "========== pokraèuje tsort ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1630,7 +1625,7 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "tato verze RPM podporuje práci s balíèky s verzí <= 4\n"
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead selhalo\n"
@@ -1640,27 +1635,27 @@ msgstr "%s: readLead selhalo\n"
msgid "%s: bad magic\n"
msgstr "©patné magické èíslo"
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature selhalo\n"
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Není dostupný ¾ádný podpis\n"
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead selhalo\n"
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread selhalo: %s\n"
@@ -1743,7 +1738,7 @@ msgstr "zkratka pro --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "aktualizace balíèku jestli¾e je ji¾ nainstalován"
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
msgid "<packagefile>+"
msgstr "<soubor_balíèku>+"
@@ -1803,31 +1798,41 @@ msgstr "nespou¹tìt ¾ádné skripty (jsou-li nìjaké)"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nespou¹tìt ¾ádné skripty (jsou-li nìjaké)"
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+#, fuzzy
+msgid "don't verify digest(s)"
+msgstr "nekontrolovat MD5 souborù v balíèku"
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify signature(s)"
+msgstr "nekontrolovat cesty symbolických linek"
+
+#: lib/poptI.c:192
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "nespou¹tìt ¾ádné skripty aktivované tímto balíèkem"
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nespou¹tìt ¾ádné skripty urèené pro balíèky"
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nespou¹tìt ¾ádné instalaèní skripty"
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nespou¹tìt ¾ádné instalaèní skripty"
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nespou¹tìt ¾ádné instalaèní skripty"
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1835,48 +1840,48 @@ msgstr ""
"aktualizovat na starou verzi balíèku (--force to dìlá pøi aktualizacích "
"automaticky)"
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr "bìhem instalace balíèku zobrazit procenta"
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr "pøemístit soubory do <adr>, jsou-li pøemístitelné"
-#: lib/poptI.c:212
+#: lib/poptI.c:217
msgid "relocate files from path <old> to <new>"
msgstr "pøemístit soubory ze <staré_cesty> do <nové_cesty>"
-#: lib/poptI.c:213
+#: lib/poptI.c:218
msgid "<old>=<new>"
msgstr "<stará_cesta>=<nová_cesta>"
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr "uchovat smazané soubory pomocí pøebalení"
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr "instalovat, i kdy¾ balíèek pøepí¹e existující soubory"
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr "pøeinstalovat, i kdy¾ je ji¾ balíèek pøítomen"
-#: lib/poptI.c:224
+#: lib/poptI.c:229
#, fuzzy
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr "odinstalovat nové balíèky, reinstalovat staré balíèky zpìt do data"
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr "<datum>"
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr "neinstalovat ale sdìlit, zda-li by to fungovalo èi nikoli"
-#: lib/poptI.c:230
+#: lib/poptI.c:235
msgid "upgrade package(s)"
msgstr "aktualizace balíèku"
@@ -1945,146 +1950,132 @@ msgstr "dotaz na balíèky aktivované balíèkem"
msgid "rpm verify mode"
msgstr "re¾im kontroly"
-#: lib/poptQV.c:126
-msgid "rpm verify mode (legacy)"
-msgstr "re¾im kontroly (zastaralý)"
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
msgid "query/verify the package(s) which require a dependency"
msgstr "dotaz/ovìøení balíèkù vy¾adujících závislost"
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
msgid "query/verify the package(s) which provide a dependency"
msgstr "dotaz/ovìøení balíèkù poskytujících závislost"
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
msgid "list all configuration files"
msgstr "vypsat v¹echny konfiguraèní soubory"
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
msgid "list all documentation files"
msgstr "vypsat v¹echny soubory s dokumentací"
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
msgid "dump basic file information"
msgstr "zobrazit základní informace o souborech"
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
msgid "list files in package"
msgstr "vypsat soubory v balíèku"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr "vynechat %%ghost soubory"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr "vynechat %%license soubory"
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, c-format
msgid "skip %%readme files"
msgstr "vynechat %%readme soubory"
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
msgid "use the following query format"
msgstr "pou¾ij následující formát dotazù"
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
msgid "substitute i18n sections into spec file"
msgstr "nahradit i18n sekce do spec souboru"
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr "zobrazit stav vypsaných souborù"
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
msgid "display a verbose file listing"
msgstr "zobrazit roz¹íøený výpis souborù"
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
msgid "don't verify MD5 digest of files"
msgstr "nekontrolovat MD5 souborù v balíèku"
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
msgid "don't verify size of files"
msgstr "nekontrolovat velikost souborù"
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
msgid "don't verify symlink path of files"
msgstr "nekontrolovat cesty symbolických linek"
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
msgid "don't verify owner of files"
msgstr "nekontrolovat vlastníka souborù"
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
msgid "don't verify group of files"
msgstr "nekontrolovat skupinu souborù"
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr "nekontrolovat èas zmìny souboru"
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
msgid "don't verify mode of files"
msgstr "nekontrolovat mód souborù"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
msgid "don't verify files in package"
msgstr "nekontrolovat soubory v balíèku"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
msgid "don't verify package dependencies"
msgstr "nekontrolovat závislosti balíèkù"
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "nespou¹tìt %verifyscript (pokud existuje)"
-#: lib/poptQV.c:275 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify digest(s)"
-msgstr "nekontrolovat MD5 souborù v balíèku"
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-#, fuzzy
-msgid "don't verify signature(s)"
-msgstr "nekontrolovat cesty symbolických linek"
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "nekontrolovat SHA1 digest v hlavièce"
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "nekontrolovat MD5 souborù v balíèku"
-#: lib/poptQV.c:301
+#: lib/poptQV.c:298
#, fuzzy
-msgid "sign a package, preserving digests"
+msgid "sign a packagei (identical to --resign)"
msgstr "podepsat balíèek (zahodit aktuální podpis)"
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
#, fuzzy
msgid "verify package signature(s)"
msgstr "ovìøit podpis v balíèku"
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
+#: lib/poptQV.c:304
#, fuzzy
-msgid "sign a package, recomputing digests"
+msgid "sign a packagei (identical to --addsign)"
msgstr "podepsat balíèek (zahodit aktuální podpis)"
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
msgid "generate signature"
msgstr "generovat PGP/GPG podpis"
@@ -2289,8 +2280,8 @@ msgstr "balíèek nemá vlastníka souboru ani seznamy id\n"
msgid "can't query %s: %s\n"
msgstr "nemohu provést dotaz %s: %s\n"
-#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, c-format
msgid "open of %s failed: %s\n"
msgstr "otevøení %s selhalo: %s\n"
@@ -2304,7 +2295,7 @@ msgstr "dotaz na %s se nezdaøil\n"
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:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "%s: Fread selhalo: %s\n"
@@ -2373,7 +2364,7 @@ msgstr "záznam balíèku èíslo: %u\n"
msgid "record %u could not be read\n"
msgstr "záznam %d nelze pøeèíst\n"
-#: lib/query.c:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr "balíèek %s není nainstalován\n"
@@ -2422,42 +2413,42 @@ msgstr "%s: writeLead selhalo: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature selhalo: %s\n"
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead selhalo\n"
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Není dostupný ¾ádný podpis (RPM v1.0)\n"
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr "NENÍ OK"
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
msgid " (MISSING KEYS:"
msgstr " (CHYBÍ KLÍÈ:"
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr " (NEDÙVÌRYHODNÝ KLÍÈ:"
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr "OK"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2466,13 +2457,13 @@ msgstr ""
"Závislost \"B\" potøebuje období (pøedpokládáno stejné jako \"A\")\n"
"\tA %s\tB %s\n"
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n"
@@ -2485,81 +2476,81 @@ msgstr "Pøipravuji..."
msgid "Preparing packages for installation..."
msgstr "Pøipravuji balíèky pro instalaci..."
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, c-format
msgid "Retrieving %s\n"
msgstr "Stahuji %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr " ... jako %s\n"
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "pøeskakuji %s - pøenos selhal - %s\n"
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, c-format
msgid "package %s is not relocateable\n"
msgstr "balíèek %s není pøemístitelný\n"
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, c-format
msgid "error reading from file %s\n"
msgstr "chyba pøi ètení ze souboru %s\n"
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "soubor %s vy¾aduje novìj¹í verzi RPM\n"
-#: lib/rpminstall.c:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nemù¾e být nainstalován\n"
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "nalezeno %d zdrojových a %d binárních balíèkù\n"
-#: lib/rpminstall.c:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr "nevyøe¹ené závislosti:\n"
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
msgid "installing binary packages\n"
msgstr "instaluji binární balíèky\n"
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "nemohu otevøít soubor %s: %s\n"
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" urèuje více balíèkù\n"
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr "odstranìní tìchto balíèkù by poru¹ilo závislosti:\n"
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, c-format
msgid "cannot open %s: %s\n"
msgstr "nemohu otevøít %s: %s\n"
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr "Instaluji %s\n"
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2664,6 +2655,11 @@ msgstr "Nemohu èíst %s, HOME je pøíli¹ velký.\n"
msgid "Unable to open %s for reading: %s.\n"
msgstr "Nemohu otevøít %s pro ètení: %s.\n"
+#: lib/rpmts.c:73
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "nemohu otevøít databázi balíèkù v %s\n"
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr "není obyèejný soubor -- pøeskakuji kontrolu velikosti\n"
@@ -3424,6 +3420,17 @@ msgstr "url port musí být èíslo\n"
msgid "failed to create %s: %s\n"
msgstr "nemohu vytvoøit %s: %s\n"
+#~ msgid "rpm verify mode (legacy)"
+#~ msgstr "re¾im kontroly (zastaralý)"
+
+#, fuzzy
+#~ msgid "sign a package, preserving digests"
+#~ msgstr "podepsat balíèek (zahodit aktuální podpis)"
+
+#, fuzzy
+#~ msgid "sign a package, recomputing digests"
+#~ msgstr "podepsat balíèek (zahodit aktuální podpis)"
+
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
@@ -3517,9 +3524,6 @@ msgstr "nemohu vytvoøit %s: %s\n"
#~ msgid "verify package signature"
#~ msgstr "ovìøit podpis v balíèku"
-#~ msgid "sign a package (discard current signature)"
-#~ msgstr "podepsat balíèek (zahodit aktuální podpis)"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "vynechat pøípadné GPG podpisy"
diff --git a/po/da.po b/po/da.po
index cb2b38c13..748d99ec9 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-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"PO-Revision-Date: 2001-04-05 23:03GMT\n"
"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -114,7 +114,7 @@ msgstr "<kmd>"
msgid "use <dir> as the top level directory"
msgstr "brug <katalog> som topniveau-katalog"
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr "<katalog>"
@@ -412,23 +412,23 @@ msgstr "ingen tar-arkiver angivet til opbygning"
msgid "no packages given for erase"
msgstr "ingen pakker angivet ved signering"
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr "ingen pakker angivet ved installation"
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr "ingen parametre angivet ved forespørgsel"
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr "ingen parametre angivet ved verifikation"
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr "uventede parametre til --querytags "
-#: rpmqv.c:1140
+#: rpmqv.c:1137
#, fuzzy
msgid "no arguments given"
msgstr "ingen parametre angivet ved forespørgsel"
@@ -1434,95 +1434,90 @@ msgstr ""
msgid " failed - "
msgstr " mislykkedes - "
-#: lib/depends.c:104
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "kunne ikke åbne Packages-database i %s\n"
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "pakken %s er allerede installeret"
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s JA (rpmrc tilfører)\n"
-#: lib/depends.c:609
+#: lib/depends.c:404
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s JA (rpmlib tilfører)\n"
-#: lib/depends.c:630
+#: lib/depends.c:425
#, fuzzy
msgid "(db files)"
msgstr "ugyldig db-fil %s\n"
-#: lib/depends.c:642
+#: lib/depends.c:437
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s JA (db tilfører)\n"
-#: lib/depends.c:655
+#: lib/depends.c:450
#, fuzzy
msgid "(db package)"
msgstr "ingen pakker\n"
-#: lib/depends.c:694
+#: lib/depends.c:489
#, fuzzy, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
#, fuzzy
msgid "NO "
msgstr "IKKE O.K."
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n"
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr "========== gemmer tsort-relationer\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n"
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr "LØKKE:\n"
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr "========== fortsætter tsort ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1630,7 +1625,7 @@ msgid ""
msgstr ""
"kun indpakninger med hovedversion <= 4 understøttes af denne udgave af RPM\n"
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead mislykkedes\n"
@@ -1640,27 +1635,27 @@ msgstr "%s: readLead mislykkedes\n"
msgid "%s: bad magic\n"
msgstr "Ugyldigt magisk tal"
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature mislykkedes\n"
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen tilgængelig signatur\n"
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread mislykkedes: %s\n"
@@ -1746,7 +1741,7 @@ msgstr "forkortelse for --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "opgradér pakke, hvis den allerede er installeret"
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
msgid "<packagefile>+"
msgstr "<pakkefil>+"
@@ -1807,32 +1802,42 @@ msgstr "udfør ikke eventuelle skripter"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "udfør ikke eventuelle skripter"
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+#, fuzzy
+msgid "don't verify digest(s)"
+msgstr "verificér ikke filerne i pakke"
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify signature(s)"
+msgstr "verificér ikke filerne i pakke"
+
+#: lib/poptI.c:192
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "udfør ikke småskripter, der måtte udløses af denne pakke"
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "udfør ingen pakkespecifikke skripter"
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "udfør ingen installations-småskripter"
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "udfør ingen installations-småskripter"
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "udfør ingen installations-småskripter"
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1840,49 +1845,49 @@ msgstr ""
"opgradér til en ældre version af pakken (--force gør ikke dette automatisk "
"ved opgraderinger)"
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr "vis procenter efterhånden som pakken installeres"
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr "omdirigér pakken til <katalog>, hvis omdirigérbar"
-#: lib/poptI.c:212
+#: lib/poptI.c:217
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "omdirigér filer fra <gammelsti> til <nysti>"
-#: lib/poptI.c:213
+#: lib/poptI.c:218
#, fuzzy
msgid "<old>=<new>"
msgstr "<gammelsti>=<nysti>"
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr "intallér selvom pakken erstatter installerede filer"
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr "geninstallér hvis pakken allerede er installeret"
-#: lib/poptI.c:224
+#: lib/poptI.c:229
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr ""
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr "installér ikke, men fortæl om det ville lykkes eller ej"
-#: lib/poptI.c:230
+#: lib/poptI.c:235
#, fuzzy
msgid "upgrade package(s)"
msgstr "opgradér pakke"
@@ -1952,153 +1957,139 @@ msgstr "forespørg pakke(r), der udløses af pakken"
msgid "rpm verify mode"
msgstr "rpm verifikationstilstand"
-#: lib/poptQV.c:126
-msgid "rpm verify mode (legacy)"
-msgstr "gammel rpm verifikationstilstand"
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
msgid "query/verify the package(s) which require a dependency"
msgstr "forespørg/verificér pakke(r), der stiller et krav"
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
msgid "query/verify the package(s) which provide a dependency"
msgstr "forespørg/verificér pakke(r), der tilfredsstiller et krav"
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
msgid "list all configuration files"
msgstr "vis alle konfigurationsfiler"
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
msgid "list all documentation files"
msgstr "vis alle dokumentationsfiler"
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
msgid "dump basic file information"
msgstr "vis grundlæggende filinformation"
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
msgid "list files in package"
msgstr "vis liste over filerne i pakken"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr ""
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, fuzzy, c-format
msgid "skip %%readme files"
msgstr "%s: readLead mislykkedes\n"
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
msgid "use the following query format"
msgstr "brug følgende forespørgselsformat"
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
msgid "substitute i18n sections into spec file"
msgstr "erstat i18n-sektioner i spec-fil"
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr "vis filernes status"
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
msgid "display a verbose file listing"
msgstr "giv en detaljeret filliste"
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
#, fuzzy
msgid "don't verify size of files"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
#, fuzzy
msgid "don't verify owner of files"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
#, fuzzy
msgid "don't verify group of files"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
#, fuzzy
msgid "don't verify mode of files"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
msgid "don't verify files in package"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
#, fuzzy
msgid "don't verify package dependencies"
msgstr "undlad at tjekke pakkers afhængighedskrav"
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "udfør ikke eventuelt %verifyscript"
-#: lib/poptQV.c:275 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify digest(s)"
-msgstr "verificér ikke filerne i pakke"
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-#, fuzzy
-msgid "don't verify signature(s)"
-msgstr "verificér ikke filerne i pakke"
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:301
+#: lib/poptQV.c:298
#, fuzzy
-msgid "sign a package, preserving digests"
+msgid "sign a packagei (identical to --resign)"
msgstr "underskriv en pakke (slet nuværende signatur)"
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
#, fuzzy
msgid "verify package signature(s)"
msgstr "verificér pakkesignatur"
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
+#: lib/poptQV.c:304
#, fuzzy
-msgid "sign a package, recomputing digests"
+msgid "sign a packagei (identical to --addsign)"
msgstr "underskriv en pakke (slet nuværende signatur)"
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
#, fuzzy
msgid "generate signature"
msgstr "generér PGP/GPG-signatur"
@@ -2307,8 +2298,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:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, c-format
msgid "open of %s failed: %s\n"
msgstr "åbning af %s mislykkedes %s\n"
@@ -2322,7 +2313,7 @@ msgstr "forespørgsel af %s mislykkedes\n"
msgid "old format source packages cannot be queried\n"
msgstr "pakke med gammelt kildeformat kan ikke forespørges\n"
-#: lib/query.c:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "%s: læs manifest mislykkedes: %s\n"
@@ -2391,7 +2382,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:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr "pakken %s er ikke installeret\n"
@@ -2440,42 +2431,42 @@ msgstr "%s: writeLead mislykkedes: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature mislykkedes: %s\n"
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ingen tilgængelig signatur (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr "IKKE O.K."
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
msgid " (MISSING KEYS:"
msgstr " (MANGLENDE NØGLER: "
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr " (IKKE-BETROEDE NØGLER:"
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr "O.K."
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2484,13 +2475,13 @@ msgstr ""
"\"B\"-afhængighed kræver en epoke (antager samme som \"A\")\n"
"\tA %s\tB %s\n"
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n"
@@ -2503,81 +2494,81 @@ msgstr "Forbereder..."
msgid "Preparing packages for installation..."
msgstr "Forbereder pakker til installation..."
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, c-format
msgid "Retrieving %s\n"
msgstr "Modtager %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "overspringer %s - overførsel mislykkedes - %s\n"
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakke %s kan ikke omrokeres\n"
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, c-format
msgid "error reading from file %s\n"
msgstr "fejl ved læsning fra filen %s\n"
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, 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:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kunne ikke installeres\n"
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "fandt %d kilde- og %d binærpakker\n"
-#: lib/rpminstall.c:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr "afhængighedskrav, der ikke kunne imødekommes:\n"
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
msgid "installing binary packages\n"
msgstr "installerer binærpakker\n"
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "kunne ikke åbne fil %s: %s\n"
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" angiver flere pakker\n"
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr "fjernelse af disse pakker ville bryde afhængighederne:\n"
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kunne ikke åbne %s: %s\n"
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2684,6 +2675,11 @@ msgstr "Kunne ikke læse %s, HOME er for stor.\n"
msgid "Unable to open %s for reading: %s.\n"
msgstr "Kunne ikke åbne %s for læsning: %s.\n"
+#: lib/rpmts.c:73
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "kunne ikke åbne Packages-database i %s\n"
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr "filen er ikke regulær -- overspringer størrelsestjek\n"
@@ -3449,6 +3445,17 @@ msgstr "url-port skal være et tal\n"
msgid "failed to create %s: %s\n"
msgstr "kunne ikke oprette %s: %s\n"
+#~ msgid "rpm verify mode (legacy)"
+#~ msgstr "gammel rpm verifikationstilstand"
+
+#, fuzzy
+#~ msgid "sign a package, preserving digests"
+#~ msgstr "underskriv en pakke (slet nuværende signatur)"
+
+#, fuzzy
+#~ msgid "sign a package, recomputing digests"
+#~ msgstr "underskriv en pakke (slet nuværende signatur)"
+
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
@@ -3554,9 +3561,6 @@ msgstr "kunne ikke oprette %s: %s\n"
#~ msgid "verify package signature"
#~ msgstr "verificér pakkesignatur"
-#~ msgid "sign a package (discard current signature)"
-#~ msgstr "underskriv en pakke (slet nuværende signatur)"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "overspring eventuelle GPG-signaturer"
diff --git a/po/de.po b/po/de.po
index 4e4f39c1b..651d408cf 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-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"PO-Revision-Date: 1998-08-03 18:02+02:00\n"
"Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
"Language-Team: German <de@li.org>\n"
@@ -157,7 +157,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "<VERZ> als Stammverzeichnis benutzen"
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr ""
@@ -478,23 +478,23 @@ msgstr "Es wurde keine tar-Datei für die Erstellung angegeben"
msgid "no packages given for erase"
msgstr "Es wurden keine Pakete für die Signatur angeben"
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr "Es wurden keine Pakete für die Installation angegeben"
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr "Es wurden keine Argumente für die Anfrage angegeben"
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr "Es wurden keine Argumente für die Überprüfung angegeben"
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr "Unerwartete Argumente zu --querytags "
-#: rpmqv.c:1140
+#: rpmqv.c:1137
#, fuzzy
msgid "no arguments given"
msgstr "Es wurden keine Argumente für die Anfrage angegeben"
@@ -1568,96 +1568,91 @@ msgstr ""
msgid " failed - "
msgstr "pgp fehlgeschlagen"
-#: lib/depends.c:104
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
#, fuzzy
msgid "(rpmrc provides)"
msgstr "die Datei »%s« gehört zu keinem Paket\n"
-#: lib/depends.c:609
+#: lib/depends.c:404
#, fuzzy
msgid "(rpmlib provides)"
msgstr "die Datei »%s« gehört zu keinem Paket\n"
# , c-format
-#: lib/depends.c:630
+#: lib/depends.c:425
#, fuzzy
msgid "(db files)"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: lib/depends.c:642
+#: lib/depends.c:437
#, fuzzy
msgid "(db provides)"
msgstr "die Datei »%s« gehört zu keinem Paket\n"
-#: lib/depends.c:655
+#: lib/depends.c:450
#, fuzzy
msgid "(db package)"
msgstr "Anfrage an alle Pakete"
-#: lib/depends.c:694
+#: lib/depends.c:489
#, fuzzy, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr "die Datei »%s« gehört zu keinem Paket\n"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "NO "
msgstr ""
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
# FIXME
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1772,7 +1767,7 @@ msgid ""
msgstr ""
"Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
@@ -1782,27 +1777,27 @@ msgstr "%s: »readLead« fehlgeschlagen\n"
msgid "%s: bad magic\n"
msgstr ""
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Keine Signatur verfügbar\n"
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
@@ -1890,7 +1885,7 @@ msgstr "Abkürzung für --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
#, fuzzy
msgid "<packagefile>+"
msgstr " -b<STUFE> <SPEC> "
@@ -1952,32 +1947,42 @@ msgstr "Keine Stufen ausführen"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "Keine Stufen ausführen"
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+#, fuzzy
+msgid "don't verify digest(s)"
+msgstr "Paket installieren"
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify signature(s)"
+msgstr "Paket installieren"
+
+#: lib/poptI.c:192
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "kein Skript ausführen, das durch dieses Paket veranlasst wurde"
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "Keine paketspezifischen Skripte ausführen"
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "Keine Installations-Skripte ausführen"
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "Keine Installations-Skripte ausführen"
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "Keine Installations-Skripte ausführen"
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1985,50 +1990,50 @@ msgstr ""
"Aktualisierung auf eine alte Version des Pakets (--force macht das bei "
"Aktualisierungen automatisch)"
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr "Prozentangabe bei der Paketinstallation ausgeben"
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
"Verschiebe das Paket, wenn es verschiebbar ist, in das Verzeichnis <VERZ>"
-#: lib/poptI.c:212
+#: lib/poptI.c:217
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
-#: lib/poptI.c:213
+#: lib/poptI.c:218
#, fuzzy
msgid "<old>=<new>"
msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr "Auch dann installieren, wenn das Paket installierte Dateien ersetzt"
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr "Neuinstallation, wenn das Paket schon vorhanden ist"
-#: lib/poptI.c:224
+#: lib/poptI.c:229
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr ""
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr "Nicht installieren - nur anzeigen, ob es funktionieren würde"
-#: lib/poptI.c:230
+#: lib/poptI.c:235
#, fuzzy
msgid "upgrade package(s)"
msgstr "Paket installieren"
@@ -2106,164 +2111,149 @@ msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
msgid "rpm verify mode"
msgstr "Anfrage-Modus"
-#: lib/poptQV.c:126
-#, fuzzy
-msgid "rpm verify mode (legacy)"
-msgstr "Anfrage-Modus"
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
#, fuzzy
msgid "query/verify the package(s) which require a dependency"
msgstr "Anfrage nach Paketen, die die Fähigkeit <i> benötigen"
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
#, fuzzy
msgid "query/verify the package(s) which provide a dependency"
msgstr "Anfrage nach Paketen, die die Fähigkeit <i> bereitstellen"
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
#, fuzzy
msgid "list all configuration files"
msgstr "Nur Konfigurationsdateien auflisten (impliziert -l)"
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
#, fuzzy
msgid "list all documentation files"
msgstr "Dokumentation installieren"
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
#, fuzzy
msgid "dump basic file information"
msgstr "Paketinformationen anzeigen"
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
#, fuzzy
msgid "list files in package"
msgstr "Paket installieren"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr ""
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, fuzzy, c-format
msgid "skip %%readme files"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
#, fuzzy
msgid "use the following query format"
msgstr "Unerwartete Quelle der Anfrage"
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
#, fuzzy
msgid "display a verbose file listing"
msgstr "Dateiliste des Pakets anzeigen"
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "Paket installieren"
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
#, fuzzy
msgid "don't verify size of files"
msgstr "Paket installieren"
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "Paket installieren"
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
#, fuzzy
msgid "don't verify owner of files"
msgstr "Paket installieren"
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
#, fuzzy
msgid "don't verify group of files"
msgstr "Paket installieren"
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
#, fuzzy
msgid "don't verify mode of files"
msgstr "Paket installieren"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
#, fuzzy
msgid "don't verify files in package"
msgstr "Paket installieren"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
#, fuzzy
msgid "don't verify package dependencies"
msgstr "Dateiabhängigkeiten nicht überprüfen"
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "Keine Stufen ausführen"
-#: lib/poptQV.c:275 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify digest(s)"
-msgstr "Paket installieren"
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-#, fuzzy
-msgid "don't verify signature(s)"
-msgstr "Paket installieren"
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "Paket installieren"
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "Paket installieren"
-#: lib/poptQV.c:301
+#: lib/poptQV.c:298
#, fuzzy
-msgid "sign a package, preserving digests"
+msgid "sign a packagei (identical to --resign)"
msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
#, fuzzy
msgid "verify package signature(s)"
msgstr "Paketsignatur überprüfen"
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
+#: lib/poptQV.c:304
#, fuzzy
-msgid "sign a package, recomputing digests"
+msgid "sign a packagei (identical to --addsign)"
msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
#, fuzzy
msgid "generate signature"
msgstr "PGP-Signatur generieren"
@@ -2478,8 +2468,8 @@ msgstr "Paket hat keinen Namen"
msgid "can't query %s: %s\n"
msgstr "Fehler: kann %s nicht öffnen\n"
-#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "öffnen von %s fehlgeschlagen: %s\n"
@@ -2493,7 +2483,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:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, fuzzy, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
@@ -2566,7 +2556,7 @@ msgstr "ungültige Paket-Nummer: %s\n"
msgid "record %u could not be read\n"
msgstr "Eintrag %d konnte nicht gelesen werden\n"
-#: lib/query.c:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr "Paket %s ist nicht installiert\n"
@@ -2617,56 +2607,56 @@ msgstr "%s: »readLead« fehlgeschlagen\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
#, fuzzy
msgid " (MISSING KEYS:"
msgstr " (FEHLENDE SCHLüSSEL)"
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "Paket %s wird nicht in %s aufgeführt"
@@ -2681,83 +2671,83 @@ msgid "Preparing packages for installation..."
msgstr "Es wurden keine Pakete für die Installation angegeben"
# , c-format
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, 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:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "Fehler: %s kann nicht installiert werden\n"
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
-#: lib/rpminstall.c:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n"
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
#, fuzzy
msgid "installing binary packages\n"
msgstr "Paket installieren"
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" bezeichnet mehrere Pakete\n"
# oder besser: "... verletzen" ?
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n"
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "Fehler: kann %s nicht öffnen\n"
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr "Installiere %s\n"
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
@@ -2865,6 +2855,11 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
+#: lib/rpmts.c:73
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr ""
@@ -3651,6 +3646,18 @@ msgid "failed to create %s: %s\n"
msgstr "anlegen von %s fehlgeschlagen\n"
#, fuzzy
+#~ msgid "rpm verify mode (legacy)"
+#~ msgstr "Anfrage-Modus"
+
+#, fuzzy
+#~ msgid "sign a package, preserving digests"
+#~ msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
+
+#, fuzzy
+#~ msgid "sign a package, recomputing digests"
+#~ msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
+
+#, fuzzy
#~ msgid "========== Header RSA signature\n"
#~ msgstr "nicht möglich, die Signatur zu lesen"
@@ -3743,9 +3750,6 @@ msgstr "anlegen von %s fehlgeschlagen\n"
#~ msgid "verify package signature"
#~ msgstr "Paketsignatur überprüfen"
-#~ msgid "sign a package (discard current signature)"
-#~ msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
-
#, fuzzy
#~ msgid "skip any GPG signatures"
#~ msgstr "alle PGP-Signaturen überspringen"
diff --git a/po/fi.po b/po/fi.po
index a50484a91..0674f65b5 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-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"
"Content-Type: text/plain; charset=\n"
@@ -114,7 +114,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "käytä <hakem> ylimpänä hakemistona"
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr ""
@@ -417,23 +417,23 @@ msgstr "käännökselle ei määritelty tar-tiedostoja"
msgid "no packages given for erase"
msgstr "allekirjoitukselle ei määritelty paketteja"
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr "asennukselle ei määritelty paketteja"
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr "kyselylle ei annettu parametrejä"
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr "tarkistukselle ei annettu parametrejä"
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr "--querytags: odottamattomia parametrejä"
-#: rpmqv.c:1140
+#: rpmqv.c:1137
#, fuzzy
msgid "no arguments given"
msgstr "kyselylle ei annettu parametrejä"
@@ -1451,94 +1451,89 @@ msgstr ""
msgid " failed - "
msgstr "pgp epäonnistui"
-#: lib/depends.c:104
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "virhe: en voi avata %s%s/packages.rpm\n"
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
#, fuzzy
msgid "(rpmrc provides)"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/depends.c:609
+#: lib/depends.c:404
#, fuzzy
msgid "(rpmlib provides)"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/depends.c:630
+#: lib/depends.c:425
#, fuzzy
msgid "(db files)"
msgstr "en voinut avata %s: %s"
-#: lib/depends.c:642
+#: lib/depends.c:437
#, fuzzy
msgid "(db provides)"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/depends.c:655
+#: lib/depends.c:450
#, fuzzy
msgid "(db package)"
msgstr "kysele kaikki paketit"
-#: lib/depends.c:694
+#: lib/depends.c:489
#, fuzzy, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "NO "
msgstr ""
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1647,7 +1642,7 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead epäonnistui\n"
@@ -1657,27 +1652,27 @@ msgstr "%s: readLead epäonnistui\n"
msgid "%s: bad magic\n"
msgstr ""
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature epäonnistui\n"
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ei allekirjoitusta saatavilla\n"
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
@@ -1761,7 +1756,7 @@ msgstr "lyhenne parametreille --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
#, fuzzy
msgid "<packagefile>+"
msgstr " -b<vaihe> <määrittely> "
@@ -1822,80 +1817,90 @@ msgstr "älä suorita mitään vaiheita"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "älä suorita mitään vaiheita"
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+#, fuzzy
+msgid "don't verify digest(s)"
+msgstr "asenna paketti"
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify signature(s)"
+msgstr "asenna paketti"
+
+#: lib/poptI.c:192
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "älä aja mitään pakettikohtaisia skriptejä"
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "älä suorita asennusskriptejä"
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "älä suorita asennusskriptejä"
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "älä suorita asennusskriptejä"
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr "päivitä vanhempaan versioon (--force päivitettäessä tekee tämän automaattisesti)"
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr "tulosta asennuksen eteneminen prosentteina"
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr "siirrä paketti hakemistoon <hakem>, jos siirrettävissä"
-#: lib/poptI.c:212
+#: lib/poptI.c:217
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
-#: lib/poptI.c:213
+#: lib/poptI.c:218
#, fuzzy
msgid "<old>=<new>"
msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr "asenna vaikka paketti korvaisi asennettuja tiedostoja"
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr "asenna uudelleen, jos paketti on jo asennettu"
-#: lib/poptI.c:224
+#: lib/poptI.c:229
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr ""
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr "älä asenna, mutta kerro onnistuisiko se"
-#: lib/poptI.c:230
+#: lib/poptI.c:235
#, fuzzy
msgid "upgrade package(s)"
msgstr "asenna paketti"
@@ -1973,164 +1978,149 @@ msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
msgid "rpm verify mode"
msgstr "kyselymoodi"
-#: lib/poptQV.c:126
-#, fuzzy
-msgid "rpm verify mode (legacy)"
-msgstr "kyselymoodi"
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
#, fuzzy
msgid "query/verify the package(s) which require a dependency"
msgstr "kysele paketteja, jotka vaativat <i> ominaisuutta"
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
#, fuzzy
msgid "query/verify the package(s) which provide a dependency"
msgstr "kysele paketteja, jotka tarjoavat <i> ominaisuuden"
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
#, fuzzy
msgid "list all configuration files"
msgstr "listaa vain konfigurointiedostot (josta seuraa -l)"
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
#, fuzzy
msgid "list all documentation files"
msgstr "asenna dokumentaatio"
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
#, fuzzy
msgid "dump basic file information"
msgstr "näytä paketin tiedot"
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
#, fuzzy
msgid "list files in package"
msgstr "asenna paketti"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr ""
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, fuzzy, c-format
msgid "skip %%readme files"
msgstr "%s: readLead epäonnistui\n"
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
#, fuzzy
msgid "use the following query format"
msgstr "odottamaton kyselyn lähde"
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
#, fuzzy
msgid "display a verbose file listing"
msgstr "näytä paketin tiedostolistaus"
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "asenna paketti"
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
#, fuzzy
msgid "don't verify size of files"
msgstr "asenna paketti"
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "asenna paketti"
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
#, fuzzy
msgid "don't verify owner of files"
msgstr "asenna paketti"
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
#, fuzzy
msgid "don't verify group of files"
msgstr "asenna paketti"
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
#, fuzzy
msgid "don't verify mode of files"
msgstr "asenna paketti"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
#, fuzzy
msgid "don't verify files in package"
msgstr "asenna paketti"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
#, fuzzy
msgid "don't verify package dependencies"
msgstr "älä tarkista paketin riippuvuuksia"
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "älä suorita mitään vaiheita"
-#: lib/poptQV.c:275 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify digest(s)"
-msgstr "asenna paketti"
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-#, fuzzy
-msgid "don't verify signature(s)"
-msgstr "asenna paketti"
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "asenna paketti"
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "asenna paketti"
-#: lib/poptQV.c:301
+#: lib/poptQV.c:298
#, fuzzy
-msgid "sign a package, preserving digests"
+msgid "sign a packagei (identical to --resign)"
msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
#, fuzzy
msgid "verify package signature(s)"
msgstr "tarkista paketin allekirjoitus"
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
+#: lib/poptQV.c:304
#, fuzzy
-msgid "sign a package, recomputing digests"
+msgid "sign a packagei (identical to --addsign)"
msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
#, fuzzy
msgid "generate signature"
msgstr "generoi PGP-allekirjoitus"
@@ -2339,8 +2329,8 @@ msgstr "paketilla ei ole nimeä"
msgid "can't query %s: %s\n"
msgstr "virhe: en voi avata %s\n"
-#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "%s:n avaus ei onnistunut: %s\n"
@@ -2354,7 +2344,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:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, fuzzy, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
@@ -2424,7 +2414,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:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr "paketti %s ei ole asennettu\n"
@@ -2474,56 +2464,56 @@ msgstr "%s: readLead epäonnistui\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmReadSignature epäonnistui\n"
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
#, fuzzy
msgid " (MISSING KEYS:"
msgstr "(PUUTTUVAT AVAIMET)"
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "paketti %s ei ole %s:ssä"
@@ -2537,82 +2527,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "asennukselle ei määritelty paketteja"
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, c-format
msgid "Retrieving %s\n"
msgstr "Haen: %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "virhe: %s ei voida asentaa\n"
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "ryhmässä %s ei ole paketteja\n"
-#: lib/rpminstall.c:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr "puuttuvat riippuvuudet:\n"
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
#, fuzzy
msgid "installing binary packages\n"
msgstr "asenna paketti"
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" määrittää useita paketteja\n"
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n"
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "virhe: en voi avata %s\n"
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr "Asennan: %s\n"
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "poistolle ei määritelty paketteja"
@@ -2717,6 +2707,11 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "En voi avata %s luettavaksi: %s."
+#: lib/rpmts.c:73
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "virhe: en voi avata %s%s/packages.rpm\n"
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr ""
@@ -3493,6 +3488,18 @@ msgid "failed to create %s: %s\n"
msgstr "%s:n luonti epäonnistui\n"
#, fuzzy
+#~ msgid "rpm verify mode (legacy)"
+#~ msgstr "kyselymoodi"
+
+#, fuzzy
+#~ msgid "sign a package, preserving digests"
+#~ msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
+
+#, fuzzy
+#~ msgid "sign a package, recomputing digests"
+#~ msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
+
+#, fuzzy
#~ msgid "========== Header RSA signature\n"
#~ msgstr "en voinut lukea allekirjoitusta"
@@ -3581,9 +3588,6 @@ msgstr "%s:n luonti epäonnistui\n"
#~ msgid "verify package signature"
#~ msgstr "tarkista paketin allekirjoitus"
-#~ msgid "sign a package (discard current signature)"
-#~ msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
-
#, fuzzy
#~ msgid "skip any GPG signatures"
#~ msgstr "ohita PGP-allekirjoitukset"
diff --git a/po/fr.po b/po/fr.po
index 273f76ad5..cd97a8054 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-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -122,7 +122,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr " --root <dir>\t- utilise <dir> comme rpertoire racine"
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr ""
@@ -457,23 +457,23 @@ msgstr "aucun package n'a t spcifi pour la construction"
msgid "no packages given for erase"
msgstr "aucun package n'a t spcifi pour la dsinstallation"
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr "aucun argument n'a t fourni pour la requte"
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr "aucun argument n'a t fourni pour la vrification"
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1140
+#: rpmqv.c:1137
#, fuzzy
msgid "no arguments given"
msgstr "aucun argument n'a t fourni pour la requte"
@@ -1491,91 +1491,86 @@ msgstr ""
msgid " failed - "
msgstr "La construction a chou.\n"
-#: lib/depends.c:104
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "impossible d'ouvrir: %s\n"
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:609
+#: lib/depends.c:404
msgid "(rpmlib provides)"
msgstr ""
-#: lib/depends.c:630
+#: lib/depends.c:425
#, fuzzy
msgid "(db files)"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/depends.c:642
+#: lib/depends.c:437
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:655
+#: lib/depends.c:450
#, fuzzy
msgid "(db package)"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/depends.c:694
+#: lib/depends.c:489
#, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr ""
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "NO "
msgstr ""
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "impossible d'ouvrir: %s\n"
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1680,7 +1675,7 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
@@ -1690,27 +1685,27 @@ msgstr ""
msgid "%s: bad magic\n"
msgstr ""
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -1795,7 +1790,7 @@ msgstr " --force - raccourci pour --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
#, fuzzy
msgid "<packagefile>+"
msgstr " -i <packagefile>\t- installe le package"
@@ -1859,33 +1854,45 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+#, fuzzy
+msgid "don't verify digest(s)"
+msgstr ""
+" -f <file>+ - interroge le package qui appartient <file>"
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify signature(s)"
+msgstr ""
+" -f <file>+ - interroge le package qui appartient <file>"
+
+#: lib/poptI.c:192
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
" -f <file>+ - interroge le package qui appartient <file>"
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:208
#, fuzzy
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
@@ -1894,56 +1901,56 @@ msgstr ""
" --oldpackage - mise jour par une ancienne version du package (--"
"force"
-#: lib/poptI.c:207
+#: lib/poptI.c:212
#, fuzzy
msgid "print percentages as package installs"
msgstr ""
" --percent - affiche des '%' pendant l'installation du package"
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:212
+#: lib/poptI.c:217
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:218
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:224
#, fuzzy
msgid "install even if the package replaces installed files"
msgstr ""
" --replacefiles - installe mme si le package remplace des fichiers "
"dj prsents"
-#: lib/poptI.c:222
+#: lib/poptI.c:227
#, fuzzy
msgid "reinstall if the package is already present"
msgstr " --replacepkgs - rinstalle si le package est dj prsent"
-#: lib/poptI.c:224
+#: lib/poptI.c:229
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr ""
-#: lib/poptI.c:227
+#: lib/poptI.c:232
#, fuzzy
msgid "don't install, but tell if it would work or not"
msgstr ""
" --test - n'installe pas, mais indique si ca fonctionnerait "
"ou pas"
-#: lib/poptI.c:230
+#: lib/poptI.c:235
#, fuzzy
msgid "upgrade package(s)"
msgstr ""
@@ -2027,163 +2034,147 @@ msgstr ""
msgid "rpm verify mode"
msgstr ""
-#: lib/poptQV.c:126
-msgid "rpm verify mode (legacy)"
-msgstr ""
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
#, fuzzy
msgid "query/verify the package(s) which require a dependency"
msgstr "aucun package n'a t spcifi pour la dsinstallation"
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
#, fuzzy
msgid "query/verify the package(s) which provide a dependency"
msgstr "aucun package n'a t spcifi pour la dsinstallation"
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
#, fuzzy
msgid "list all configuration files"
msgstr ""
" -c - donne uniquement la liste des fichiers de "
"configuration (implique -l)"
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
#, fuzzy
msgid "list all documentation files"
msgstr ""
" -d - donne uniquement la liste des fichiers de "
"documentation (implique -l)"
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
#, fuzzy
msgid "dump basic file information"
msgstr ""
" -i - affiche les informations relatives un package"
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
#, fuzzy
msgid "list files in package"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr ""
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, fuzzy, c-format
msgid "skip %%readme files"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
#, fuzzy
msgid "use the following query format"
msgstr "source de requte inattendue"
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr ""
" -f <file>+ - interroge le package qui appartient <file>"
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
#, fuzzy
msgid "display a verbose file listing"
msgstr " -l - affiche la liste des packages"
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
#, fuzzy
msgid "don't verify size of files"
msgstr ""
" -f <file>+ - interroge le package qui appartient <file>"
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
#, fuzzy
msgid "don't verify mode of files"
msgstr ""
" -f <file>+ - interroge le package qui appartient <file>"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/poptQV.c:275 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify digest(s)"
-msgstr ""
-" -f <file>+ - interroge le package qui appartient <file>"
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-#, fuzzy
-msgid "don't verify signature(s)"
-msgstr ""
-" -f <file>+ - interroge le package qui appartient <file>"
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
msgid "don't verify GPG V3 DSA signature(s)"
msgstr ""
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:301
-msgid "sign a package, preserving digests"
+#: lib/poptQV.c:298
+msgid "sign a packagei (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
#, fuzzy
msgid "verify package signature(s)"
msgstr " --sign - genre une signature PGP"
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
-msgid "sign a package, recomputing digests"
+#: lib/poptQV.c:304
+msgid "sign a packagei (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
#, fuzzy
msgid "generate signature"
msgstr " --sign - genre une signature PGP"
@@ -2391,8 +2382,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:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "La construction a chou.\n"
@@ -2406,7 +2397,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, fuzzy, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -2476,7 +2467,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, fuzzy, c-format
msgid "package %s is not installed\n"
msgstr "aucun package n'a t spcifi pour l'installation"
@@ -2525,55 +2516,55 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "aucun package n'a t spcifi pour l'installation"
@@ -2587,81 +2578,81 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "aucun package n'a t spcifi pour la dsinstallation"
@@ -2766,6 +2757,11 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "impossible d'ouvrir: %s\n"
+#: lib/rpmts.c:73
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "impossible d'ouvrir: %s\n"
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 6f2225eec..ebcac65af 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-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"PO-Revision-Date: 2001-01-13 22:31+0100\n"
"Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -113,7 +113,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr ""
@@ -403,23 +403,23 @@ msgstr ""
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1140
+#: rpmqv.c:1137
msgid "no arguments given"
msgstr ""
@@ -1404,89 +1404,84 @@ msgstr ""
msgid " failed - "
msgstr ""
-#: lib/depends.c:104
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr ""
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:609
+#: lib/depends.c:404
msgid "(rpmlib provides)"
msgstr ""
-#: lib/depends.c:630
+#: lib/depends.c:425
msgid "(db files)"
msgstr ""
-#: lib/depends.c:642
+#: lib/depends.c:437
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:655
+#: lib/depends.c:450
msgid "(db package)"
msgstr ""
-#: lib/depends.c:694
+#: lib/depends.c:489
#, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr ""
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "NO "
msgstr ""
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1591,7 +1586,7 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
@@ -1601,27 +1596,27 @@ msgstr ""
msgid "%s: bad magic\n"
msgstr ""
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1700,7 +1695,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
msgid "<packagefile>+"
msgstr ""
@@ -1760,77 +1755,85 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+msgid "don't verify digest(s)"
+msgstr ""
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+msgid "don't verify signature(s)"
+msgstr ""
+
+#: lib/poptI.c:192
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:212
+#: lib/poptI.c:217
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:218
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:224
+#: lib/poptI.c:229
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr ""
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:230
+#: lib/poptI.c:235
msgid "upgrade package(s)"
msgstr ""
@@ -1894,138 +1897,126 @@ msgstr ""
msgid "rpm verify mode"
msgstr ""
-#: lib/poptQV.c:126
-msgid "rpm verify mode (legacy)"
-msgstr ""
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
msgid "query/verify the package(s) which require a dependency"
msgstr ""
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
msgid "query/verify the package(s) which provide a dependency"
msgstr ""
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
msgid "list all configuration files"
msgstr ""
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
msgid "list all documentation files"
msgstr ""
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
msgid "dump basic file information"
msgstr ""
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
msgid "list files in package"
msgstr ""
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr ""
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, c-format
msgid "skip %%readme files"
msgstr ""
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
msgid "use the following query format"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
msgid "substitute i18n sections into spec file"
msgstr ""
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
msgid "don't execute verify script(s)"
msgstr ""
-#: lib/poptQV.c:275 lib/poptQV.c:313
-msgid "don't verify digest(s)"
-msgstr ""
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-msgid "don't verify signature(s)"
-msgstr ""
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
msgid "don't verify GPG V3 DSA signature(s)"
msgstr ""
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:301
-msgid "sign a package, preserving digests"
+#: lib/poptQV.c:298
+msgid "sign a packagei (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
msgid "verify package signature(s)"
msgstr ""
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
-msgid "sign a package, recomputing digests"
+#: lib/poptQV.c:304
+msgid "sign a packagei (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
msgid "generate signature"
msgstr ""
@@ -2228,8 +2219,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2243,7 +2234,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, c-format
msgid "%s: read manifest failed: %s\n"
msgstr ""
@@ -2312,7 +2303,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2359,55 +2350,55 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
@@ -2420,81 +2411,81 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2599,6 +2590,11 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
+#: lib/rpmts.c:73
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr ""
diff --git a/po/is.po b/po/is.po
index fbdde9668..0659382cb 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-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"PO-Revision-Date: 2001-07-12 13:25+0000\n"
"Last-Translator: Richard Allen <ra@hp.is>\n"
"Language-Team: is <kde-isl@mmedia.is>\n"
@@ -113,7 +113,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr ""
@@ -404,23 +404,23 @@ msgstr ""
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1140
+#: rpmqv.c:1137
msgid "no arguments given"
msgstr ""
@@ -1410,90 +1410,85 @@ msgstr ""
msgid " failed - "
msgstr ""
-#: lib/depends.c:104
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "get ekki opnað pakka gagnagrunn í\n"
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr ""
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:609
+#: lib/depends.c:404
msgid "(rpmlib provides)"
msgstr ""
-#: lib/depends.c:630
+#: lib/depends.c:425
msgid "(db files)"
msgstr ""
-#: lib/depends.c:642
+#: lib/depends.c:437
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:655
+#: lib/depends.c:450
#, fuzzy
msgid "(db package)"
msgstr "uppfæra pakka"
-#: lib/depends.c:694
+#: lib/depends.c:489
#, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr ""
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "NO "
msgstr ""
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1598,7 +1593,7 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
@@ -1608,27 +1603,27 @@ msgstr ""
msgid "%s: bad magic\n"
msgstr ""
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: Fseek brást: %s\n"
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1707,7 +1702,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
msgid "<packagefile>+"
msgstr "<pakkaskrá>+"
@@ -1767,77 +1762,87 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+#, fuzzy
+msgid "don't verify digest(s)"
+msgstr "ekki yfirfara MD5 undirritun skráa"
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify signature(s)"
+msgstr "ekki yfirfara symlink slóð skráa"
+
+#: lib/poptI.c:192
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:212
+#: lib/poptI.c:217
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:218
msgid "<old>=<new>"
msgstr "<gömul>=<ný>"
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:224
+#: lib/poptI.c:229
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr ""
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:230
+#: lib/poptI.c:235
msgid "upgrade package(s)"
msgstr "uppfæra pakka"
@@ -1905,143 +1910,129 @@ msgstr ""
msgid "rpm verify mode"
msgstr ""
-#: lib/poptQV.c:126
-msgid "rpm verify mode (legacy)"
-msgstr ""
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
msgid "query/verify the package(s) which require a dependency"
msgstr "fyrirspurn/yfirferð á pakkana sem hafa pakkaþarfir"
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
msgid "query/verify the package(s) which provide a dependency"
msgstr "fyrirspurn/yfirferð á pakkana sem uppfylla þarfir annara pakka"
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
msgid "list all configuration files"
msgstr ""
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
msgid "list all documentation files"
msgstr ""
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
msgid "dump basic file information"
msgstr ""
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
msgid "list files in package"
msgstr ""
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr ""
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, c-format
msgid "skip %%readme files"
msgstr ""
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
msgid "use the following query format"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
msgid "substitute i18n sections into spec file"
msgstr ""
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
msgid "don't verify MD5 digest of files"
msgstr "ekki yfirfara MD5 undirritun skráa"
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
msgid "don't verify size of files"
msgstr "ekki yfirfara stærð skráa"
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
msgid "don't verify symlink path of files"
msgstr "ekki yfirfara symlink slóð skráa"
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
msgid "don't verify owner of files"
msgstr "ekki yfirfara eiganda skráa"
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
msgid "don't verify group of files"
msgstr "ekki yfirfara hop skráa"
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
msgid "don't verify mode of files"
msgstr "ekki yfirfara heimildir skráa"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
msgid "don't verify files in package"
msgstr "ekki yfirfara skrárnar í pakkanum"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
msgid "don't verify package dependencies"
msgstr "ekki skoða pakkaskilyrðin"
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
msgid "don't execute verify script(s)"
msgstr ""
-#: lib/poptQV.c:275 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify digest(s)"
-msgstr "ekki yfirfara MD5 undirritun skráa"
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-#, fuzzy
-msgid "don't verify signature(s)"
-msgstr "ekki yfirfara symlink slóð skráa"
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "ekki yfirfara SHA1 undirritunina"
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "ekki yfirfara MD5 undirritun skráa"
-#: lib/poptQV.c:301
-msgid "sign a package, preserving digests"
+#: lib/poptQV.c:298
+msgid "sign a packagei (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
#, fuzzy
msgid "verify package signature(s)"
msgstr "búa til undirskrift"
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
-msgid "sign a package, recomputing digests"
+#: lib/poptQV.c:304
+msgid "sign a packagei (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
msgid "generate signature"
msgstr "búa til undirskrift"
@@ -2244,8 +2235,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2259,7 +2250,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "%s: gat ekki lesið manifest: %s\n"
@@ -2328,7 +2319,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2375,55 +2366,55 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: Fseek brást: %s\n"
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
@@ -2436,81 +2427,81 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2615,6 +2606,11 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Get ekki opnað %s til lesturs: %s.\n"
+#: lib/rpmts.c:73
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "get ekki opnað pakka gagnagrunn í\n"
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 0bb88fc71..9d14b994e 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-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"PO-Revision-Date: 1999-12-01 22:49 +JST\n"
"Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
"Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -122,7 +122,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "¥È¥Ã¥×¥Ç¥£¥ì¥¯¥È¥ê¤È¤·¤Æ <dir> ¤ò»ÈÍѤ·¤Þ¤¹"
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr ""
@@ -436,23 +436,23 @@ msgstr "ºîÀ®(build)¤Î¤¿¤á¤Î tar ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
msgid "no packages given for erase"
msgstr "½ð̾¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr "¸¡¾Ú¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr "--querytags ¤Î°ú¿ô¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
-#: rpmqv.c:1140
+#: rpmqv.c:1137
#, fuzzy
msgid "no arguments given"
msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
@@ -1483,94 +1483,89 @@ msgstr ""
msgid " failed - "
msgstr "¼ºÇÔ - "
-#: lib/depends.c:104
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
-#: lib/depends.c:609
+#: lib/depends.c:404
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
-#: lib/depends.c:630
+#: lib/depends.c:425
#, fuzzy
msgid "(db files)"
msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s"
-#: lib/depends.c:642
+#: lib/depends.c:437
#, fuzzy
msgid "(db provides)"
msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
-#: lib/depends.c:655
+#: lib/depends.c:450
#, fuzzy
msgid "(db package)"
msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n"
-#: lib/depends.c:694
+#: lib/depends.c:489
#, fuzzy, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "NO "
msgstr ""
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1681,7 +1676,7 @@ msgid ""
msgstr ""
"¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹"
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
@@ -1691,27 +1686,27 @@ msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
msgid "%s: bad magic\n"
msgstr "ÉÔÀµ¤Ê¥Þ¥¸¥Ã¥¯"
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Í­¸ú¤Ê½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó\n"
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
@@ -1798,7 +1793,7 @@ msgstr "--replacepkgs ¤È --replacefiles ¤òû½Ì¤·¤¿¤â¤Î"
msgid "upgrade package(s) if already installed"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
#, fuzzy
msgid "<packagefile>+"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
@@ -1863,34 +1858,44 @@ msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó"
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+#, fuzzy
+msgid "don't verify digest(s)"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify signature(s)"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
+
+#: lib/poptI.c:192
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
"¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥¹¥¯¥ê¥×¥È¤ò\n"
"¼Â¹Ô¤·¤Þ¤»¤ó"
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "¥Ñ¥Ã¥±¡¼¥¸»ØÄê¤Î¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó"
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó"
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó"
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó"
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1898,53 +1903,53 @@ msgstr ""
"¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹\n"
"(¥¢¥Ã¥×¥°¥ì¡¼¥É»þ¤Î --force ¤Ï¤³¤ì¤ò¼«Æ°Åª¤Ë¹Ô¤¤¤Þ¤¹)"
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÝ¤Ë '%' ¤Çɽ¼¨¤·¤Þ¤¹"
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
"ºÆÇÛÃÖ²Äǽ¤Ê¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·¡¢¥¤¥ó¥¹¥È¡¼¥ë¥Ñ¥¹\n"
"ÀÜƬ¼­¤ò <dir> ¤ËÀßÄꤷ¤Þ¤¹"
-#: lib/poptI.c:212
+#: lib/poptI.c:217
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "<oldpath> ¤«¤é <newpath> ¤Ë¥Õ¥¡¥¤¥ë¤òºÆÇÛÃÖ¤µ¤»¤Þ¤¹"
-#: lib/poptI.c:213
+#: lib/poptI.c:218
#, fuzzy
msgid "<old>=<new>"
msgstr "<oldpath> ¤«¤é <newpath> ¤Ë¥Õ¥¡¥¤¥ë¤òºÆÇÛÃÖ¤µ¤»¤Þ¤¹"
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr ""
"¥¤¥ó¥¹¥È¡¼¥ë»þ¤ËÃÖ¤­´¹¤¨¤é¤ì¤ë¥Õ¥¡¥¤¥ë¤¬\n"
"¤¢¤Ã¤Æ¤â¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹"
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr "´û¤Ë¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ç¤âºÆ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹"
-#: lib/poptI.c:224
+#: lib/poptI.c:229
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr ""
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤»¤º¤Ë¡¢¥Æ¥¹¥È¤Î¤ß¹Ô¤¤¤Þ¤¹"
-#: lib/poptI.c:230
+#: lib/poptI.c:235
#, fuzzy
msgid "upgrade package(s)"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
@@ -2022,165 +2027,150 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹"
msgid "rpm verify mode"
msgstr "Ì䤤¹ç¤ï¤»¥â¡¼¥É"
-#: lib/poptQV.c:126
-#, fuzzy
-msgid "rpm verify mode (legacy)"
-msgstr "Ì䤤¹ç¤ï¤»¥â¡¼¥É"
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
#, fuzzy
msgid "query/verify the package(s) which require a dependency"
msgstr ""
"<cap> ¤Îµ¡Ç½¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤Æ\n"
"Ì䤤¹ç¤ï¤»¤Þ¤¹"
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
#, fuzzy
msgid "query/verify the package(s) which provide a dependency"
msgstr "<cap> ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
#, fuzzy
msgid "list all configuration files"
msgstr "Á´¤Æ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤Þ¤¹"
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
#, fuzzy
msgid "list all documentation files"
msgstr "Á´¤Æ¤Î¥É¥­¥å¥á¥ó¥È¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤Þ¤¹"
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
#, fuzzy
msgid "dump basic file information"
msgstr "´ðËÜŪ¤Ê¥Õ¥¡¥¤¥ë¾ðÊó¤ò¥À¥ó¥×¤·¤Þ¤¹"
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
#, fuzzy
msgid "list files in package"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤Þ¤¹\n"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr ""
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, fuzzy, c-format
msgid "skip %%readme files"
msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
msgid "use the following query format"
msgstr "°Ê²¼¤ÎÌ䤤¹ç¤ï¤»¥Õ¥©¡¼¥Þ¥Ã¥È¤ò»ÈÍѤ·¤Þ¤¹"
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "°Ê²¼¤Î¥«¥¿¥í¥°¤«¤é i18n ¥»¥¯¥·¥ç¥ó¤òÃÖ¤­´¹¤¨¤Þ¤¹"
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr "Îóµó¤·¤¿¥Õ¥¡¥¤¥ë¤Î¾õÂÖ¤òɽ¼¨¤·¤Þ¤¹"
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
#, fuzzy
msgid "display a verbose file listing"
msgstr "¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤ò¾éŤËɽ¼¨¤·¤Þ¤¹"
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
#, fuzzy
msgid "don't verify size of files"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
#, fuzzy
msgid "don't verify owner of files"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
#, fuzzy
msgid "don't verify group of files"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
#, fuzzy
msgid "don't verify mode of files"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
#, fuzzy
msgid "don't verify files in package"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
#, fuzzy
msgid "don't verify package dependencies"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:275 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify digest(s)"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-#, fuzzy
-msgid "don't verify signature(s)"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:301
+#: lib/poptQV.c:298
#, fuzzy
-msgid "sign a package, preserving digests"
+msgid "sign a packagei (identical to --resign)"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤·¤Þ¤¹(¸½ºß¤Î½ð̾¤Ï¼Î¤Æ¤é¤ì¤Þ¤¹)"
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
#, fuzzy
msgid "verify package signature(s)"
msgstr "½ð̾¤Î¸¡¾Ú¤ò¤·¤Þ¤¹"
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
+#: lib/poptQV.c:304
#, fuzzy
-msgid "sign a package, recomputing digests"
+msgid "sign a packagei (identical to --addsign)"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤·¤Þ¤¹(¸½ºß¤Î½ð̾¤Ï¼Î¤Æ¤é¤ì¤Þ¤¹)"
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
#, fuzzy
msgid "generate signature"
msgstr "PGP/GPG ½ð̾¤òÀ¸À®¤·¤Þ¤¹"
@@ -2399,8 +2389,8 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥Õ¥¡¥¤¥ë½êÍ­¼Ô¤ä id ¥ê¥¹¥È¤ò¤É¤Á¤é¤â»ý¤Ã¤Æ¤¤¤Þ¤»¤ó"
msgid "can't query %s: %s\n"
msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n"
@@ -2414,7 +2404,7 @@ msgstr "%s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
msgid "old format source packages cannot be queried\n"
msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n"
-#: lib/query.c:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, fuzzy, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
@@ -2484,7 +2474,7 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥ÉÈÖ¹æ %d\n"
msgid "record %u could not be read\n"
msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
-#: lib/query.c:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
@@ -2534,43 +2524,43 @@ msgstr "%s: writedLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Í­¸ú¤Ê½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó(v1.0 RPM)\n"
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
#, fuzzy
msgid " (MISSING KEYS:"
msgstr " (¥­¡¼¤Îʶ¼º) "
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr " (¿®Íê¤Ç¤­¤Ê¤¤¸°:"
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2579,13 +2569,13 @@ msgstr ""
"\"B\" ¤Î°Í¸À­¤Ï epoch ¤òɬÍפȤ·¤Þ¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n"
"\tA %s\tB %s\n"
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n"
@@ -2599,81 +2589,81 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, c-format
msgid "Retrieving %s\n"
msgstr "%s ¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr "%s ¤È¤·¤Æ...\n"
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s ¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹ - žÁ÷¼ºÇÔ - %s\n"
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Þ¤»¤ó"
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤«¤é¤ÎÆɤ߹þ¤ß¥¨¥é¡¼ "
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¤è¤ê¿·¤·¤¤ RPM ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹\n"
-#: lib/rpminstall.c:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó\n"
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿\n"
-#: lib/rpminstall.c:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr "°Í¸À­¤Î·çÇ¡:\n"
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
msgid "installing binary packages\n"
msgstr "¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n"
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ¤ÏÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n"
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr "¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤È°Í¸À­¤òÇ˲õ¤·¤Þ¤¹:\n"
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n"
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2778,6 +2768,11 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Æɤ߹þ¤à¤¿¤á¤Ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s¡£"
+#: lib/rpmts.c:73
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr ""
@@ -3561,6 +3556,18 @@ msgid "failed to create %s: %s\n"
msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
#, fuzzy
+#~ msgid "rpm verify mode (legacy)"
+#~ msgstr "Ì䤤¹ç¤ï¤»¥â¡¼¥É"
+
+#, fuzzy
+#~ msgid "sign a package, preserving digests"
+#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤·¤Þ¤¹(¸½ºß¤Î½ð̾¤Ï¼Î¤Æ¤é¤ì¤Þ¤¹)"
+
+#, fuzzy
+#~ msgid "sign a package, recomputing digests"
+#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤·¤Þ¤¹(¸½ºß¤Î½ð̾¤Ï¼Î¤Æ¤é¤ì¤Þ¤¹)"
+
+#, fuzzy
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
@@ -3669,9 +3676,6 @@ msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
#~ msgid "verify package signature"
#~ msgstr "½ð̾¤Î¸¡¾Ú¤ò¤·¤Þ¤¹"
-#~ msgid "sign a package (discard current signature)"
-#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤·¤Þ¤¹(¸½ºß¤Î½ð̾¤Ï¼Î¤Æ¤é¤ì¤Þ¤¹)"
-
#, fuzzy
#~ msgid "skip any GPG signatures"
#~ msgstr "GPG ½ð̾¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹"
diff --git a/po/ko.po b/po/ko.po
index e01027828..2c50fc5c8 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"PO-Revision-Date: 2001-09-07 22:03+0900\n"
"Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
"Language-Team: GNU Translation project <ko@li.org>\n"
@@ -113,7 +113,7 @@ msgstr "<¸í·É>"
msgid "use <dir> as the top level directory"
msgstr "<µð·ºÅ丮> ¸¦ ÃÖ»óÀ§ µð·ºÅ丮·Î »ç¿ëÇÕ´Ï´Ù"
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr "<µð·ºÅ丮>"
@@ -412,23 +412,23 @@ msgstr "ÆÐÅ°Áö Á¦ÀÛ¿¡ ÇÊ¿äÇÑ tar ÆÄÀÏÀ» ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
msgid "no packages given for erase"
msgstr "¼­¸íÇÒ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr "¼³Ä¡ÇÒ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr "°ËÁõ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr "--querytags ¿É¼Ç¿¡ ºÎÀûÀýÇÑ Àμö°¡ ÁöÁ¤µÇ¾ú½À´Ï´Ù "
-#: rpmqv.c:1140
+#: rpmqv.c:1137
#, fuzzy
msgid "no arguments given"
msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
@@ -1424,75 +1424,70 @@ msgstr "Çì´õ¿¡ ¾ÆÄ«À̺ê ÆÄÀÏÀÌ ¾ø½À´Ï´Ù"
msgid " failed - "
msgstr " ½ÇÆÐÇÔ - "
-#: lib/depends.c:104
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n"
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n"
-#: lib/depends.c:609
+#: lib/depends.c:404
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n"
-#: lib/depends.c:630
+#: lib/depends.c:425
#, fuzzy
msgid "(db files)"
msgstr "À߸øµÈ db ÆÄÀÏ %s\n"
-#: lib/depends.c:642
+#: lib/depends.c:437
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n"
-#: lib/depends.c:655
+#: lib/depends.c:450
#, fuzzy
msgid "(db package)"
msgstr "ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
-#: lib/depends.c:694
+#: lib/depends.c:489
#, fuzzy, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "NO "
msgstr "¾Æ´Ï¿À"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr "¿¹"
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n"
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1500,20 +1495,20 @@ msgid ""
msgstr ""
"========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n"
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n"
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr "·çÇÁ(LOOP):\n"
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1622,7 +1617,7 @@ msgid ""
msgstr ""
"ÀÌ RPM ¹öÀü¿¡¼­´Â ÁÖ¿ä ¹øÈ£(major number) <= 4 ÀÇ ÆÐŰ¡ ¸¸À» Áö¿øÇÕ´Ï´Ù\n"
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
@@ -1632,27 +1627,27 @@ msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
msgid "%s: bad magic\n"
msgstr "À߸øµÈ magic ÀÔ´Ï´Ù"
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù\n"
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
@@ -1734,7 +1729,7 @@ msgstr "--replacepkgs ¿Í --replacefiles ¿É¼ÇÀ» µ¿½Ã¿¡ »ç¿ëÇÕ´Ï´Ù"
msgid "upgrade package(s) if already installed"
msgstr "±âÁ¸¿¡ ¼³Ä¡µÈ ÆÐÅ°Áö¸¦ ¾÷±×·¹À̵å ÇÕ´Ï´Ù"
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
msgid "<packagefile>+"
msgstr "<ÆÐÅ°ÁöÆÄÀÏ>+"
@@ -1796,31 +1791,41 @@ msgstr "%%preun ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù (ÀÖÀ» °æ¿ì)"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "%%postun ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù (ÀÖÀ» °æ¿ì)"
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+#, fuzzy
+msgid "don't verify digest(s)"
+msgstr "ÆÄÀÏÀÇ MD5 Ãà¾à(digest)À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify signature(s)"
+msgstr "ÆÄÀÏÀÇ ½Éº¼¸¯ ¸µÅ© °æ·Î¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
+
+#: lib/poptI.c:192
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "ÀÌ ÆÐÅ°Áö¿¡ ÀÇÇØ ¹ß»ýµÇ´Â ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "%%triggerprein ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "%%triggerin ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "%%triggerun ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "%%triggerpostun ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1828,49 +1833,49 @@ msgstr ""
"ÀÌÀü ¹öÀüÀÇ ÆÐÅ°Áö·Î ´Ù¿î±×·¹À̵å ÇÕ´Ï´Ù (--force ¿É¼ÇÀ» »ç¿ë½Ã¿¡´Â ÀÌ ¿É¼Ç"
"ÀÌ ÀÚµ¿À¸·Î Àû¿ëµË´Ï´Ù)"
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr "ÆÐÅ°Áö ¼³Ä¡¸¦ ÆÛ¼¾Æ®(%)·Î Ç¥½ÃÇÕ´Ï´Ù"
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
"Àç¹èÄ¡ ±â´ÉÀÌ ÀÖ´Â ÆÐÅ°ÁöÀÇ °æ¿ì, ÁöÁ¤µÈ <µð·ºÅ丮> ·Î Àç¹èÄ¡ÇÏ¿© ¼³Ä¡ÇÕ´Ï´Ù"
-#: lib/poptI.c:212
+#: lib/poptI.c:217
msgid "relocate files from path <old> to <new>"
msgstr "<ÀÌÀü°æ·Î> ¿¡¼­ <»õ·Î¿î°æ·Î> ·Î ÆÄÀÏÀ» Àç¹èÄ¡ ÇÕ´Ï´Ù"
-#: lib/poptI.c:213
+#: lib/poptI.c:218
msgid "<old>=<new>"
msgstr "<ÀÌÀü°æ·Î>=<»õ·Î¿î°æ·Î>"
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr "ÀçÆÐŰ¡(repackaging)À¸·Î ÀÎÇØ »èÁ¦µÇ´Â ÆÐÅ°Áö ÆÄÀÏÀ» ÀúÀåÇÕ´Ï´Ù"
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr "ÆÐÅ°Áö ¼³Ä¡½Ã ±âÁ¸¿¡ ¼³Ä¡µÇ¾î ÀÖ´Â ÆÄÀÏÀ» µ¤¾î¾¹´Ï´Ù"
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr "ÆÐÅ°Áö°¡ ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ´Â °æ¿ì¿¡µµ ¼³Ä¡ÇÕ´Ï´Ù"
-#: lib/poptI.c:224
+#: lib/poptI.c:229
#, fuzzy
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr "»õ·Î¿î ÆÐÅ°Áö »èÁ¦, ÀÌÀü ÆÐÅ°Áö À缳ġ, ³¯Â¥ º¹±¸(back to date)"
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr "<³¯Â¥>"
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr "ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÏÁö ¾Ê°í, Á¦´ë·Î ¼³Ä¡µÇ´ÂÁö¸¸ È®ÀÎÇÕ´Ï´Ù"
-#: lib/poptI.c:230
+#: lib/poptI.c:235
msgid "upgrade package(s)"
msgstr "ÆÐÅ°Áö¸¦ ¾÷±×·¹À̵å ÇÕ´Ï´Ù"
@@ -1939,146 +1944,132 @@ msgstr "ÆÐÅ°Áö·Î ÀÎÇÏ¿© ¹ß»ýµÇ´Â ÆÐÅ°Áö¿¡ ´ëÇØ ÁúÀÇÇÕ´Ï´Ù"
msgid "rpm verify mode"
msgstr "rpm °ËÁõ ¸ðµå"
-#: lib/poptQV.c:126
-msgid "rpm verify mode (legacy)"
-msgstr "rpm °ËÁõ ¸ðµå (legacy)"
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
msgid "query/verify the package(s) which require a dependency"
msgstr "ÀÇÁ¸¼ºÀ» ÇÊ¿ä·Î ÇÏ´Â ÆÐÅ°Áö¿¡ ´ëÇØ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù"
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
msgid "query/verify the package(s) which provide a dependency"
msgstr "ÀÇÁ¸¼ºÀ» Á¦°øÇÏ´Â ÆÐÅ°Áö¿¡ ´ëÇØ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù"
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
msgid "list all configuration files"
msgstr "¸ðµç ¼³Á¤ ÆÄÀÏÀ» ³ª¿­ÇÕ´Ï´Ù"
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
msgid "list all documentation files"
msgstr "¸ðµç ¹®¼­ ÆÄÀÏÀ» ³ª¿­ÇÕ´Ï´Ù"
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
msgid "dump basic file information"
msgstr "±âº» ÆÄÀÏ Á¤º¸¸¦ ¾Ë·ÁÁÝ´Ï´Ù"
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
msgid "list files in package"
msgstr "ÆÐÅ°Áö ¾ÈÀÇ ÆÄÀÏÀ» ³ª¿­ÇÕ´Ï´Ù"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr "%%ghost ÆÄÀÏÀ» »ý·«ÇÕ´Ï´Ù"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr "%%license ÆÄÀÏÀ» »ý·«ÇÕ´Ï´Ù"
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, c-format
msgid "skip %%readme files"
msgstr "%%readme ÆÄÀÏÀ» »ý·«ÇÕ´Ï´Ù"
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
msgid "use the following query format"
msgstr "´ÙÀ½ÀÇ ÁúÀÇ Çü½ÄÀ» »ç¿ëÇϽʽÿä"
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
msgid "substitute i18n sections into spec file"
msgstr "spec ÆÄÀÏ ¾ÈÀÇ i18n Ç׸ñ(section)À» ´ëü(substitute)ÇÕ´Ï´Ù"
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr "³ª¿­µÈ ÆÄÀÏÀÇ »óÅÂ(state)¸¦ º¸¿©ÁÝ´Ï´Ù"
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
msgid "display a verbose file listing"
msgstr "ÆÄÀÏ ¸ñ·ÏÀ» ÀÚ¼¼È÷ º¸¿©ÁÝ´Ï´Ù"
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
msgid "don't verify MD5 digest of files"
msgstr "ÆÄÀÏÀÇ MD5 Ãà¾à(digest)À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
msgid "don't verify size of files"
msgstr "ÆÄÀÏÀÇ ¿ë·®À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
msgid "don't verify symlink path of files"
msgstr "ÆÄÀÏÀÇ ½Éº¼¸¯ ¸µÅ© °æ·Î¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
msgid "don't verify owner of files"
msgstr "ÆÄÀÏÀÇ ¼ÒÀ¯ÀÚ¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
msgid "don't verify group of files"
msgstr "ÆÄÀÏÀÇ ±×·ìÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr "ÆÄÀÏÀÇ ÃÖÁ¾ º¯°æ ½Ã°£À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
msgid "don't verify mode of files"
msgstr "ÆÄÀÏÀÇ ¸ðµå¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
msgid "don't verify files in package"
msgstr "ÆÐÅ°Áö ¾ÈÀÇ ÆÄÀÏÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
msgid "don't verify package dependencies"
msgstr "ÆÐÅ°ÁöÀÇ ÀÇÁ¸¼ºÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "%verifyscript¸¦ ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù (ÀÖÀ» °æ¿ì)"
-#: lib/poptQV.c:275 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify digest(s)"
-msgstr "ÆÄÀÏÀÇ MD5 Ãà¾à(digest)À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-#, fuzzy
-msgid "don't verify signature(s)"
-msgstr "ÆÄÀÏÀÇ ½Éº¼¸¯ ¸µÅ© °æ·Î¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "SHA1 Ãà¾à(digest) Çì´õ¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "ÆÄÀÏÀÇ MD5 Ãà¾à(digest)À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:301
+#: lib/poptQV.c:298
#, fuzzy
-msgid "sign a package, preserving digests"
+msgid "sign a packagei (identical to --resign)"
msgstr "ÆÐÅ°Áö¿¡ ¼­¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼­¸íÀº »èÁ¦µË´Ï´Ù)"
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
#, fuzzy
msgid "verify package signature(s)"
msgstr "ÆÐÅ°ÁöÀÇ ¼­¸íÀ» °Ë»çÇÕ´Ï´Ù"
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
+#: lib/poptQV.c:304
#, fuzzy
-msgid "sign a package, recomputing digests"
+msgid "sign a packagei (identical to --addsign)"
msgstr "ÆÐÅ°Áö¿¡ ¼­¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼­¸íÀº »èÁ¦µË´Ï´Ù)"
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
msgid "generate signature"
msgstr "¼­¸íÀ» ÀÛ¼ºÇÕ´Ï´Ù"
@@ -2295,8 +2286,8 @@ msgstr "ÆÐÅ°Áö¿¡ ÆÄÀÏ ¼ÒÀ¯ÀÚ ¶Ç´Â id ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù\n"
msgid "can't query %s: %s\n"
msgstr "%s (À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n"
-#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s (À»)¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %s\n"
@@ -2310,7 +2301,7 @@ msgstr "%s (À»)¸¦ ÁúÀÇÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n"
msgid "old format source packages cannot be queried\n"
msgstr "ÀÌÀü Çü½ÄÀÇ ¼Ò½º ÆÐÅ°Áö´Â ÁúÀÇÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/query.c:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "%s: Àдµ¥ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
@@ -2379,7 +2370,7 @@ msgstr "ÆÐÅ°Áö ±â·Ï(record) ¹øÈ£: %u\n"
msgid "record %u could not be read\n"
msgstr "±â·Ï(record) ¹øÈ£ %u (Àº)´Â ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/query.c:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr "%s ÆÐÅ°Áö´Â ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n"
@@ -2428,42 +2419,42 @@ msgstr "%s: writeLead¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr "¿Ã¹Ù¸£Áö ¾ÊÀ½"
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
msgid " (MISSING KEYS:"
msgstr " (Å°¸¦ ãÀ» ¼ö ¾øÀ½:"
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr " (Å°¸¦ ½Å·ÚÇÒ ¼ö ¾øÀ½:"
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr "È®ÀÎ"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2472,13 +2463,13 @@ msgstr ""
"\"B\" ÀÇÁ¸¼ºÀº Áß¿ä½Ã µÇ´Â °Í(epoch)À» ÇÊ¿ä·Î ÇÕ´Ï´Ù (\"A\" ·Î °¡Á¤ÇÕ´Ï´Ù)\n"
"\tA %s\tB %s\n"
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "%s-%s-%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n"
@@ -2491,81 +2482,81 @@ msgstr "Áغñ Áß..."
msgid "Preparing packages for installation..."
msgstr "¼³Ä¡ÇÒ ÆÐÅ°Áö¸¦ ÁغñÇÏ°í ÀÖ½À´Ï´Ù..."
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, c-format
msgid "Retrieving %s\n"
msgstr "%s (À»)¸¦ º¹±¸ÇÕ´Ï´Ù\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr " ... %s (À¸)·Î\n"
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s (À»)¸¦ »ý·«ÇÕ´Ï´Ù - Àü¼Û(transfer)¿¡ ½ÇÆÐÇÔ - %s\n"
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, c-format
msgid "package %s is not relocateable\n"
msgstr "%s ÆÐÅ°Áö´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, c-format
msgid "error reading from file %s\n"
msgstr "%s ÆÄÀÏÀ» Àд µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n"
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "%s ÆÄÀÏÀÌ ÃֽŠ¹öÀüÀÇ RPMÀ» ÇÊ¿ä·Î ÇÕ´Ï´Ù\n"
-#: lib/rpminstall.c:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s (Àº)´Â ¼³Ä¡µÉ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%d ÀÇ ¼Ò½º¿Í %d ÀÇ ¹ÙÀ̳ʸ® ÆÐÅ°Áö¸¦ ã¾Ò½À´Ï´Ù\n"
-#: lib/rpminstall.c:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆÐÇÔ:\n"
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
msgid "installing binary packages\n"
msgstr "¹ÙÀ̳ʸ® ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n"
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "%s ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ¿©·¯°³ÀÇ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÕ´Ï´Ù\n"
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr "ÀÌ ÆÐÅ°ÁöµéÀ» Á¦°ÅÇϸé ÀÇÁ¸¼ºÀÌ ±úÁú ¼ö ÀÖÀ½:\n"
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr "%s (À»)¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n"
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2670,6 +2661,11 @@ msgstr "%s (À»)¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù, HOMEÀÌ ³Ê¹« Å®´Ï´Ù.\n"
msgid "Unable to open %s for reading: %s.\n"
msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s.\n"
+#: lib/rpmts.c:73
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n"
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr "ÆÄÀÏÀÌ ¿Ã¹Ù¸£Áö(regular) ¾Ê½À´Ï´Ù -- ¿ë·® °Ë»ç¸¦ »ý·«ÇÕ´Ï´Ù\n"
@@ -3438,6 +3434,17 @@ msgstr "URL Æ÷Æ®´Â ¹Ýµå½Ã ¼ýÀÚÀ̾î¾ß ÇÕ´Ï´Ù\n"
msgid "failed to create %s: %s\n"
msgstr "%s (À»)¸¦ »ý¼ºÇϴµ¥ ½ÇÆÐÇÔ: %s\n"
+#~ msgid "rpm verify mode (legacy)"
+#~ msgstr "rpm °ËÁõ ¸ðµå (legacy)"
+
+#, fuzzy
+#~ msgid "sign a package, preserving digests"
+#~ msgstr "ÆÐÅ°Áö¿¡ ¼­¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼­¸íÀº »èÁ¦µË´Ï´Ù)"
+
+#, fuzzy
+#~ msgid "sign a package, recomputing digests"
+#~ msgstr "ÆÐÅ°Áö¿¡ ¼­¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼­¸íÀº »èÁ¦µË´Ï´Ù)"
+
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
@@ -3530,9 +3537,6 @@ msgstr "%s (À»)¸¦ »ý¼ºÇϴµ¥ ½ÇÆÐÇÔ: %s\n"
#~ msgid "verify package signature"
#~ msgstr "ÆÐÅ°ÁöÀÇ ¼­¸íÀ» °Ë»çÇÕ´Ï´Ù"
-#~ msgid "sign a package (discard current signature)"
-#~ msgstr "ÆÐÅ°Áö¿¡ ¼­¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼­¸íÀº »èÁ¦µË´Ï´Ù)"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "GPG ¼­¸íÀº °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
diff --git a/po/no.po b/po/no.po
index bdc54dd49..cb8eac8e2 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-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"PO-Revision-Date: 2001-06-27 12:24+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <no@li.org>\n"
@@ -113,7 +113,7 @@ msgstr "<kmd>"
msgid "use <dir> as the top level directory"
msgstr "bruk <katalog> som toppnivåkatalog"
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr "<kat>"
@@ -411,23 +411,23 @@ msgstr "ingen tar-fil oppgitt for bygging"
msgid "no packages given for erase"
msgstr "ingen pakker oppgitt for signering"
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr "ingen pakker oppgitt for installering"
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr "ingen argumenter oppgitt for spørring"
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr "ingen argumenter oppgitt for verifisering"
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr "uventede argumenter til --querytags "
-#: rpmqv.c:1140
+#: rpmqv.c:1137
#, fuzzy
msgid "no arguments given"
msgstr "ingen argumenter oppgitt for spørring"
@@ -1425,90 +1425,85 @@ msgstr ""
msgid " failed - "
msgstr " feilet - "
-#: lib/depends.c:104
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "kan ikke åpne pakkedatabase i %s\n"
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "pakke %s er allerede installert"
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:609
+#: lib/depends.c:404
msgid "(rpmlib provides)"
msgstr ""
-#: lib/depends.c:630
+#: lib/depends.c:425
msgid "(db files)"
msgstr ""
-#: lib/depends.c:642
+#: lib/depends.c:437
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:655
+#: lib/depends.c:450
#, fuzzy
msgid "(db package)"
msgstr "ingen pakker\n"
-#: lib/depends.c:694
+#: lib/depends.c:489
#, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr ""
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "NO "
msgstr "NEI"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr "JA"
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1613,7 +1608,7 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead feilet\n"
@@ -1623,27 +1618,27 @@ msgstr "%s: readLead feilet\n"
msgid "%s: bad magic\n"
msgstr "Ugyldig magi"
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature feilet\n"
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen signatur tilgjengelig\n"
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead feilet\n"
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread feilet: %s\n"
@@ -1724,7 +1719,7 @@ msgstr "forkortning for --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "oppgrader pakke(r) hvis allerede installert"
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
msgid "<packagefile>+"
msgstr "<pakkefil>+"
@@ -1784,31 +1779,41 @@ msgstr "ikke kjør %%preun skriptlet (hvis noen)"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "ikke kjør %%postun skriptlet (hvis noen)"
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+#, fuzzy
+msgid "don't verify digest(s)"
+msgstr "ikke verifiser header SHA1 digest"
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify signature(s)"
+msgstr "ikke verifiser sti til symbolske lenker for filer"
+
+#: lib/poptI.c:192
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "Ikke kjør noen skriptlets som utløses av denne pakken"
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "ikke kjør %%triggerprein skriptlets"
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "ikke kjør %%triggerin skriptlets"
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "ikke kjør %%triggerun skriplets"
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "ikke kjør %%triggerpostun skriptlets"
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1816,48 +1821,48 @@ msgstr ""
"oppgrader til en gammel versjon av pakken (--force ved oppgraderinger gjør "
"dette automatisk)"
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr "skriv ut prosentvis fremgang etter som pakken installeres"
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr "omplasser pakken til <kat>, hvis den er omplasserbar"
-#: lib/poptI.c:212
+#: lib/poptI.c:217
msgid "relocate files from path <old> to <new>"
msgstr "omplasser filer fra sti <gml> til <ny>"
-#: lib/poptI.c:213
+#: lib/poptI.c:218
msgid "<old>=<new>"
msgstr "<gml>=<ny>"
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr "lagre slettede pakkefiler ved ompakking"
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr "installer selv om pakken erstatter installerte filer"
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr "reinstaller selv om pakken allerede er installert"
-#: lib/poptI.c:224
+#: lib/poptI.c:229
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:230
#, fuzzy
msgid "<date>"
msgstr "<sti>"
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr "ikke installer, men si ifra om det ville virke eller ikke"
-#: lib/poptI.c:230
+#: lib/poptI.c:235
msgid "upgrade package(s)"
msgstr "oppgrader pakke(r)"
@@ -1926,145 +1931,131 @@ msgstr "spør pakker utløst av <pakke>"
msgid "rpm verify mode"
msgstr ""
-#: lib/poptQV.c:126
-msgid "rpm verify mode (legacy)"
-msgstr ""
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
msgid "query/verify the package(s) which require a dependency"
msgstr "spør etter etter pakker som trenger <funk> funksjonalitet"
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
msgid "query/verify the package(s) which provide a dependency"
msgstr "spør etter pakker som tilbyr <funk> funksjonalitet"
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
msgid "list all configuration files"
msgstr ""
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
msgid "list all documentation files"
msgstr ""
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
msgid "dump basic file information"
msgstr ""
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
msgid "list files in package"
msgstr ""
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr ""
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, c-format
msgid "skip %%readme files"
msgstr ""
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
msgid "use the following query format"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
msgid "substitute i18n sections into spec file"
msgstr ""
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
msgid "don't verify size of files"
msgstr "ikke verifiser størrelse på filer"
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
msgid "don't verify symlink path of files"
msgstr "ikke verifiser sti til symbolske lenker for filer"
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
msgid "don't verify owner of files"
msgstr "ikke verifiser eier av filer"
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
msgid "don't verify group of files"
msgstr "ikke verifiser gruppe for filer"
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr "ikke verifisert endringsdato for filer"
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
msgid "don't verify mode of files"
msgstr "ikke verifiser modus for filer"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
msgid "don't verify files in package"
msgstr "ikke verifiser filer i pakke"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
msgid "don't verify package dependencies"
msgstr "ikke verifiser pakkeavhengigheter"
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "ikke kjør %verifyscript (hvis noen)"
-#: lib/poptQV.c:275 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify digest(s)"
-msgstr "ikke verifiser header SHA1 digest"
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-#, fuzzy
-msgid "don't verify signature(s)"
-msgstr "ikke verifiser sti til symbolske lenker for filer"
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "ikke verifiser header SHA1 digest"
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:301
+#: lib/poptQV.c:298
#, fuzzy
-msgid "sign a package, preserving digests"
+msgid "sign a packagei (identical to --resign)"
msgstr "signer en pakke (forkast nåværende signatur)"
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
#, fuzzy
msgid "verify package signature(s)"
msgstr "verifiser pakkesignatur"
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
+#: lib/poptQV.c:304
#, fuzzy
-msgid "sign a package, recomputing digests"
+msgid "sign a packagei (identical to --addsign)"
msgstr "signer en pakke (forkast nåværende signatur)"
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
msgid "generate signature"
msgstr "generer signatur"
@@ -2269,8 +2260,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:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, c-format
msgid "open of %s failed: %s\n"
msgstr "feil under åpning av %s: %s\n"
@@ -2284,7 +2275,7 @@ msgstr "spørring på %s feilet\n"
msgid "old format source packages cannot be queried\n"
msgstr "kildepakker i gammelt format kan ikke spørres\n"
-#: lib/query.c:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "%s: lesing av manifest feilet: %s\n"
@@ -2353,7 +2344,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr "pakke %s er ikke installert\n"
@@ -2400,55 +2391,55 @@ msgstr "%s: writeLead feilet: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature feilet: %s\n"
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead feilet\n"
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ingen signatur tilgjengelig (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr "IKKE OK"
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr "OK"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "pakke %s er i konflikt: %s\n"
@@ -2461,81 +2452,81 @@ msgstr "Forbereder..."
msgid "Preparing packages for installation..."
msgstr "Forbereder pakker for installasjon..."
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, c-format
msgid "Retrieving %s\n"
msgstr "Henter %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "hopper over %s - overføring feilet - %s\n"
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakke %s kan ikke relokeres\n"
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, c-format
msgid "error reading from file %s\n"
msgstr "feil under lesing fra fil %s\n"
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, 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:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "fant %d kilde- og %d binærpakker\n"
-#: lib/rpminstall.c:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr "feilede avhengigheter:\n"
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
msgid "installing binary packages\n"
msgstr "installerer binærpakker\n"
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" spesifiserer flere pakker\n"
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr "fjerning av disse pakkene vil ødelegge avhengigheter:\n"
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan ikke åpne %s: %s\n"
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2640,6 +2631,11 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Kunne ikke åpne spec fil %s: %s\n"
+#: lib/rpmts.c:73
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "kan ikke åpne pakkedatabase i %s\n"
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr ""
@@ -3392,6 +3388,14 @@ msgid "failed to create %s: %s\n"
msgstr "kunne ikke opprette %s: %s\n"
#, fuzzy
+#~ msgid "sign a package, preserving digests"
+#~ msgstr "signer en pakke (forkast nåværende signatur)"
+
+#, fuzzy
+#~ msgid "sign a package, recomputing digests"
+#~ msgstr "signer en pakke (forkast nåværende signatur)"
+
+#, fuzzy
#~ msgid "sign a package, discarding all current signatures"
#~ msgstr "signer en pakke (forkast nåværende signatur)"
@@ -3429,9 +3433,6 @@ msgstr "kunne ikke opprette %s: %s\n"
#~ msgid "verify package signature"
#~ msgstr "verifiser pakkesignatur"
-#~ msgid "sign a package (discard current signature)"
-#~ msgstr "signer en pakke (forkast nåværende signatur)"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "hopp over GPG-signaturer"
diff --git a/po/pl.po b/po/pl.po
index 80a4fbf4f..469b5351b 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-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"PO-Revision-Date: 1999-05-25 17:00+0100\n"
"Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -121,7 +121,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "u¿yj <katalogu> jako katalogu najwy¿szego poziomu"
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr ""
@@ -426,23 +426,23 @@ msgstr "nie podano nazw plików tar do budowania"
msgid "no packages given for erase"
msgstr "nie podano nazwy pakietu do podpisania"
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr "nie podano nazw plików do zainstalowania"
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr "nie podano argumentów dla trybu zapytañ"
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr "nie podano argumentów dla sprawdzania"
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr "nieoczekiwane argumenty dla --querytags "
-#: rpmqv.c:1140
+#: rpmqv.c:1137
#, fuzzy
msgid "no arguments given"
msgstr "nie podano argumentów dla trybu zapytañ"
@@ -1465,95 +1465,90 @@ msgstr ""
msgid " failed - "
msgstr " nie powiod³o siê -"
-#: lib/depends.c:104
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany"
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
#, fuzzy
msgid "(rpmrc provides)"
msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
-#: lib/depends.c:609
+#: lib/depends.c:404
#, fuzzy
msgid "(rpmlib provides)"
msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
-#: lib/depends.c:630
+#: lib/depends.c:425
#, fuzzy
msgid "(db files)"
msgstr "b³êdny status pliku: %s"
-#: lib/depends.c:642
+#: lib/depends.c:437
#, fuzzy
msgid "(db provides)"
msgstr "Udostêpniane zasoby:"
-#: lib/depends.c:655
+#: lib/depends.c:450
#, fuzzy
msgid "(db package)"
msgstr "znaleziono %d pakietów\n"
-#: lib/depends.c:694
+#: lib/depends.c:489
#, fuzzy, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
#, fuzzy
msgid "NO "
msgstr "NIE DOBRZE"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "usuwanie indeksu grupy\n"
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1664,7 +1659,7 @@ msgid ""
msgstr ""
"tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a"
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead nie powiod³o siê\n"
@@ -1674,27 +1669,27 @@ msgstr "%s: readLead nie powiod³o siê\n"
msgid "%s: bad magic\n"
msgstr "B³êdny magic"
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature nie powiod³o siê\n"
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Sygnatura nie jest dostêpna\n"
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead nie powiod³o siê\n"
@@ -1782,7 +1777,7 @@ msgstr "skrócona wersja kombinacji --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany"
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
#, fuzzy
msgid "<packagefile>+"
msgstr " -p <nazwa pakietu>+ "
@@ -1843,32 +1838,42 @@ msgstr "nie wykonuj ¿adnych etapów"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nie wykonuj ¿adnych etapów"
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+#, fuzzy
+msgid "don't verify digest(s)"
+msgstr "nie sprawdzaj plików pakietu"
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify signature(s)"
+msgstr "nie sprawdzaj plików pakietu"
+
+#: lib/poptI.c:192
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "odpytywanie pakietów zahaczanych przez pakiet"
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nie wykonuj ¿adnych skryptów instalacyjnych"
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nie wykonuj ¿adnych skryptów instalacyjnych"
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nie wykonuj ¿adnych skryptów instalacyjnych"
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nie wykonuj ¿adnych skryptów instalacyjnych"
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1876,49 +1881,49 @@ msgstr ""
"uaktualnij do starej wersji (--force robi to samo automatycznie podczas "
"uaktualniania)"
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr "wy¶wietlaj stan instalacji w procentach"
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr "przesuñ pliki pakietu do drzewa <katalog>, je¶li jest przesuwalny"
-#: lib/poptI.c:212
+#: lib/poptI.c:217
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "przesuñ pliki z drzewa <stara-¶cie¿ka> do drzewa <nowa-¶cie¿ka>"
-#: lib/poptI.c:213
+#: lib/poptI.c:218
#, fuzzy
msgid "<old>=<new>"
msgstr " --relocate <stara-¶cie¿ka>=<nowa-¶cie¿ka>"
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr "instaluj nawet gdy pakiet zastêpuje inne zainstalowane pliki"
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr "przeinstaluj je¶li pakiet jest ju¿ zainstalowany"
-#: lib/poptI.c:224
+#: lib/poptI.c:229
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr ""
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr "nie instaluj, podaj tylko czy instalacja zadzia³a czy nie"
-#: lib/poptI.c:230
+#: lib/poptI.c:235
#, fuzzy
msgid "upgrade package(s)"
msgstr " --upgrade <nazwa pakietu>"
@@ -1995,157 +2000,142 @@ msgstr "odpytywanie pakietów zahaczanych przez pakiet"
msgid "rpm verify mode"
msgstr "tryb odpytywania"
-#: lib/poptQV.c:126
-#, fuzzy
-msgid "rpm verify mode (legacy)"
-msgstr "tryb odpytywania"
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
#, fuzzy
msgid "query/verify the package(s) which require a dependency"
msgstr "odszukaj pakiety wymagaj±ce zasobu <zas>"
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
#, fuzzy
msgid "query/verify the package(s) which provide a dependency"
msgstr "odszukaj pakiety udostêpniaj±ce zasób <zas>"
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
msgid "list all configuration files"
msgstr "wy¶wietl wszystkie pliki konfiguracyjne"
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
msgid "list all documentation files"
msgstr "wy¶wietl wszystkie pliki dokumentacji"
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
msgid "dump basic file information"
msgstr "podaj postawowe informacje o pliku"
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
msgid "list files in package"
msgstr "wy¶wietl pliki zawarte w pakiecie"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr ""
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, fuzzy, c-format
msgid "skip %%readme files"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
msgid "use the following query format"
msgstr "u¿yj nastêpuj±cego formatu zapytania"
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr "wy¶wietl status pokazywanych plików"
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
msgid "display a verbose file listing"
msgstr "wy¶wietl wiêcej informacji o plikach z listy"
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
#, fuzzy
msgid "don't verify size of files"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
#, fuzzy
msgid "don't verify owner of files"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
#, fuzzy
msgid "don't verify group of files"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
#, fuzzy
msgid "don't verify mode of files"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
msgid "don't verify files in package"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
#, fuzzy
msgid "don't verify package dependencies"
msgstr "nie sprawdzaj zale¿no¶ci pakietu"
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "nie wykonuj ¿adnych etapów"
-#: lib/poptQV.c:275 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify digest(s)"
-msgstr "nie sprawdzaj plików pakietu"
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-#, fuzzy
-msgid "don't verify signature(s)"
-msgstr "nie sprawdzaj plików pakietu"
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:301
+#: lib/poptQV.c:298
#, fuzzy
-msgid "sign a package, preserving digests"
+msgid "sign a packagei (identical to --resign)"
msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)"
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
#, fuzzy
msgid "verify package signature(s)"
msgstr "sprawd¼ sygnaturê pakietu"
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
+#: lib/poptQV.c:304
#, fuzzy
-msgid "sign a package, recomputing digests"
+msgid "sign a packagei (identical to --addsign)"
msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)"
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
#, fuzzy
msgid "generate signature"
msgstr "generuj sygnaturê PGP/GPG"
@@ -2356,8 +2346,8 @@ msgstr "pakiet nie ma ani w³a¶ciciela pliku ani list id"
msgid "can't query %s: %s\n"
msgstr "nie mo¿na odwi±zaæ %s: %s\n"
-#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, c-format
msgid "open of %s failed: %s\n"
msgstr "otwarcie %s nie powiod³o siê\n"
@@ -2371,7 +2361,7 @@ msgstr "odpytywanie %s nie powiod³o siê\n"
msgid "old format source packages cannot be queried\n"
msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n"
-#: lib/query.c:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, fuzzy, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "%s: readLead nie powiod³o siê\n"
@@ -2441,7 +2431,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:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr "pakiet %s nie jest zainstalowany\n"
@@ -2491,55 +2481,55 @@ msgstr "%s: readLead nie powiod³o siê\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmReadSignature nie powiod³o siê\n"
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Sygnatura nie jest dostêpna (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr "NIE DOBRZE"
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
msgid " (MISSING KEYS:"
msgstr " (BRAK KLUCZY:"
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr "(NIEWIARYGODNE KLUCZE:"
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr "OK"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, fuzzy, c-format
msgid " %s A %s\tB %s\n"
msgstr " rpm {--version}"
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n"
@@ -2553,81 +2543,81 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "nie podano nazw plików do zainstalowania"
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, 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:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr "... jako %s\n"
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s pomijany - transmisja %s nie powiod³a siê\n"
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakiet %s nie jest przesuwalny\n"
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, c-format
msgid "error reading from file %s\n"
msgstr "b³±d czytania z pliku %s\n"
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "plik %s wymaga nowszej wersji RPM\n"
-#: lib/rpminstall.c:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie mo¿e byæ zainstalowany\n"
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, 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:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr "niespe³nione zale¿no¶ci:\n"
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
msgid "installing binary packages\n"
msgstr "instalacja pakietów binarnych\n"
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "nie mo¿na otworzyæ pliku %s: %s"
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" okre¶la wiele pakietów\n"
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr "usuniêcie tych pakietów zerwie zale¿no¶ci:\n"
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nie mo¿na otworzyæ %s\n"
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr "Instalacja %s\n"
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2732,6 +2722,11 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Nie mo¿na otworzyæ %s do odczytu: %s."
+#: lib/rpmts.c:73
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr "plik nieregularny -- sprawdzanie rozmiaru pominiête\n"
@@ -3503,6 +3498,18 @@ msgid "failed to create %s: %s\n"
msgstr "utworzenie %s nie powiod³o siê\n"
#, fuzzy
+#~ msgid "rpm verify mode (legacy)"
+#~ msgstr "tryb odpytywania"
+
+#, fuzzy
+#~ msgid "sign a package, preserving digests"
+#~ msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)"
+
+#, fuzzy
+#~ msgid "sign a package, recomputing digests"
+#~ msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)"
+
+#, fuzzy
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
@@ -3610,9 +3617,6 @@ msgstr "utworzenie %s nie powiod³o siê\n"
#~ msgid "verify package signature"
#~ msgstr "sprawd¼ sygnaturê pakietu"
-#~ msgid "sign a package (discard current signature)"
-#~ msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "pomiñ wszelkie sygnatury GPG"
diff --git a/po/pt.po b/po/pt.po
index 66e044e3a..290e0a6c7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"PO-Revision-Date: 2000-06-22 01:13+01:00\n"
"Last-Translator: José Nuno Coelho Sanarra Pires\n"
"Language-Team: pt <kde@poli.org>\n"
@@ -113,7 +113,7 @@ msgstr "<com>"
msgid "use <dir> as the top level directory"
msgstr "usa <dir> como a directoria de topo"
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr "<dir>"
@@ -407,23 +407,23 @@ msgstr "não foram indicados ficheiros tar para a criação"
msgid "no packages given for erase"
msgstr "não foram indicados pacotes para assinar"
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr "não foram indicados pacotes para instalar"
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr "não foram indicados argumentos para a pesquisa"
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr "não foram indicados argumentos para a verificação"
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr "argumentos inesperados no --querytags "
-#: rpmqv.c:1140
+#: rpmqv.c:1137
#, fuzzy
msgid "no arguments given"
msgstr "não foram indicados argumentos para a pesquisa"
@@ -1421,95 +1421,90 @@ msgstr ""
msgid " failed - "
msgstr " falhou - "
-#: lib/depends.c:104
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "não consigo abrir a base de dados Packages em %s\n"
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "o pacote %s já está instalado"
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n"
-#: lib/depends.c:609
+#: lib/depends.c:404
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n"
-#: lib/depends.c:630
+#: lib/depends.c:425
#, fuzzy
msgid "(db files)"
msgstr "ficheiro db inválido %s\n"
-#: lib/depends.c:642
+#: lib/depends.c:437
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s SI (oferecidos pelo db)\n"
-#: lib/depends.c:655
+#: lib/depends.c:450
#, fuzzy
msgid "(db package)"
msgstr "nenhum pacote\n"
-#: lib/depends.c:694
+#: lib/depends.c:489
#, fuzzy, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr "%s: (%s, %s) adicionado à cache de dependências.\n"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
#, fuzzy
msgid "NO "
msgstr "NÃO-OK"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "a remover o %s-%s-%s \"%s\" das relações do tsort.\n"
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr "=========== a guardar as relações do tsort\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr "========== só os sucessores (ordem de apresentação)\n"
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr "CICLO:\n"
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr "========== a prosseguir o tsort ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1616,7 +1611,7 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "só os pacotes com versão <= 4 são suportados por esta versão do RPM\n"
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr ":%s: o readLead falhou\n"
@@ -1626,27 +1621,27 @@ msgstr ":%s: o readLead falhou\n"
msgid "%s: bad magic\n"
msgstr "Código de integridade inválido"
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: o rpmReadSignature falhou\n"
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Nenhuma assinatura disponível\n"
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr ":%s: o readLead falhou\n"
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: O fread falhou: %s\n"
@@ -1728,7 +1723,7 @@ msgstr "abreviatura para --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "actualizar o pacote se já estiver instalado"
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
msgid "<packagefile>+"
msgstr "<pacote>+"
@@ -1788,80 +1783,90 @@ msgstr "não executar os scripts (se existirem)"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "não executar os scripts (se existirem)"
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+#, fuzzy
+msgid "don't verify digest(s)"
+msgstr "não verificar os ficheiros no pacote"
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify signature(s)"
+msgstr "não verificar os ficheiros no pacote"
+
+#: lib/poptI.c:192
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "não executar nenhuns 'scriptlets' activados por este pacote"
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "não executa nenhuns scripts específicos do pacote"
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "não executar nenhuns 'scriptlets' de instalação"
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "não executar nenhuns 'scriptlets' de instalação"
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "não executar nenhuns 'scriptlets' de instalação"
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr "actualiza para um versão antiga do pacote (o --force faz isto automaticamente)"
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr "mostra percentagens enquanto o pacote instala"
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr "muda o pacote para <dir>, se for possível"
-#: lib/poptI.c:212
+#: lib/poptI.c:217
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "muda os ficheiros de <oldpath> para <newpath>"
-#: lib/poptI.c:213
+#: lib/poptI.c:218
#, fuzzy
msgid "<old>=<new>"
msgstr "<dir_ant>=<dir_nova>"
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr "instala mesmo se o pacote substituir ficheiros instalados"
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr "reinstalar se o pacote já estiver presente"
-#: lib/poptI.c:224
+#: lib/poptI.c:229
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr ""
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr "não instala, mas indica se iria funcionar ou não"
-#: lib/poptI.c:230
+#: lib/poptI.c:235
#, fuzzy
msgid "upgrade package(s)"
msgstr "actualizar o pacote"
@@ -1931,153 +1936,139 @@ msgstr "pesquisar o(s) pacote(s) activados pelo pacote"
msgid "rpm verify mode"
msgstr "modo de verificação do rpm"
-#: lib/poptQV.c:126
-msgid "rpm verify mode (legacy)"
-msgstr "modo de verificação do rpm (antigo)"
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
msgid "query/verify the package(s) which require a dependency"
msgstr "pesquisar/verificar o(s) pacote(s) que precisa duma dependência"
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
msgid "query/verify the package(s) which provide a dependency"
msgstr "pesquisar/verificar o(s) pacote(s) que oferecem uma dependência"
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
msgid "list all configuration files"
msgstr "listar todos os ficheiros de configuração"
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
msgid "list all documentation files"
msgstr "listar todos os ficheiros de documentação"
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
msgid "dump basic file information"
msgstr "apresentar a informação básica do ficheiro"
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
msgid "list files in package"
msgstr "listar os ficheiros no pacote"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr ""
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, fuzzy, c-format
msgid "skip %%readme files"
msgstr ":%s: o readLead falhou\n"
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
msgid "use the following query format"
msgstr "usar o formato de pesquisa seguinte"
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
msgid "substitute i18n sections into spec file"
msgstr "substituir as secções i18n no ficheiro spec"
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr "mostrar os estados dos ficheiros listados"
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
msgid "display a verbose file listing"
msgstr "mostrar uma listagem descritiva do ficheiro"
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "não verificar os ficheiros no pacote"
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
#, fuzzy
msgid "don't verify size of files"
msgstr "não verificar os ficheiros no pacote"
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "não verificar os ficheiros no pacote"
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
#, fuzzy
msgid "don't verify owner of files"
msgstr "não verificar os ficheiros no pacote"
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
#, fuzzy
msgid "don't verify group of files"
msgstr "não verificar os ficheiros no pacote"
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
#, fuzzy
msgid "don't verify mode of files"
msgstr "não verificar os ficheiros no pacote"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
msgid "don't verify files in package"
msgstr "não verificar os ficheiros no pacote"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
#, fuzzy
msgid "don't verify package dependencies"
msgstr "não verifica as dependências do pacote"
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "não executar o %verifyscript (se existir)"
-#: lib/poptQV.c:275 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify digest(s)"
-msgstr "não verificar os ficheiros no pacote"
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-#, fuzzy
-msgid "don't verify signature(s)"
-msgstr "não verificar os ficheiros no pacote"
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "não verificar os ficheiros no pacote"
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "não verificar os ficheiros no pacote"
-#: lib/poptQV.c:301
+#: lib/poptQV.c:298
#, fuzzy
-msgid "sign a package, preserving digests"
+msgid "sign a packagei (identical to --resign)"
msgstr "assinar um pacote (retira a assinatura actual)"
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
#, fuzzy
msgid "verify package signature(s)"
msgstr "verificar a assinatura do pacote"
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
+#: lib/poptQV.c:304
#, fuzzy
-msgid "sign a package, recomputing digests"
+msgid "sign a packagei (identical to --addsign)"
msgstr "assinar um pacote (retira a assinatura actual)"
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
#, fuzzy
msgid "generate signature"
msgstr "gerar a assinatura PGP/GPG"
@@ -2283,8 +2274,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:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, c-format
msgid "open of %s failed: %s\n"
msgstr "o acesso ao %s falhou: %s\n"
@@ -2298,7 +2289,7 @@ msgstr "a pesquisa do %s falhou\n"
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:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, fuzzy, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "%s: O fread falhou: %s\n"
@@ -2367,7 +2358,7 @@ msgstr "número de registo do pacote: %u\n"
msgid "record %u could not be read\n"
msgstr "o registo %d não pôde ser lido\n"
-#: lib/query.c:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr "o pacote %s não está instalado\n"
@@ -2416,42 +2407,42 @@ msgstr "%s: o writeLead falhou: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: o rpmWriteSignature falhou: %s\n"
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ":%s: o readLead falhou\n"
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Nenhuma assinatura disponível (RPM v1.0)\n"
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr "NÃO-OK"
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
msgid " (MISSING KEYS:"
msgstr " (FALTAM AS CHAVES:"
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr " (CHAVES SUSPEITAS:"
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr "OK"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2460,13 +2451,13 @@ msgstr ""
"A dependência \"B\" precisa duma época (assumindo a mesma que \"A\")\n"
"\t %s\tB %s\n"
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "requisito %s-%s-%s do pacote não satisfeito: %s\n"
@@ -2479,81 +2470,81 @@ msgstr "A preparar..."
msgid "Preparing packages for installation..."
msgstr "A preparar os pacotes para a instalação..."
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, 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:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr " ... como %s\n"
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "a ignorar o %s - a transferência falhou - %s\n"
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, 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:449
+#: lib/rpminstall.c:464
#, c-format
msgid "error reading from file %s\n"
msgstr "erro ao ler do ficheiros %s\n"
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, 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:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, c-format
msgid "%s cannot be installed\n"
msgstr "o %s não pode ser instalado\n"
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, 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:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr "dependências falhadas:\n"
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
msgid "installing binary packages\n"
msgstr "a instalar os pacotes binários\n"
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "não consigo aceder ao ficheiro %s: %s\n"
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "o \"%s\" especifica vários pacotes\n"
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr "a remoção destes pacotes irá quebrar dependências:\n"
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, c-format
msgid "cannot open %s: %s\n"
msgstr "não consigo aceder ao %s: %s\n"
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr "A instalar o %s\n"
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2658,6 +2649,11 @@ msgstr "Não consigo ler o %s, a HOME é demasiado grande.\n"
msgid "Unable to open %s for reading: %s.\n"
msgstr "Não consegui abrir o %s para leitura: %s.\n"
+#: lib/rpmts.c:73
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "não consigo abrir a base de dados Packages em %s\n"
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr "o ficheiro não é normal -- a ignorar a verificação do tamanho\n"
@@ -3416,6 +3412,17 @@ msgstr "o porto do URL tem de ser um número\n"
msgid "failed to create %s: %s\n"
msgstr "não consegui criar o %s: %s\n"
+#~ msgid "rpm verify mode (legacy)"
+#~ msgstr "modo de verificação do rpm (antigo)"
+
+#, fuzzy
+#~ msgid "sign a package, preserving digests"
+#~ msgstr "assinar um pacote (retira a assinatura actual)"
+
+#, fuzzy
+#~ msgid "sign a package, recomputing digests"
+#~ msgstr "assinar um pacote (retira a assinatura actual)"
+
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr "o pacote não tem o nome de utilizador nem as listas de IDs (nunca deve ocorrer)\n"
@@ -3517,9 +3524,6 @@ msgstr "não consegui criar o %s: %s\n"
#~ msgid "verify package signature"
#~ msgstr "verificar a assinatura do pacote"
-#~ msgid "sign a package (discard current signature)"
-#~ msgstr "assinar um pacote (retira a assinatura actual)"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "ignorar as assinaturas de GPG"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7c821eeac..9b19ced09 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-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
#: build.c:36
#, fuzzy
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "use <diretrio> como diretrio raiz"
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr ""
@@ -454,23 +454,23 @@ msgstr "no foram passados arquivos tar para construo"
msgid "no packages given for erase"
msgstr "no foram passados pacotes para assinatura"
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr "no foi passado pacote para instalao"
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr "no foi passado argumento para pesquisa"
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr "no foi passado argumento para verificao"
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr "argumentos no esperados em --querytags"
-#: rpmqv.c:1140
+#: rpmqv.c:1137
#, fuzzy
msgid "no arguments given"
msgstr "no foi passado argumento para pesquisa"
@@ -1578,94 +1578,88 @@ msgstr ""
msgid " failed - "
msgstr "Construo falhou.\n"
-# , c-format
-#: lib/depends.c:104
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "No consegui abrir: %s\n"
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "no foi passado pacote para instalao"
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:609
+#: lib/depends.c:404
msgid "(rpmlib provides)"
msgstr ""
# , c-format
-#: lib/depends.c:630
+#: lib/depends.c:425
#, fuzzy
msgid "(db files)"
msgstr "No consegui abrir: %s\n"
-#: lib/depends.c:642
+#: lib/depends.c:437
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:655
+#: lib/depends.c:450
#, fuzzy
msgid "(db package)"
msgstr "pesquise todos os pacotes"
-#: lib/depends.c:694
+#: lib/depends.c:489
#, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr ""
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "NO "
msgstr ""
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
# , c-format
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "No consegui abrir: %s\n"
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1778,7 +1772,7 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
@@ -1788,29 +1782,29 @@ msgstr ""
msgid "%s: bad magic\n"
msgstr ""
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr ""
# , c-format
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "No consegui abrir: %s\n"
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
# , c-format
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "No consegui abrir: %s\n"
@@ -1897,7 +1891,7 @@ msgstr "alis para --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "no foi passado pacote para instalao"
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
#, fuzzy
msgid "<packagefile>+"
msgstr " -b<estgio> <spec> "
@@ -1960,32 +1954,42 @@ msgstr "no execute nenhum estgio"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "no execute nenhum estgio"
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+#, fuzzy
+msgid "don't verify digest(s)"
+msgstr "instale pacote"
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify signature(s)"
+msgstr "instale pacote"
+
+#: lib/poptI.c:192
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "no execute nenhuma script especfica do pacote"
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "no execute nenhuma script de instalao"
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "no execute nenhuma script de instalao"
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "no execute nenhuma script de instalao"
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1993,48 +1997,48 @@ msgstr ""
"atualize para uma verso mais velha do pacote (--force em atualizaes no faz "
"isto automaticamente)"
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr "imprima porcentagens a medida que o pacote vai sendo instalado"
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr "realoque o pacote para <diretrio>, se realocvel"
-#: lib/poptI.c:212
+#: lib/poptI.c:217
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:218
#, fuzzy
msgid "<old>=<new>"
msgstr " [--nomd5] [alvos]"
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr "instale mesmo que o pacote substitua arquivos j instalados"
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr "reinstale se o pacote j estiver presente"
-#: lib/poptI.c:224
+#: lib/poptI.c:229
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr ""
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr "no instale, mas diga se a instalao funcionar ou no"
-#: lib/poptI.c:230
+#: lib/poptI.c:235
#, fuzzy
msgid "upgrade package(s)"
msgstr "instale pacote"
@@ -2112,165 +2116,150 @@ msgstr "pesquise o pacote ao qual <arquivo> pertence"
msgid "rpm verify mode"
msgstr "modo pesquisa"
-#: lib/poptQV.c:126
-#, fuzzy
-msgid "rpm verify mode (legacy)"
-msgstr "modo pesquisa"
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
#, fuzzy
msgid "query/verify the package(s) which require a dependency"
msgstr "pesquise pacotes que requerem capacidade <i>"
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
#, fuzzy
msgid "query/verify the package(s) which provide a dependency"
msgstr "pesquise pacotes que fornecem a capacidade <i>"
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
#, fuzzy
msgid "list all configuration files"
msgstr "liste somente os arquivos de configurao (implica -l)"
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
#, fuzzy
msgid "list all documentation files"
msgstr "instale documentao"
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
#, fuzzy
msgid "dump basic file information"
msgstr "mostre informao do pacote"
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
#, fuzzy
msgid "list files in package"
msgstr "instale pacote"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr ""
# , c-format
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, fuzzy, c-format
msgid "skip %%readme files"
msgstr "No consegui abrir: %s\n"
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
#, fuzzy
msgid "use the following query format"
msgstr "fonte de pesquisa no esperado"
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
#, fuzzy
msgid "display a verbose file listing"
msgstr "mostre a lista de arquivos do pacote"
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "instale pacote"
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
#, fuzzy
msgid "don't verify size of files"
msgstr "instale pacote"
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "instale pacote"
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
#, fuzzy
msgid "don't verify owner of files"
msgstr "instale pacote"
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
#, fuzzy
msgid "don't verify group of files"
msgstr "instale pacote"
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
#, fuzzy
msgid "don't verify mode of files"
msgstr "instale pacote"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
#, fuzzy
msgid "don't verify files in package"
msgstr "instale pacote"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
#, fuzzy
msgid "don't verify package dependencies"
msgstr "no verifique as dependncias do pacote"
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "no execute nenhum estgio"
-#: lib/poptQV.c:275 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify digest(s)"
-msgstr "instale pacote"
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-#, fuzzy
-msgid "don't verify signature(s)"
-msgstr "instale pacote"
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "instale pacote"
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "instale pacote"
-#: lib/poptQV.c:301
+#: lib/poptQV.c:298
#, fuzzy
-msgid "sign a package, preserving digests"
+msgid "sign a packagei (identical to --resign)"
msgstr "assine um pacote (descarte a assinatura corrente)"
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
#, fuzzy
msgid "verify package signature(s)"
msgstr "verifique a assinatura do pacote"
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
+#: lib/poptQV.c:304
#, fuzzy
-msgid "sign a package, recomputing digests"
+msgid "sign a packagei (identical to --addsign)"
msgstr "assine um pacote (descarte a assinatura corrente)"
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
#, fuzzy
msgid "generate signature"
msgstr "gere assinatura PGP"
@@ -2481,8 +2470,8 @@ msgstr "no foi passado pacote para instalao"
msgid "can't query %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "Construo falhou.\n"
@@ -2497,7 +2486,7 @@ msgid "old format source packages cannot be queried\n"
msgstr ""
# , c-format
-#: lib/query.c:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, fuzzy, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "No consegui abrir: %s\n"
@@ -2568,7 +2557,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, fuzzy, c-format
msgid "package %s is not installed\n"
msgstr "no foi passado pacote para instalao"
@@ -2622,55 +2611,55 @@ msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "no foi passado pacote para instalao"
@@ -2692,86 +2681,86 @@ 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:281
+#: lib/rpminstall.c:296
#, 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:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "no foi passado pacote para instalao"
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "no foi passado pacote para instalao"
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
#, fuzzy
msgid "failed dependencies:\n"
msgstr "lista dependncias do pacote"
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
#, fuzzy
msgid "installing binary packages\n"
msgstr "instale pacote"
# , c-format
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
#, fuzzy
msgid "removing these packages would break dependencies:\n"
msgstr "lista dependncias do pacote"
# , c-format
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "no foi passado pacote para desinstalao"
@@ -2883,6 +2872,12 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "No consegui abrir: %s\n"
+# , c-format
+#: lib/rpmts.c:73
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "No consegui abrir: %s\n"
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr ""
@@ -3676,6 +3671,18 @@ msgid "failed to create %s: %s\n"
msgstr "No consegui abrir o pipe tar: %s\n"
#, fuzzy
+#~ msgid "rpm verify mode (legacy)"
+#~ msgstr "modo pesquisa"
+
+#, fuzzy
+#~ msgid "sign a package, preserving digests"
+#~ msgstr "assine um pacote (descarte a assinatura corrente)"
+
+#, fuzzy
+#~ msgid "sign a package, recomputing digests"
+#~ msgstr "assine um pacote (descarte a assinatura corrente)"
+
+#, fuzzy
#~ msgid "========== Header RSA signature\n"
#~ msgstr "gere assinatura PGP"
@@ -3779,9 +3786,6 @@ msgstr "No consegui abrir o pipe tar: %s\n"
#~ msgid "verify package signature"
#~ msgstr "verifique a assinatura do pacote"
-#~ msgid "sign a package (discard current signature)"
-#~ msgstr "assine um pacote (descarte a assinatura corrente)"
-
#, fuzzy
#~ msgid "skip any GPG signatures"
#~ msgstr "desconsidere quaisquer assinaturas PGP"
diff --git a/po/ro.po b/po/ro.po
index 99f407123..1df85ef42 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-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"PO-Revision-Date: 1999-04-10 12:00+EST\n"
"Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
"Language-Team: Romanian <ro@li.org>\n"
@@ -113,7 +113,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr ""
@@ -403,23 +403,23 @@ msgstr ""
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1140
+#: rpmqv.c:1137
msgid "no arguments given"
msgstr ""
@@ -1404,89 +1404,84 @@ msgstr ""
msgid " failed - "
msgstr ""
-#: lib/depends.c:104
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr ""
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:609
+#: lib/depends.c:404
msgid "(rpmlib provides)"
msgstr ""
-#: lib/depends.c:630
+#: lib/depends.c:425
msgid "(db files)"
msgstr ""
-#: lib/depends.c:642
+#: lib/depends.c:437
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:655
+#: lib/depends.c:450
msgid "(db package)"
msgstr ""
-#: lib/depends.c:694
+#: lib/depends.c:489
#, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr ""
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "NO "
msgstr ""
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1591,7 +1586,7 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
@@ -1601,27 +1596,27 @@ msgstr ""
msgid "%s: bad magic\n"
msgstr ""
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1700,7 +1695,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
msgid "<packagefile>+"
msgstr ""
@@ -1760,77 +1755,85 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+msgid "don't verify digest(s)"
+msgstr ""
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+msgid "don't verify signature(s)"
+msgstr ""
+
+#: lib/poptI.c:192
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:212
+#: lib/poptI.c:217
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:218
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:224
+#: lib/poptI.c:229
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr ""
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:230
+#: lib/poptI.c:235
msgid "upgrade package(s)"
msgstr ""
@@ -1894,138 +1897,126 @@ msgstr ""
msgid "rpm verify mode"
msgstr ""
-#: lib/poptQV.c:126
-msgid "rpm verify mode (legacy)"
-msgstr ""
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
msgid "query/verify the package(s) which require a dependency"
msgstr ""
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
msgid "query/verify the package(s) which provide a dependency"
msgstr ""
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
msgid "list all configuration files"
msgstr ""
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
msgid "list all documentation files"
msgstr ""
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
msgid "dump basic file information"
msgstr ""
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
msgid "list files in package"
msgstr ""
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr ""
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, c-format
msgid "skip %%readme files"
msgstr ""
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
msgid "use the following query format"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
msgid "substitute i18n sections into spec file"
msgstr ""
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
msgid "don't execute verify script(s)"
msgstr ""
-#: lib/poptQV.c:275 lib/poptQV.c:313
-msgid "don't verify digest(s)"
-msgstr ""
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-msgid "don't verify signature(s)"
-msgstr ""
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
msgid "don't verify GPG V3 DSA signature(s)"
msgstr ""
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:301
-msgid "sign a package, preserving digests"
+#: lib/poptQV.c:298
+msgid "sign a packagei (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
msgid "verify package signature(s)"
msgstr ""
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
-msgid "sign a package, recomputing digests"
+#: lib/poptQV.c:304
+msgid "sign a packagei (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
msgid "generate signature"
msgstr ""
@@ -2228,8 +2219,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2243,7 +2234,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, c-format
msgid "%s: read manifest failed: %s\n"
msgstr ""
@@ -2312,7 +2303,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2359,55 +2350,55 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
@@ -2420,81 +2411,81 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2599,6 +2590,11 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
+#: lib/rpmts.c:73
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index b3a545040..b9a81f558 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr ""
@@ -408,23 +408,23 @@ msgstr ""
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1140
+#: rpmqv.c:1137
msgid "no arguments given"
msgstr ""
@@ -1409,89 +1409,84 @@ msgstr ""
msgid " failed - "
msgstr ""
-#: lib/depends.c:104
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr ""
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:609
+#: lib/depends.c:404
msgid "(rpmlib provides)"
msgstr ""
-#: lib/depends.c:630
+#: lib/depends.c:425
msgid "(db files)"
msgstr ""
-#: lib/depends.c:642
+#: lib/depends.c:437
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:655
+#: lib/depends.c:450
msgid "(db package)"
msgstr ""
-#: lib/depends.c:694
+#: lib/depends.c:489
#, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr ""
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "NO "
msgstr ""
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1596,7 +1591,7 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
@@ -1606,27 +1601,27 @@ msgstr ""
msgid "%s: bad magic\n"
msgstr ""
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1705,7 +1700,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
msgid "<packagefile>+"
msgstr ""
@@ -1765,77 +1760,85 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+msgid "don't verify digest(s)"
+msgstr ""
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+msgid "don't verify signature(s)"
+msgstr ""
+
+#: lib/poptI.c:192
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:212
+#: lib/poptI.c:217
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:218
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:224
+#: lib/poptI.c:229
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr ""
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:230
+#: lib/poptI.c:235
msgid "upgrade package(s)"
msgstr ""
@@ -1899,138 +1902,126 @@ msgstr ""
msgid "rpm verify mode"
msgstr ""
-#: lib/poptQV.c:126
-msgid "rpm verify mode (legacy)"
-msgstr ""
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
msgid "query/verify the package(s) which require a dependency"
msgstr ""
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
msgid "query/verify the package(s) which provide a dependency"
msgstr ""
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
msgid "list all configuration files"
msgstr ""
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
msgid "list all documentation files"
msgstr ""
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
msgid "dump basic file information"
msgstr ""
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
msgid "list files in package"
msgstr ""
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr ""
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, c-format
msgid "skip %%readme files"
msgstr ""
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
msgid "use the following query format"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
msgid "substitute i18n sections into spec file"
msgstr ""
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
msgid "don't execute verify script(s)"
msgstr ""
-#: lib/poptQV.c:275 lib/poptQV.c:313
-msgid "don't verify digest(s)"
-msgstr ""
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-msgid "don't verify signature(s)"
-msgstr ""
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
msgid "don't verify GPG V3 DSA signature(s)"
msgstr ""
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:301
-msgid "sign a package, preserving digests"
+#: lib/poptQV.c:298
+msgid "sign a packagei (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
msgid "verify package signature(s)"
msgstr ""
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
-msgid "sign a package, recomputing digests"
+#: lib/poptQV.c:304
+msgid "sign a packagei (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
msgid "generate signature"
msgstr ""
@@ -2233,8 +2224,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2248,7 +2239,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, c-format
msgid "%s: read manifest failed: %s\n"
msgstr ""
@@ -2317,7 +2308,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2364,55 +2355,55 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
@@ -2425,81 +2416,81 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2604,6 +2595,11 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
+#: lib/rpmts.c:73
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 995432e6b..0db595d88 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-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"PO-Revision-Date: 2001-08-29 13:55-0400\n"
"Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -115,7 +115,7 @@ msgstr "<ËÏÍÁÎÄÁ>"
msgid "use <dir> as the top level directory"
msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ËÁÔÁÌÏÇ> ËÁË ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ"
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr "<ËÁÔÁÌÏÇ>"
@@ -424,23 +424,23 @@ msgstr "ÎÅ ÚÁÄÁÎÙ tar-ÆÁÊÌÙ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÁ"
msgid "no packages given for erase"
msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÐÏÄÐÉÓÉ"
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ"
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁÐÒÏÓÁ"
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÄÌÑ ×ÅÒÉÆÉËÁÃÉÉ"
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr "ÎÅÏÖÉÄÁÎÎÙÅ ÁÒÇÕÍÅÎÔÙ ÄÌÑ --querytags "
-#: rpmqv.c:1140
+#: rpmqv.c:1137
#, fuzzy
msgid "no arguments given"
msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁÐÒÏÓÁ"
@@ -1442,75 +1442,70 @@ msgstr "æÁÊÌ ÁÒÈÉ×Á ÎÅ ÎÁÊÄÅÎ × ÚÁÇÏÌÏ×ËÅ ÐÁËÅÔÁ"
msgid " failed - "
msgstr "ÎÅ ÕÄÁÌÏÓØ - "
-#: lib/depends.c:104
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n"
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s YES (rpmrc provides)\n"
-#: lib/depends.c:609
+#: lib/depends.c:404
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s YES (rpmlib provides)\n"
-#: lib/depends.c:630
+#: lib/depends.c:425
#, fuzzy
msgid "(db files)"
msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n"
-#: lib/depends.c:642
+#: lib/depends.c:437
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s YES (db provides)\n"
-#: lib/depends.c:655
+#: lib/depends.c:450
#, fuzzy
msgid "(db package)"
msgstr "ÎÅÔ ÐÁËÅÔÏ×\n"
-#: lib/depends.c:694
+#: lib/depends.c:489
#, fuzzy, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "NO "
msgstr "îåT"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr "äá"
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n"
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1519,20 +1514,20 @@ msgstr ""
"========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, "
"ÇÌÕÂÉÎÁ)\n"
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n"
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr "ãéëì:\n"
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1640,7 +1635,7 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ÐÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ÐÁËÅÔÙ ×ÅÒÓÉÉ <= 4\n"
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: ÏÛÉÂËÁ readLead\n"
@@ -1650,27 +1645,27 @@ msgstr "%s: ÏÛÉÂËÁ readLead\n"
msgid "%s: bad magic\n"
msgstr "îÅ×ÅÒÎÙÊ magic"
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: ÏÛÉÂËÁ rpmReadSignature\n"
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: ðÏÄÐÉÓØ ÎÅÄÏÓÔÕÐÎÁ\n"
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: ÏÛÉÂËÁ readLead\n"
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ Fread: %s\n"
@@ -1754,7 +1749,7 @@ msgstr "ÓÏËÒÁÝÅÎÉÅ ÄÌÑ --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "ÏÂÎÏ×ÉÔØ ÐÁËÅÔ(Ù) ÅÓÌÉ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
msgid "<packagefile>+"
msgstr "<ÆÁÊÌ ÐÁËÅÔÁ>+"
@@ -1814,31 +1809,41 @@ msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%preun ÓÃÅÎÁÒÉÅ× (ÅÓÌÉ ÅÓÔØ)"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%postun ÓÃÅÎÁÒÉÅ× (ÅÓÌÉ ÅÓÔØ)"
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+#, fuzzy
+msgid "don't verify digest(s)"
+msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÎÁ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ MD5"
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify signature(s)"
+msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÐÕÔØ ÓÉÍ×ÏÌÉÞÅÓËÉÈ ÓÓÙÌÏË"
+
+#: lib/poptI.c:192
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÔÒÉÇÇÅÒ-ÓÃÅÎÁÒÉÅ×, ×Ú×ÅÄÅÎÎÙÈ ÜÔÉÍ ÐÁËÅÔÏÍ"
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%triggerprein ÓÃÅÎÁÒÉÅ×"
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%triggerin ÓÃÅÎÁÒÉÅ×"
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%triggerun ÓÃÅÎÁÒÉÅ×"
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%triggerpostun ÓÃÅÎÁÒÉÅ×"
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1846,50 +1851,50 @@ msgstr ""
"ÏÔËÁÔ ÎÁ ÂÏÌÅÅ ÓÔÁÒÕÀ ×ÅÒÓÉÀ ÐÁËÅÔÁ (--force ÐÒÉ ÏÂÎÏ×ÌÅÎÉÉ ÄÅÌÁÅÔ ÜÔÏ "
"Á×ÔÏÍÁÔÉÞÅÓËÉ)"
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr "×Ù×ÏÄÉÔØ ÐÒÏÃÅÎÔ ÇÏÔÏ×ÎÏÓÔÉ ÐÏ ÍÅÒÅ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ"
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr "ÐÅÒÅÍÅÓÔÉÔØ ÐÁËÅÔ × <ËÁÔÁÌÏÇ>, ÅÓÌÉ ÐÁËÅÔ ÜÔÏ ÐÏÚ×ÏÌÑÅÔ"
-#: lib/poptI.c:212
+#: lib/poptI.c:217
msgid "relocate files from path <old> to <new>"
msgstr "ÐÅÒÅÍÅÓÔÉÔØ ÆÁÊÌÙ ÉÚ ÐÕÔÉ <old> × <new>"
-#: lib/poptI.c:213
+#: lib/poptI.c:218
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr "ÓÏÈÒÁÎÉÔØ ÐÏÄÌÅÖÁÝÉÅ ÕÄÁÌÅÎÉÀ ÆÁÊÌÙ × ÎÏ×ÏÍ ÐÁËÅÔÅ"
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, ÄÁÖÅ ÅÓÌÉ ÐÁËÅÔ ÐÅÒÅÐÉÛÅÔ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÆÁÊÌÙ"
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr "ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ, ÅÓÌÉ ÐÁËÅÔ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
-#: lib/poptI.c:224
+#: lib/poptI.c:229
#, fuzzy
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
"ÕÄÁÌÉÔØ ÎÏ×ÙÊ(Å) ÐÁËÅÔ(Ù), ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ ÓÔÁÒÙÊ(Å) ÐÁËÅÔ(Ù), ÏÂÒÁÔÎÏ ÎÁ "
"ÕËÁÚÁÎÎÕÀ ÄÁÔÕ"
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr "<ÄÁÔÁ>"
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr "ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, Á ÔÏÌØËÏ ÓÏÏÂÝÉÔØ, ÕÄÁÓÔÓÑ ÌÉ ÕÓÔÁÎÏ×ËÁ"
-#: lib/poptI.c:230
+#: lib/poptI.c:235
msgid "upgrade package(s)"
msgstr "ÏÂÎÏ×ÉÔØ ÐÁËÅÔ(Ù)"
@@ -1958,146 +1963,132 @@ msgstr "ÚÁÐÒÏÓÉÔØ ÐÁËÅÔÙ Ó ÔÒÉÇÇÅÒ-ÓÃÅÎÁÒÉÑÍÉ ÎÁ ÐÁËÅÔ"
msgid "rpm verify mode"
msgstr "ÒÅÖÉÍ ÐÒÏ×ÅÒËÉ rpm"
-#: lib/poptQV.c:126
-msgid "rpm verify mode (legacy)"
-msgstr "ÒÅÖÉÍ ÐÒÏ×ÅÒËÉ rpm (ÓÔÁÒÙÊ)"
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
msgid "query/verify the package(s) which require a dependency"
msgstr "ÎÁÊÔÉ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔÙ, ÔÒÅÂÕÀÝÉÅ ÓÅÒ×ÉÓ"
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
msgid "query/verify the package(s) which provide a dependency"
msgstr "ÎÁÊÔÉ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔÙ, ÐÒÅÄÏÓÔÁ×ÌÑÀÝÉÅ ÓÅÒ×ÉÓ"
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
msgid "list all configuration files"
msgstr "ÐÏËÁÚÁÔØ ×ÓÅ ÆÁÊÌÙ ËÏÎÆÉÇÕÒÁÃÉÉ"
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
msgid "list all documentation files"
msgstr "ÐÏËÁÚÁÔØ ×ÓÅ ÆÁÊÌÙ ÄÏËÕÍÅÎÔÁÃÉÉ"
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
msgid "dump basic file information"
msgstr "ÐÏËÁÚÁÔØ ÏÓÎÏ×ÎÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÆÁÊÌÅ"
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
msgid "list files in package"
msgstr "ÐÏËÁÚÁÔØ ÓÐÉÓÏË ÆÁÊÌÏ× ÐÁËÅÔÁ"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr "ÐÒÏÐÕÓÔÉÔØ ÆÁÊÌÙ %%ghost"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr "ÐÒÏÐÕÓÔÉÔØ ÆÁÊÌÙ %%license"
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, c-format
msgid "skip %%readme files"
msgstr "ÐÒÏÐÕÓÔÉÔØ ÆÁÊÌÙ %%readme"
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
msgid "use the following query format"
msgstr "ÉÓÐÏÌØÚÕÊÔÅ ÓÌÅÄÕÀÝÉÊ ÆÏÒÍÁÔ ÚÁÐÒÏÓÁ"
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
msgid "substitute i18n sections into spec file"
msgstr "ÚÁÍÅÎÉÔØ ÓÅËÃÉÉ i18n × ÆÁÊÌÅ ÓÐÅÃÉÆÉËÁÃÉÉ"
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr "ÐÏËÁÚÁÔØ ÓÏÓÔÏÑÎÉÅ ÐÅÒÅÞÉÓÌÅÎÎÙÈ ÆÁÊÌÏ×"
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
msgid "display a verbose file listing"
msgstr "ÐÏËÁÚÁÔØ ÄÅÔÁÌØÎÙÊ ÓÐÉÓÏË ÆÁÊÌÏ×"
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
msgid "don't verify MD5 digest of files"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÎÁ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ MD5"
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
msgid "don't verify size of files"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÒÁÚÍÅÒ ÆÁÊÌÏ×"
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
msgid "don't verify symlink path of files"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÐÕÔØ ÓÉÍ×ÏÌÉÞÅÓËÉÈ ÓÓÙÌÏË"
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
msgid "don't verify owner of files"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÈÏÚÑÉÎÁ ÆÁÊÌÏ×"
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
msgid "don't verify group of files"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÇÒÕÐÐÕ ÆÁÊÌÏ×"
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ×ÒÅÍÑ ÍÏÄÉÆÉËÁÃÉÉ ÆÁÊÌÏ×"
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
msgid "don't verify mode of files"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÐÒÁ×Á ÄÏÓÔÕÐÁ ÆÁÊÌÏ× ÐÁËÅÔÁ"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
msgid "don't verify files in package"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÐÁËÅÔÁ"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
msgid "don't verify package dependencies"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÚÁ×ÉÓÉÍÏÓÔÉ ÐÁËÅÔÁ"
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %verifyscript (ÅÓÌÉ ÅÓÔØ)"
-#: lib/poptQV.c:275 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify digest(s)"
-msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÎÁ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ MD5"
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-#, fuzzy
-msgid "don't verify signature(s)"
-msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÐÕÔØ ÓÉÍ×ÏÌÉÞÅÓËÉÈ ÓÓÙÌÏË"
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ SHA1 ÚÁÇÏÌÏ×ËÁ ÐÁËÅÔÁ"
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÎÁ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ MD5"
-#: lib/poptQV.c:301
+#: lib/poptQV.c:298
#, fuzzy
-msgid "sign a package, preserving digests"
+msgid "sign a packagei (identical to --resign)"
msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕÝÕÀ ÐÏÄÐÉÓØ)"
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
#, fuzzy
msgid "verify package signature(s)"
msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ × ÐÁËÅÔÅ"
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
+#: lib/poptQV.c:304
#, fuzzy
-msgid "sign a package, recomputing digests"
+msgid "sign a packagei (identical to --addsign)"
msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕÝÕÀ ÐÏÄÐÉÓØ)"
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
msgid "generate signature"
msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ ÐÏÄÐÉÓØ"
@@ -2302,8 +2293,8 @@ msgstr "ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÓÐÉÓËÏ× ÎÉ ÈÏÚÑÅ× ÆÁÊÌÏ×, ÎÉ ÉÈ ID\n"
msgid "can't query %s: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÒÏÓÉÔØ %s: %s\n"
-#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, c-format
msgid "open of %s failed: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
@@ -2317,7 +2308,7 @@ msgstr "ÏÛÉÂËÁ ÚÁÐÒÏÓÁ %s\n"
msgid "old format source packages cannot be queried\n"
msgstr "ÚÁÐÒÏÓÙ Ë ÉÓÈÏÄÎÙÍ ÐÁËÅÔÁÍ × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n"
-#: lib/query.c:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ ÞÔÅÎÉÑ ÓÐÉÓËÁ ÆÁÊÌÏ×: %s\n"
@@ -2386,7 +2377,7 @@ msgstr "ÎÏÍÅÒ ÚÁÐÉÓÉ ÐÁËÅÔÁ: %u\n"
msgid "record %u could not be read\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÚÁÐÉÓØ %u\n"
-#: lib/query.c:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
@@ -2435,42 +2426,42 @@ msgstr "%s: ÏÛÉÂËÁ writeLead: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ rpmWriteSignature: %s\n"
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: ÏÛÉÂËÁ readLead\n"
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: ðÏÄÐÉÓÉ ÎÅÔ (RPM v1.0)\n"
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr "îå Oë"
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
msgid " (MISSING KEYS:"
msgstr " (ïôóõôóô÷õàô ëìàþé:"
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr " (îåô äï÷åòéñ ë ëìàþáí:"
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr "Oë"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2479,13 +2470,13 @@ msgstr ""
"ÄÌÑ ÚÁ×ÉÓÉÍÏÓÔÉ \"B\" ÎÕÖÎÏ ÕËÁÚÁÔØ \"epoch\" (ÔÁË ÖÅ ËÁË ÄÌÑ \"A\")\n"
"\tA %s\tB %s\n"
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
@@ -2498,81 +2489,81 @@ msgstr "ðÏÄÇÏÔÏ×ËÁ..."
msgid "Preparing packages for installation..."
msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× ÄÌÑ ÕÓÔÁÎÏ×ËÉ..."
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, c-format
msgid "Retrieving %s\n"
msgstr "úÁÇÒÕÖÁÅÔÓÑ %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr " ... ËÁË %s\n"
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s ÐÒÏÐÕÓËÁÅÔÓÑ - ÏÛÉÂËÁ ÐÅÒÅÄÁÞÉ - %s\n"
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, c-format
msgid "package %s is not relocateable\n"
msgstr "ÐÁËÅÔ %s - ÎÅ ÐÅÒÅÍÅÝÁÅÍÙÊ\n"
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, c-format
msgid "error reading from file %s\n"
msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s\n"
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "ÄÌÑ ÆÁÊÌÁ %s ÎÅÏÂÈÏÄÉÍÁ ÂÏÌÅÅ ÎÏ×ÁÑ ×ÅÒÓÉÑ RPM\n"
-#: lib/rpminstall.c:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n"
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ÐÁËÅÔÏ×\n"
-#: lib/rpminstall.c:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n"
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
msgid "installing binary packages\n"
msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÂÉÎÁÒÎÙÅ ÐÁËÅÔÙ\n"
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s: %s\n"
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ×\n"
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr "ÕÄÁÌÅÎÉÅ ÜÔÉÈ ÐÁËÅÔÏ× ÎÁÒÕÛÉÔ ÚÁ×ÉÓÉÍÏÓÔÉ:\n"
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s\n"
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2677,6 +2668,11 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ %s, ÚÎÁÞÅÎÉÅ HOME ÓÌÉÛËÏÍ ×ÅÌÉËÏ.\n"
msgid "Unable to open %s for reading: %s.\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ: %s.\n"
+#: lib/rpmts.c:73
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n"
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr "ÎÅÏÂÙÞÎÙÊ ÆÁÊÌ -- ÐÒÏÐÕÓËÁÀ ÐÒÏ×ÅÒËÕ ÒÁÚÍÅÒÁ\n"
@@ -3441,6 +3437,17 @@ msgstr "url ÐÏÒÔ ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ\n"
msgid "failed to create %s: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n"
+#~ msgid "rpm verify mode (legacy)"
+#~ msgstr "ÒÅÖÉÍ ÐÒÏ×ÅÒËÉ rpm (ÓÔÁÒÙÊ)"
+
+#, fuzzy
+#~ msgid "sign a package, preserving digests"
+#~ msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕÝÕÀ ÐÏÄÐÉÓØ)"
+
+#, fuzzy
+#~ msgid "sign a package, recomputing digests"
+#~ msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕÝÕÀ ÐÏÄÐÉÓØ)"
+
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
@@ -3534,9 +3541,6 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n"
#~ msgid "verify package signature"
#~ msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ × ÐÁËÅÔÅ"
-#~ msgid "sign a package (discard current signature)"
-#~ msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕÝÕÀ ÐÏÄÐÉÓØ)"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "ÐÒÏÐÕÓÔÉÔØ ×ÓÅ GPG-ÐÏÄÐÉÓÉ"
diff --git a/po/sk.po b/po/sk.po
index a10b71ded..abfdf9f2d 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-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"PO-Revision-Date: 1999-04-08 21:37+02:00\n"
"Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -115,7 +115,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "pou¾i» <adresár> ako adresár najvy¹¹ej úrovne"
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr ""
@@ -424,23 +424,23 @@ msgstr "neboli zadané ¾iadne tar-súbory pre zostavenie"
msgid "no packages given for erase"
msgstr "neboli zadané ¾iadne balíky na podpis"
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr "neboli zadané ¾iadne balíky pre in¹taláciu"
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr "neboli zadané ¾iadne argumenty pre otázku"
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr "neboli zadané ¾iadne argumenty pre overenie"
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr "neoèakávané argumenty pre --querytags"
-#: rpmqv.c:1140
+#: rpmqv.c:1137
#, fuzzy
msgid "no arguments given"
msgstr "neboli zadané ¾iadne argumenty pre otázku"
@@ -1464,95 +1464,90 @@ msgstr ""
msgid " failed - "
msgstr " zlyhalo - "
-#: lib/depends.c:104
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "balík %s nie je nain¹talovaný\n"
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
#, fuzzy
msgid "(rpmrc provides)"
msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
-#: lib/depends.c:609
+#: lib/depends.c:404
#, fuzzy
msgid "(rpmlib provides)"
msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
-#: lib/depends.c:630
+#: lib/depends.c:425
#, fuzzy
msgid "(db files)"
msgstr "chybný stav súboru: %s"
-#: lib/depends.c:642
+#: lib/depends.c:437
#, fuzzy
msgid "(db provides)"
msgstr "Poskytuje:"
-#: lib/depends.c:655
+#: lib/depends.c:450
#, fuzzy
msgid "(db package)"
msgstr "nájdených %d balíkov\n"
-#: lib/depends.c:694
+#: lib/depends.c:489
#, fuzzy, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
#, fuzzy
msgid "NO "
msgstr "NIE JE V PORIADKU"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "odstraòuje sa index skupín\n"
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1661,7 +1656,7 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "táto verzia RPM podporuje iba balíky s hlavným èíslom <= 3"
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead zlyhalo\n"
@@ -1671,27 +1666,27 @@ msgstr "%s: readLead zlyhalo\n"
msgid "%s: bad magic\n"
msgstr "Chybné magické èíslo"
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature zlyhalo\n"
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Podpis nie je k dispozícii\n"
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
@@ -1779,7 +1774,7 @@ msgstr "skratka pre --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "balík %s nie je nain¹talovaný\n"
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
#, fuzzy
msgid "<packagefile>+"
msgstr " -p <súbor_balíku>+"
@@ -1840,32 +1835,42 @@ msgstr "nevykona» ¾iadne etapy"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nevykona» ¾iadne etapy"
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+#, fuzzy
+msgid "don't verify digest(s)"
+msgstr "zobrazi» súbory v balíku"
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify signature(s)"
+msgstr "zobrazi» súbory v balíku"
+
+#: lib/poptI.c:192
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "nevykona» ¾iadne skripty spú¹»ané týmto balíkom"
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nevykona» ¾iadne skripty ¹pecifikované balíkom"
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nevykona» ¾iadne in¹talaèné skripty"
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nevykona» ¾iadne in¹talaèné skripty"
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nevykona» ¾iadne in¹talaèné skripty"
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1873,49 +1878,49 @@ msgstr ""
"aktualizova» na star¹iu verziu balíka (--force to pri aktualizácii urobí "
"automaticky)"
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr "vypisova» percentá poèas in¹talácie balíka"
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr "presunú» balík do <adresára>, pokiaµ to balík povoµuje"
-#: lib/poptI.c:212
+#: lib/poptI.c:217
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "presunú» súbory zo <starej_cesty> do <novej_cesty>"
-#: lib/poptI.c:213
+#: lib/poptI.c:218
#, fuzzy
msgid "<old>=<new>"
msgstr " --relocate <stará_cesta>=<nová_cesta>"
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr "in¹talova» aj pokiaµ balík prepí¹e in¹talované súbory"
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr "prein¹talova», pokiaµ u¾ balík existuje"
-#: lib/poptI.c:224
+#: lib/poptI.c:229
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr ""
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr "nein¹talova», ale oznámi», èi by to bolo mo¾né"
-#: lib/poptI.c:230
+#: lib/poptI.c:235
#, fuzzy
msgid "upgrade package(s)"
msgstr " --upgrade <súbor_balíka>"
@@ -1992,159 +1997,144 @@ msgstr "opýta» sa balíkov spustených balíkom"
msgid "rpm verify mode"
msgstr "re¾im otázok"
-#: lib/poptQV.c:126
-#, fuzzy
-msgid "rpm verify mode (legacy)"
-msgstr "re¾im otázok"
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
#, fuzzy
msgid "query/verify the package(s) which require a dependency"
msgstr "opýta» sa na balíky vy¾adujúce schopnos» <schopnos»>"
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
#, fuzzy
msgid "query/verify the package(s) which provide a dependency"
msgstr "opýta» sa na balíky poskytujúce schopnos» <schopnos»>"
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
msgid "list all configuration files"
msgstr "zobrazi» v¹etky konfiguraèné súbory"
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
#, fuzzy
msgid "list all documentation files"
msgstr "zobrazi» v¹etky dokumentaèné súbory"
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
msgid "dump basic file information"
msgstr "zobrazi» základné informácie o balíku"
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
msgid "list files in package"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr ""
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, fuzzy, c-format
msgid "skip %%readme files"
msgstr "%s: readLead zlyhalo\n"
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
msgid "use the following query format"
msgstr "pou¾i» nasledovný formát otázky"
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor"
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr "zobrazii» stav daných súborov"
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
msgid "display a verbose file listing"
msgstr "zobrazi» podrobný zoznam súborov balíka"
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
#, fuzzy
msgid "don't verify size of files"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
#, fuzzy
msgid "don't verify owner of files"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
#, fuzzy
msgid "don't verify group of files"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
#, fuzzy
msgid "don't verify mode of files"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
#, fuzzy
msgid "don't verify files in package"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
#, fuzzy
msgid "don't verify package dependencies"
msgstr "neoverova» závislosti balíka"
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "nevykona» ¾iadne etapy"
-#: lib/poptQV.c:275 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify digest(s)"
-msgstr "zobrazi» súbory v balíku"
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-#, fuzzy
-msgid "don't verify signature(s)"
-msgstr "zobrazi» súbory v balíku"
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:301
+#: lib/poptQV.c:298
#, fuzzy
-msgid "sign a package, preserving digests"
+msgid "sign a packagei (identical to --resign)"
msgstr "podpísa» balík (znièi» aktuálny podpis)"
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
#, fuzzy
msgid "verify package signature(s)"
msgstr "overi» podpis balíka"
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
+#: lib/poptQV.c:304
#, fuzzy
-msgid "sign a package, recomputing digests"
+msgid "sign a packagei (identical to --addsign)"
msgstr "podpísa» balík (znièi» aktuálny podpis)"
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
#, fuzzy
msgid "generate signature"
msgstr "vytvori» PGP/GPG podpis"
@@ -2353,8 +2343,8 @@ msgstr "balík neobsahuje ani vlastníka súboru, ani zoznamy identifikácií"
msgid "can't query %s: %s\n"
msgstr "zmazanie %s zlyhalo: %s\n"
-#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "otvorenie %s zlyhalo\n"
@@ -2368,7 +2358,7 @@ msgstr "otázka na %s zlyhala\n"
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:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, fuzzy, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
@@ -2438,7 +2428,7 @@ msgstr "po¾aduje sa záznam èíslo %d\n"
msgid "record %u could not be read\n"
msgstr "záznam %d nie je mo¾né preèíta»\n"
-#: lib/query.c:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr "balík %s nie je nain¹talovaný\n"
@@ -2488,55 +2478,55 @@ msgstr "%s: readLead zlyhalo\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmReadSignature zlyhalo\n"
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Podpis nie je k dispozícii (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr "NIE JE V PORIADKU"
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
msgid " (MISSING KEYS:"
msgstr " (CHÝBAJÚCE K¥ÚÈE):"
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr " (NEDÔVERUJE SA K¥ÚÈOM: "
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr "V PORIADKU"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, fuzzy, c-format
msgid " %s A %s\tB %s\n"
msgstr " rpm {--version}"
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n"
@@ -2550,81 +2540,81 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "neboli zadané ¾iadne balíky pre in¹taláciu"
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, 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:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr "... ako %s\n"
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s vynechané - prenos zlyhal - %s\n"
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "balík %s nie je nain¹talovaný\n"
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "chyba pri vytváraní doèasného súboru %s"
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie je mo¾né nain¹talova»\n"
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, 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:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr "nevyrie¹ené závislosti:\n"
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
msgid "installing binary packages\n"
msgstr "in¹talujú sa binárne balíky\n"
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "nie je mo¾né otvori» súbor %s: %s"
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ¹pecifikuje viac balíkov\n"
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr "odstránenie týchto balíkov by poru¹ilo závislosti:\n"
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nie je mo¾né otvori» %s\n"
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr "In¹taluje sa %s\n"
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2729,6 +2719,11 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Nie je mo¾né otvori» %s pre èítanie: %s."
+#: lib/rpmts.c:73
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr "nejde o be¾ný súbor - kontrola veµkosti vynechaná\n"
@@ -3500,6 +3495,18 @@ msgid "failed to create %s: %s\n"
msgstr "nepodarilo sa vytvori» %s\n"
#, fuzzy
+#~ msgid "rpm verify mode (legacy)"
+#~ msgstr "re¾im otázok"
+
+#, fuzzy
+#~ msgid "sign a package, preserving digests"
+#~ msgstr "podpísa» balík (znièi» aktuálny podpis)"
+
+#, fuzzy
+#~ msgid "sign a package, recomputing digests"
+#~ msgstr "podpísa» balík (znièi» aktuálny podpis)"
+
+#, fuzzy
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
@@ -3607,9 +3614,6 @@ msgstr "nepodarilo sa vytvori» %s\n"
#~ msgid "verify package signature"
#~ msgstr "overi» podpis balíka"
-#~ msgid "sign a package (discard current signature)"
-#~ msgstr "podpísa» balík (znièi» aktuálny podpis)"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "vynecha» akékoµvek GPG podpisy"
diff --git a/po/sl.po b/po/sl.po
index 5fc0b9dde..ffed41995 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 <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.231 2002/03/12 16:56:58 jbj Exp $
+# $Id: sl.po,v 1.232 2002/03/13 18:00:01 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"PO-Revision-Date: 2000-10-08 19:05+0200\n"
"Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -119,7 +119,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "uporabi <imenik> za korenski imenik"
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr ""
@@ -422,23 +422,23 @@ msgstr "arhiv tar za izgradnjo manjka"
msgid "no packages given for erase"
msgstr "paketi katere bi bilo potrebno podpisati niso navedeni"
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr "argumenti za poizvedbo niso podani"
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr "argumenti za preverjanje niso podani"
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr "neprièakovani argumenti za --querytags "
-#: rpmqv.c:1140
+#: rpmqv.c:1137
#, fuzzy
msgid "no arguments given"
msgstr "argumenti za poizvedbo niso podani"
@@ -1465,95 +1465,90 @@ msgstr ""
msgid " failed - "
msgstr " neuspe¹no - "
-#: lib/depends.c:104
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n"
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "paket %s-%s-%s je ¾e name¹èen"
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s DA (rpmrc ponudbe)\n"
-#: lib/depends.c:609
+#: lib/depends.c:404
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s DA (rpmlib ponudbe)\n"
-#: lib/depends.c:630
+#: lib/depends.c:425
#, fuzzy
msgid "(db files)"
msgstr "po¹kodovana zbirka podatkov %s"
-#: lib/depends.c:642
+#: lib/depends.c:437
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s DA (db ponudbe)\n"
-#: lib/depends.c:655
+#: lib/depends.c:450
#, fuzzy
msgid "(db package)"
msgstr "ni paketov\n"
-#: lib/depends.c:694
+#: lib/depends.c:489
#, fuzzy, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
#, fuzzy
msgid "NO "
msgstr "NI DOBRO"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "odstranjujemo seznam skupin\n"
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1662,7 +1657,7 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <=4"
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead je bil neuspe¹en\n"
@@ -1672,27 +1667,27 @@ msgstr "%s: readLead je bil neuspe¹en\n"
msgid "%s: bad magic\n"
msgstr "Napaèno magièno ¹tevilo"
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature je bil neuspe¹en\n"
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Podpis ni na voljo\n"
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead je bil neuspe¹en\n"
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
@@ -1778,7 +1773,7 @@ msgstr "okraj¹ava za --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "paket %s-%s-%s je ¾e name¹èen"
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
#, fuzzy
msgid "<packagefile>+"
msgstr " -p <paket>+ "
@@ -1840,32 +1835,42 @@ msgstr "brez izvajanja katerekoli stopen izgradnje"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "brez izvajanja katerekoli stopen izgradnje"
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+#, fuzzy
+msgid "don't verify digest(s)"
+msgstr "brez preverjanja datotek v paketu"
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify signature(s)"
+msgstr "brez preverjanja datotek v paketu"
+
+#: lib/poptI.c:192
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "brez izvajanja katerihkoli skriptov, ki jih po¾ene ta paket"
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "brez izvajanja skriptov paketa"
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "brez izvajanja namestitvenih skriptov"
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "brez izvajanja namestitvenih skriptov"
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "brez izvajanja namestitvenih skriptov"
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1873,49 +1878,49 @@ msgstr ""
"nadgraditev na starej¹o razlièico paketa (--force pri nadgradnjah "
"avtomatièno vkljuèi to izbiro)"
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr "izpis odstotkov med namestitvijo"
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr "èe je mogoèe, bo paket prestavljen v imenik <imenik>"
-#: lib/poptI.c:212
+#: lib/poptI.c:217
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "prestavljanje datoteke iz stare poti v novo"
-#: lib/poptI.c:213
+#: lib/poptI.c:218
#, fuzzy
msgid "<old>=<new>"
msgstr " --relocate <starapot>=<novapot>"
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr "namesti, èetudi paket pi¹e prek ¾e name¹èene datoteke"
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr "ponovno namesti, èe paket ¾e obstaja"
-#: lib/poptI.c:224
+#: lib/poptI.c:229
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr ""
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr "ne namesti, a ugotovi, èe bi delovalo"
-#: lib/poptI.c:230
+#: lib/poptI.c:235
#, fuzzy
msgid "upgrade package(s)"
msgstr " --upgrade <paket> "
@@ -1992,157 +1997,142 @@ msgstr "poizvedba po paketih, ki jih spro¾i paket"
msgid "rpm verify mode"
msgstr "poizvedbeni naèin"
-#: lib/poptQV.c:126
-#, fuzzy
-msgid "rpm verify mode (legacy)"
-msgstr "poizvedbeni naèin (opu¹èen)"
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
#, fuzzy
msgid "query/verify the package(s) which require a dependency"
msgstr "poizvedba po paketih, ki potrebujejo dano zmo¾nost <mo¾>"
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
#, fuzzy
msgid "query/verify the package(s) which provide a dependency"
msgstr "poizvedba po paketih, ki ponujajo dano zmo¾nost <mo¾>"
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
msgid "list all configuration files"
msgstr "izpis vseh nastavitvene datoteke"
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
msgid "list all documentation files"
msgstr "izpis vseh dokumentacijske datoteke"
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
msgid "dump basic file information"
msgstr "iznos osnovnih podatkov o datoteki"
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
msgid "list files in package"
msgstr "izpis seznama datotek v paketu"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr ""
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, fuzzy, c-format
msgid "skip %%readme files"
msgstr "%s: readLead je bil neuspe¹en\n"
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
msgid "use the following query format"
msgstr "uporabi naslednjo obliko poizvedbe"
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "zamenjava razdeljkov I18N z naslednjim katalogom"
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr "izpis stanja seznama datotek"
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
msgid "display a verbose file listing"
msgstr "izpis ob¹irnega seznama datotek"
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
#, fuzzy
msgid "don't verify size of files"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
#, fuzzy
msgid "don't verify owner of files"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
#, fuzzy
msgid "don't verify group of files"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
#, fuzzy
msgid "don't verify mode of files"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
msgid "don't verify files in package"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
#, fuzzy
msgid "don't verify package dependencies"
msgstr "brez preverjanja soodvisnosti paketa"
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "brez izvajanja katerekoli stopen izgradnje"
-#: lib/poptQV.c:275 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify digest(s)"
-msgstr "brez preverjanja datotek v paketu"
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-#, fuzzy
-msgid "don't verify signature(s)"
-msgstr "brez preverjanja datotek v paketu"
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:301
+#: lib/poptQV.c:298
#, fuzzy
-msgid "sign a package, preserving digests"
+msgid "sign a packagei (identical to --resign)"
msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)"
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
#, fuzzy
msgid "verify package signature(s)"
msgstr "preveri podpis paketa(-ov)"
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
+#: lib/poptQV.c:304
#, fuzzy
-msgid "sign a package, recomputing digests"
+msgid "sign a packagei (identical to --addsign)"
msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)"
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
#, fuzzy
msgid "generate signature"
msgstr "izdelava podpisa PGP/GPG"
@@ -2352,8 +2342,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:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, c-format
msgid "open of %s failed: %s\n"
msgstr "odpiranje %s je bilo neuspe¹no: %s\n"
@@ -2367,7 +2357,7 @@ msgstr "poizvedba po %s je bila neuspe¹na\n"
msgid "old format source packages cannot be queried\n"
msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n"
-#: lib/query.c:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, fuzzy, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
@@ -2437,7 +2427,7 @@ msgstr "¹tevilka zapisa paketa: %d\n"
msgid "record %u could not be read\n"
msgstr "zapisa %d ni mo¾no prebrati\n"
-#: lib/query.c:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s ni name¹èen\n"
@@ -2486,42 +2476,42 @@ msgstr "%s: writeLead je bil neuspe¹en: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature je bilo neuspe¹no: %s\n"
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead je bil neuspe¹en\n"
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Podpis ni na voljo (RPM v1.0)\n"
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr "NI DOBRO"
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
msgid " (MISSING KEYS:"
msgstr " (MANJKAJOÈI KLJUÈI:"
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr " (NEPREVERJENI KLJUÈI:"
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr "V REDU"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2530,13 +2520,13 @@ msgstr ""
"odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n"
"\tA %s\tB %s\n"
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
@@ -2550,81 +2540,81 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "paketi za namestitev niso navedeni"
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, 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:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr " ... kot %s\n"
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "preskoèeno - %s - prenos neuspe¹en - %s\n"
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, c-format
msgid "package %s is not relocateable\n"
msgstr "paketa %s ni mo¾no premakniti\n"
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, c-format
msgid "error reading from file %s\n"
msgstr "napaka pri branju iz datoteke %s\n"
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, 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:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ni mo¾no namestiti\n"
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "najdeno %d izvornih in %d binarnih paketov\n"
-#: lib/rpminstall.c:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr "neuspe¹ne soodvisnosti:\n"
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
msgid "installing binary packages\n"
msgstr "name¹èanje binarnih paketov\n"
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "ni mo¾no odpreti datoteke %s: %s\n"
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" doloèa veè paketov\n"
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n"
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ni mo¾no odpreti %s: %s\n"
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr "Name¹èanje %s\n"
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2729,6 +2719,11 @@ msgstr "Ni mo¾no prebrati %s, HOME je prevelik."
msgid "Unable to open %s for reading: %s.\n"
msgstr "%s ni mo¾no odpreti za branje: %s."
+#: lib/rpmts.c:73
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n"
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr "datoteka ni navadna datoteka -- preskakujemo preverjanje velikosti\n"
@@ -3507,6 +3502,18 @@ msgid "failed to create %s: %s\n"
msgstr "neuspe¹no ustvarjanje %s: %s\n"
#, fuzzy
+#~ msgid "rpm verify mode (legacy)"
+#~ msgstr "poizvedbeni naèin (opu¹èen)"
+
+#, fuzzy
+#~ msgid "sign a package, preserving digests"
+#~ msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)"
+
+#, fuzzy
+#~ msgid "sign a package, recomputing digests"
+#~ msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)"
+
+#, fuzzy
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
@@ -3614,9 +3621,6 @@ msgstr "neuspe¹no ustvarjanje %s: %s\n"
#~ msgid "verify package signature"
#~ msgstr "preveri podpis paketa(-ov)"
-#~ msgid "sign a package (discard current signature)"
-#~ msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "preskoèi vse podpise GPG"
diff --git a/po/sr.po b/po/sr.po
index 0e5dcb32c..55b1f15de 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-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-05-02 21:41:47-0400\n"
@@ -112,7 +112,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "koristi <dir> kao direktorijum najvi¹eg nivoa"
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr ""
@@ -415,23 +415,23 @@ msgstr "nedostaju 'tar' datoteke za kreiranje"
msgid "no packages given for erase"
msgstr "nedostaje paket za potpisivanje"
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr "nedostaje paket za instalaciju"
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr "nedostaju argumenti za upit"
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr "nedostaju argumenti za proveru"
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr "neoèekivani argumenti za --querytags"
-#: rpmqv.c:1140
+#: rpmqv.c:1137
#, fuzzy
msgid "no arguments given"
msgstr "nedostaju argumenti za upit"
@@ -1449,94 +1449,89 @@ msgstr ""
msgid " failed - "
msgstr "PGP omanuo"
-#: lib/depends.c:104
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n"
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "paket %s nije instaliran\n"
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
#, fuzzy
msgid "(rpmrc provides)"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/depends.c:609
+#: lib/depends.c:404
#, fuzzy
msgid "(rpmlib provides)"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/depends.c:630
+#: lib/depends.c:425
#, fuzzy
msgid "(db files)"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/depends.c:642
+#: lib/depends.c:437
#, fuzzy
msgid "(db provides)"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/depends.c:655
+#: lib/depends.c:450
#, fuzzy
msgid "(db package)"
msgstr "upit nad svim paketima"
-#: lib/depends.c:694
+#: lib/depends.c:489
#, fuzzy, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "NO "
msgstr ""
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "gre¹ka uklanjanja sloga %s u %s"
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1645,7 +1640,7 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a"
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: Neuspeo 'readLead'\n"
@@ -1655,27 +1650,27 @@ msgstr "%s: Neuspeo 'readLead'\n"
msgid "%s: bad magic\n"
msgstr ""
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: Neuspelo 'rpmReadSignature'\n"
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Potpis nije na raspolaganju\n"
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
@@ -1759,7 +1754,7 @@ msgstr "skraæenica za --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "paket %s nije instaliran\n"
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
#, fuzzy
msgid "<packagefile>+"
msgstr " -b<faza> <spec>\t "
@@ -1821,80 +1816,90 @@ msgstr "nemoj izvr¹iti nijednu fazu"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nemoj izvr¹iti nijednu fazu"
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+#, fuzzy
+msgid "don't verify digest(s)"
+msgstr "instaliraj paket"
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify signature(s)"
+msgstr "instaliraj paket"
+
+#: lib/poptI.c:192
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "upit nad paketom koji ima <datoteku>"
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nemoj izvr¹iti nijedan skript iz paketa"
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nemoj izvr¹iti nijedan instalacioni skript"
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nemoj izvr¹iti nijedan instalacioni skript"
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nemoj izvr¹iti nijedan instalacioni skript"
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr "a¾uriraj na staru verziju paketa (--force kod a¾uriranja ovo radi automatski)"
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr "pi¹i procente instalacije paketa"
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr "premesti paket u <dir>, ako se mo¾e premestiti"
-#: lib/poptI.c:212
+#: lib/poptI.c:217
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
-#: lib/poptI.c:213
+#: lib/poptI.c:218
#, fuzzy
msgid "<old>=<new>"
msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr "instaliraj èak iako æe paket zameniti instalirane datoteke"
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr "ponovo instaliraj ako je paket veæ prisutan"
-#: lib/poptI.c:224
+#: lib/poptI.c:229
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr ""
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr "nemoj instalirati, ali reci da li æe da radi ili ne"
-#: lib/poptI.c:230
+#: lib/poptI.c:235
#, fuzzy
msgid "upgrade package(s)"
msgstr "instaliraj paket"
@@ -1972,164 +1977,149 @@ msgstr "upit nad paketom koji ima <datoteku>"
msgid "rpm verify mode"
msgstr "re¾im upita"
-#: lib/poptQV.c:126
-#, fuzzy
-msgid "rpm verify mode (legacy)"
-msgstr "re¾im upita"
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
#, fuzzy
msgid "query/verify the package(s) which require a dependency"
msgstr "upit za pakete koji zahtevaju <i> svojstvo"
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
#, fuzzy
msgid "query/verify the package(s) which provide a dependency"
msgstr "upit za pakete koji omoguæavaju <i> svojstvo"
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
#, fuzzy
msgid "list all configuration files"
msgstr "prika¾i samo konfiguracione datoteke (povlaèi -i)"
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
#, fuzzy
msgid "list all documentation files"
msgstr "instaliraj dokumentaciju"
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
#, fuzzy
msgid "dump basic file information"
msgstr "prika¾i informacije o paketu"
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
#, fuzzy
msgid "list files in package"
msgstr "instaliraj paket"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr ""
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, fuzzy, c-format
msgid "skip %%readme files"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
#, fuzzy
msgid "use the following query format"
msgstr "neoèekivan izvor upita"
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
#, fuzzy
msgid "substitute i18n sections into spec file"
msgstr "upit nad paketom koji ima <datoteku>"
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
#, fuzzy
msgid "display a verbose file listing"
msgstr "prika¾i listu datoteka u paketu"
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "instaliraj paket"
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
#, fuzzy
msgid "don't verify size of files"
msgstr "instaliraj paket"
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "instaliraj paket"
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
#, fuzzy
msgid "don't verify owner of files"
msgstr "instaliraj paket"
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
#, fuzzy
msgid "don't verify group of files"
msgstr "instaliraj paket"
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
#, fuzzy
msgid "don't verify mode of files"
msgstr "instaliraj paket"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
#, fuzzy
msgid "don't verify files in package"
msgstr "instaliraj paket"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
#, fuzzy
msgid "don't verify package dependencies"
msgstr "nemoj proveravati zavisnosti paketa"
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "nemoj izvr¹iti nijednu fazu"
-#: lib/poptQV.c:275 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify digest(s)"
-msgstr "instaliraj paket"
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-#, fuzzy
-msgid "don't verify signature(s)"
-msgstr "instaliraj paket"
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "instaliraj paket"
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "instaliraj paket"
-#: lib/poptQV.c:301
+#: lib/poptQV.c:298
#, fuzzy
-msgid "sign a package, preserving digests"
+msgid "sign a packagei (identical to --resign)"
msgstr "potpi¹i paket (ukloni tekuæi potpis)"
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
#, fuzzy
msgid "verify package signature(s)"
msgstr "proveri potpis u paketu"
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
+#: lib/poptQV.c:304
#, fuzzy
-msgid "sign a package, recomputing digests"
+msgid "sign a packagei (identical to --addsign)"
msgstr "potpi¹i paket (ukloni tekuæi potpis)"
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
#, fuzzy
msgid "generate signature"
msgstr "napravi PGP potpis"
@@ -2338,8 +2328,8 @@ msgstr "paket nema imena"
msgid "can't query %s: %s\n"
msgstr "gre¹ka: ne mogu da otvorim %s\n"
-#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "neuspelo otvaranje %s: %s\n"
@@ -2353,7 +2343,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:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, fuzzy, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
@@ -2423,7 +2413,7 @@ msgstr "pogre¹an broj paketa: %s\n"
msgid "record %u could not be read\n"
msgstr "ne mogu da proèitam slog %d\n"
-#: lib/query.c:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s nije instaliran\n"
@@ -2473,56 +2463,56 @@ msgstr "%s: Neuspeo 'readLead'\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: Neuspelo 'rpmReadSignature'\n"
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n"
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
#, fuzzy
msgid " (MISSING KEYS:"
msgstr " (NEDOSTAJUÆI KLJUÈEVI)"
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "paket %s nije naveden u %s"
@@ -2536,82 +2526,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "nedostaje paket za instalaciju"
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, c-format
msgid "Retrieving %s\n"
msgstr "Pribavljam %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n"
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "paket %s nije instaliran\n"
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "gre¹ka: %s se ne mo¾e instalirati\n"
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "grupa %s ne sadr¾i nijedan paket\n"
-#: lib/rpminstall.c:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr "lo¹e meðuzavisnosti:\n"
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
#, fuzzy
msgid "installing binary packages\n"
msgstr "instaliraj paket"
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" odreðuje vi¹e paketa\n"
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr "uklanjanje oviha paketa æe naru¹iti zavisnosti:\n"
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "gre¹ka: ne mogu da otvorim %s\n"
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr "Instaliram %s\n"
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "neodstaje paket za deinstalaciju"
@@ -2716,6 +2706,11 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Ne mogu da otvorim %s za èitanje: %s"
+#: lib/rpmts.c:73
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n"
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr ""
@@ -3492,6 +3487,18 @@ msgid "failed to create %s: %s\n"
msgstr "neuspelo kreiranje %s\n"
#, fuzzy
+#~ msgid "rpm verify mode (legacy)"
+#~ msgstr "re¾im upita"
+
+#, fuzzy
+#~ msgid "sign a package, preserving digests"
+#~ msgstr "potpi¹i paket (ukloni tekuæi potpis)"
+
+#, fuzzy
+#~ msgid "sign a package, recomputing digests"
+#~ msgstr "potpi¹i paket (ukloni tekuæi potpis)"
+
+#, fuzzy
#~ msgid "========== Header RSA signature\n"
#~ msgstr "ne mogu da proèitam potpis"
@@ -3580,9 +3587,6 @@ msgstr "neuspelo kreiranje %s\n"
#~ msgid "verify package signature"
#~ msgstr "proveri potpis u paketu"
-#~ msgid "sign a package (discard current signature)"
-#~ msgstr "potpi¹i paket (ukloni tekuæi potpis)"
-
#, fuzzy
#~ msgid "skip any GPG signatures"
#~ msgstr "preskoèi sve PGP potpise"
diff --git a/po/sv.po b/po/sv.po
index a4c800a86..5cec43383 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"PO-Revision-Date: 2001-09-12 14:18+0200\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -113,7 +113,7 @@ msgstr "<kommando>"
msgid "use <dir> as the top level directory"
msgstr "använd <kat> som toppkatalog"
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr "<kat>"
@@ -415,23 +415,23 @@ msgstr "inga tar-filer angivna för tillverkning"
msgid "no packages given for erase"
msgstr "inga paket angivna för signering"
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr "inga paket angivna för installation"
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr "inga parametrar angivna för fråga"
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr "inga parametrar angivna för verifiering"
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr "oväntade argument till --querytags "
-#: rpmqv.c:1140
+#: rpmqv.c:1137
#, fuzzy
msgid "no arguments given"
msgstr "inga parametrar angivna för fråga"
@@ -1427,75 +1427,70 @@ msgstr "Ingen arkivfilen i huvud"
msgid " failed - "
msgstr " misslyckades - "
-#: lib/depends.c:104
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "kan inte öppna paketdatabas i %s\n"
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "paket %s är redan installerat"
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n"
-#: lib/depends.c:609
+#: lib/depends.c:404
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n"
-#: lib/depends.c:630
+#: lib/depends.c:425
#, fuzzy
msgid "(db files)"
msgstr "felaktig db-fil %s\n"
-#: lib/depends.c:642
+#: lib/depends.c:437
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s JA (db-tillhandahållande)\n"
-#: lib/depends.c:655
+#: lib/depends.c:450
#, fuzzy
msgid "(db package)"
msgstr "inga paket\n"
-#: lib/depends.c:694
+#: lib/depends.c:489
#, fuzzy, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr "%s: (%s, %s) tillagt till beroendecachen.\n"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "NO "
msgstr "NEJ "
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr "JA"
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "tar bort %s-%s-%s \"%s\" från tsort-relationer.\n"
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr "========== noterar alla relationer\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1503,20 +1498,20 @@ msgid ""
msgstr ""
"========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n"
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr "========== endast efterföljare (presentationsordning)\n"
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr "LOOP:\n"
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr "========== fortsätter med tsort ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1624,7 +1619,7 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "endast paket med huvudnummer <= 4 stöds av denna version av RPM\n"
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead misslyckades\n"
@@ -1634,27 +1629,27 @@ msgstr "%s: readLead misslyckades\n"
msgid "%s: bad magic\n"
msgstr "Felaktigt magiskt tal"
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature misslyckades\n"
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen signatur tillgänglig\n"
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead misslyckades\n"
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread misslyckades: %s\n"
@@ -1737,7 +1732,7 @@ msgstr "kortform för --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "uppgradera paket om redan installerat/de"
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
msgid "<packagefile>+"
msgstr "<paketfil>+"
@@ -1798,31 +1793,41 @@ msgstr "utför inte (eventuellt) %%preun-skript"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "utför inte (eventuellt) %%postun-skript"
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+#, fuzzy
+msgid "don't verify digest(s)"
+msgstr "verifiera inte MD5-summor för filer"
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify signature(s)"
+msgstr "verifiera inte sökvägen i symboliska länkar"
+
+#: lib/poptI.c:192
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "kör inte skript utlösta av detta paket"
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "kör inte %%triggerprein-skript"
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "kör inte %%triggerin-skript"
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "kör inte %%triggerun-skript"
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "kör inte %%triggerpostun-skript"
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1830,49 +1835,49 @@ msgstr ""
"uppgradera till en gammal version av paketet (--force vid uppgraderingar gör "
"detta automatiskt)"
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr "skriv procent allt eftersom paketet installeras"
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr "flytta paketet till <katalog>, om flyttbart"
-#: lib/poptI.c:212
+#: lib/poptI.c:217
msgid "relocate files from path <old> to <new>"
msgstr "relokera filer från <gammal> till <ny>"
-#: lib/poptI.c:213
+#: lib/poptI.c:218
msgid "<old>=<new>"
msgstr "<gammal>=<ny>"
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr "spara raderade paketfiler genom ompaketering"
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr "installera även om paketet byter ut installerade filer"
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr "installera om ifall paketet redan är installerat"
-#: lib/poptI.c:224
+#: lib/poptI.c:229
#, fuzzy
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
"avinstallera nya paket och ominstallera gamla paket tillbaka till datum"
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr "<datum>"
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr "installera inte, men tala om ifall det skulle fungera eller inte"
-#: lib/poptI.c:230
+#: lib/poptI.c:235
msgid "upgrade package(s)"
msgstr "uppgradera paket"
@@ -1941,146 +1946,132 @@ msgstr "fråga paket utlösta av paketet"
msgid "rpm verify mode"
msgstr "rpm verifieringsläge"
-#: lib/poptQV.c:126
-msgid "rpm verify mode (legacy)"
-msgstr "rpm verifieringsläge (ärvt)"
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
msgid "query/verify the package(s) which require a dependency"
msgstr "fråga/verifiera paket som behöver ett beroende"
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
msgid "query/verify the package(s) which provide a dependency"
msgstr "fråga/verifiera paket som tillhandahåller ett beroende"
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
msgid "list all configuration files"
msgstr "lista alla konfigurationsfiler"
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
msgid "list all documentation files"
msgstr "lista alla dokumentationsfiler"
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
msgid "dump basic file information"
msgstr "visa filinformation"
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
msgid "list files in package"
msgstr "lista filer i paketet"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr "hoppa över %%ghost-filer"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr "hoppa över %%license-filer"
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, c-format
msgid "skip %%readme files"
msgstr "hoppa över %%readme-filer"
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
msgid "use the following query format"
msgstr "använd följande frågeformat"
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
msgid "substitute i18n sections into spec file"
msgstr "ersätt översatta sektioner till specfil"
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr "visa tillstånd för de listade filerna"
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
msgid "display a verbose file listing"
msgstr "visa en utförlig fillistning"
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
msgid "don't verify MD5 digest of files"
msgstr "verifiera inte MD5-summor för filer"
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
msgid "don't verify size of files"
msgstr "verifiera inte storlekar på filer"
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
msgid "don't verify symlink path of files"
msgstr "verifiera inte sökvägen i symboliska länkar"
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
msgid "don't verify owner of files"
msgstr "verifiera inte ägare till filer"
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
msgid "don't verify group of files"
msgstr "verifiera inte grupper till filer"
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr "verifiera inte modifikationstiden för filer"
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
msgid "don't verify mode of files"
msgstr "verifiera inte rättigheter för filer"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
msgid "don't verify files in package"
msgstr "verifiera inte filerna i paketet"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
msgid "don't verify package dependencies"
msgstr "verifiera inte paketberoenden"
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "utför inte (eventuellt) %verifyscript"
-#: lib/poptQV.c:275 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify digest(s)"
-msgstr "verifiera inte MD5-summor för filer"
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-#, fuzzy
-msgid "don't verify signature(s)"
-msgstr "verifiera inte sökvägen i symboliska länkar"
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "verifiera inte huvudets SHA1-summa"
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "verifiera inte MD5-summor för filer"
-#: lib/poptQV.c:301
+#: lib/poptQV.c:298
#, fuzzy
-msgid "sign a package, preserving digests"
+msgid "sign a packagei (identical to --resign)"
msgstr "signera ett paket (släng nuvarande signatur)"
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
#, fuzzy
msgid "verify package signature(s)"
msgstr "verifiera paketsignatur"
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
+#: lib/poptQV.c:304
#, fuzzy
-msgid "sign a package, recomputing digests"
+msgid "sign a packagei (identical to --addsign)"
msgstr "signera ett paket (släng nuvarande signatur)"
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
msgid "generate signature"
msgstr "generera signatur"
@@ -2286,8 +2277,8 @@ msgstr "paketet har varken filägare eller id-listor\n"
msgid "can't query %s: %s\n"
msgstr "kan inte fråga %s: %s\n"
-#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, c-format
msgid "open of %s failed: %s\n"
msgstr "misslyckades med att öppna %s: %s\n"
@@ -2301,7 +2292,7 @@ msgstr "fråga av %s misslyckades\n"
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:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "%s: läsning av paketlista misslyckades: %s\n"
@@ -2370,7 +2361,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:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s är inte installerat\n"
@@ -2419,42 +2410,42 @@ msgstr "%s: writeLead misslyckades: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature misslyckades: %s\n"
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead misslyckades\n"
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ingen signatur tillgänglig (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr "EJ OK"
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
msgid " (MISSING KEYS:"
msgstr " (SAKNADE NYCKLAR:"
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr " (EJ BETRODDA NYCKLAR:"
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr "OK"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2463,13 +2454,13 @@ msgstr ""
"\"B\"-beroendet behöver en epok (antar samma som \"A\")\n"
"\tA %s\tB %s\n"
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n"
@@ -2482,81 +2473,81 @@ msgstr "Förbereder..."
msgid "Preparing packages for installation..."
msgstr "Förbereder paket för installation ..."
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, 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:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "hoppar över %s - överföring misslyckades - %s\n"
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, c-format
msgid "package %s is not relocateable\n"
msgstr "paket %s är inte relokerbart\n"
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, c-format
msgid "error reading from file %s\n"
msgstr "fel vid läsning från fil %s\n"
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, 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:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kan inte installeras\n"
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "hittade %d käll- och %d binärpaket\n"
-#: lib/rpminstall.c:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr "ouppfyllda beroenden:\n"
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
msgid "installing binary packages\n"
msgstr "installerar binärpaket\n"
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "kan inte öppna filen %s: %s\n"
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" anger flera paket\n"
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n"
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan inte öppna %s: %s\n"
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr "Installerar %s\n"
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2661,6 +2652,11 @@ msgstr "Kan inte läsa %s, HOME är för stor.\n"
msgid "Unable to open %s for reading: %s.\n"
msgstr "Kan inte öppna %s för läsning: %s.\n"
+#: lib/rpmts.c:73
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "kan inte öppna paketdatabas i %s\n"
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr "filen är inte en vanlig fil -- hoppar över storlekskontroll\n"
@@ -3422,6 +3418,17 @@ msgstr "url-port måste vara ett tal\n"
msgid "failed to create %s: %s\n"
msgstr "kunde inte skapa %s: %s\n"
+#~ msgid "rpm verify mode (legacy)"
+#~ msgstr "rpm verifieringsläge (ärvt)"
+
+#, fuzzy
+#~ msgid "sign a package, preserving digests"
+#~ msgstr "signera ett paket (släng nuvarande signatur)"
+
+#, fuzzy
+#~ msgid "sign a package, recomputing digests"
+#~ msgstr "signera ett paket (släng nuvarande signatur)"
+
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
@@ -3515,9 +3522,6 @@ msgstr "kunde inte skapa %s: %s\n"
#~ msgid "verify package signature"
#~ msgstr "verifiera paketsignatur"
-#~ msgid "sign a package (discard current signature)"
-#~ msgstr "signera ett paket (släng nuvarande signatur)"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "hoppa över eventuella GPG-signaturer"
diff --git a/po/tr.po b/po/tr.po
index 978befcab..7d27925e2 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-03-12 11:41-0500\n"
+"POT-Creation-Date: 2002-03-13 12:57-0500\n"
"PO-Revision-Date: 2001-07-05 08:02+300\n"
"Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
"Language-Team: Turkish <tr@li.org>\n"
@@ -114,7 +114,7 @@ msgstr "<kmt>"
msgid "use <dir> as the top level directory"
msgstr "Üst düzey dizin olarak <dizin> kullanýlýr"
-#: lib/poptI.c:210 rpmqv.c:125
+#: lib/poptI.c:215 rpmqv.c:125
msgid "<dir>"
msgstr "<dizin>"
@@ -422,23 +422,23 @@ msgstr "oluþturma için gereken tar dosyalarý belirtilmemiþ"
msgid "no packages given for erase"
msgstr "imzalanacak paket(ler) belirtilmedi"
-#: rpmqv.c:1085
+#: rpmqv.c:1084
msgid "no packages given for install"
msgstr "yüklenecek paket(ler) belirtilmedi"
-#: rpmqv.c:1103
+#: rpmqv.c:1100
msgid "no arguments given for query"
msgstr "sorgulama için hiç argüman belirtilmedi"
-#: rpmqv.c:1116
+#: rpmqv.c:1113
msgid "no arguments given for verify"
msgstr "denetleme için hiç argüman belirtilmedi"
-#: rpmqv.c:1124
+#: rpmqv.c:1121
msgid "unexpected arguments to --querytags "
msgstr "--querytags ile beklenmeyen girdiler"
-#: rpmqv.c:1140
+#: rpmqv.c:1137
#, fuzzy
msgid "no arguments given"
msgstr "sorgulama için hiç argüman belirtilmedi"
@@ -1447,75 +1447,70 @@ msgstr ""
msgid " failed - "
msgstr " baþarýsýz - "
-#: lib/depends.c:104
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "%s de Paket veritabaný açýlamadý\n"
-
-#: lib/depends.c:297
+#: lib/depends.c:149
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "%s zaten kurulu"
-#: lib/depends.c:568
+#: lib/depends.c:363
msgid "(cached)"
msgstr ""
-#: lib/depends.c:593
+#: lib/depends.c:388
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s EVET (rpmrc saðlar)\n"
-#: lib/depends.c:609
+#: lib/depends.c:404
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s EVET (rpmlib saðlar)\n"
-#: lib/depends.c:630
+#: lib/depends.c:425
#, fuzzy
msgid "(db files)"
msgstr "db dosyasý %s hatalý\n"
-#: lib/depends.c:642
+#: lib/depends.c:437
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s EVET (db saðlar)\n"
-#: lib/depends.c:655
+#: lib/depends.c:450
#, fuzzy
msgid "(db package)"
msgstr "paket yok\n"
-#: lib/depends.c:694
+#: lib/depends.c:489
#, fuzzy, c-format
msgid "%9s: (%s, %s) added to Depends cache.\n"
msgstr "%s: (%s, %s) Baðýmlýlar alanýna eklendi.\n"
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "NO "
msgstr "HAYIR "
-#: lib/depends.c:696 lib/rpmds.c:411 lib/rpmds.c:570
+#: lib/depends.c:491 lib/rpmds.c:410 lib/rpmds.c:569
msgid "YES"
msgstr "EVET"
-#: lib/depends.c:962
+#: lib/depends.c:759
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:1081
+#: lib/depends.c:878
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "tsort baðýntýlarýndan %s-%s-%s \"%s\" kaldýrýlýyor\n"
#. Record all relations.
-#: lib/depends.c:1349
+#: lib/depends.c:1146
msgid "========== recording tsort relations\n"
msgstr "========== tsort baðýntýlarý kaydediliyor\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1455
+#: lib/depends.c:1252
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1523,20 +1518,20 @@ msgid ""
msgstr ""
"========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n"
-#: lib/depends.c:1548
+#: lib/depends.c:1345
msgid "========== successors only (presentation order)\n"
msgstr "========== sadece ardýllar (sunum sýrasý)\n"
-#: lib/depends.c:1618
+#: lib/depends.c:1415
msgid "LOOP:\n"
msgstr "ÇEVRÝM:\n"
-#: lib/depends.c:1653
+#: lib/depends.c:1450
msgid "========== continuing tsort ...\n"
msgstr "========== tsort sürüyor ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1658
+#: lib/depends.c:1455
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1646,7 +1641,7 @@ msgstr ""
"RPM'nin bu sürümünde sadece ilk sürüm rakamý <= 4 olan paketler "
"destekleniyor\n"
-#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:554
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead baþarýsýz\n"
@@ -1656,27 +1651,27 @@ msgstr "%s: readLead baþarýsýz\n"
msgid "%s: bad magic\n"
msgstr "Magic hatalý"
-#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:570
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature baþarýsýz\n"
-#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:575
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ýmza bulundurmuyor\n"
-#: lib/package.c:328 lib/rpmchecksig.c:474
+#: lib/package.c:328 lib/rpmchecksig.c:475
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead baþarýsýz\n"
-#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:646
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:504
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread baþarýsýz: %s\n"
@@ -1760,7 +1755,7 @@ msgstr "--replacepkgs --replacefiles için kýsaltma"
msgid "upgrade package(s) if already installed"
msgstr "paket(ler) kurulu ise paket(ler)i günceller"
-#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:236
msgid "<packagefile>+"
msgstr "<paketDosyasý>+"
@@ -1820,31 +1815,41 @@ msgstr "%%preun betiði (varsa) çalýþtýrýlmaz"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "%%postun betiði (varsa) çalýþtýrýlmaz"
-#: lib/poptI.c:187
+#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309
+#, fuzzy
+msgid "don't verify digest(s)"
+msgstr "dosyalarýn MD5 özümlemesi doðrulanmaz"
+
+#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify signature(s)"
+msgstr "dosyalarýn sembolik bað dosya yollarý doðrulanmaz"
+
+#: lib/poptI.c:192
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "bu paket tarafýndan tetiklenen hiç bir betik çalýþtýrýlmaz"
-#: lib/poptI.c:190
+#: lib/poptI.c:195
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "hiçbir %%triggerprein betiði çalýþtýrýlmaz"
-#: lib/poptI.c:193
+#: lib/poptI.c:198
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "hiçbir %%triggerin betiði çalýþtýrýlmaz."
-#: lib/poptI.c:196
+#: lib/poptI.c:201
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "hiçbir %%triggerun betiði çalýþtýrýlmaz."
-#: lib/poptI.c:199
+#: lib/poptI.c:204
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "hiçbir %%triggerpostun betiði çalýþtýrýlmaz."
-#: lib/poptI.c:203
+#: lib/poptI.c:208
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1852,49 +1857,49 @@ msgstr ""
"paketin eski bir sürüme güncellenmesini saðlar (--force ayný iþi otomatik "
"yapar)"
-#: lib/poptI.c:207
+#: lib/poptI.c:212
msgid "print percentages as package installs"
msgstr "kurulumun geliþimi yüzde olarak gösterilir"
-#: lib/poptI.c:209
+#: lib/poptI.c:214
msgid "relocate the package to <dir>, if relocatable"
msgstr "eðer deðitirilebiliyorsa paketin yerini <dizin>'e deðiþtirir"
-#: lib/poptI.c:212
+#: lib/poptI.c:217
msgid "relocate files from path <old> to <new>"
msgstr "dosyalarý <eski> dizininden kaldýrýp <yeni> dizinine yerleþtirir"
-#: lib/poptI.c:213
+#: lib/poptI.c:218
msgid "<old>=<new>"
msgstr "<eski>=<yeni>"
-#: lib/poptI.c:216
+#: lib/poptI.c:221
msgid "save erased package files by repackaging"
msgstr "yeniden paketleme sýrasýnda silinen paket dosyalarýný kaydeder"
-#: lib/poptI.c:219
+#: lib/poptI.c:224
msgid "install even if the package replaces installed files"
msgstr "paket dosyalarý mevcut dosyalarla yer deðiþtirse bile paketi kurar"
-#: lib/poptI.c:222
+#: lib/poptI.c:227
msgid "reinstall if the package is already present"
msgstr "paketi yeniden kurar"
-#: lib/poptI.c:224
+#: lib/poptI.c:229
#, fuzzy
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
"yeni paket(ler) kaldýrýlýr, geriye dönük eski paket(ler) yeniden kurulur"
-#: lib/poptI.c:225
+#: lib/poptI.c:230
msgid "<date>"
msgstr "<tarih>"
-#: lib/poptI.c:227
+#: lib/poptI.c:232
msgid "don't install, but tell if it would work or not"
msgstr "yükleme yapmaz, sadece çalýþýp çalýþmayacaðýný belirtir"
-#: lib/poptI.c:230
+#: lib/poptI.c:235
msgid "upgrade package(s)"
msgstr "paket günceller"
@@ -1965,146 +1970,132 @@ msgstr "paket tarafýndan tetiklenen paketleri sorgular"
msgid "rpm verify mode"
msgstr "rpm denetleme kipi"
-#: lib/poptQV.c:126
-msgid "rpm verify mode (legacy)"
-msgstr "rpm denetleme kipi (eski tip)"
-
-#: lib/poptQV.c:128
+#: lib/poptQV.c:125
msgid "query/verify the package(s) which require a dependency"
msgstr "bir baðýmlýlýk gerektiren paketleri sorgular/denetler"
-#: lib/poptQV.c:130
+#: lib/poptQV.c:127
msgid "query/verify the package(s) which provide a dependency"
msgstr "bir baðýmlýlýðý saðlayan paketleri sorgular/denetler"
-#: lib/poptQV.c:190
+#: lib/poptQV.c:187
msgid "list all configuration files"
msgstr "tüm yapýlandýrma dosyalarýný listeler"
-#: lib/poptQV.c:192
+#: lib/poptQV.c:189
msgid "list all documentation files"
msgstr "tüm belgeleme dosyalarýný gösterir"
-#: lib/poptQV.c:194
+#: lib/poptQV.c:191
msgid "dump basic file information"
msgstr "temel dosya bilgilerini gösterir"
-#: lib/poptQV.c:196
+#: lib/poptQV.c:193
msgid "list files in package"
msgstr "paketteki dosyalarý gösterir"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:198
#, c-format
msgid "skip %%ghost files"
msgstr "%%ghost dosyalarý atlanýr"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:202
#, c-format
msgid "skip %%license files"
msgstr "%%license dosyalarý atlanýr"
-#: lib/poptQV.c:208
+#: lib/poptQV.c:205
#, c-format
msgid "skip %%readme files"
msgstr "%%readme dosyalarý atlanýr"
-#: lib/poptQV.c:214
+#: lib/poptQV.c:211
msgid "use the following query format"
msgstr "izleyen sorgulama biçimini kullanýr"
-#: lib/poptQV.c:216
+#: lib/poptQV.c:213
msgid "substitute i18n sections into spec file"
msgstr "spec dosyasýndaki i18n bölümleri yerine kullanýlýr"
-#: lib/poptQV.c:218
+#: lib/poptQV.c:215
msgid "display the states of the listed files"
msgstr "listelenmiþ dosyalarýn durumunu gösterir"
-#: lib/poptQV.c:220
+#: lib/poptQV.c:217
msgid "display a verbose file listing"
msgstr "ayrýntýlý dosya listesi gösterir"
-#: lib/poptQV.c:240
+#: lib/poptQV.c:237
msgid "don't verify MD5 digest of files"
msgstr "dosyalarýn MD5 özümlemesi doðrulanmaz"
-#: lib/poptQV.c:243
+#: lib/poptQV.c:240
msgid "don't verify size of files"
msgstr "dosyalarýn uzunluklarý doðrulanmaz"
-#: lib/poptQV.c:246
+#: lib/poptQV.c:243
msgid "don't verify symlink path of files"
msgstr "dosyalarýn sembolik bað dosya yollarý doðrulanmaz"
-#: lib/poptQV.c:249
+#: lib/poptQV.c:246
msgid "don't verify owner of files"
msgstr "dosyalarýn sahipleri doðrulanmaz"
-#: lib/poptQV.c:252
+#: lib/poptQV.c:249
msgid "don't verify group of files"
msgstr "dosyalarýn gruplarý doðrulanmaz"
-#: lib/poptQV.c:255
+#: lib/poptQV.c:252
msgid "don't verify modification time of files"
msgstr "dosyalarýn deðiþiklik zamanlarý doðrulanmaz"
-#: lib/poptQV.c:258 lib/poptQV.c:261
+#: lib/poptQV.c:255 lib/poptQV.c:258
msgid "don't verify mode of files"
msgstr "dosyalarýn kipleri doðrulanmaz"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:261
msgid "don't verify files in package"
msgstr "paketteki dosyalar doðrulanamaz"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:263
msgid "don't verify package dependencies"
msgstr "paket baðýmlýlýklarý doðrulanmaz"
-#: lib/poptQV.c:268 lib/poptQV.c:272
+#: lib/poptQV.c:265 lib/poptQV.c:269
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "(varsa) %verifyscript çalýþtýrýlmaz"
-#: lib/poptQV.c:275 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify digest(s)"
-msgstr "dosyalarýn MD5 özümlemesi doðrulanmaz"
-
-#: lib/poptQV.c:278 lib/poptQV.c:316
-#, fuzzy
-msgid "don't verify signature(s)"
-msgstr "dosyalarýn sembolik bað dosya yollarý doðrulanmaz"
-
-#: lib/poptQV.c:283
+#: lib/poptQV.c:280
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "Baþlýk SHA1 özümlemesi doðrulanmaz"
-#: lib/poptQV.c:286
+#: lib/poptQV.c:283
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "dosyalarýn MD5 özümlemesi doðrulanmaz"
-#: lib/poptQV.c:301
+#: lib/poptQV.c:298
#, fuzzy
-msgid "sign a package, preserving digests"
+msgid "sign a packagei (identical to --resign)"
msgstr "paketi imzalar (mevcut imza kaldýrýlýr)"
-#: lib/poptQV.c:303
+#: lib/poptQV.c:300
#, fuzzy
msgid "verify package signature(s)"
msgstr "paket imzasýný denetler"
-#: lib/poptQV.c:305
+#: lib/poptQV.c:302
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:307
+#: lib/poptQV.c:304
#, fuzzy
-msgid "sign a package, recomputing digests"
+msgid "sign a packagei (identical to --addsign)"
msgstr "paketi imzalar (mevcut imza kaldýrýlýr)"
-#: lib/poptQV.c:309
+#: lib/poptQV.c:306
msgid "generate signature"
msgstr "imza üretir"
@@ -2309,8 +2300,8 @@ msgstr "paket ne dosya sahibi ne de kimlik listesi içeriyor\n"
msgid "can't query %s: %s\n"
msgstr "%s sorgulanamýyor: %s\n"
-#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
-#: lib/rpminstall.c:845
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:348 lib/rpminstall.c:490
+#: lib/rpminstall.c:865
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s açýlamadý: %s\n"
@@ -2324,7 +2315,7 @@ msgstr "%s 'nin sorgulamasý baþarýsýzlýkla sonuçlandý\n"
msgid "old format source packages cannot be queried\n"
msgstr "eski biçem kaynak paketleri sorgulanamaz\n"
-#: lib/query.c:664 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:503
#, fuzzy, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "%s: bildirge okuma baþarýsýz: %s\n"
@@ -2393,7 +2384,7 @@ msgstr "paket kayýt numarasý: %u\n"
msgid "record %u could not be read\n"
msgstr "%u. kayýt okunamadý\n"
-#: lib/query.c:955 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:653
#, c-format
msgid "package %s is not installed\n"
msgstr "%s paketi kurulu deðil\n"
@@ -2442,42 +2433,42 @@ msgstr "%s: writeLead baþarýsýz: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature baþarýsýz: %s\n"
-#: lib/rpmchecksig.c:488
+#: lib/rpmchecksig.c:489
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead baþarýsýz\n"
-#: lib/rpmchecksig.c:559
+#: lib/rpmchecksig.c:560
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ýmza bulundurmuyor (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:804
+#: lib/rpmchecksig.c:805
msgid "NOT OK"
msgstr "TAMAM DEÐÝL"
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:806 lib/rpmchecksig.c:820
msgid " (MISSING KEYS:"
msgstr " (EKSÝK ANAHTARLAR:"
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
+#: lib/rpmchecksig.c:809 lib/rpmchecksig.c:823
msgid " (UNTRUSTED KEYS:"
msgstr " (GÜVENCESÝZ ANAHTARLAR:"
-#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:819
msgid "OK"
msgstr "Tamam"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:539
+#: lib/rpmds.c:538
#, fuzzy, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2486,13 +2477,13 @@ msgstr ""
"\"B\" baðýmlýlýðý bir dönemsellik gerektirir (tabii ki \"A\" da)\n"
"\tA %s\tB %s\n"
-#: lib/rpmds.c:569
+#: lib/rpmds.c:568
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
#. @=branchstate@
-#: lib/rpmds.c:593
+#: lib/rpmds.c:592
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "paket %s-%s-%s gereksinimi tatmin edici deðil: %s\n"
@@ -2505,81 +2496,81 @@ msgstr "Hazýrlanýyor..."
msgid "Preparing packages for installation..."
msgstr "Kurulacak paketler hazýrlanýyor..."
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:296
#, 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:293
+#: lib/rpminstall.c:308
#, c-format
msgid " ... as %s\n"
msgstr "... %s olarak\n"
-#: lib/rpminstall.c:297
+#: lib/rpminstall.c:312
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s atlanýyor - aktarým baþarýsýz - %s\n"
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:410
#, c-format
msgid "package %s is not relocateable\n"
msgstr "%s paketi yeniden konumlandýrýlamaz\n"
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:464
#, c-format
msgid "error reading from file %s\n"
msgstr "%s dosyasýndan okuma hatalý\n"
-#: lib/rpminstall.c:455
+#: lib/rpminstall.c:470
#, 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:467 lib/rpminstall.c:701
+#: lib/rpminstall.c:482 lib/rpminstall.c:721
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s yüklenemedi\n"
-#: lib/rpminstall.c:503
+#: lib/rpminstall.c:518
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n"
-#: lib/rpminstall.c:521 lib/rpminstall.c:1029
+#: lib/rpminstall.c:536 lib/rpminstall.c:1049
msgid "failed dependencies:\n"
msgstr "baðýmlýlýklarda hata; gerekli paketler:\n"
-#: lib/rpminstall.c:544
+#: lib/rpminstall.c:559
msgid "installing binary packages\n"
msgstr "icra edilebilir paketleri kuruluyor\n"
-#: lib/rpminstall.c:566
+#: lib/rpminstall.c:581
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "%s dosyasý açýlamadý: %s\n"
-#: lib/rpminstall.c:636
+#: lib/rpminstall.c:656
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" birden fazla paketi tanýmlýyor\n"
-#: lib/rpminstall.c:660
+#: lib/rpminstall.c:680
msgid "removing these packages would break dependencies:\n"
msgstr "bu paketin silinmesi aþaðýdakilerin baðýmlýlýklarýný etkileyecektir:\n"
-#: lib/rpminstall.c:687
+#: lib/rpminstall.c:707
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s açýlamadý: %s\n"
-#: lib/rpminstall.c:693
+#: lib/rpminstall.c:713
#, c-format
msgid "Installing %s\n"
msgstr "%s kuruluyor\n"
-#: lib/rpminstall.c:1022
+#: lib/rpminstall.c:1042
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2684,6 +2675,11 @@ msgstr "%s okunamýyor, EV çok büyük\n"
msgid "Unable to open %s for reading: %s.\n"
msgstr "%s okuma eriþimi için açýlamadý: %s.\n"
+#: lib/rpmts.c:73
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "%s de Paket veritabaný açýlamadý\n"
+
#: lib/signature.c:118
msgid "file is not regular -- skipping size check\n"
msgstr "dosya normal deðil -- uzunluk denetimi atlanýyor\n"
@@ -3446,6 +3442,17 @@ msgstr "url portu bir sayý olmalý\n"
msgid "failed to create %s: %s\n"
msgstr "%s oluþturulamadý: %s\n"
+#~ msgid "rpm verify mode (legacy)"
+#~ msgstr "rpm denetleme kipi (eski tip)"
+
+#, fuzzy
+#~ msgid "sign a package, preserving digests"
+#~ msgstr "paketi imzalar (mevcut imza kaldýrýlýr)"
+
+#, fuzzy
+#~ msgid "sign a package, recomputing digests"
+#~ msgstr "paketi imzalar (mevcut imza kaldýrýlýr)"
+
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
@@ -3539,9 +3546,6 @@ msgstr "%s oluþturulamadý: %s\n"
#~ msgid "verify package signature"
#~ msgstr "paket imzasýný denetler"
-#~ msgid "sign a package (discard current signature)"
-#~ msgstr "paketi imzalar (mevcut imza kaldýrýlýr)"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "tüm GPG imzalarýný atlar"
diff --git a/popt/po/cs.po b/popt/po/cs.po
index 994ee16ce..6a09338cb 100644
--- a/popt/po/cs.po
+++ b/popt/po/cs.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: 2001-07-24 00:03+0100\n"
"Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -9,103 +9,80 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr "neznámé èíslo chyby"
+#: popthelp.c:53
+msgid "Show this help message"
+msgstr "Vypí¹e tuto nápovìdu"
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "volba (%d) není v popt implementována\n"
+#: popthelp.c:54
+msgid "Display brief usage message"
+msgstr "Vypí¹e krátký návod k pou¾ití"
-#: popt.c:1132
-msgid "missing argument"
-msgstr "chybí argument"
+#: popthelp.c:57
+msgid "Display option defaults in message"
+msgstr "Zobrazit implicitní volby ve zprávì"
-#: popt.c:1134
-msgid "unknown option"
-msgstr "neznámá volba"
+#~ msgid "unknown errno"
+#~ msgstr "neznámé èíslo chyby"
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "po¾adovány vzájemnì výluèné logické operace"
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "volba (%d) není v popt implementována\n"
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr "opt->arg nesmí být NULL"
+#~ msgid "missing argument"
+#~ msgstr "chybí argument"
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "aliasy vnoøené pøíli¹ hluboko"
+#~ msgid "unknown option"
+#~ msgstr "neznámá volba"
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "chyba v quotování parametrù"
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "po¾adovány vzájemnì výluèné logické operace"
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "chybná numerická hodnota"
+#~ msgid "opt->arg should not be NULL"
+#~ msgstr "opt->arg nesmí být NULL"
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "èíslo je pøíli¹ velké nebo pøíli¹ malé"
+#~ msgid "aliases nested too deeply"
+#~ msgstr "aliasy vnoøené pøíli¹ hluboko"
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr "selhala alokace pamìti"
+#~ msgid "error in parameter quoting"
+#~ msgstr "chyba v quotování parametrù"
-#: popt.c:1152
-msgid "unknown error"
-msgstr "neznámá chyba"
+#~ msgid "invalid numeric value"
+#~ msgstr "chybná numerická hodnota"
-#: popthelp.c:53
-msgid "Show this help message"
-msgstr "Vypí¹e tuto nápovìdu"
+#~ msgid "number too large or too small"
+#~ msgstr "èíslo je pøíli¹ velké nebo pøíli¹ malé"
-#: popthelp.c:54
-msgid "Display brief usage message"
-msgstr "Vypí¹e krátký návod k pou¾ití"
+#~ msgid "memory allocation failed"
+#~ msgstr "selhala alokace pamìti"
-#: popthelp.c:57
-msgid "Display option defaults in message"
-msgstr "Zobrazit implicitní volby ve zprávì"
+#~ msgid "unknown error"
+#~ msgstr "neznámá chyba"
-#: popthelp.c:99
-msgid "NONE"
-msgstr "NONE"
+#~ msgid "NONE"
+#~ msgstr "NONE"
-#: popthelp.c:100
-msgid "VAL"
-msgstr "VAL"
+#~ msgid "VAL"
+#~ msgstr "VAL"
-#: popthelp.c:101
-msgid "INT"
-msgstr "INT"
+#~ msgid "INT"
+#~ msgstr "INT"
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LONG"
+#~ msgid "LONG"
+#~ msgstr "LONG"
-#: popthelp.c:103
-msgid "STRING"
-msgstr "STRING"
+#~ msgid "STRING"
+#~ msgstr "STRING"
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLOAT"
+#~ msgid "FLOAT"
+#~ msgstr "FLOAT"
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DOUBLE"
+#~ msgid "DOUBLE"
+#~ msgstr "DOUBLE"
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Pou¾ití:"
+#~ msgid "Usage:"
+#~ msgstr "Pou¾ití:"
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[VOLBY...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[VOLBY...]"
diff --git a/popt/po/da.po b/popt/po/da.po
index a3dd547a1..b09e43488 100644
--- a/popt/po/da.po
+++ b/popt/po/da.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
"Last-Translator: Martin Hansen <mah@k64.dk>\n"
"Language-Team: Dansk <dansk@klid.dk>\n"
@@ -10,55 +10,6 @@ msgstr ""
"Content-Transfer-Encoding: 8-bit\n"
"X-Generator: KTranslator v 0.6.0\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr "ukendt fejlnr."
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr "mangler argument"
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr "ukendt tilvalg"
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "de ønskede handlinger udelukker hinanden"
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "aliaser er for dybt indlejret"
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "fejl i parameter citering"
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "ugyldig numerisk værdi"
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "nummer for stort, eller for lille"
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr "ukendt fejl"
-
#: popthelp.c:53
msgid "Show this help message"
msgstr "Vis denne hjælpemeddelelse"
@@ -72,42 +23,62 @@ msgstr "Vis kortfattet brugsanvisning"
msgid "Display option defaults in message"
msgstr "Vis kortfattet brugsanvisning"
-#: popthelp.c:99
-msgid "NONE"
-msgstr "INGEN"
+#~ msgid "unknown errno"
+#~ msgstr "ukendt fejlnr."
+
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
+
+#~ msgid "missing argument"
+#~ msgstr "mangler argument"
+
+#~ msgid "unknown option"
+#~ msgstr "ukendt tilvalg"
+
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "de ønskede handlinger udelukker hinanden"
+
+#~ msgid "aliases nested too deeply"
+#~ msgstr "aliaser er for dybt indlejret"
+
+#~ msgid "error in parameter quoting"
+#~ msgstr "fejl i parameter citering"
+
+#~ msgid "invalid numeric value"
+#~ msgstr "ugyldig numerisk værdi"
+
+#~ msgid "number too large or too small"
+#~ msgstr "nummer for stort, eller for lille"
+
+#~ msgid "unknown error"
+#~ msgstr "ukendt fejl"
+
+#~ msgid "NONE"
+#~ msgstr "INGEN"
-#: popthelp.c:100
-msgid "VAL"
-msgstr "VAL"
+#~ msgid "VAL"
+#~ msgstr "VAL"
-#: popthelp.c:101
-msgid "INT"
-msgstr "INT"
+#~ msgid "INT"
+#~ msgstr "INT"
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LONG"
+#~ msgid "LONG"
+#~ msgstr "LONG"
-#: popthelp.c:103
-msgid "STRING"
-msgstr "STRING"
+#~ msgid "STRING"
+#~ msgstr "STRING"
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLOAT"
+#~ msgid "FLOAT"
+#~ msgstr "FLOAT"
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DOUBLE"
+#~ msgid "DOUBLE"
+#~ msgstr "DOUBLE"
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Brug:"
+#~ msgid "Usage:"
+#~ msgstr "Brug:"
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[TILVALG...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[TILVALG...]"
diff --git a/popt/po/de.po b/popt/po/de.po
index 6cfef98ae..d9ced6467 100644
--- a/popt/po/de.po
+++ b/popt/po/de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
#: popthelp.c:53
msgid "Show this help message"
msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
#: popthelp.c:57
msgid "Display option defaults in message"
msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/popt/po/es.po b/popt/po/es.po
index a45041550..7d84d4179 100644
--- a/popt/po/es.po
+++ b/popt/po/es.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr "errno desconocido"
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "tipo de opción (%d) no implementada en popt\n"
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr "falta argumento"
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr "opción desconocida"
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "requerida operación lógica mutuamente exclusiva"
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "alias anidados muy profundamente"
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "error en cita de parámetros"
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "valor numérico inválido"
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "número muy largo o muy pequeño"
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr "error desconocido"
-
#: popthelp.c:53
msgid "Show this help message"
msgstr "Muestra este mensaje de ayuda"
@@ -76,42 +27,62 @@ msgstr "Indica el modo de uso resumido"
msgid "Display option defaults in message"
msgstr "Indica el modo de uso resumido"
-#: popthelp.c:99
-msgid "NONE"
-msgstr "NONE"
+#~ msgid "unknown errno"
+#~ msgstr "errno desconocido"
+
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "tipo de opción (%d) no implementada en popt\n"
+
+#~ msgid "missing argument"
+#~ msgstr "falta argumento"
+
+#~ msgid "unknown option"
+#~ msgstr "opción desconocida"
+
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "requerida operación lógica mutuamente exclusiva"
+
+#~ msgid "aliases nested too deeply"
+#~ msgstr "alias anidados muy profundamente"
+
+#~ msgid "error in parameter quoting"
+#~ msgstr "error en cita de parámetros"
+
+#~ msgid "invalid numeric value"
+#~ msgstr "valor numérico inválido"
+
+#~ msgid "number too large or too small"
+#~ msgstr "número muy largo o muy pequeño"
+
+#~ msgid "unknown error"
+#~ msgstr "error desconocido"
+
+#~ msgid "NONE"
+#~ msgstr "NONE"
-#: popthelp.c:100
-msgid "VAL"
-msgstr "VAL"
+#~ msgid "VAL"
+#~ msgstr "VAL"
-#: popthelp.c:101
-msgid "INT"
-msgstr "INT"
+#~ msgid "INT"
+#~ msgstr "INT"
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LONG"
+#~ msgid "LONG"
+#~ msgstr "LONG"
-#: popthelp.c:103
-msgid "STRING"
-msgstr "STRING"
+#~ msgid "STRING"
+#~ msgstr "STRING"
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLOAT"
+#~ msgid "FLOAT"
+#~ msgstr "FLOAT"
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DOUBLE"
+#~ msgid "DOUBLE"
+#~ msgstr "DOUBLE"
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Modo de Uso:"
+#~ msgid "Usage:"
+#~ msgstr "Modo de Uso:"
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[OPCIÓN...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[OPCIÓN...]"
diff --git a/popt/po/eu_ES.po b/popt/po/eu_ES.po
index 6cfef98ae..d9ced6467 100644
--- a/popt/po/eu_ES.po
+++ b/popt/po/eu_ES.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
#: popthelp.c:53
msgid "Show this help message"
msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
#: popthelp.c:57
msgid "Display option defaults in message"
msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/popt/po/fi.po b/popt/po/fi.po
index 6cfef98ae..d9ced6467 100644
--- a/popt/po/fi.po
+++ b/popt/po/fi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
#: popthelp.c:53
msgid "Show this help message"
msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
#: popthelp.c:57
msgid "Display option defaults in message"
msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/popt/po/fr.po b/popt/po/fr.po
index 6cfef98ae..d9ced6467 100644
--- a/popt/po/fr.po
+++ b/popt/po/fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
#: popthelp.c:53
msgid "Show this help message"
msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
#: popthelp.c:57
msgid "Display option defaults in message"
msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/popt/po/gl.po b/popt/po/gl.po
index e1ca10e76..46d2df46f 100644
--- a/popt/po/gl.po
+++ b/popt/po/gl.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: 2001-01-17 01:01+0100\n"
"Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -9,55 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr "errno descoñecido"
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "tipo de opción (%d) non implementada en popt\n"
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr "falta un argumento"
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr "opción descoñecida"
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "solicitáronse operacións lóxicas mutuamente excluíntes"
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "aliases aniñados a un nivel demasiado profundo"
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "erro nas comiñas do parámetro"
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "valor numérico non válido"
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "número demasiado grande ou pequeno"
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr "erro descoñecido"
-
#: popthelp.c:53
msgid "Show this help message"
msgstr "Amosar esta mensaxe de axuda"
@@ -71,42 +22,62 @@ msgstr "Amosar brevemente o xeito de utilización"
msgid "Display option defaults in message"
msgstr "Amosar brevemente o xeito de utilización"
-#: popthelp.c:99
-msgid "NONE"
-msgstr "NADA"
+#~ msgid "unknown errno"
+#~ msgstr "errno descoñecido"
+
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "tipo de opción (%d) non implementada en popt\n"
+
+#~ msgid "missing argument"
+#~ msgstr "falta un argumento"
+
+#~ msgid "unknown option"
+#~ msgstr "opción descoñecida"
+
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "solicitáronse operacións lóxicas mutuamente excluíntes"
+
+#~ msgid "aliases nested too deeply"
+#~ msgstr "aliases aniñados a un nivel demasiado profundo"
+
+#~ msgid "error in parameter quoting"
+#~ msgstr "erro nas comiñas do parámetro"
+
+#~ msgid "invalid numeric value"
+#~ msgstr "valor numérico non válido"
+
+#~ msgid "number too large or too small"
+#~ msgstr "número demasiado grande ou pequeno"
+
+#~ msgid "unknown error"
+#~ msgstr "erro descoñecido"
+
+#~ msgid "NONE"
+#~ msgstr "NADA"
-#: popthelp.c:100
-msgid "VAL"
-msgstr "VAL"
+#~ msgid "VAL"
+#~ msgstr "VAL"
-#: popthelp.c:101
-msgid "INT"
-msgstr "INT"
+#~ msgid "INT"
+#~ msgstr "INT"
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LONG"
+#~ msgid "LONG"
+#~ msgstr "LONG"
-#: popthelp.c:103
-msgid "STRING"
-msgstr "CADEA"
+#~ msgid "STRING"
+#~ msgstr "CADEA"
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLOAT"
+#~ msgid "FLOAT"
+#~ msgstr "FLOAT"
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DOUBLE"
+#~ msgid "DOUBLE"
+#~ msgstr "DOUBLE"
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Uso:"
+#~ msgid "Usage:"
+#~ msgstr "Uso:"
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[OPCIÓN...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[OPCIÓN...]"
diff --git a/popt/po/hu.po b/popt/po/hu.po
index 87c9c0821..30eda3d62 100644
--- a/popt/po/hu.po
+++ b/popt/po/hu.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: 2000-08-03 23:26+0200\n"
"Last-Translator: László Németh <nemeth@qwertynet.hu>\n"
"Language-Team: Hungarian\n"
@@ -9,55 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
#: popthelp.c:53
msgid "Show this help message"
msgstr "E súgó megjelenítése"
@@ -70,43 +21,3 @@ msgstr "Rövid használati utasítás megjelenítése"
#, fuzzy
msgid "Display option defaults in message"
msgstr "Rövid használati utasítás megjelenítése"
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/popt/po/id.po b/popt/po/id.po
index 6cfef98ae..d9ced6467 100644
--- a/popt/po/id.po
+++ b/popt/po/id.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
#: popthelp.c:53
msgid "Show this help message"
msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
#: popthelp.c:57
msgid "Display option defaults in message"
msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/popt/po/is.po b/popt/po/is.po
index d63865815..33c2f667c 100644
--- a/popt/po/is.po
+++ b/popt/po/is.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: 2001-06-08 01:35+0000\n"
"Last-Translator: Richard Allen <ra@hp.is>\n"
"Language-Team: is <kde-isl@mmedia.is>\n"
@@ -9,103 +9,80 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr "óþekkt villunúmer"
+#: popthelp.c:53
+msgid "Show this help message"
+msgstr "Sýna þessa hjálp"
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "rofagerðin (%d) er ekki studd í popt\n"
+#: popthelp.c:54
+msgid "Display brief usage message"
+msgstr "Sýna stuttar notkunarleiðbeiningar"
-#: popt.c:1132
-msgid "missing argument"
-msgstr "vantar viðfang"
+#: popthelp.c:57
+msgid "Display option defaults in message"
+msgstr "Sýna sjálfgefin gildi rofa í skilaboðum"
-#: popt.c:1134
-msgid "unknown option"
-msgstr "óþekktur rofi"
+#~ msgid "unknown errno"
+#~ msgstr "óþekkt villunúmer"
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "beðið um rofa sem slökkva hvor á öðrum"
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "rofagerðin (%d) er ekki studd í popt\n"
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr "opt->arg ætti ekki að vera NULL"
+#~ msgid "missing argument"
+#~ msgstr "vantar viðfang"
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "alíasar of flóknir"
+#~ msgid "unknown option"
+#~ msgstr "óþekktur rofi"
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "villa í viðföngum (gæsalappir og svo frv.)"
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "beðið um rofa sem slökkva hvor á öðrum"
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "ógilt tölulegt gildi"
+#~ msgid "opt->arg should not be NULL"
+#~ msgstr "opt->arg ætti ekki að vera NULL"
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "talan of stór eða smá"
+#~ msgid "aliases nested too deeply"
+#~ msgstr "alíasar of flóknir"
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr "ekki tókst að taka frá minni"
+#~ msgid "error in parameter quoting"
+#~ msgstr "villa í viðföngum (gæsalappir og svo frv.)"
-#: popt.c:1152
-msgid "unknown error"
-msgstr "óþekkt villa"
+#~ msgid "invalid numeric value"
+#~ msgstr "ógilt tölulegt gildi"
-#: popthelp.c:53
-msgid "Show this help message"
-msgstr "Sýna þessa hjálp"
+#~ msgid "number too large or too small"
+#~ msgstr "talan of stór eða smá"
-#: popthelp.c:54
-msgid "Display brief usage message"
-msgstr "Sýna stuttar notkunarleiðbeiningar"
+#~ msgid "memory allocation failed"
+#~ msgstr "ekki tókst að taka frá minni"
-#: popthelp.c:57
-msgid "Display option defaults in message"
-msgstr "Sýna sjálfgefin gildi rofa í skilaboðum"
+#~ msgid "unknown error"
+#~ msgstr "óþekkt villa"
-#: popthelp.c:99
-msgid "NONE"
-msgstr "ENGIN"
+#~ msgid "NONE"
+#~ msgstr "ENGIN"
-#: popthelp.c:100
-msgid "VAL"
-msgstr "VAL"
+#~ msgid "VAL"
+#~ msgstr "VAL"
-#: popthelp.c:101
-msgid "INT"
-msgstr "INT"
+#~ msgid "INT"
+#~ msgstr "INT"
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LONG"
+#~ msgid "LONG"
+#~ msgstr "LONG"
-#: popthelp.c:103
-msgid "STRING"
-msgstr "STRING"
+#~ msgid "STRING"
+#~ msgstr "STRING"
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLOAT"
+#~ msgid "FLOAT"
+#~ msgstr "FLOAT"
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DOUBLE"
+#~ msgid "DOUBLE"
+#~ msgstr "DOUBLE"
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Notkun:"
+#~ msgid "Usage:"
+#~ msgstr "Notkun:"
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[ROFI...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[ROFI...]"
diff --git a/popt/po/it.po b/popt/po/it.po
index 6cfef98ae..d9ced6467 100644
--- a/popt/po/it.po
+++ b/popt/po/it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
#: popthelp.c:53
msgid "Show this help message"
msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
#: popthelp.c:57
msgid "Display option defaults in message"
msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/popt/po/ja.po b/popt/po/ja.po
index 6cfef98ae..d9ced6467 100644
--- a/popt/po/ja.po
+++ b/popt/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
#: popthelp.c:53
msgid "Show this help message"
msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
#: popthelp.c:57
msgid "Display option defaults in message"
msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/popt/po/ko.po b/popt/po/ko.po
index 11d34a266..b0130781b 100644
--- a/popt/po/ko.po
+++ b/popt/po/ko.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: 2001-09-06 20:06+0900\n"
"Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
"Language-Team: GNU Translation project <ko@li.org>\n"
@@ -9,103 +9,80 @@ msgstr ""
"Content-Type: text/plain; charset=EUC-KR\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr "¾Ë ¼ö ¾ø´Â ¿À·ùÄÚµå(errno) ÀÔ´Ï´Ù"
+#: popthelp.c:53
+msgid "Show this help message"
+msgstr "ÀÌ µµ¿ò¸»À» º¸¿©ÁÝ´Ï´Ù"
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "¿É¼Ç À¯Çü (%d)Àº popt¿¡¼­ »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù\n"
+#: popthelp.c:54
+msgid "Display brief usage message"
+msgstr "°£´ÜÇÑ »ç¿ë¹ýÀ» º¸¿©ÁÝ´Ï´Ù"
-#: popt.c:1132
-msgid "missing argument"
-msgstr "Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
+#: popthelp.c:57
+msgid "Display option defaults in message"
+msgstr "±âº»ÀûÀÎ ¿É¼ÇÀ» º¸¿©ÁÝ´Ï´Ù"
-#: popt.c:1134
-msgid "unknown option"
-msgstr "¾Ë ¼ö ¾ø´Â ¿É¼ÇÀÔ´Ï´Ù"
+#~ msgid "unknown errno"
+#~ msgstr "¾Ë ¼ö ¾ø´Â ¿À·ùÄÚµå(errno) ÀÔ´Ï´Ù"
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "¾çÂÊ¿¡ ¹èŸÀû ³í¸® ¿¬»êÀÌ ÁöÁ¤µÇ¾ú½À´Ï´Ù"
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "¿É¼Ç À¯Çü (%d)Àº popt¿¡¼­ »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr "¿É¼Ç->Àμö°¡ NULLÀÌ µÇ¾î¼­´Â ¾ÈµË´Ï´Ù"
+#~ msgid "missing argument"
+#~ msgstr "Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "º°Äª(alias)ÀÌ º¹ÀâÇÏ°Ô ¼³Á¤µÇ¾ú½À´Ï´Ù"
+#~ msgid "unknown option"
+#~ msgstr "¾Ë ¼ö ¾ø´Â ¿É¼ÇÀÔ´Ï´Ù"
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "¸Å°³º¯¼ö¿¡ ¿À·ù°¡ ÀÖ½À´Ï´Ù"
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "¾çÂÊ¿¡ ¹èŸÀû ³í¸® ¿¬»êÀÌ ÁöÁ¤µÇ¾ú½À´Ï´Ù"
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "À߸øµÈ ¼öÄ¡ °ªÀÔ´Ï´Ù"
+#~ msgid "opt->arg should not be NULL"
+#~ msgstr "¿É¼Ç->Àμö°¡ NULLÀÌ µÇ¾î¼­´Â ¾ÈµË´Ï´Ù"
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "¼ýÀÚ°¡ ³Ê¹« Å©°Å³ª ³Ê¹« Àû½À´Ï´Ù"
+#~ msgid "aliases nested too deeply"
+#~ msgstr "º°Äª(alias)ÀÌ º¹ÀâÇÏ°Ô ¼³Á¤µÇ¾ú½À´Ï´Ù"
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr "¸Þ¸ð¸® ÇÒ´ç¿¡ ½ÇÆÐÇß½À´Ï´Ù"
+#~ msgid "error in parameter quoting"
+#~ msgstr "¸Å°³º¯¼ö¿¡ ¿À·ù°¡ ÀÖ½À´Ï´Ù"
-#: popt.c:1152
-msgid "unknown error"
-msgstr "¾Ë ¼ö ¾ø´Â ¿À·ùÀÔ´Ï´Ù"
+#~ msgid "invalid numeric value"
+#~ msgstr "À߸øµÈ ¼öÄ¡ °ªÀÔ´Ï´Ù"
-#: popthelp.c:53
-msgid "Show this help message"
-msgstr "ÀÌ µµ¿ò¸»À» º¸¿©ÁÝ´Ï´Ù"
+#~ msgid "number too large or too small"
+#~ msgstr "¼ýÀÚ°¡ ³Ê¹« Å©°Å³ª ³Ê¹« Àû½À´Ï´Ù"
-#: popthelp.c:54
-msgid "Display brief usage message"
-msgstr "°£´ÜÇÑ »ç¿ë¹ýÀ» º¸¿©ÁÝ´Ï´Ù"
+#~ msgid "memory allocation failed"
+#~ msgstr "¸Þ¸ð¸® ÇÒ´ç¿¡ ½ÇÆÐÇß½À´Ï´Ù"
-#: popthelp.c:57
-msgid "Display option defaults in message"
-msgstr "±âº»ÀûÀÎ ¿É¼ÇÀ» º¸¿©ÁÝ´Ï´Ù"
+#~ msgid "unknown error"
+#~ msgstr "¾Ë ¼ö ¾ø´Â ¿À·ùÀÔ´Ï´Ù"
-#: popthelp.c:99
-msgid "NONE"
-msgstr "¾øÀ½(NONE)"
+#~ msgid "NONE"
+#~ msgstr "¾øÀ½(NONE)"
-#: popthelp.c:100
-msgid "VAL"
-msgstr "°ª(VAL)"
+#~ msgid "VAL"
+#~ msgstr "°ª(VAL)"
-#: popthelp.c:101
-msgid "INT"
-msgstr "Á¤¼ö(INT)"
+#~ msgid "INT"
+#~ msgstr "Á¤¼ö(INT)"
-#: popthelp.c:102
-msgid "LONG"
-msgstr "Á¤¼ö(LONG)"
+#~ msgid "LONG"
+#~ msgstr "Á¤¼ö(LONG)"
-#: popthelp.c:103
-msgid "STRING"
-msgstr "¹®ÀÚ¿­(STRING)"
+#~ msgid "STRING"
+#~ msgstr "¹®ÀÚ¿­(STRING)"
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "¼Ò¼ö(FLOAT)"
+#~ msgid "FLOAT"
+#~ msgstr "¼Ò¼ö(FLOAT)"
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "¼Ò¼ö(DOUBLE)"
+#~ msgid "DOUBLE"
+#~ msgstr "¼Ò¼ö(DOUBLE)"
-#: popthelp.c:106
-msgid "ARG"
-msgstr "Àμö(ARG)"
+#~ msgid "ARG"
+#~ msgstr "Àμö(ARG)"
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "»ç¿ë¹ý:"
+#~ msgid "Usage:"
+#~ msgstr "»ç¿ë¹ý:"
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[¿É¼Ç...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[¿É¼Ç...]"
diff --git a/popt/po/no.po b/popt/po/no.po
index 39f382400..3572e8e10 100644
--- a/popt/po/no.po
+++ b/popt/po/no.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: 2001-06-27 11:05+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
"Language-Team: Norwegian <no@li.org>\n"
@@ -9,103 +9,80 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr "ukjent errno"
+#: popthelp.c:53
+msgid "Show this help message"
+msgstr "Vis denne hjelpmeldingen"
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "flaggtype (%d) ikke implementert i popt\n"
+#: popthelp.c:54
+msgid "Display brief usage message"
+msgstr "Vis kort bruksmelding"
-#: popt.c:1132
-msgid "missing argument"
-msgstr "manglende argument"
+#: popthelp.c:57
+msgid "Display option defaults in message"
+msgstr "Vis forvalgte flagg i melding"
-#: popt.c:1134
-msgid "unknown option"
-msgstr "ukjent flagg"
+#~ msgid "unknown errno"
+#~ msgstr "ukjent errno"
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "gjensidig eksluderende logiske operasjoner forespurt"
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "flaggtype (%d) ikke implementert i popt\n"
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr "opt->arg må ikke være NULL"
+#~ msgid "missing argument"
+#~ msgstr "manglende argument"
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "aliaser med for dype løkker"
+#~ msgid "unknown option"
+#~ msgstr "ukjent flagg"
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "feil i parametersitering"
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "gjensidig eksluderende logiske operasjoner forespurt"
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "ugyldig numerisk verdi"
+#~ msgid "opt->arg should not be NULL"
+#~ msgstr "opt->arg må ikke være NULL"
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "tallet er for stort eller lite"
+#~ msgid "aliases nested too deeply"
+#~ msgstr "aliaser med for dype løkker"
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr "minneallokering feilet"
+#~ msgid "error in parameter quoting"
+#~ msgstr "feil i parametersitering"
-#: popt.c:1152
-msgid "unknown error"
-msgstr "ukjent feil"
+#~ msgid "invalid numeric value"
+#~ msgstr "ugyldig numerisk verdi"
-#: popthelp.c:53
-msgid "Show this help message"
-msgstr "Vis denne hjelpmeldingen"
+#~ msgid "number too large or too small"
+#~ msgstr "tallet er for stort eller lite"
-#: popthelp.c:54
-msgid "Display brief usage message"
-msgstr "Vis kort bruksmelding"
+#~ msgid "memory allocation failed"
+#~ msgstr "minneallokering feilet"
-#: popthelp.c:57
-msgid "Display option defaults in message"
-msgstr "Vis forvalgte flagg i melding"
+#~ msgid "unknown error"
+#~ msgstr "ukjent feil"
-#: popthelp.c:99
-msgid "NONE"
-msgstr "INGEN"
+#~ msgid "NONE"
+#~ msgstr "INGEN"
-#: popthelp.c:100
-msgid "VAL"
-msgstr "VERDI"
+#~ msgid "VAL"
+#~ msgstr "VERDI"
-#: popthelp.c:101
-msgid "INT"
-msgstr "HELTALL"
+#~ msgid "INT"
+#~ msgstr "HELTALL"
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LONG"
+#~ msgid "LONG"
+#~ msgstr "LONG"
-#: popthelp.c:103
-msgid "STRING"
-msgstr "STRENG"
+#~ msgid "STRING"
+#~ msgstr "STRENG"
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLYTTALL"
+#~ msgid "FLOAT"
+#~ msgstr "FLYTTALL"
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DOUBLE"
+#~ msgid "DOUBLE"
+#~ msgstr "DOUBLE"
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Bruk:"
+#~ msgid "Usage:"
+#~ msgstr "Bruk:"
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[FLAGG...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[FLAGG...]"
diff --git a/popt/po/pl.po b/popt/po/pl.po
index 6cfef98ae..d9ced6467 100644
--- a/popt/po/pl.po
+++ b/popt/po/pl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
#: popthelp.c:53
msgid "Show this help message"
msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
#: popthelp.c:57
msgid "Display option defaults in message"
msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/popt/po/popt.pot b/popt/po/popt.pot
index c66570dc9..c0c056c2d 100644
--- a/popt/po/popt.pot
+++ b/popt/po/popt.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
#: popthelp.c:53
msgid "Show this help message"
msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
#: popthelp.c:57
msgid "Display option defaults in message"
msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/popt/po/pt.po b/popt/po/pt.po
index b6040c248..de630131d 100644
--- a/popt/po/pt.po
+++ b/popt/po/pt.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: 2001-01-21 19:31+00:00\n"
"Last-Translator: Pedro Morais <morais@kde.org>\n"
"Language-Team: pt <morais@kde.org>\n"
@@ -9,55 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=iso-latin1\n"
"Content-Transfer-Encoding: none\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr "errno desconhecido"
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "tipo de opção (%d) não implementado no popt\n"
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr "falta um argumento"
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr "opção desconhecida"
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "foram pedidas operações lógicas mutuamente exclusivas"
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "'aliases' demasiado aninhados"
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "erros no 'quoting' de parâmetros"
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "valor númerico inválido"
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "número demasiado grando ou pequeno"
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr "erro desconhecido"
-
#: popthelp.c:53
msgid "Show this help message"
msgstr "Mostrar esta mensagem de ajuda"
@@ -71,42 +22,62 @@ msgstr "Mostrar uma mensagem de utilização sucinta"
msgid "Display option defaults in message"
msgstr "Mostrar uma mensagem de utilização sucinta"
-#: popthelp.c:99
-msgid "NONE"
-msgstr "NONE"
+#~ msgid "unknown errno"
+#~ msgstr "errno desconhecido"
+
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "tipo de opção (%d) não implementado no popt\n"
+
+#~ msgid "missing argument"
+#~ msgstr "falta um argumento"
+
+#~ msgid "unknown option"
+#~ msgstr "opção desconhecida"
+
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "foram pedidas operações lógicas mutuamente exclusivas"
+
+#~ msgid "aliases nested too deeply"
+#~ msgstr "'aliases' demasiado aninhados"
+
+#~ msgid "error in parameter quoting"
+#~ msgstr "erros no 'quoting' de parâmetros"
+
+#~ msgid "invalid numeric value"
+#~ msgstr "valor númerico inválido"
+
+#~ msgid "number too large or too small"
+#~ msgstr "número demasiado grando ou pequeno"
+
+#~ msgid "unknown error"
+#~ msgstr "erro desconhecido"
+
+#~ msgid "NONE"
+#~ msgstr "NONE"
-#: popthelp.c:100
-msgid "VAL"
-msgstr "VAL"
+#~ msgid "VAL"
+#~ msgstr "VAL"
-#: popthelp.c:101
-msgid "INT"
-msgstr "INT"
+#~ msgid "INT"
+#~ msgstr "INT"
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LONG"
+#~ msgid "LONG"
+#~ msgstr "LONG"
-#: popthelp.c:103
-msgid "STRING"
-msgstr "STRING"
+#~ msgid "STRING"
+#~ msgstr "STRING"
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLOAT"
+#~ msgid "FLOAT"
+#~ msgstr "FLOAT"
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DOUBLE"
+#~ msgid "DOUBLE"
+#~ msgstr "DOUBLE"
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Utilização:"
+#~ msgid "Usage:"
+#~ msgstr "Utilização:"
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[OPÇÃO...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[OPÇÃO...]"
diff --git a/popt/po/pt_BR.po b/popt/po/pt_BR.po
index 6cfef98ae..d9ced6467 100644
--- a/popt/po/pt_BR.po
+++ b/popt/po/pt_BR.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
#: popthelp.c:53
msgid "Show this help message"
msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
#: popthelp.c:57
msgid "Display option defaults in message"
msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/popt/po/ro.po b/popt/po/ro.po
index 7289ba905..6f637084f 100644
--- a/popt/po/ro.po
+++ b/popt/po/ro.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: 2000-06-14 23:23+EST\n"
"Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
"Language-Team: Romanian <ro@li.org>\n"
@@ -9,56 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr "eroare necunoscuta"
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr "argument lipsa"
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr "optiune necunoscuta"
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "recursivitate infinita la optiunile sinonime"
-
-#: popt.c:1142
-#, fuzzy
-msgid "error in parameter quoting"
-msgstr "eroare la insertie parametru"
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "valoare numarica invalida"
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "numar prea mare sau prea mic"
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr "eroare necuinoscuta"
-
#: popthelp.c:53
msgid "Show this help message"
msgstr "Afisare mesaj de help"
@@ -72,42 +22,36 @@ msgstr "Afisare mesaj sintaxa sumar"
msgid "Display option defaults in message"
msgstr "Afisare mesaj sintaxa sumar"
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
+#~ msgid "unknown errno"
+#~ msgstr "eroare necunoscuta"
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
+#~ msgid "missing argument"
+#~ msgstr "argument lipsa"
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
+#~ msgid "unknown option"
+#~ msgstr "optiune necunoscuta"
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
+#~ msgid "aliases nested too deeply"
+#~ msgstr "recursivitate infinita la optiunile sinonime"
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
+#, fuzzy
+#~ msgid "error in parameter quoting"
+#~ msgstr "eroare la insertie parametru"
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
+#~ msgid "invalid numeric value"
+#~ msgstr "valoare numarica invalida"
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
+#~ msgid "number too large or too small"
+#~ msgstr "numar prea mare sau prea mic"
+
+#~ msgid "unknown error"
+#~ msgstr "eroare necuinoscuta"
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Sintaxa:"
+#~ msgid "Usage:"
+#~ msgstr "Sintaxa:"
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[OPTIUNE...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[OPTIUNE...]"
diff --git a/popt/po/ru.po b/popt/po/ru.po
index 0655d8629..5f5e130c0 100644
--- a/popt/po/ru.po
+++ b/popt/po/ru.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: 2001-07-05 21:00-0500\n"
"Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -9,103 +9,80 @@ msgstr ""
"Content-Type: text/plain; charset=koi8-r\n"
"Content-Transfer-Encoding: 8bit\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÎÏÍÅÒ ÏÛÉÂËÉ"
+#: popthelp.c:53
+msgid "Show this help message"
+msgstr "ðÏËÁÚÁÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ"
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "ÏÂÒÁÂÏÔËÁ ÐÁÒÁÍÅÔÒÁ (%d) × popt ÎÅ ÐÒÅÄÕÓÍÏÔÒÅÎÁ\n"
+#: popthelp.c:54
+msgid "Display brief usage message"
+msgstr "ðÏËÁÚÁÔØ ËÒÁÔËÕÀ ÉÎÓÔÒÕËÃÉÀ ÐÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ"
-#: popt.c:1132
-msgid "missing argument"
-msgstr "ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ"
+#: popthelp.c:57
+msgid "Display option defaults in message"
+msgstr "ðÏËÁÚÁÔØ ÐÁÒÁÍÅÔÒÙ ÐÏ ÕÍÏÌÞÁÎÉÀ"
-#: popt.c:1134
-msgid "unknown option"
-msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÐÁÒÁÍÅÔÒ"
+#~ msgid "unknown errno"
+#~ msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÎÏÍÅÒ ÏÛÉÂËÉ"
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "ÚÁÐÒÏÛÅÎÙ ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÝÉÅ ÌÏÇÉÞÅÓËÉÅ ÏÐÅÒÁÃÉÉ"
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "ÏÂÒÁÂÏÔËÁ ÐÁÒÁÍÅÔÒÁ (%d) × popt ÎÅ ÐÒÅÄÕÓÍÏÔÒÅÎÁ\n"
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr "opt->arg ÎÅ ÍÏÖÅÔ ÂÙÔØ NULL"
+#~ msgid "missing argument"
+#~ msgstr "ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ"
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "ÐÒÅ×ÙÛÅÎ ÕÒÏ×ÅÎØ ÄÏÐÕÓÔÉÍÏÊ ÒÅËÕÒÓÉÉ ÐÏÄÓÔÁÎÏ×ÏË"
+#~ msgid "unknown option"
+#~ msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÐÁÒÁÍÅÔÒ"
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "ÏÛÉÂËa ÐÏÍÅÝÅÎÉÑ ÐÁÒÁÍÅÔÒÏ× × ËÁ×ÙÞËÉ"
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "ÚÁÐÒÏÛÅÎÙ ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÝÉÅ ÌÏÇÉÞÅÓËÉÅ ÏÐÅÒÁÃÉÉ"
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÞÉÓÌÏ×ÏÅ ÚÎÁÞÅÎÉÅ"
+#~ msgid "opt->arg should not be NULL"
+#~ msgstr "opt->arg ÎÅ ÍÏÖÅÔ ÂÙÔØ NULL"
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "ÞÉÓÌÏ×ÏÅ ÚÎÁÞÅÎÉÅ ÚÁ ÐÒÅÄÅÌÁÍÉ ÐÒÅÄÕÓÍÏÔÒÅÎÎÏÇÏ"
+#~ msgid "aliases nested too deeply"
+#~ msgstr "ÐÒÅ×ÙÛÅÎ ÕÒÏ×ÅÎØ ÄÏÐÕÓÔÉÍÏÊ ÒÅËÕÒÓÉÉ ÐÏÄÓÔÁÎÏ×ÏË"
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr "ÏÛÉÂËÁ ×ÙÄÅÌÅÎÉÑ ÐÁÍÑÔÉ"
+#~ msgid "error in parameter quoting"
+#~ msgstr "ÏÛÉÂËa ÐÏÍÅÝÅÎÉÑ ÐÁÒÁÍÅÔÒÏ× × ËÁ×ÙÞËÉ"
-#: popt.c:1152
-msgid "unknown error"
-msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ"
+#~ msgid "invalid numeric value"
+#~ msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÞÉÓÌÏ×ÏÅ ÚÎÁÞÅÎÉÅ"
-#: popthelp.c:53
-msgid "Show this help message"
-msgstr "ðÏËÁÚÁÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ"
+#~ msgid "number too large or too small"
+#~ msgstr "ÞÉÓÌÏ×ÏÅ ÚÎÁÞÅÎÉÅ ÚÁ ÐÒÅÄÅÌÁÍÉ ÐÒÅÄÕÓÍÏÔÒÅÎÎÏÇÏ"
-#: popthelp.c:54
-msgid "Display brief usage message"
-msgstr "ðÏËÁÚÁÔØ ËÒÁÔËÕÀ ÉÎÓÔÒÕËÃÉÀ ÐÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ"
+#~ msgid "memory allocation failed"
+#~ msgstr "ÏÛÉÂËÁ ×ÙÄÅÌÅÎÉÑ ÐÁÍÑÔÉ"
-#: popthelp.c:57
-msgid "Display option defaults in message"
-msgstr "ðÏËÁÚÁÔØ ÐÁÒÁÍÅÔÒÙ ÐÏ ÕÍÏÌÞÁÎÉÀ"
+#~ msgid "unknown error"
+#~ msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ"
-#: popthelp.c:99
-msgid "NONE"
-msgstr "NONE"
+#~ msgid "NONE"
+#~ msgstr "NONE"
-#: popthelp.c:100
-msgid "VAL"
-msgstr "VAL"
+#~ msgid "VAL"
+#~ msgstr "VAL"
-#: popthelp.c:101
-msgid "INT"
-msgstr "INT"
+#~ msgid "INT"
+#~ msgstr "INT"
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LONG"
+#~ msgid "LONG"
+#~ msgstr "LONG"
-#: popthelp.c:103
-msgid "STRING"
-msgstr "STRING"
+#~ msgid "STRING"
+#~ msgstr "STRING"
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLOAT"
+#~ msgid "FLOAT"
+#~ msgstr "FLOAT"
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DOUBLE"
+#~ msgid "DOUBLE"
+#~ msgstr "DOUBLE"
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ:"
+#~ msgid "Usage:"
+#~ msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ:"
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[ðáòáíåôò...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[ðáòáíåôò...]"
diff --git a/popt/po/sk.po b/popt/po/sk.po
index ea8c4ca29..9c68ea3be 100644
--- a/popt/po/sk.po
+++ b/popt/po/sk.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: 1999-08-04 21:40+0200\n"
"Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -13,55 +13,6 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
#: popthelp.c:53
msgid "Show this help message"
msgstr "Vypísa» túto správu"
@@ -74,43 +25,3 @@ msgstr "Zobrazi» struèný návod na pou¾itie"
#, fuzzy
msgid "Display option defaults in message"
msgstr "Zobrazi» struèný návod na pou¾itie"
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/popt/po/sl.po b/popt/po/sl.po
index fe5f1e53e..b40b3c0fb 100644
--- a/popt/po/sl.po
+++ b/popt/po/sl.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: 2000-09-05 12:30+0200\n"
"Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -9,55 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
#: popthelp.c:53
msgid "Show this help message"
msgstr "Prika¾i to sporoèilo s pomoèjo"
@@ -70,43 +21,3 @@ msgstr "Prika¾i kratko sporoèilo o uporabi"
#, fuzzy
msgid "Display option defaults in message"
msgstr "Prika¾i kratko sporoèilo o uporabi"
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/popt/po/sr.po b/popt/po/sr.po
index 6cfef98ae..d9ced6467 100644
--- a/popt/po/sr.po
+++ b/popt/po/sr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
#: popthelp.c:53
msgid "Show this help message"
msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
#: popthelp.c:57
msgid "Display option defaults in message"
msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/popt/po/sv.po b/popt/po/sv.po
index e0b6a9fcb..3e7a0198b 100644
--- a/popt/po/sv.po
+++ b/popt/po/sv.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: 2001-07-12 22:26+0100\n"
"Last-Translator: Christian Rose <menthos@menthos.com>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -9,103 +9,80 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr "okänt felnummer"
+#: popthelp.c:53
+msgid "Show this help message"
+msgstr "Visa denna hjälptext"
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "flaggtypen (%d) är inte implementerad i popt\n"
+#: popthelp.c:54
+msgid "Display brief usage message"
+msgstr "Visa en kortfattad användningstext"
-#: popt.c:1132
-msgid "missing argument"
-msgstr "argument saknas"
+#: popthelp.c:57
+msgid "Display option defaults in message"
+msgstr "Visa standardalternativ för flaggor i meddelande"
-#: popt.c:1134
-msgid "unknown option"
-msgstr "okänd flagga"
+#~ msgid "unknown errno"
+#~ msgstr "okänt felnummer"
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "ömsesidigt uteslutande logiska operationer begärdes"
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "flaggtypen (%d) är inte implementerad i popt\n"
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr "opt->arg får inte vara NULL"
+#~ msgid "missing argument"
+#~ msgstr "argument saknas"
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "alias är nästlade för djupt"
+#~ msgid "unknown option"
+#~ msgstr "okänd flagga"
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "fel i parametercitering"
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "ömsesidigt uteslutande logiska operationer begärdes"
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "ogiltigt numeriskt värde"
+#~ msgid "opt->arg should not be NULL"
+#~ msgstr "opt->arg får inte vara NULL"
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "talet för stort eller för litet"
+#~ msgid "aliases nested too deeply"
+#~ msgstr "alias är nästlade för djupt"
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr "minnesallokering misslyckades"
+#~ msgid "error in parameter quoting"
+#~ msgstr "fel i parametercitering"
-#: popt.c:1152
-msgid "unknown error"
-msgstr "okänt fel"
+#~ msgid "invalid numeric value"
+#~ msgstr "ogiltigt numeriskt värde"
-#: popthelp.c:53
-msgid "Show this help message"
-msgstr "Visa denna hjälptext"
+#~ msgid "number too large or too small"
+#~ msgstr "talet för stort eller för litet"
-#: popthelp.c:54
-msgid "Display brief usage message"
-msgstr "Visa en kortfattad användningstext"
+#~ msgid "memory allocation failed"
+#~ msgstr "minnesallokering misslyckades"
-#: popthelp.c:57
-msgid "Display option defaults in message"
-msgstr "Visa standardalternativ för flaggor i meddelande"
+#~ msgid "unknown error"
+#~ msgstr "okänt fel"
-#: popthelp.c:99
-msgid "NONE"
-msgstr "INGET"
+#~ msgid "NONE"
+#~ msgstr "INGET"
-#: popthelp.c:100
-msgid "VAL"
-msgstr "VÄRDE"
+#~ msgid "VAL"
+#~ msgstr "VÄRDE"
-#: popthelp.c:101
-msgid "INT"
-msgstr "HELTAL"
+#~ msgid "INT"
+#~ msgstr "HELTAL"
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LÅNG"
+#~ msgid "LONG"
+#~ msgstr "LÅNG"
-#: popthelp.c:103
-msgid "STRING"
-msgstr "STRÄNG"
+#~ msgid "STRING"
+#~ msgstr "STRÄNG"
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLYTTAL"
+#~ msgid "FLOAT"
+#~ msgstr "FLYTTAL"
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DUBBEL"
+#~ msgid "DOUBLE"
+#~ msgstr "DUBBEL"
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Användning:"
+#~ msgid "Usage:"
+#~ msgstr "Användning:"
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[FLAGGA...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[FLAGGA...]"
diff --git a/popt/po/tr.po b/popt/po/tr.po
index 3eb3d37e0..609f3611f 100644
--- a/popt/po/tr.po
+++ b/popt/po/tr.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: 2000-02-11 13:01+0200\n"
"Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
"Language-Team: Turkish <tr@li.org>\n"
@@ -9,55 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=iso8859-9\n"
"Content-Transfer-Encoding: 8bit\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr "bilinmeyen hata no"
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "seçenek türü (%d) popt için geçersiz\n"
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr "argüman eksik"
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr "bilinmeyen seçenek"
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "birbirini dýþlayan mantýksal iþlemler istendi"
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "adlarda çok fazla içiçelikler"
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "parametrelerde týrnak iþaretleme hatalý "
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "sayýsal deðer geçersiz"
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "sayý ya çok büyük ya da çok küçük"
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr "bilinmeyen hata"
-
#: popthelp.c:53
msgid "Show this help message"
msgstr "Bu yardým iletisini gösterir"
@@ -71,42 +22,62 @@ msgstr "Kýsa bir kullaným iletisi göster"
msgid "Display option defaults in message"
msgstr "Kýsa bir kullaným iletisi göster"
-#: popthelp.c:99
-msgid "NONE"
-msgstr "YOK"
+#~ msgid "unknown errno"
+#~ msgstr "bilinmeyen hata no"
+
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "seçenek türü (%d) popt için geçersiz\n"
+
+#~ msgid "missing argument"
+#~ msgstr "argüman eksik"
+
+#~ msgid "unknown option"
+#~ msgstr "bilinmeyen seçenek"
+
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "birbirini dýþlayan mantýksal iþlemler istendi"
+
+#~ msgid "aliases nested too deeply"
+#~ msgstr "adlarda çok fazla içiçelikler"
+
+#~ msgid "error in parameter quoting"
+#~ msgstr "parametrelerde týrnak iþaretleme hatalý "
+
+#~ msgid "invalid numeric value"
+#~ msgstr "sayýsal deðer geçersiz"
+
+#~ msgid "number too large or too small"
+#~ msgstr "sayý ya çok büyük ya da çok küçük"
+
+#~ msgid "unknown error"
+#~ msgstr "bilinmeyen hata"
+
+#~ msgid "NONE"
+#~ msgstr "YOK"
-#: popthelp.c:100
-msgid "VAL"
-msgstr "DEÐ"
+#~ msgid "VAL"
+#~ msgstr "DEÐ"
-#: popthelp.c:101
-msgid "INT"
-msgstr "INT"
+#~ msgid "INT"
+#~ msgstr "INT"
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LONG"
+#~ msgid "LONG"
+#~ msgstr "LONG"
-#: popthelp.c:103
-msgid "STRING"
-msgstr "STRING"
+#~ msgid "STRING"
+#~ msgstr "STRING"
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLOAT"
+#~ msgid "FLOAT"
+#~ msgstr "FLOAT"
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DOUBLE"
+#~ msgid "DOUBLE"
+#~ msgstr "DOUBLE"
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Kullanýmý:"
+#~ msgid "Usage:"
+#~ msgstr "Kullanýmý:"
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[SEÇENEK...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[SEÇENEK...]"
diff --git a/popt/po/uk.po b/popt/po/uk.po
index 4ddfa1d99..e9fe67706 100644
--- a/popt/po/uk.po
+++ b/popt/po/uk.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: 1999-09-30 16:54+0200\n"
"Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
"Language-Team: Ukrainian <uk@li.org>\n"
@@ -13,55 +13,6 @@ msgstr ""
"Content-Type: text/plain; charset=koi8-u\n"
"Content-Transfer-Encoding: 8bit\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
#: popthelp.c:53
msgid "Show this help message"
msgstr "ðÏËÁÚÁÔÉ ÃÀ ÄÏצÄËÕ"
@@ -74,43 +25,3 @@ msgstr "ðÏËÁÚÁÔÉ ËÏÒÏÔËÕ ÄÏצÄËÕ ÐÒÏ ×ÉËÏÒÉÓÔÁÎÎÑ"
#, fuzzy
msgid "Display option defaults in message"
msgstr "ðÏËÁÚÁÔÉ ËÏÒÏÔËÕ ÄÏצÄËÕ ÐÒÏ ×ÉËÏÒÉÓÔÁÎÎÑ"
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/popt/po/wa.po b/popt/po/wa.po
index b1b0d10cb..2d12949ee 100644
--- a/popt/po/wa.po
+++ b/popt/po/wa.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: 1999-03-18 23:11+0100\n"
"Last-Translator: Nobody yet\n"
"Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -17,55 +17,6 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
#: popthelp.c:53
msgid "Show this help message"
msgstr "Mostrer ci messaedje d' aide chal"
@@ -78,43 +29,3 @@ msgstr "Mostre on court messaedje so kmint vos è siervi"
#, fuzzy
msgid "Display option defaults in message"
msgstr "Mostre on court messaedje so kmint vos è siervi"
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/popt/po/zh.po b/popt/po/zh.po
index 6cfef98ae..d9ced6467 100644
--- a/popt/po/zh.po
+++ b/popt/po/zh.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
#: popthelp.c:53
msgid "Show this help message"
msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
#: popthelp.c:57
msgid "Display option defaults in message"
msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/popt/po/zh_CN.GB2312.po b/popt/po/zh_CN.GB2312.po
index 8a54e4c65..0f4f96e71 100644
--- a/popt/po/zh_CN.GB2312.po
+++ b/popt/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
"PO-Revision-Date: 1999-11-11 05:04+0800\n"
"Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
"Language-Team: TLDN\n"
@@ -9,55 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=gb2312\n"
"Content-Transfer-Encoding: 8bit\n"
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
#: popthelp.c:53
msgid "Show this help message"
msgstr "ÏÔʾÕâÌõ°ïÖúÐÅÏ¢"
@@ -70,43 +21,3 @@ msgstr "ÏÔʾ¼ò¶ÌʹÓÃÐÅÏ¢"
#, fuzzy
msgid "Display option defaults in message"
msgstr "ÏÔʾ¼ò¶ÌʹÓÃÐÅÏ¢"
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""