summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.lclintrc7
-rw-r--r--CHANGES1
-rw-r--r--Doxyheader14
-rw-r--r--build.c7
-rw-r--r--build/Makefile.am3
-rw-r--r--build/myftw.c2
-rw-r--r--build/pack.c10
-rw-r--r--configure.in87
-rw-r--r--lib/.lclintrc6
-rw-r--r--lib/Makefile.am3
-rw-r--r--lib/depends.c30
-rw-r--r--lib/fsm.c2
-rw-r--r--lib/package.c10
-rw-r--r--lib/problems.c2
-rw-r--r--lib/psm.c107
-rw-r--r--lib/query.c22
-rw-r--r--lib/rpmal.c16
-rw-r--r--lib/rpmchecksig.c1
-rw-r--r--lib/rpmcli.h13
-rw-r--r--lib/rpmds.h6
-rw-r--r--lib/rpmfi.h4
-rw-r--r--lib/rpminstall.c50
-rw-r--r--lib/rpmlib.h618
-rw-r--r--lib/rpmts.c210
-rw-r--r--lib/rpmts.h320
-rw-r--r--lib/rpmvercmp.c2
-rw-r--r--lib/transaction.c19
-rw-r--r--lib/ts.c12
-rw-r--r--lib/verify.c105
-rw-r--r--misc/Makefile.am2
-rw-r--r--po/cs.po666
-rw-r--r--po/da.po663
-rw-r--r--po/de.po654
-rw-r--r--po/fi.po654
-rw-r--r--po/fr.po654
-rw-r--r--po/gl.po648
-rw-r--r--po/is.po655
-rw-r--r--po/ja.po658
-rw-r--r--po/ko.po669
-rw-r--r--po/no.po663
-rw-r--r--po/pl.po658
-rw-r--r--po/pt_BR.po658
-rw-r--r--po/ro.po648
-rw-r--r--po/rpm.pot648
-rw-r--r--po/ru.po666
-rw-r--r--po/sk.po658
-rw-r--r--po/sl.po660
-rw-r--r--po/sr.po654
-rw-r--r--po/sv.po666
-rw-r--r--po/tr.po665
-rw-r--r--popt/Makefile.am2
-rw-r--r--python/Makefile.am9
-rw-r--r--python/Makefile.in3
-rw-r--r--python/db-py.c4
-rw-r--r--python/header-py.c14
-rw-r--r--python/rpmmodule.c96
-rw-r--r--python/upgrade.c1
-rwxr-xr-xrpm.c2
-rw-r--r--rpm.spec.in7
-rw-r--r--rpm2cpio.c4
-rw-r--r--rpmdb/Makefile.am3
-rw-r--r--rpmdb/dbconfig.c1
-rw-r--r--rpmdb/header.c21
-rw-r--r--rpmdb/rpmdb.c148
-rw-r--r--rpmdb/rpmdb.h280
-rw-r--r--rpmio/Makefile.am3
-rw-r--r--rpmio/macro.c14
-rwxr-xr-xrpmqv.c8
-rw-r--r--tools/Makefile.am3
-rw-r--r--tools/dumpdb.c3
-rw-r--r--tools/rpmsort.c13
-rw-r--r--tools/tpkgid.c6
72 files changed, 7902 insertions, 7599 deletions
diff --git a/.lclintrc b/.lclintrc
index ca9175ec7..3c6cb3c2e 100644
--- a/.lclintrc
+++ b/.lclintrc
@@ -13,8 +13,13 @@
+strict # lclint level
-includenest 16 # getting deep, sigh
-# --- not-yet at strict level
+# --- in progress
+#+bounds
+#+boundswrite
+-redecl
+-redef
+# --- not-yet at strict level
-bitwisesigned # pita
-elseifcomplete # 95 occurences
-exportconst # 839 occurences
diff --git a/CHANGES b/CHANGES
index 98579bc85..5f89751ac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -112,6 +112,7 @@
- fix: 2 memory leaks in headerSprintf.
- fix: db mire's access out-of-bounds memory.
- plug most install mode leaks.
+ - opaque (well mostly) rpmTransactionSet using methods.
4.0.3 -> 4.0.4:
- solaris: translate i86pc to i386 (#57182).
diff --git a/Doxyheader b/Doxyheader
index 1355627f5..b88bb2916 100644
--- a/Doxyheader
+++ b/Doxyheader
@@ -8,11 +8,13 @@
*/
/** \defgroup rpmrc RPMRC.
*/
-/** \defgroup rpmdep RPMDEP.
+/** \defgroup rpmts Transaction Set API.
*/
-/** \defgroup rpmtrans RPMTRANS.
+/** \defgroup rpmte Transaction set Element API.
*/
-/** \defgroup rpmdb RPMDB.
+/** \defgroup rpmds Dependency Set API.
+ */
+/** \defgroup rpmfi File Info set API.
*/
/** \defgroup lead LEAD.
*/
@@ -22,11 +24,11 @@
*/
/** \defgroup payload PAYLOAD.
*/
-/** \defgroup dbi DBI.
+/** \defgroup rpmdb RPM database API.
*/
-/** \defgroup db1 DB1.
+/** \defgroup dbi DataBase Index element API.
*/
-/** \defgroup db3 DB3.
+/** \defgroup db3 Berkeley DB API.
*/
/** \defgroup rpmrpc RPMRPC.
*/
diff --git a/build.c b/build.c
index f24322e9a..cb25adfbd 100644
--- a/build.c
+++ b/build.c
@@ -30,9 +30,10 @@ static int checkSpec(rpmTransactionSet ts, Header h)
&& !headerIsEntry(h, RPMTAG_CONFLICTNAME))
return 0;
- rc = rpmtransAddPackage(ts, h, NULL, 0, NULL);
+ rc = rpmtsAddPackage(ts, h, NULL, 0, NULL);
+
+ rc = rpmtsCheck(ts);
- rc = rpmdepCheck(ts);
ps = rpmtsGetProblems(ts);
if (rc == 0 && ps) {
rpmMessage(RPMMESS_ERROR, _("Failed build dependencies:\n"));
@@ -42,7 +43,7 @@ static int checkSpec(rpmTransactionSet ts, Header h)
ps = rpmProblemSetFree(ps);
/* XXX nuke the added package. */
- rpmtransClean(ts);
+ rpmtsClean(ts);
return rc;
}
diff --git a/build/Makefile.am b/build/Makefile.am
index 7ee98d00a..211fb8586 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -2,8 +2,7 @@
AUTOMAKE_OPTIONS = 1.4 foreign
-INCLUDES = \
- -I$(top_srcdir) \
+INCLUDES = -I. \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
diff --git a/build/myftw.c b/build/myftw.c
index 65199ac4f..7bb6f35a6 100644
--- a/build/myftw.c
+++ b/build/myftw.c
@@ -229,6 +229,7 @@ int myftw (const char *dir,
if (flag == MYFTW_D)
{
+/*@-compdef@*/ /* FIX: *dirs not defined */
if (retval == 0)
retval = myftw_dir (dirs, 0, descriptors, buf, len, func, fl);
if (dirs[0] != NULL)
@@ -241,6 +242,7 @@ int myftw (const char *dir,
errno = save;
/*@=mods@*/
}
+/*@=compdef@*/
}
return retval;
diff --git a/build/pack.c b/build/pack.c
index 5fbaf9ba6..9a711e395 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -11,7 +11,9 @@
#include "cpio.h"
#include "fsm.h"
#include "psm.h"
+
#include "rpmfi.h"
+#include "rpmts.h"
#include "buildio.h"
@@ -54,7 +56,7 @@ static int cpio_doio(FD_t fdo, /*@unused@*/ Header h, CSA_t csa,
fileSystem@*/
/*@modifies fdo, csa, rpmGlobalMacroContext, fileSystem @*/
{
- rpmTransactionSet ts = rpmtransCreateSet(NULL, NULL);
+ rpmTransactionSet ts = rpmtsCreate();
TFI_t fi = csa->cpioList;
const char *failedFile = NULL;
FD_t cfd;
@@ -89,7 +91,7 @@ static int cpio_doio(FD_t fdo, /*@unused@*/ Header h, CSA_t csa,
}
failedFile = _free(failedFile);
- ts = rpmtransFree(ts);
+ ts = rpmtsFree(ts);
return rc;
}
@@ -319,7 +321,7 @@ int readRPM(const char *fileName, Spec *specp, struct rpmlead *lead,
spec->packages->header = headerFree(spec->packages->header, "spec->packages");
/* Read the rpm lead, signatures, and header */
- { rpmTransactionSet ts = rpmtransCreateSet(NULL, NULL);
+ { rpmTransactionSet ts = rpmtsCreate();
/* XXX W2DO? pass fileName? */
/*@-mustmod@*/ /* LCL: segfault */
@@ -327,7 +329,7 @@ int readRPM(const char *fileName, Spec *specp, struct rpmlead *lead,
&spec->packages->header);
/*@=mustmod@*/
- ts = rpmtransFree(ts);
+ ts = rpmtsFree(ts);
if (sigs) *sigs = NULL; /* XXX HACK */
}
diff --git a/configure.in b/configure.in
index d8bd049e9..f338dec9a 100644
--- a/configure.in
+++ b/configure.in
@@ -211,31 +211,35 @@ AM_PROG_LIBTOOL
AC_CHECK_TOOL(AR, ar, :)
-if test "$cross_compiling" != "yes"; then
dnl
-dnl Set search path for common programs
+dnl use defaults if cross-compiling, otherwise use the default path.
dnl
- MYPATH="/bin:/usr/bin:/usr/local/bin:$PATH:/sbin:/usr/sbin:/usr/local/sbin:/opt/gnu/bin"
+if test "$cross_compiling" = "yes"; then
+ MYPATH=""
+else
+# MYPATH="/bin:/usr/bin:/usr/local/bin:$PATH:/sbin:/usr/sbin:/usr/local/sbin:/opt/gnu/bin"
+ MYPATH=$PATH
+fi
dnl
dnl Find some common programs
dnl
- AC_PATH_PROG(BZIP2BIN, bzip2, /usr/bin/bzip2, $MYPATH)
- AC_PATH_PROG(__CAT, cat, /bin/cat, $MYPATH)
- AC_PATH_PROG(__CHGRP, chgrp, /bin/chgrp, $MYPATH)
- AC_PATH_PROG(__CHMOD, chmod, /bin/chmod, $MYPATH)
- AC_PATH_PROG(__CHOWN, chown, /bin/chown, $MYPATH)
- AC_PATH_PROG(__CP, cp, /bin/cp, $MYPATH)
- AC_PATH_PROG(__CPIO, cpio, /bin/cpio, $MYPATH)
- AC_PATH_PROG(__FILE, file, /usr/bin/file, $MYPATH)
- AC_PATH_PROG(__GPG, gpg, /usr/bin/gpg, $MYPATH)
- AC_PATH_PROG(__GREP, grep, /bin/grep, $MYPATH)
- AC_PATH_PROG(GZIPBIN, gzip, /bin/gzip, $MYPATH)
- AC_PATH_PROG(UNZIPBIN, unzip, /usr/bin/unzip, $MYPATH)
-
- AC_PATH_PROG(__ID, id, /usr/bin/id, $MYPATH)
- AC_MSG_CHECKING(checking whether id supports -u)
- if `${__ID} -u 2>&1 > /dev/null` ; then
+AC_PATH_PROG(BZIP2BIN, bzip2, /usr/bin/bzip2, $MYPATH)
+AC_PATH_PROG(__CAT, cat, /bin/cat, $MYPATH)
+AC_PATH_PROG(__CHGRP, chgrp, /bin/chgrp, $MYPATH)
+AC_PATH_PROG(__CHMOD, chmod, /bin/chmod, $MYPATH)
+AC_PATH_PROG(__CHOWN, chown, /bin/chown, $MYPATH)
+AC_PATH_PROG(__CP, cp, /bin/cp, $MYPATH)
+AC_PATH_PROG(__CPIO, cpio, /bin/cpio, $MYPATH)
+AC_PATH_PROG(__FILE, file, /usr/bin/file, $MYPATH)
+AC_PATH_PROG(__GPG, gpg, /usr/bin/gpg, $MYPATH)
+AC_PATH_PROG(__GREP, grep, /bin/grep, $MYPATH)
+AC_PATH_PROG(GZIPBIN, gzip, /bin/gzip, $MYPATH)
+AC_PATH_PROG(UNZIPBIN, unzip, /usr/bin/unzip, $MYPATH)
+
+AC_PATH_PROG(__ID, id, /usr/bin/id, $MYPATH)
+AC_MSG_CHECKING(checking whether id supports -u)
+ if ${__ID} -u 2>&1 > /dev/null ; then
__ID_U="%{__id} -u"
AC_MSG_RESULT(yes)
else
@@ -243,14 +247,14 @@ dnl XXX Watchout for square brackets fed to m4.
__ID_U="%{__id} | %{__sed} 's/[[^=]]*=\\\\([[0-9]][[0-9]]*\\\\).*$/\\\\1/'"
AC_MSG_RESULT(no)
fi
- AC_SUBST(__ID_U)
-
- AC_PATH_PROG(__INSTALL, install, /usr/bin/install, $MYPATH)
- AC_PATH_PROG(__MAKE, make, /usr/bin/make, $MYPATH)
- AC_PATH_PROG(__MKDIR, mkdir, /bin/mkdir, $MYPATH)
- AC_PATH_PROG(__MV, mv, /bin/mv, $MYPATH)
- AC_PATH_PROG(__PATCH, patch, /usr/bin/patch, $MYPATH)
- AC_MSG_CHECKING(old version of patch)
+AC_SUBST(__ID_U)
+
+AC_PATH_PROG(__INSTALL, install, /usr/bin/install, $MYPATH)
+AC_PATH_PROG(__MAKE, make, /usr/bin/make, $MYPATH)
+AC_PATH_PROG(__MKDIR, mkdir, /bin/mkdir, $MYPATH)
+AC_PATH_PROG(__MV, mv, /bin/mv, $MYPATH)
+AC_PATH_PROG(__PATCH, patch, /usr/bin/patch, $MYPATH)
+AC_MSG_CHECKING(old version of patch)
PATCHVERSION=`patch --version 2>&1`
if test "$PATCHVERSION" = "Patch version 2.1"; then
@@ -261,21 +265,20 @@ dnl XXX Watchout for square brackets fed to m4.
AC_MSG_RESULT(patch later then 2.2 found)
fi
- AC_PATH_PROG(__PERL, perl, /usr/bin/perl, $MYPATH)
- AC_PATH_PROG(PGPBIN, pgp, /usr/bin/pgp, $MYPATH)
- AC_PATH_PROG(__PYTHON, python, /usr/bin/python, $MYPATH)
- AC_PATH_PROG(__RM, rm, /bin/rm, $MYPATH)
- AC_PATH_PROG(__RSH, rsh, /usr/bin/rsh, $MYPATH)
- AC_PATH_PROG(__SED, sed, /bin/sed, $MYPATH)
- AC_PATH_PROG(__SSH, ssh, /usr/bin/ssh, $MYPATH)
- AC_PATH_PROG(__TAR, tar, /bin/tar, $MYPATH)
-
- AC_PATH_PROG(__LD, ld, /usr/bin/ld, $MYPATH)
- AC_PATH_PROG(__NM, nm, /usr/bin/nm, $MYPATH)
- AC_PATH_PROG(__OBJCOPY, objcopy, /usr/bin/objcopy, $MYPATH)
- AC_PATH_PROG(__OBJDUMP, objdump, /usr/bin/objdump, $MYPATH)
- AC_PATH_PROG(__STRIP, strip, /usr/bin/strip, $MYPATH)
-fi
+AC_PATH_PROG(__PERL, perl, /usr/bin/perl, $MYPATH)
+AC_PATH_PROG(PGPBIN, pgp, /usr/bin/pgp, $MYPATH)
+AC_PATH_PROG(__PYTHON, python, /usr/bin/python, $MYPATH)
+AC_PATH_PROG(__RM, rm, /bin/rm, $MYPATH)
+AC_PATH_PROG(__RSH, rsh, /usr/bin/rsh, $MYPATH)
+AC_PATH_PROG(__SED, sed, /bin/sed, $MYPATH)
+AC_PATH_PROG(__SSH, ssh, /usr/bin/ssh, $MYPATH)
+AC_PATH_PROG(__TAR, tar, /bin/tar, $MYPATH)
+
+AC_PATH_PROG(__LD, ld, /usr/bin/ld, $MYPATH)
+AC_PATH_PROG(__NM, nm, /usr/bin/nm, $MYPATH)
+AC_PATH_PROG(__OBJCOPY, objcopy, /usr/bin/objcopy, $MYPATH)
+AC_PATH_PROG(__OBJDUMP, objdump, /usr/bin/objdump, $MYPATH)
+AC_PATH_PROG(__STRIP, strip, /usr/bin/strip, $MYPATH)
addlib() {
l=$1
diff --git a/lib/.lclintrc b/lib/.lclintrc
index 1e8e2e077..ed6d03765 100644
--- a/lib/.lclintrc
+++ b/lib/.lclintrc
@@ -23,6 +23,12 @@
-typeuse
-varuse
+# --- in progress
+#+bounds
+#+boundswrite
+-redecl
+-redef
+
# --- not-yet at strict level
-bitwisesigned # pita
-elseifcomplete # 95 occurences
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e6a07095b..748978182 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,8 +2,7 @@
AUTOMAKE_OPTIONS = 1.4 foreign
-INCLUDES = \
- -I$(top_srcdir) \
+INCLUDES = -I. \
-I$(top_srcdir)/build \
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
diff --git a/lib/depends.c b/lib/depends.c
index 01bbb749c..ba7381240 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -1,4 +1,4 @@
-/** \ingroup rpmdep
+/** \ingroup rpmts
* \file lib/depends.c
*/
@@ -8,14 +8,14 @@
#include <rpmmacro.h> /* XXX rpmExpand("%{_dependency_whiteout}" */
+#include "rpmdb.h" /* XXX response cache needs dbiOpen et al. */
+
#include "rpmal.h"
#include "rpmds.h"
#include "rpmfi.h"
#include "rpmte.h"
#include "rpmts.h"
-#include "rpmdb.h" /* XXX response cache needs dbiOpen et al. */
-
#include "debug.h"
/*@access tsortInfo @*/
@@ -116,7 +116,7 @@ static int removePackage(rpmTransactionSet ts, Header h, int dboffset,
return 0;
}
-int rpmtransAddPackage(rpmTransactionSet ts, Header h,
+int rpmtsAddPackage(rpmTransactionSet ts, Header h,
fnpyKey key, int upgrade, rpmRelocation * relocs)
{
HGE_t hge = (HGE_t)headerGetEntryMinMemory;
@@ -301,7 +301,7 @@ exit:
return ec;
}
-void rpmtransAvailablePackage(rpmTransactionSet ts, Header h, fnpyKey key)
+void rpmtsAvailablePackage(rpmTransactionSet ts, Header h, fnpyKey key)
{
int scareMem = 0;
rpmDepSet provides = dsNew(h, RPMTAG_PROVIDENAME, scareMem);
@@ -314,7 +314,7 @@ void rpmtransAvailablePackage(rpmTransactionSet ts, Header h, fnpyKey key)
provides = dsFree(provides);
}
-int rpmtransRemovePackage(rpmTransactionSet ts, Header h, int dboffset)
+int rpmtsRemovePackage(rpmTransactionSet ts, Header h, int dboffset)
{
return removePackage(ts, h, dboffset, RPMAL_NOMATCH);
}
@@ -353,6 +353,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet dep)
const char * DNEVR;
rc = -1;
+/*@-branchstate@*/
if ((DNEVR = dsiGetDNEVR(dep)) != NULL) {
DBC * dbcursor = NULL;
void * datap = NULL;
@@ -362,7 +363,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet dep)
xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, 0);
memset(key, 0, sizeof(*key));
- key->data = (void *) DNEVR;
+/*@i@*/ key->data = (void *) DNEVR;
key->size = DNEVRlen;
memset(data, 0, sizeof(*data));
data->data = datap;
@@ -377,6 +378,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet dep)
memcpy(&rc, datap, datalen);
xx = dbiCclose(dbi, dbcursor, 0);
}
+/*@=branchstate@*/
if (rc >= 0) {
dsiNotify(dep, _("(cached)"), rc);
@@ -506,7 +508,7 @@ exit:
xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, DB_WRITECURSOR);
memset(key, 0, sizeof(*key));
- key->data = (void *) DNEVR;
+/*@i@*/ key->data = (void *) DNEVR;
key->size = DNEVRlen;
memset(data, 0, sizeof(*data));
data->data = &rc;
@@ -752,6 +754,7 @@ static struct badDeps_s * badDeps = NULL;
/**
*/
+/*@-modobserver -observertrans @*/
static void freeBadDeps(void)
/*@globals badDeps, badDepsInitialized @*/
/*@modifies badDeps, badDepsInitialized @*/
@@ -764,6 +767,7 @@ static void freeBadDeps(void)
}
badDepsInitialized = 0;
}
+/*@=modobserver =observertrans @*/
/**
* Check for dependency relations to be ignored.
@@ -1130,7 +1134,7 @@ static void addQ(/*@dependent@*/ transactionElement p,
}
/*@=mustmod@*/
-int rpmdepOrder(rpmTransactionSet ts)
+int rpmtsOrder(rpmTransactionSet ts)
{
rpmDepSet requires;
int_32 Flags;
@@ -1170,7 +1174,7 @@ int rpmdepOrder(rpmTransactionSet ts)
/*@-modfilesystem -nullpass -formattype@*/
if (_tso_debug)
-fprintf(stderr, "*** rpmdepOrder(%p) order %p[%d]\n", ts, ts->order, ts->orderCount);
+fprintf(stderr, "*** rpmtsOrder(%p) order %p[%d]\n", ts, ts->order, ts->orderCount);
/*@=modfilesystem =nullpass =formattype@*/
/* T1. Initialize. */
@@ -1501,7 +1505,7 @@ prtTSI(" p", teGetTSI(p));
}
/* Return no. of packages that could not be ordered. */
- rpmMessage(RPMMESS_ERROR, _("rpmdepOrder failed, %d elements remain\n"),
+ rpmMessage(RPMMESS_ERROR, _("rpmtsOrder failed, %d elements remain\n"),
loopcheck);
return loopcheck;
}
@@ -1601,7 +1605,7 @@ assert(newOrderCount == ts->orderCount);
ts->addedPackages = alFree(ts->addedPackages);
ts->numAddedPackages = 0;
#else
- rpmtransClean(ts);
+ rpmtsClean(ts);
#endif
freeBadDeps();
@@ -1642,7 +1646,7 @@ static int rpmdbCloseDBI(/*@null@*/ rpmdb db, int rpmtag)
}
/*@=mustmod =type@*/
-int rpmdepCheck(rpmTransactionSet ts)
+int rpmtsCheck(rpmTransactionSet ts)
{
rpmdbMatchIterator mi = NULL;
teIterator pi = NULL; transactionElement p;
diff --git a/lib/fsm.c b/lib/fsm.c
index 7cabb1fe3..6b261573a 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -30,7 +30,7 @@
#define alloca_strdup(_s) strcpy(alloca(strlen(_s)+1), (_s))
/*@unchecked@*/
-int _fsm_debug = 0;
+int _fsm_debug = 1;
/* XXX Failure to remove is not (yet) cause for failure. */
/*@-exportlocal -exportheadervar@*/
diff --git a/lib/package.c b/lib/package.c
index 178430144..90ce04374 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -206,8 +206,8 @@ int rpmReadPackageFile(rpmTransactionSet ts, FD_t fd,
/* Figger the most effective available signature. */
ts->sigtag = 0;
- if (ts->verify_legacy) {
- if (ts->sigtag == 0 && !ts->nosignatures) {
+ if (ts->vsflags & _RPMTS_VSF_VERIFY_LEGACY) {
+ if (ts->sigtag == 0 && !(ts->vsflags & _RPMTS_VSF_NOSIGNATURES)) {
if (headerIsEntry(sig, RPMSIGTAG_DSA))
ts->sigtag = RPMSIGTAG_DSA;
else if (headerIsEntry(sig, RPMSIGTAG_RSA))
@@ -220,7 +220,7 @@ int rpmReadPackageFile(rpmTransactionSet ts, FD_t fd,
fdInitDigest(fd, PGPHASHALGO_MD5, 0);
}
}
- if (ts->sigtag == 0 && !ts->nodigests) {
+ if (ts->sigtag == 0 && !(ts->vsflags & _RPMTS_VSF_NODIGESTS)) {
if (headerIsEntry(sig, RPMSIGTAG_SHA1))
ts->sigtag = RPMSIGTAG_SHA1;
else if (headerIsEntry(sig, RPMSIGTAG_MD5)) {
@@ -229,13 +229,13 @@ int rpmReadPackageFile(rpmTransactionSet ts, FD_t fd,
}
}
} else {
- if (ts->sigtag == 0 && !ts->nosignatures) {
+ if (ts->sigtag == 0 && !(ts->vsflags & _RPMTS_VSF_NOSIGNATURES)) {
if (headerIsEntry(sig, RPMSIGTAG_DSA))
ts->sigtag = RPMSIGTAG_DSA;
else if (headerIsEntry(sig, RPMSIGTAG_RSA))
ts->sigtag = RPMSIGTAG_RSA;
}
- if (ts->sigtag == 0 && !ts->nodigests) {
+ if (ts->sigtag == 0 && !(ts->vsflags & _RPMTS_VSF_NODIGESTS)) {
if (headerIsEntry(sig, RPMSIGTAG_SHA1))
ts->sigtag = RPMSIGTAG_SHA1;
}
diff --git a/lib/problems.c b/lib/problems.c
index a3827578c..d8c7f5518 100644
--- a/lib/problems.c
+++ b/lib/problems.c
@@ -68,7 +68,9 @@ rpmProblemSet rpmProblemSetFree(rpmProblemSet ps)
}
ps->probs = _free(ps->probs);
}
+/*@-nullstate@*/ /* FIX: ps->probs may be NULL */
(void) rpmpsUnlink(ps, "destroy");
+/*@=nullstate@*/
/*@-refcounttrans -usereleased@*/
ps = _free(ps);
/*@=refcounttrans =usereleased@*/
diff --git a/lib/psm.c b/lib/psm.c
index c9a3aaa8d..4c2377f01 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -1,4 +1,4 @@
-/** \ingroup rpmtrans payload
+/** \ingroup rpmts payload
* \file lib/psm.c
* Package state machine to handle a package from a transaction set.
*/
@@ -474,9 +474,7 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, FD_t fd,
rpmRC rc;
int i;
- /*@-mustmod@*/ /* LCL: segfault */
rc = rpmReadPackageFile(ts, fd, "InstallSourcePackage", &h);
- /*@=mustmod@*/
if (!(rc == RPMRC_OK || rc == RPMRC_BADSIZE) || h == NULL) {
goto exit;
}
@@ -489,7 +487,7 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, FD_t fd,
goto exit;
}
- (void) rpmtransAddPackage(ts, h, NULL, 0, NULL);
+ (void) rpmtsAddPackage(ts, h, NULL, 0, NULL);
fi = fiNew(ts, fi, h, RPMTAG_BASENAMES, scareMem);
h = headerFree(h, "InstallSourcePackage");
@@ -562,14 +560,14 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, FD_t fd,
}
}
- _sourcedir = rpmGenPath(ts->rootDir, "%{_sourcedir}", "");
+ _sourcedir = rpmGenPath(rpmtsGetRootDir(ts), "%{_sourcedir}", "");
rc = chkdir(_sourcedir, "sourcedir");
if (rc) {
rc = RPMRC_FAIL;
goto exit;
}
- _specdir = rpmGenPath(ts->rootDir, "%{_specdir}", "");
+ _specdir = rpmGenPath(rpmtsGetRootDir(ts), "%{_specdir}", "");
rc = chkdir(_specdir, "specdir");
if (rc) {
rc = RPMRC_FAIL;
@@ -640,7 +638,7 @@ exit:
psm->te = NULL;
/* XXX nuke the added package(s). */
- rpmtransClean(ts);
+ rpmtsClean(ts);
psm->ts = rpmtsUnlink(ts, "InstallSourcePackage");
@@ -690,9 +688,8 @@ static int runScript(PSM_t psm, Header h,
const char * sln,
int progArgc, const char ** progArgv,
const char * script, int arg1, int arg2)
- /*@globals rpmGlobalMacroContext,
- fileSystem, internalState@*/
- /*@modifies psm, rpmGlobalMacroContext, fileSystem, internalState @*/
+ /*@globals rpmGlobalMacroContext, fileSystem, internalState@*/
+ /*@modifies rpmGlobalMacroContext, fileSystem, internalState @*/
{
const rpmTransactionSet ts = psm->ts;
TFI_t fi = psm->fi;
@@ -712,6 +709,7 @@ static int runScript(PSM_t psm, Header h,
const char * fn = NULL;
int i, xx;
int freePrefixes = 0;
+ FD_t scriptFd;
FD_t out;
rpmRC rc = RPMRC_OK;
const char *n, *v, *r;
@@ -750,9 +748,11 @@ static int runScript(PSM_t psm, Header h,
prefixBuf = alloca(maxPrefixLength + 50);
if (script) {
+ const char * rootDir = rpmtsGetRootDir(ts);
FD_t fd;
+
/*@-branchstate@*/
- if (makeTempFile((!ts->chrootDone ? ts->rootDir : "/"), &fn, &fd)) {
+ if (makeTempFile((!ts->chrootDone ? rootDir : "/"), &fn, &fd)) {
if (freePrefixes) free(prefixes);
return 1;
}
@@ -769,10 +769,10 @@ static int runScript(PSM_t psm, Header h,
xx = Fclose(fd);
{ const char * sn = fn;
- if (!ts->chrootDone && ts->rootDir != NULL &&
- !(ts->rootDir[0] == '/' && ts->rootDir[1] == '\0'))
+ if (!ts->chrootDone && rootDir != NULL &&
+ !(rootDir[0] == '/' && rootDir[1] == '\0'))
{
- sn += strlen(ts->rootDir)-1;
+ sn += strlen(rootDir)-1;
}
argv[argc++] = sn;
}
@@ -791,13 +791,14 @@ static int runScript(PSM_t psm, Header h,
argv[argc] = NULL;
- if (ts->scriptFd != NULL) {
+ scriptFd = rpmtsGetScriptFd(ts);
+ if (scriptFd != NULL) {
if (rpmIsVerbose()) {
- out = fdDup(Fileno(ts->scriptFd));
+ out = fdDup(Fileno(scriptFd));
} else {
out = Fopen("/dev/null", "w.fdio");
if (Ferror(out)) {
- out = fdDup(Fileno(ts->scriptFd));
+ out = fdDup(Fileno(scriptFd));
}
}
} else {
@@ -820,8 +821,8 @@ static int runScript(PSM_t psm, Header h,
xx = dup2(pipes[0], STDIN_FILENO);
xx = close(pipes[0]);
- if (ts->scriptFd != NULL) {
- int sfdno = Fileno(ts->scriptFd);
+ if (scriptFd != NULL) {
+ int sfdno = Fileno(scriptFd);
int ofdno = Fileno(out);
if (sfdno != STDERR_FILENO)
xx = dup2(sfdno, STDERR_FILENO);
@@ -832,7 +833,7 @@ static int runScript(PSM_t psm, Header h,
xx = Fclose (out);
}
if (sfdno > STDERR_FILENO) {
- xx = Fclose (ts->scriptFd);
+ xx = Fclose (scriptFd);
}
}
@@ -859,7 +860,8 @@ static int runScript(PSM_t psm, Header h,
}
}
- if ((rootDir = ts->rootDir) != NULL) /* XXX can't happen */
+ rootDir = rpmtsGetRootDir(ts);
+ if (rootDir != NULL) /* XXX can't happen */
switch(urlIsURL(rootDir)) {
case URL_IS_PATH:
rootDir += sizeof("file://") - 1;
@@ -919,10 +921,8 @@ static int runScript(PSM_t psm, Header h,
* @return rpmRC return code
*/
static rpmRC runInstScript(PSM_t psm)
- /*@globals rpmGlobalMacroContext,
- fileSystem, internalState @*/
- /*@modifies psm, rpmGlobalMacroContext,
- fileSystem, internalState @*/
+ /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
+ /*@modifies rpmGlobalMacroContext, fileSystem, internalState @*/
{
TFI_t fi = psm->fi;
HGE_t hge = fi->hge;
@@ -1236,7 +1236,7 @@ int psmStage(PSM_t psm, pkgStage stage)
case PSM_INIT:
rpmMessage(RPMMESS_DEBUG, _("%s: %s has %d files, test = %d\n"),
psm->stepName, teGetNEVR(psm->te),
- tfiGetFC(fi), (ts->transFlags & RPMTRANS_FLAG_TEST));
+ tfiGetFC(fi), (rpmtsGetFlags(ts) & RPMTRANS_FLAG_TEST));
/*
* When we run scripts, we pass an argument which is the number of
@@ -1263,7 +1263,7 @@ assert(psm->mi == NULL);
while ((psm->oh = rpmdbNextIterator(psm->mi))) {
fi->record = rpmdbGetIteratorOffset(psm->mi);
- if (ts->transFlags & RPMTRANS_FLAG_MULTILIB)
+ if (rpmtsGetFlags(ts) & RPMTRANS_FLAG_MULTILIB)
psm->oh = headerCopy(psm->oh);
else
psm->oh = NULL;
@@ -1278,7 +1278,7 @@ assert(psm->mi == NULL);
memset(fi->fstates, RPMFILE_STATE_NORMAL, fc);
}
- if (ts->transFlags & RPMTRANS_FLAG_JUSTDB) break;
+ if (rpmtsGetFlags(ts) & RPMTRANS_FLAG_JUSTDB) break;
if (fc <= 0) break;
/*
@@ -1337,7 +1337,7 @@ assert(psm->mi == NULL);
}
break;
case PSM_PRE:
- if (ts->transFlags & RPMTRANS_FLAG_TEST) break;
+ if (rpmtsGetFlags(ts) & RPMTRANS_FLAG_TEST) break;
/* Change root directory if requested and not already done. */
rc = psmStage(psm, PSM_CHROOT_IN);
@@ -1346,11 +1346,11 @@ assert(psm->mi == NULL);
psm->scriptTag = RPMTAG_PREIN;
psm->progTag = RPMTAG_PREINPROG;
- if (!(ts->transFlags & RPMTRANS_FLAG_NOTRIGGERPREIN)) {
+ if (!(rpmtsGetFlags(ts) & RPMTRANS_FLAG_NOTRIGGERPREIN)) {
/* XXX FIXME: implement %triggerprein. */
}
- if (!(ts->transFlags & RPMTRANS_FLAG_NOPRE)) {
+ if (!(rpmtsGetFlags(ts) & RPMTRANS_FLAG_NOPRE)) {
rc = psmStage(psm, PSM_SCRIPT);
if (rc) {
rpmError(RPMERR_SCRIPT,
@@ -1368,7 +1368,7 @@ assert(psm->mi == NULL);
psm->sense = RPMSENSE_TRIGGERUN;
psm->countCorrection = -1;
- if (!(ts->transFlags & RPMTRANS_FLAG_NOTRIGGERUN)) {
+ if (!(rpmtsGetFlags(ts) & RPMTRANS_FLAG_NOTRIGGERUN)) {
/* Run triggers in other package(s) this package sets off. */
rc = psmStage(psm, PSM_TRIGGERS);
if (rc) break;
@@ -1378,7 +1378,7 @@ assert(psm->mi == NULL);
if (rc) break;
}
- if (!(ts->transFlags & RPMTRANS_FLAG_NOPREUN))
+ if (!(rpmtsGetFlags(ts) & RPMTRANS_FLAG_NOPREUN))
rc = psmStage(psm, PSM_SCRIPT);
}
if (psm->goal == PSM_PKGSAVE) {
@@ -1474,12 +1474,12 @@ assert(psm->mi == NULL);
}
break;
case PSM_PROCESS:
- if (ts->transFlags & RPMTRANS_FLAG_TEST) break;
+ if (rpmtsGetFlags(ts) & RPMTRANS_FLAG_TEST) break;
if (psm->goal == PSM_PKGINSTALL) {
int i;
- if (ts->transFlags & RPMTRANS_FLAG_JUSTDB) break;
+ if (rpmtsGetFlags(ts) & RPMTRANS_FLAG_JUSTDB) break;
#ifdef DYING
if (fi->fc <= 0) break;
for (i = 0; i < fi->fc; i++)
@@ -1569,8 +1569,8 @@ assert(psm->mi == NULL);
if (psm->goal == PSM_PKGERASE) {
int fc = tfiGetFC(fi);
- if (ts->transFlags & RPMTRANS_FLAG_JUSTDB) break;
- if (ts->transFlags & RPMTRANS_FLAG_APPLYONLY) break;
+ if (rpmtsGetFlags(ts) & RPMTRANS_FLAG_JUSTDB) break;
+ if (rpmtsGetFlags(ts) & RPMTRANS_FLAG_APPLYONLY) break;
if (fc <= 0) break;
psm->what = RPMCALLBACK_UNINST_START;
@@ -1624,7 +1624,7 @@ assert(psm->mi == NULL);
}
break;
case PSM_POST:
- if (ts->transFlags & RPMTRANS_FLAG_TEST) break;
+ if (rpmtsGetFlags(ts) & RPMTRANS_FLAG_TEST) break;
if (psm->goal == PSM_PKGINSTALL) {
int_32 installTime = (int_32) time(NULL);
@@ -1638,7 +1638,7 @@ assert(psm->mi == NULL);
xx = headerAddEntry(fi->h, RPMTAG_INSTALLTIME, RPM_INT32_TYPE,
&installTime, 1);
- if (ts->transFlags & RPMTRANS_FLAG_MULTILIB) {
+ if (rpmtsGetFlags(ts) & RPMTRANS_FLAG_MULTILIB) {
uint_32 multiLib, * newMultiLib, * p;
if (hge(fi->h, RPMTAG_MULTILIBS, NULL,
@@ -1660,7 +1660,7 @@ assert(psm->mi == NULL);
* If this package has already been installed, remove it from
* the database before adding the new one.
*/
- if (fi->record && !(ts->transFlags & RPMTRANS_FLAG_APPLYONLY)) {
+ if (fi->record && !(rpmtsGetFlags(ts) & RPMTRANS_FLAG_APPLYONLY)) {
rc = psmStage(psm, PSM_RPMDB_REMOVE);
if (rc) break;
}
@@ -1673,11 +1673,11 @@ assert(psm->mi == NULL);
psm->sense = RPMSENSE_TRIGGERIN;
psm->countCorrection = 0;
- if (!(ts->transFlags & RPMTRANS_FLAG_NOPOST)) {
+ if (!(rpmtsGetFlags(ts) & RPMTRANS_FLAG_NOPOST)) {
rc = psmStage(psm, PSM_SCRIPT);
if (rc) break;
}
- if (!(ts->transFlags & RPMTRANS_FLAG_NOTRIGGERIN)) {
+ if (!(rpmtsGetFlags(ts) & RPMTRANS_FLAG_NOTRIGGERIN)) {
/* Run triggers in other package(s) this package sets off. */
rc = psmStage(psm, PSM_TRIGGERS);
if (rc) break;
@@ -1687,7 +1687,7 @@ assert(psm->mi == NULL);
if (rc) break;
}
- if (!(ts->transFlags & RPMTRANS_FLAG_APPLYONLY))
+ if (!(rpmtsGetFlags(ts) & RPMTRANS_FLAG_APPLYONLY))
rc = markReplacedFiles(psm);
}
@@ -1698,18 +1698,18 @@ assert(psm->mi == NULL);
psm->sense = RPMSENSE_TRIGGERPOSTUN;
psm->countCorrection = -1;
- if (!(ts->transFlags & RPMTRANS_FLAG_NOPOSTUN)) {
+ if (!(rpmtsGetFlags(ts) & RPMTRANS_FLAG_NOPOSTUN)) {
rc = psmStage(psm, PSM_SCRIPT);
/* XXX WTFO? postun failures don't cause erasure failure. */
}
- if (!(ts->transFlags & RPMTRANS_FLAG_NOTRIGGERPOSTUN)) {
+ if (!(rpmtsGetFlags(ts) & RPMTRANS_FLAG_NOTRIGGERPOSTUN)) {
/* Run triggers in other package(s) this package sets off. */
rc = psmStage(psm, PSM_TRIGGERS);
if (rc) break;
}
- if (!(ts->transFlags & RPMTRANS_FLAG_APPLYONLY))
+ if (!(rpmtsGetFlags(ts) & RPMTRANS_FLAG_APPLYONLY))
rc = psmStage(psm, PSM_RPMDB_REMOVE);
}
if (psm->goal == PSM_PKGSAVE) {
@@ -1802,8 +1802,8 @@ assert(psm->mi == NULL);
case PSM_DESTROY:
break;
case PSM_COMMIT:
- if (!(ts->transFlags & RPMTRANS_FLAG_PKGCOMMIT)) break;
- if (ts->transFlags & RPMTRANS_FLAG_APPLYONLY) break;
+ if (!(rpmtsGetFlags(ts) & RPMTRANS_FLAG_PKGCOMMIT)) break;
+ if (rpmtsGetFlags(ts) & RPMTRANS_FLAG_APPLYONLY) break;
rc = fsmSetup(fi->fsm, FSM_PKGCOMMIT, ts, fi,
NULL, NULL, &psm->failedFile);
@@ -1811,8 +1811,9 @@ assert(psm->mi == NULL);
break;
case PSM_CHROOT_IN:
+ { const char * rootDir = rpmtsGetRootDir(ts);
/* Change root directory if requested and not already done. */
- if (ts->rootDir && !ts->chrootDone && !psm->chrootDone) {
+ if (rootDir != NULL && !ts->chrootDone && !psm->chrootDone) {
static int _loaded = 0;
/*
@@ -1827,12 +1828,12 @@ assert(psm->mi == NULL);
xx = chdir("/");
/*@-superuser@*/
- rc = chroot(ts->rootDir);
+ rc = chroot(rootDir);
/*@=superuser@*/
psm->chrootDone = ts->chrootDone = 1;
if (ts->rpmdb != NULL) ts->rpmdb->db_chrootDone = 1;
}
- break;
+ } break;
case PSM_CHROOT_OUT:
/* Restore root directory if changed. */
if (psm->chrootDone) {
@@ -1892,12 +1893,12 @@ fprintf(stderr, "*** PSM_RDB_LOAD: header #%u not found\n", fi->record);
rc = (fi->h ? RPMRC_OK : RPMRC_FAIL);
break;
case PSM_RPMDB_ADD:
- if (ts->transFlags & RPMTRANS_FLAG_TEST) break;
+ if (rpmtsGetFlags(ts) & RPMTRANS_FLAG_TEST) break;
if (fi->h != NULL) /* XXX can't happen */
rc = rpmdbAdd(ts->rpmdb, ts->id, fi->h);
break;
case PSM_RPMDB_REMOVE:
- if (ts->transFlags & RPMTRANS_FLAG_TEST) break;
+ if (rpmtsGetFlags(ts) & RPMTRANS_FLAG_TEST) break;
rc = rpmdbRemove(ts->rpmdb, ts->id, fi->record);
break;
diff --git a/lib/query.c b/lib/query.c
index abd222b32..1ab183b6b 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -15,16 +15,15 @@
#include <rpmcli.h>
#include <rpmbuild.h>
+#include "rpmdb.h"
#include "rpmts.h"
#include "manifest.h"
#include "debug.h"
-/*@access rpmTransactionSet@*/ /* XXX ts->rpmdb */
/*@access rpmdbMatchIterator@*/ /* XXX compared with NULL */
/*@access Header@*/ /* XXX compared with NULL */
-/*@access rpmdb@*/ /* XXX compared with NULL */
/*@access FD_t@*/ /* XXX compared with NULL */
/**
@@ -624,11 +623,7 @@ restart:
/*@loopbreak@*/ break;
}
- ts->verify_legacy = 1;
- /*@=mustmod@*/ /* LCL: something fishy here, was segfault */
rpmrc = rpmReadPackageFile(ts, fd, fileURL, &h);
- /*@=mustmod@*/
- ts->verify_legacy = 0;
(void) Fclose(fd);
@@ -648,7 +643,7 @@ restart:
if (rpmrc == RPMRC_OK) {
res = qva->qva_showPackage(qva, ts, h);
h = headerFree(h, "QueryVerify");
- rpmtransClean(ts);
+ rpmtsClean(ts);
continue;
}
@@ -978,6 +973,7 @@ restart:
int rpmcliQuery(rpmTransactionSet ts, QVA_t qva, const char ** argv)
{
const char * arg;
+ int vsflags;
int ec = 0;
if (qva->qva_showPackage == NULL)
@@ -995,9 +991,14 @@ int rpmcliQuery(rpmTransactionSet ts, QVA_t qva, const char ** argv)
break;
}
- ts->nodigests = (qva->qva_flags & VERIFY_DIGEST);
- ts->nosignatures = (qva->qva_flags & VERIFY_SIGNATURE);
+ vsflags = 0;
+ if (qva->qva_flags & VERIFY_DIGEST)
+ vsflags |= _RPMTS_VSF_NODIGESTS;
+ if (qva->qva_flags & VERIFY_SIGNATURE)
+ vsflags |= _RPMTS_VSF_NOSIGNATURES;
+ vsflags |= _RPMTS_VSF_VERIFY_LEGACY;
+ (void) rpmtsSetVerifySigFlags(ts, vsflags);
if (qva->qva_source == RPMQV_ALL) {
/*@-nullpass@*/ /* FIX: argv can be NULL, cast to pass argv array */
ec = rpmQueryVerify(qva, ts, (const char *) argv);
@@ -1006,9 +1007,10 @@ int rpmcliQuery(rpmTransactionSet ts, QVA_t qva, const char ** argv)
if (argv != NULL)
while ((arg = *argv++) != NULL) {
ec += rpmQueryVerify(qva, ts, arg);
- rpmtransClean(ts);
+ rpmtsClean(ts);
}
}
+ (void) rpmtsSetVerifySigFlags(ts, 0);
if (qva->qva_showPackage == showQueryPackage)
qva->qva_showPackage = NULL;
diff --git a/lib/rpmal.c b/lib/rpmal.c
index 4a8a5e59f..5a4afb987 100644
--- a/lib/rpmal.c
+++ b/lib/rpmal.c
@@ -51,7 +51,7 @@ typedef /*@abstract@*/ struct availableIndexEntry_s * availableIndexEntry;
struct availableIndexEntry_s {
/*@exposed@*/ /*@dependent@*/ /*@null@*/
alKey pkgKey; /*!< Containing package. */
-/*@dependent@*/
+/*@observer@*/
const char * entry; /*!< Dependency name. */
unsigned short entryLen; /*!< No. of bytes in name. */
unsigned short entryIx; /*!< Dependency index. */
@@ -319,9 +319,9 @@ fprintf(stderr, "*** del %p[%d]\n", al->list, pkgNum);
(void) tfiSetDX(fi, dx);
- /*@-assignexpose@*/
+ /*@-assignexpose -dependenttrans -observertrans@*/
dieNeedle->dirName = (char *) tfiGetDN(fi);
- /*@=assignexpose@*/
+ /*@=assignexpose =dependenttrans =observertrans@*/
dieNeedle->dirNameLen = (dieNeedle->dirName != NULL
? strlen(dieNeedle->dirName) : 0);
die = bsearch(dieNeedle, al->dirs, al->numDirs,
@@ -435,9 +435,9 @@ fprintf(stderr, "*** add %p[%d]\n", al->list, pkgNum);
(void) tfiSetDX(fi, dx);
- /*@-assignexpose@*/
+ /*@-assignexpose -dependenttrans -observertrans@*/
dieNeedle->dirName = (char *) tfiGetDN(fi);
- /*@=assignexpose@*/
+ /*@=assignexpose =dependenttrans =observertrans@*/
dieNeedle->dirNameLen = (dieNeedle->dirName != NULL
? strlen(dieNeedle->dirName) : 0);
die = bsearch(dieNeedle, al->dirs, origNumDirs,
@@ -481,9 +481,9 @@ fprintf(stderr, "+++ die[%3d] %p [%d] %s\n", al->numDirs, die, die->dirNameLen,
/* Rewind to first file, generate file index entry for each file. */
fi = tfiInit(fi, first);
while ((first = tfiNext(fi)) >= 0 && first < next) {
- /*@-assignexpose -onlytrans @*/
+ /*@-assignexpose -dependenttrans -observertrans @*/
fie->baseName = tfiGetBN(fi);
- /*@=assignexpose =onlytrans @*/
+ /*@=assignexpose =dependenttrans =observertrans @*/
fie->baseNameLen = (fie->baseName ? strlen(fie->baseName) : 0);
fie->pkgNum = pkgNum;
fie->fileFlags = tfiGetFFlags(fi);
@@ -660,7 +660,9 @@ if (_al_debug)
fprintf(stderr, "==> die %p %s\n", die, (die->dirName ? die->dirName : "(nil)"));
/*@=modfilesys@*/
+/*@-observertrans@*/
fieNeedle->baseName = baseName;
+/*@=observertrans@*/
fieNeedle->baseNameLen = strlen(fieNeedle->baseName);
fie = bsearch(fieNeedle, die->files, die->numFiles,
sizeof(*fieNeedle), fieCompare);
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index 37a83601b..ce3abbf16 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -9,6 +9,7 @@
#include <rpmcli.h>
#include "rpmpgp.h"
+#include "rpmdb.h"
#include "rpmts.h"
#include "rpmlead.h"
diff --git a/lib/rpmcli.h b/lib/rpmcli.h
index 30ca0470e..647e9a504 100644
--- a/lib/rpmcli.h
+++ b/lib/rpmcli.h
@@ -354,17 +354,6 @@ int showVerifyPackage(QVA_t qva, rpmTransactionSet ts, Header h)
/*@modifies ts, h, rpmGlobalMacroContext, fileSystem, internalState @*/;
/**
- * Check original header digest.
- * @deprecated Remove.
- * @todo Make digest/signature check part of rpmdb iterator.
- * @param h header
- * @return 0 on success (or unavailable), 1 on digest mismatch
- */
-/*@unused@*/
-int rpmVerifyDigest(Header h)
- /*@modifies nothing @*/;
-
-/**
* Check package and header signatures.
* @param qva parsed query/verify options
* @param ts transaction set
@@ -443,7 +432,7 @@ int rpmInstallSource(rpmTransactionSet ts, const char * arg,
* Describe database command line requests.
*/
struct rpmInstallArguments_s {
- rpmtransFlags transFlags;
+ rpmtsFlags transFlags;
rpmprobFilterFlags probFilter;
rpmInstallInterfaceFlags installInterfaceFlags;
rpmEraseInterfaceFlags eraseInterfaceFlags;
diff --git a/lib/rpmds.h b/lib/rpmds.h
index 16d201892..55b90a56b 100644
--- a/lib/rpmds.h
+++ b/lib/rpmds.h
@@ -154,7 +154,7 @@ int dsiSetIx(/*@null@*/ rpmDepSet ds, int ix)
* @param ds dependency set
* @return current dependency DNEVR, NULL on invalid
*/
-/*@null@*/
+/*@observer@*/ /*@null@*/
const char * dsiGetDNEVR(/*@null@*/ const rpmDepSet ds)
/*@*/;
@@ -163,7 +163,7 @@ const char * dsiGetDNEVR(/*@null@*/ const rpmDepSet ds)
* @param ds dependency set
* @return current dependency name, NULL on invalid
*/
-/*@null@*/
+/*@observer@*/ /*@null@*/
const char * dsiGetN(/*@null@*/ const rpmDepSet ds)
/*@*/;
@@ -172,7 +172,7 @@ const char * dsiGetN(/*@null@*/ const rpmDepSet ds)
* @param ds dependency set
* @return current dependency EVR, NULL on invalid
*/
-/*@null@*/
+/*@observer@*/ /*@null@*/
const char * dsiGetEVR(/*@null@*/ const rpmDepSet ds)
/*@*/;
diff --git a/lib/rpmfi.h b/lib/rpmfi.h
index b0217ed7b..56b96492b 100644
--- a/lib/rpmfi.h
+++ b/lib/rpmfi.h
@@ -237,7 +237,7 @@ int tfiSetDX(/*@null@*/ TFI_t fi, int dx)
* @param fi file info set
* @return current base name, NULL on invalid
*/
-/*@null@*/
+/*@observer@*/ /*@null@*/
const char * tfiGetBN(/*@null@*/ TFI_t fi)
/*@*/;
@@ -246,7 +246,7 @@ const char * tfiGetBN(/*@null@*/ TFI_t fi)
* @param fi file info set
* @return current directory, NULL on invalid
*/
-/*@null@*/
+/*@observer@*/ /*@null@*/
const char * tfiGetDN(/*@null@*/ TFI_t fi)
/*@*/;
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index d777eb73b..ccd86303e 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -6,6 +6,7 @@
#include <rpmcli.h>
+#include "rpmdb.h"
#include "rpmts.h" /* XXX ts->rpmdb */
#include "manifest.h"
@@ -223,6 +224,7 @@ int rpmInstall(rpmTransactionSet ts,
/*@only@*/ /*@null@*/ const char * fileURL = NULL;
int stopInstall = 0;
const char ** av = NULL;
+ int vsflags;
int ac = 0;
int rc;
int xx;
@@ -235,8 +237,13 @@ int rpmInstall(rpmTransactionSet ts,
relocations = ia->relocations;
ts->goal = TSM_INSTALL;
- ts->nodigests = (ia->qva_flags & VERIFY_DIGEST);
- ts->nosignatures = (ia->qva_flags & VERIFY_SIGNATURE);
+
+ vsflags = 0;
+ if (ia->qva_flags & VERIFY_DIGEST)
+ vsflags |= _RPMTS_VSF_NODIGESTS;
+ if (ia->qva_flags & VERIFY_SIGNATURE)
+ vsflags |= _RPMTS_VSF_NOSIGNATURES;
+ vsflags |= _RPMTS_VSF_VERIFY_LEGACY;
ts->dbmode = (rpmtsGetFlags(ts) & RPMTRANS_FLAG_TEST)
? O_RDONLY : (O_RDWR|O_CREAT);
@@ -359,11 +366,11 @@ restart:
continue;
}
- ts->verify_legacy = 1;
- /*@-mustmod -nullstate @*/ /* LCL: segfault */
+ /* Read the header, verifying signatures (if present). */
+ xx = rpmtsSetVerifySigFlags(ts, vsflags);
eiu->rpmrc = rpmReadPackageFile(ts, eiu->fd, *eiu->fnp, &eiu->h);
- /*@=mustmod =nullstate @*/
- ts->verify_legacy = 0;
+ xx = rpmtsSetVerifySigFlags(ts, xx);
+
eiu->isSource = headerIsEntry(eiu->h, RPMTAG_SOURCEPACKAGE);
xx = Fclose(eiu->fd);
@@ -447,7 +454,7 @@ restart:
/*@-nullstate@*/ /* FIX: ts->rootDir may be NULL? */
/*@-abstract@*/
- rc = rpmtransAddPackage(ts, eiu->h, (fnpyKey)fileName,
+ rc = rpmtsAddPackage(ts, eiu->h, (fnpyKey)fileName,
(ia->installInterfaceFlags & INSTALL_UPGRADE) != 0,
relocations);
/*@=abstract@*/
@@ -527,7 +534,7 @@ restart:
if (eiu->numRPMS && !(ia->installInterfaceFlags & INSTALL_NODEPS)) {
/*@-nullstate@*/ /* FIX: ts->rootDir may be NULL? */
- if (rpmdepCheck(ts)) {
+ if (rpmtsCheck(ts)) {
eiu->numFailed = eiu->numPkgs;
stopInstall = 1;
}
@@ -563,7 +570,7 @@ restart:
if (eiu->numRPMS && !(ia->installInterfaceFlags & INSTALL_NOORDER)) {
/*@-nullstate@*/ /* FIX: ts->rootDir may be NULL? */
- if (rpmdepOrder(ts)) {
+ if (rpmtsOrder(ts)) {
eiu->numFailed = eiu->numPkgs;
stopInstall = 1;
}
@@ -577,7 +584,7 @@ restart:
rpmMessage(RPMMESS_DEBUG, _("installing binary packages\n"));
/*@-nullstate@*/ /* FIX: ts->rootDir may be NULL? */
- rc = rpmRunTransactions(ts, NULL, probFilter);
+ rc = rpmtsRun(ts, NULL, probFilter);
/*@=nullstate@*/
ps = rpmtsGetProblems(ts);
@@ -606,9 +613,7 @@ restart:
}
if (!(rpmtsGetFlags(ts) & RPMTRANS_FLAG_TEST)) {
-#if !defined(__LCLINT__) /* LCL: segfault */
eiu->rpmrc = rpmInstallSourcePackage(ts, eiu->fd, NULL, NULL);
-#endif
if (eiu->rpmrc != RPMRC_OK) eiu->numFailed++;
}
@@ -656,8 +661,6 @@ int rpmErase(rpmTransactionSet ts,
#endif
ts->goal = TSM_ERASE;
- ts->nodigests = (ia->qva_flags & VERIFY_DIGEST);
- ts->nosignatures = (ia->qva_flags & VERIFY_SIGNATURE);
/* XXX W2DO? O_EXCL??? */
ts->dbmode = (rpmtsGetFlags(ts) & RPMTRANS_FLAG_TEST)
@@ -683,7 +686,7 @@ int rpmErase(rpmTransactionSet ts,
while ((h = rpmdbNextIterator(mi)) != NULL) {
unsigned int recOffset = rpmdbGetIteratorOffset(mi);
if (recOffset) {
- (void) rpmtransRemovePackage(ts, h, recOffset);
+ (void) rpmtsRemovePackage(ts, h, recOffset);
numPackages++;
}
}
@@ -693,7 +696,7 @@ int rpmErase(rpmTransactionSet ts,
if (!(ia->eraseInterfaceFlags & UNINSTALL_NODEPS)) {
- if (rpmdepCheck(ts)) {
+ if (rpmtsCheck(ts)) {
numFailed = numPackages;
stopUninstall = 1;
}
@@ -711,7 +714,7 @@ int rpmErase(rpmTransactionSet ts,
if (!stopUninstall) {
(void) rpmtsSetFlags(ts, (rpmtsGetFlags(ts) | RPMTRANS_FLAG_REVERSE));
- numFailed += rpmRunTransactions(ts, NULL, 0);
+ numFailed += rpmtsRun(ts, NULL, 0);
ps = rpmtsGetProblems(ts);
ps = rpmProblemSetFree(ps);
}
@@ -890,9 +893,7 @@ IDTX IDTXglob(rpmTransactionSet ts, const char * globstr, rpmTag tag)
continue;
}
- /*@-mustmod@*/ /* LCL: segfault */
xx = rpmReadPackageFile(ts, fd, av[i], &h);
- /*@=mustmod@*/
rpmrc = (xx ? RPMRC_FAIL : RPMRC_OK); /* XXX HACK */
isSource = headerIsEntry(h, RPMTAG_SOURCEPACKAGE);
@@ -1019,7 +1020,7 @@ int rpmRollback(rpmTransactionSet ts,
rpmMessage(RPMMESS_DEBUG, "\t+++ %s\n", rp->key);
- rc = rpmtransAddPackage(ts, rp->h, (fnpyKey)rp->key,
+ rc = rpmtsAddPackage(ts, rp->h, (fnpyKey)rp->key,
0, ia->relocations);
if (rc != 0)
goto exit;
@@ -1044,7 +1045,7 @@ int rpmRollback(rpmTransactionSet ts,
rpmMessage(RPMMESS_DEBUG,
"\t--- rpmdb instance #%u\n", ip->instance);
- rc = rpmtransRemovePackage(ts, ip->instance);
+ rc = rpmtsRemovePackage(ts, ip->instance);
if (rc != 0)
goto exit;
@@ -1070,7 +1071,7 @@ int rpmRollback(rpmTransactionSet ts,
rpmMessage(RPMMESS_DEBUG, _("rollback %d packages to %s"),
packagesTotal, ctime(&tid));
- rc = rpmdepCheck(ts);
+ rc = rpmtsCheck(ts);
ps = rpmtsGetProblems(ts);
if (rc != 0 && ps) {
rpmMessage(RPMMESS_ERROR, _("Failed dependencies:\n"));
@@ -1080,12 +1081,11 @@ int rpmRollback(rpmTransactionSet ts,
}
ps = rpmProblemSetFree(ps);
- rc = rpmdepOrder(ts);
+ rc = rpmtsOrder(ts);
if (rc != 0)
goto exit;
- rc = rpmRunTransactions(ts, NULL,
- (ia->probFilter|RPMPROB_FILTER_OLDPACKAGE));
+ rc = rpmtsRun(ts, NULL, (ia->probFilter|RPMPROB_FILTER_OLDPACKAGE));
ps = rpmtsGetProblems(ts);
if (rc > 0)
rpmProblemSetPrint(stderr, ps);
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 1b0655d8f..fea0232d5 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -81,21 +81,31 @@ typedef /*@abstract@*/ void * alKey;
typedef /*@abstract@*/ int alNum;
/*@=mutrep@*/
-/**
+/** \ingroup rpmtrans
* Dependency tag sets from a header, so that a header can be discarded early.
*/
typedef /*@abstract@*/ /*@refcounted@*/ struct rpmDepSet_s * rpmDepSet;
-/**
+/** \ingroup rpmtrans
* File info tag sets from a header, so that a header can be discarded early.
*/
typedef /*@abstract@*/ /*@refcounted@*/ struct TFI_s * TFI_t;
-/**
+/** \ingroup rpmtrans
* An element of a transaction set, i.e. a TR_ADDED or TR_REMOVED package.
*/
typedef /*@abstract@*/ struct transactionElement_s * transactionElement;
+/** \ingroup rpmdb
+ * Database of headers and tag value indices.
+ */
+typedef /*@abstract@*/ /*@refcounted@*/ struct rpmdb_s * rpmdb;
+
+/** \ingroup rpmdb
+ * Database iterator.
+ */
+typedef /*@abstract@*/ struct _rpmdbMatchIterator * rpmdbMatchIterator;
+
/** \ingroup header
* Return name, version, release strings from header.
* @param h header
@@ -128,7 +138,7 @@ void headerMergeLegacySigs(Header h, const Header sig)
Header headerRegenSigHeader(const Header h)
/*@modifies h @*/;
-/**
+/** \ingroup header
* Retrieve file names from header.
* The representation of file names in package headers changed in rpm-4.0.
* Originally, file names were stored as an array of paths. In rpm-4.0,
@@ -145,7 +155,7 @@ void rpmBuildFileList(Header h, /*@out@*/ const char *** fileListPtr,
/*@out@*/ int * fileCountPtr)
/*@modifies *fileListPtr, *fileCountPtr @*/;
-/**
+/** \ingroup header
* Retrieve tag info from header.
* This is a "dressed" entry to headerGetEntry to do:
* 1) DIRNAME/BASENAME/DIRINDICES -> FILENAMES tag conversions.
@@ -371,7 +381,9 @@ typedef enum rpmTag_e {
RPMTAG_MULTILIBS = 1127,
RPMTAG_INSTALLTID = 1128,
RPMTAG_REMOVETID = 1129,
+/*@-enummemuse@*/
RPMTAG_SHA1RHN = 1130, /*!< internal */
+/*@=enummemuse@*/
RPMTAG_RHNPLATFORM = 1131,
RPMTAG_PLATFORM = 1132,
/*@-enummemuse@*/
@@ -643,284 +655,6 @@ void rpmFreeRpmrc(void)
/*@}*/
/* ==================================================================== */
-/** \name RPMDB */
-/*@{*/
-
-/** \ingroup rpmdb
- */
-typedef /*@abstract@*/ /*@refcounted@*/ struct rpmdb_s * rpmdb;
-
-/** \ingroup rpmdb
- */
-typedef /*@abstract@*/ struct _dbiIndexSet * dbiIndexSet;
-
-/** \ingroup rpmdb
- * Tags for which rpmdb indices will be built.
- */
-/*@unchecked@*/
-/*@only@*/ /*@null@*/ extern int * dbiTags;
-/*@unchecked@*/
-extern int dbiTagsMax;
-
-/** \ingroup rpmdb
- * Unreference a database instance.
- * @param db rpm database
- * @param msg
- * @return NULL always
- */
-/*@unused@*/ /*@null@*/
-rpmdb rpmdbUnlink (/*@killref@*/ /*@only@*/ rpmdb db, const char * msg)
- /*@modifies db @*/;
-
-/** @todo Remove debugging entry from the ABI. */
-/*@null@*/
-rpmdb XrpmdbUnlink (/*@killref@*/ /*@only@*/ rpmdb db, const char * msg,
- const char * fn, unsigned ln)
- /*@modifies db @*/;
-#define rpmdbUnlink(_db, _msg) XrpmdbUnlink(_db, _msg, __FILE__, __LINE__)
-
-/** \ingroup rpmdb
- * Reference a database instance.
- * @param db rpm database
- * @param msg
- * @return new rpm database reference
- */
-/*@unused@*/
-rpmdb rpmdbLink (rpmdb db, const char * msg)
- /*@modifies db @*/;
-
-/** @todo Remove debugging entry from the ABI. */
-rpmdb XrpmdbLink (rpmdb db, const char * msg,
- const char * fn, unsigned ln)
- /*@modifies db @*/;
-#define rpmdbLink(_db, _msg) XrpmdbLink(_db, _msg, __FILE__, __LINE__)
-
-/** \ingroup rpmdb
- * Open rpm database.
- * @param prefix path to top of install tree
- * @retval dbp address of rpm database
- * @param mode open(2) flags: O_RDWR or O_RDONLY (O_CREAT also)
- * @param perms database permissions
- * @return 0 on success
- */
-int rpmdbOpen (/*@null@*/ const char * prefix, /*@null@*/ /*@out@*/ rpmdb * dbp,
- int mode, int perms)
- /*@globals fileSystem @*/
- /*@modifies *dbp, fileSystem @*/;
-
-/** \ingroup rpmdb
- * Initialize database.
- * @param prefix path to top of install tree
- * @param perms database permissions
- * @return 0 on success
- */
-int rpmdbInit(/*@null@*/ const char * prefix, int perms)
- /*@globals fileSystem @*/
- /*@modifies fileSystem @*/;
-
-/** \ingroup rpmdb
- * Verify database components.
- * @param prefix path to top of install tree
- * @return 0 on success
- */
-int rpmdbVerify(/*@null@*/ const char * prefix)
- /*@globals fileSystem @*/
- /*@modifies fileSystem @*/;
-
-/** \ingroup rpmdb
- * Close all database indices and free rpmdb.
- * @param db rpm database
- * @return 0 on success
- */
-int rpmdbClose (/*@killref@*/ /*@only@*/ /*@null@*/ rpmdb db)
- /*@globals fileSystem @*/
- /*@modifies db, fileSystem @*/;
-
-/** \ingroup rpmdb
- * Sync all database indices.
- * @param db rpm database
- * @return 0 on success
- */
-int rpmdbSync (/*@null@*/ rpmdb db)
- /*@globals fileSystem @*/
- /*@modifies fileSystem @*/;
-
-/** \ingroup rpmdb
- * Open all database indices.
- * @param db rpm database
- * @return 0 on success
- */
-int rpmdbOpenAll (/*@null@*/ rpmdb db)
- /*@modifies db @*/;
-
-/** \ingroup rpmdb
- * Return number of instances of package in rpm database.
- * @param db rpm database
- * @param name rpm package name
- * @return number of instances
- */
-int rpmdbCountPackages(/*@null@*/ rpmdb db, const char * name)
- /*@globals fileSystem @*/
- /*@modifies db, fileSystem @*/;
-
-/** \ingroup rpmdb
- */
-typedef /*@abstract@*/ struct _rpmdbMatchIterator * rpmdbMatchIterator;
-
-/** \ingroup rpmdb
- * Destroy rpm database iterator.
- * @param mi rpm database iterator
- * @return NULL always
- */
-/*@null@*/ rpmdbMatchIterator rpmdbFreeIterator(
- /*@only@*//*@null@*/rpmdbMatchIterator mi)
- /*@globals fileSystem @*/
- /*@modifies mi, fileSystem @*/;
-
-/** \ingroup rpmdb
- * Return header join key for current position of rpm database iterator.
- * @param mi rpm database iterator
- * @return current header join key
- */
-unsigned int rpmdbGetIteratorOffset(/*@null@*/ rpmdbMatchIterator mi)
- /*@*/;
-
-/** \ingroup rpmdb
- * Return number of elements in rpm database iterator.
- * @param mi rpm database iterator
- * @return number of elements
- */
-int rpmdbGetIteratorCount(/*@null@*/ rpmdbMatchIterator mi)
- /*@*/;
-
-/** \ingroup rpmdb
- * Append items to set of package instances to iterate.
- * @param mi rpm database iterator
- * @param hdrNums array of package instances
- * @param nHdrNums number of elements in array
- * @return 0 on success, 1 on failure (bad args)
- */
-int rpmdbAppendIterator(/*@null@*/ rpmdbMatchIterator mi,
- /*@null@*/ const int * hdrNums, int nHdrNums)
- /*@modifies mi @*/;
-
-/** \ingroup rpmdb
- * Remove items from set of package instances to iterate.
- * @note Sorted hdrNums are always passed in rpmlib.
- * @param mi rpm database iterator
- * @param hdrNums array of package instances
- * @param nHdrNums number of elements in array
- * @param sorted is the array sorted? (array will be sorted on return)
- * @return 0 on success, 1 on failure (bad args)
- */
-int rpmdbPruneIterator(/*@null@*/ rpmdbMatchIterator mi,
- /*@null@*/ int * hdrNums, int nHdrNums, int sorted)
- /*@modifies mi, hdrNums @*/;
-
-/**
- * Tag value pattern match mode.
- */
-typedef enum rpmMireMode_e {
- RPMMIRE_DEFAULT = 0, /*!< regex with \., .* and ^...$ added */
- RPMMIRE_STRCMP = 1, /*!< strcmp on strings */
- RPMMIRE_REGEX = 2, /*!< regex patterns */
- RPMMIRE_GLOB = 3 /*!< glob patterns through fnmatch(3) */
-} rpmMireMode;
-
-/** \ingroup rpmdb
- * Add pattern to iterator selector.
- * @param mi rpm database iterator
- * @param tag rpm tag
- * @param mode type of pattern match
- * @param pattern pattern to match
- * @return 0 on success
- */
-int rpmdbSetIteratorRE(/*@null@*/ rpmdbMatchIterator mi, rpmTag tag,
- rpmMireMode mode, /*@null@*/ const char * pattern)
- /*@modifies mi @*/;
-
-/** \ingroup rpmdb
- * Prepare iterator for lazy writes.
- * @note Must be called before rpmdbNextIterator() in CDB model database.
- * @param mi rpm database iterator
- * @param rewrite new value of rewrite
- * @return previous value
- */
-int rpmdbSetIteratorRewrite(/*@null@*/ rpmdbMatchIterator mi, int rewrite)
- /*@modifies mi @*/;
-
-/** \ingroup rpmdb
- * Modify iterator to mark header for lazy write.
- * @param mi rpm database iterator
- * @param modified new value of modified
- * @return previous value
- */
-int rpmdbSetIteratorModified(/*@null@*/ rpmdbMatchIterator mi, int modified)
- /*@modifies mi @*/;
-
-/** \ingroup rpmdb
- * Return next package header from iteration.
- * @param mi rpm database iterator
- * @return NULL on end of iteration.
- */
-/*@null@*/ Header rpmdbNextIterator(/*@null@*/ rpmdbMatchIterator mi)
- /*@globals fileSystem @*/
- /*@modifies mi, fileSystem @*/;
-
-/** @todo Remove debugging entry from the ABI. */
-/*@unused@*/
-/*@null@*/ Header XrpmdbNextIterator(rpmdbMatchIterator mi,
- const char * f, unsigned int l)
- /*@globals fileSystem @*/
- /*@modifies mi, fileSystem @*/;
-
-/** \ingroup rpmdb
- * Return database iterator.
- * @param db rpm database
- * @param rpmtag rpm tag
- * @param keyp key data (NULL for sequential access)
- * @param keylen key data length (0 will use strlen(keyp))
- * @return NULL on failure
- */
-/*@only@*/ /*@null@*/ rpmdbMatchIterator rpmdbInitIterator(
- /*@null@*/ rpmdb db, rpmTag rpmtag,
- /*@null@*/ const void * keyp, size_t keylen)
- /*@globals fileSystem @*/
- /*@modifies db, fileSystem @*/;
-
-/** \ingroup rpmdb
- * Add package header to rpm database and indices.
- * @param db rpm database
- * @param iid install transaction id (iid = 0 or -1 to skip)
- * @param h header
- * @return 0 on success
- */
-int rpmdbAdd(/*@null@*/ rpmdb db, int iid, Header h)
- /*@globals fileSystem @*/
- /*@modifies db, h, fileSystem @*/;
-
-/** \ingroup rpmdb
- * Remove package header from rpm database and indices.
- * @param db rpm database
- * @param rid remove transaction id (rid = 0 or -1 to skip)
- * @param hdrNum package instance number in database
- * @return 0 on success
- */
-int rpmdbRemove(/*@null@*/ rpmdb db, /*@unused@*/ int rid, unsigned int hdrNum)
- /*@globals fileSystem @*/
- /*@modifies db, fileSystem @*/;
-
-/** \ingroup rpmdb
- * Rebuild database indices from package headers.
- * @param prefix path to top of install tree
- * @return 0 on success
- */
-int rpmdbRebuild(/*@null@*/ const char * prefix)
- /*@globals rpmGlobalMacroContext, fileSystem @*/
- /*@modifies rpmGlobalMacroContext, fileSystem @*/;
-
-/*@}*/
-/* ==================================================================== */
/** \name RPMPROBS */
/*@{*/
@@ -930,7 +664,7 @@ int rpmdbRebuild(/*@null@*/ const char * prefix)
typedef /*@abstract@*/ struct rpmProblem_s * rpmProblem;
/**
- * Transaction problems found by rpmRunTransactions().
+ * Transaction problems found by rpmtsRun().
*/
typedef /*@abstract@*/ /*@refcounted@*/ struct rpmProblemSet_s * rpmProblemSet;
@@ -1107,6 +841,7 @@ int rpmProblemSetTrim(/*@null@*/ rpmProblemSet ps,
/*@{*/
/**
* Prototype for headerFreeData() vector.
+ *
* @param data address of data (or NULL)
* @param type type of data (or -1 to force free)
* @return NULL always
@@ -1117,6 +852,7 @@ typedef /*@null@*/
/**
* Prototype for headerGetEntry() vector.
+ *
* Will never return RPM_I18NSTRING_TYPE! RPM_STRING_TYPE elements with
* RPM_I18NSTRING_TYPE equivalent entries are translated (if HEADER_I18NTABLE
* entry is present).
@@ -1136,6 +872,7 @@ typedef int (*HGE_t) (Header h, rpmTag tag,
/**
* Prototype for headerAddEntry() vector.
+ *
* Duplicate tags are okay, but only defined for iteration (with the
* exceptions noted below). While you are allowed to add i18n string
* arrays through this function, you probably don't mean to. See
@@ -1155,6 +892,7 @@ typedef int (*HAE_t) (Header h, rpmTag tag, rpmTagType type,
/**
* Prototype for headerModifyEntry() vector.
* If there are multiple entries with this tag, the first one gets replaced.
+ *
* @param h header
* @param tag tag
* @param type tag value data type
@@ -1180,6 +918,22 @@ typedef int (*HRE_t) (Header h, int_32 tag)
/*@modifies h @*/;
/**
+ * @todo Generalize filter mechanism.
+ */
+typedef enum rpmprobFilterFlags_e {
+ RPMPROB_FILTER_NONE = 0,
+ RPMPROB_FILTER_IGNOREOS = (1 << 0), /*!< from --ignoreos */
+ RPMPROB_FILTER_IGNOREARCH = (1 << 1), /*!< from --ignorearch */
+ RPMPROB_FILTER_REPLACEPKG = (1 << 2), /*!< from --replacepkgs */
+ RPMPROB_FILTER_FORCERELOCATE= (1 << 3), /*!< from --badreloc */
+ RPMPROB_FILTER_REPLACENEWFILES= (1 << 4), /*!< from --replacefiles */
+ RPMPROB_FILTER_REPLACEOLDFILES= (1 << 5), /*!< from --replacefiles */
+ RPMPROB_FILTER_OLDPACKAGE = (1 << 6), /*!< from --oldpackage */
+ RPMPROB_FILTER_DISKSPACE = (1 << 7), /*!< from --ignoresize */
+ RPMPROB_FILTER_DISKNODES = (1 << 8) /*!< from --ignoresize */
+} rpmprobFilterFlags;
+
+/**
* We pass these around as an array with a sentinel.
*/
typedef struct rpmRelocation_s {
@@ -1281,234 +1035,9 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, FD_t fd,
fileSystem, internalState @*/;
/** \ingroup rpmtrans
- * Unreference a transaction instance.
- * @param ts transaction set
- * @param msg
- * @return NULL always
- */
-/*@unused@*/ /*@null@*/
-rpmTransactionSet rpmtsUnlink (/*@killref@*/ /*@only@*/ rpmTransactionSet ts,
- const char * msg)
- /*@modifies ts @*/;
-
-/** @todo Remove debugging entry from the ABI. */
-/*@null@*/
-rpmTransactionSet XrpmtsUnlink (/*@killref@*/ /*@only@*/ rpmTransactionSet ts,
- const char * msg, const char * fn, unsigned ln)
- /*@modifies ts @*/;
-#define rpmtsUnlink(_ts, _msg) XrpmtsUnlink(_ts, _msg, __FILE__, __LINE__)
-
-/** \ingroup rpmtrans
- * Reference a transaction set instance.
- * @param ts transaction set
- * @param msg
- * @return new transaction set reference
- */
-/*@unused@*/
-rpmTransactionSet rpmtsLink (rpmTransactionSet ts, const char * msg)
- /*@modifies ts @*/;
-
-/** @todo Remove debugging entry from the ABI. */
-rpmTransactionSet XrpmtsLink (rpmTransactionSet ts,
- const char * msg, const char * fn, unsigned ln)
- /*@modifies ts @*/;
-#define rpmtsLink(_ts, _msg) XrpmtsLink(_ts, _msg, __FILE__, __LINE__)
-
-/** \ingroup rpmtrans
- * Close the database used by the transaction.
- * @param ts transaction set
- * @return 0 on success
- */
-int rpmtsCloseDB(rpmTransactionSet ts)
- /*@globals fileSystem @*/
- /*@modifies ts, fileSystem @*/;
-
-/** \ingroup rpmtrans
- * Open the database used by the transaction.
- * @param ts transaction set
- * @param dbmode O_RDONLY or O_RDWR
- * @return 0 on success
- */
-int rpmtsOpenDB(rpmTransactionSet ts, int dbmode)
- /*@globals fileSystem, internalState @*/
- /*@modifies ts, fileSystem, internalState @*/;
-
-/** \ingroup rpmtrans
- * Return transaction database iterator.
- * @param ts transaction set
- * @param rpmtag rpm tag
- * @param keyp key data (NULL for sequential access)
- * @param keylen key data length (0 will use strlen(keyp))
- * @return NULL on failure
- */
-/*@only@*/ /*@null@*/
-rpmdbMatchIterator rpmtsInitIterator(const rpmTransactionSet ts, int rpmtag,
- /*@null@*/ const void * keyp, size_t keylen)
- /*@globals fileSystem @*/
- /*@modifies ts, fileSystem @*/;
-
-/**
- * Attempt to solve a needed dependency.
- * @param ts transaction set
- * @param ds dependency set
- * @return 0 if resolved (and added to ts), 1 not found
- */
-int rpmtsSolve(rpmTransactionSet ts, rpmDepSet ds)
- /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
- /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/;
-
-/**
- * Attempt to solve a needed dependency.
- * @param ts transaction set
- * @param ds dependency set
- * @return 0 if resolved (and added to ts), 1 not found
- */
-/*@unused@*/
-int rpmtsAvailable(rpmTransactionSet ts, const rpmDepSet ds)
- /*@globals fileSystem @*/
- /*@modifies ts, fileSystem @*/;
-
-/**
- * Return (and clear) current transaction set problems.
- * @param ts transaction set
- * @return current problem set (or NULL)
- */
-/*@null@*/
-rpmProblemSet rpmtsGetProblems(rpmTransactionSet ts)
- /*@modifies ts @*/;
-
-/** \ingroup rpmtrans
- * Re-create an empty transaction set.
- * @param ts transaction set
- */
-void rpmtransClean(rpmTransactionSet ts)
- /*@modifies ts @*/;
-
-/** \ingroup rpmtrans
- * Destroy transaction set, closing the database as well.
- * @param ts transaction set
- * @return NULL always
- */
-/*@null@*/ rpmTransactionSet
-rpmtransFree(/*@killref@*/ /*@only@*//*@null@*/ rpmTransactionSet ts)
- /*@globals fileSystem @*/
- /*@modifies ts, fileSystem @*/;
-
-/** \ingroup rpmtrans
- * Create an empty transaction set.
- * @param db rpm database (may be NULL if database is not accessed)
- * @param rootDir path to top of install tree
- * @return transaction set
+ * Bit(s) to control rpmtsRun() operation.
*/
-/*@only@*/ rpmTransactionSet rpmtransCreateSet(
- /*@null@*/ rpmdb db,
- /*@null@*/ const char * rootDir)
- /*@modifies db @*/;
-
-/** \ingroup rpmtrans
- * Add package to be installed to transaction set.
- *
- * If fd is NULL, the callback specified in rpmtransCreateSet() is used to
- * open and close the file descriptor. If Header is NULL, the fd is always
- * used, otherwise fd is only needed (and only opened) for actual package
- * installation.
- *
- * @warning The fd argument has been eliminated, and is assumed always NULL.
- *
- * @param ts transaction set
- * @param h header
- * @param key package retrieval key (e.g. file name)
- * @param upgrade is package being upgraded?
- * @param relocs package file relocations
- * @return 0 on success, 1 on I/O error, 2 needs capabilities
- */
-int rpmtransAddPackage(rpmTransactionSet ts, Header h,
- /*@exposed@*/ /*@null@*/ const fnpyKey key, int upgrade,
- /*@null@*/ rpmRelocation * relocs)
- /*@globals fileSystem, internalState @*/
- /*@modifies ts, h, fileSystem, internalState @*/;
-
-/** \ingroup rpmtrans
- * Add package to universe of possible packages to install in transaction set.
- * @warning The key parameter is non-functional.
- * @param ts transaction set
- * @param h header
- * @param key package private data
- */
-/*@unused@*/
-void rpmtransAvailablePackage(rpmTransactionSet ts, Header h,
- /*@exposed@*/ /*@null@*/ fnpyKey key)
- /*@modifies h, ts @*/;
-
-/** \ingroup rpmtrans
- * Add package to be erased to transaction set.
- * @param ts transaction set
- * @param h header
- * @param dboffset rpm database instance
- * @return 0 on success
- */
-int rpmtransRemovePackage(rpmTransactionSet ts, Header h, int dboffset)
- /*@modifies ts, h @*/;
-
-/** \ingroup rpmtrans
- * Save file handle to be used as stderr when running package scripts.
- * @param ts transaction set
- * @param fd file handle
- */
-/*@unused@*/
-void rpmtransSetScriptFd(rpmTransactionSet ts, FD_t fd)
- /*@modifies ts, fd @*/;
-
-/** \ingroup rpmtrans
- * Retrieve keys from ordered transaction set.
- * @todo Removed packages have no keys, returned as interleaved NULL pointers.
- * @param ts transaction set
- * @retval ep address of returned element array pointer (or NULL)
- * @retval nep address of no. of returned elements (or NULL)
- * @return 0 always
- */
-/*@unused@*/
-int rpmtransGetKeys(rpmTransactionSet ts,
- /*@null@*/ /*@out@*/ fnpyKey ** ep,
- /*@null@*/ /*@out@*/ int * nep)
- /*@modifies ts, ep, nep @*/;
-
-/** \ingroup rpmtrans
- * Check that all dependencies can be resolved.
- * @param ts transaction set
- * @return 0 on success
- */
-int rpmdepCheck(rpmTransactionSet ts)
- /*@globals fileSystem, internalState @*/
- /*@modifies ts, fileSystem, internalState @*/;
-
-/** \ingroup rpmtrans
- * Determine package order in a transaction set according to dependencies.
- *
- * Order packages, returning error if circular dependencies cannot be
- * eliminated by removing PreReq's from the loop(s). Only dependencies from
- * added or removed packages are used to determine ordering using a
- * topological sort (Knuth vol. 1, p. 262). Use rpmdepCheck() to verify
- * that all dependencies can be resolved.
- *
- * The final order ends up as installed packages followed by removed packages,
- * with packages removed for upgrades immediately following the new package
- * to be installed.
- *
- * The operation would be easier if we could sort the addedPackages array in the
- * transaction set, but we store indexes into the array in various places.
- *
- * @param ts transaction set
- * @return no. of (added) packages that could not be ordered
- */
-int rpmdepOrder(rpmTransactionSet ts)
- /*@globals fileSystem, internalState@*/
- /*@modifies ts, fileSystem, internalState @*/;
-
-/** \ingroup rpmtrans
- * Bit(s) to control rpmRunTransactions() operation.
- */
-typedef enum rpmtransFlags_e {
+typedef enum rpmtsFlags_e {
RPMTRANS_FLAG_NONE = 0,
RPMTRANS_FLAG_TEST = (1 << 0), /*!< from --test */
RPMTRANS_FLAG_BUILD_PROBS = (1 << 1), /*!< @todo Document. */
@@ -1552,7 +1081,7 @@ typedef enum rpmtransFlags_e {
/*@=enummemuse@*/
RPMTRANS_FLAG_NOMD5 = (1 << 27), /*!< from --nomd5 */
RPMTRANS_FLAG_NOSUGGESTS = (1 << 28) /*!< from --nosuggests */
-} rpmtransFlags;
+} rpmtsFlags;
#define _noTransScripts \
( RPMTRANS_FLAG_NOPRE | \
@@ -1607,71 +1136,6 @@ void rpmShowRpmlibProvides(FILE * fp)
/*@globals fileSystem @*/
/*@modifies *fp, fileSystem @*/;
-/**
- * @todo Generalize filter mechanism.
- */
-typedef enum rpmprobFilterFlags_e {
- RPMPROB_FILTER_NONE = 0,
- RPMPROB_FILTER_IGNOREOS = (1 << 0), /*!< from --ignoreos */
- RPMPROB_FILTER_IGNOREARCH = (1 << 1), /*!< from --ignorearch */
- RPMPROB_FILTER_REPLACEPKG = (1 << 2), /*!< from --replacepkgs */
- RPMPROB_FILTER_FORCERELOCATE= (1 << 3), /*!< from --badreloc */
- RPMPROB_FILTER_REPLACENEWFILES= (1 << 4), /*!< from --replacefiles */
- RPMPROB_FILTER_REPLACEOLDFILES= (1 << 5), /*!< from --replacefiles */
- RPMPROB_FILTER_OLDPACKAGE = (1 << 6), /*!< from --oldpackage */
- RPMPROB_FILTER_DISKSPACE = (1 << 7), /*!< from --ignoresize */
- RPMPROB_FILTER_DISKNODES = (1 << 8) /*!< from --ignoresize */
-} rpmprobFilterFlags;
-
-/** \ingroup rpmtrans
- * Get transaction flags, i.e. bits to control rpmRunTransactions().
- * @param ts transaction set
- * @return transaction flags
- */
-rpmtransFlags rpmtsGetFlags(rpmTransactionSet ts)
- /*@*/;
-
-/** \ingroup rpmtrans
- * Set transaction flags, i.e. bits to control rpmRunTransactions().
- * @param ts transaction set
- * @param ntransFlags new transaction flags
- * @return previous transaction flags
- */
-rpmtransFlags rpmtsSetFlags(rpmTransactionSet ts, rpmtransFlags ntransFlags)
- /*@modifies ts @*/;
-
-/** \ingroup rpmtrans
- * Set transaction notify callback function and argument.
- *
- * @warning This call must be made before rpmRunTransactions() for
- * install/upgrade/freshen to "work".
- *
- * @param ts transaction set
- * @param notify progress callback
- * @param notifyData progress callback private data
- * @return 0 on success
- */
-int rpmtsSetNotifyCallback(rpmTransactionSet ts,
- /*@observer@*/ rpmCallbackFunction notify,
- /*@observer@*/ rpmCallbackData notifyData)
- /*@modifies ts @*/;
-
-/** \ingroup rpmtrans
- * Process all packages in a transaction set.
- *
- * @param ts transaction set
- * @param okProbs previously known problems (or NULL)
- * @param ignoreSet bits to filter problem types
- * @return 0 on success, -1 on error, >0 with newProbs set
- */
-int rpmRunTransactions(rpmTransactionSet ts,
- rpmProblemSet okProbs,
- rpmprobFilterFlags ignoreSet)
- /*@globals rpmGlobalMacroContext,
- fileSystem, internalState@*/
- /*@modifies ts, rpmGlobalMacroContext,
- fileSystem, internalState @*/;
-
/*@}*/
/**
diff --git a/lib/rpmts.c b/lib/rpmts.c
index 9f22248cb..dd0a36f31 100644
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -6,7 +6,9 @@
#include <rpmlib.h>
#include <rpmmacro.h> /* XXX rpmtsOpenDB() needs rpmGetPath */
-#include <rpmpgp.h> /* XXX rpmtransFree() needs pgpFreeDig */
+#include <rpmpgp.h> /* XXX rpmtsFree() needs pgpFreeDig */
+
+#include "rpmdb.h" /* XXX stealing db->db_mode. */
#include "rpmds.h"
#include "rpmfi.h"
@@ -14,10 +16,9 @@
#include "rpmte.h"
#include "rpmts.h"
-#include "rpmdb.h" /* XXX stealing db->db_mode. */
-
#include "debug.h"
+/*@access FD_t @*/ /* XXX compared with NULL */
/*@access rpmProblemSet @*/
/*@access rpmTransactionSet @*/
/*@access fnpyKey @*/
@@ -82,7 +83,7 @@ int rpmtsOpenDB(rpmTransactionSet ts, int dbmode)
(void) rpmtsCloseDB(ts);
- /* XXX there's a db lock race here. */
+ /* XXX there's a potential db lock race here. */
ts->dbmode = dbmode;
rc = rpmdbOpen(ts->rootDir, &ts->rpmdb, ts->dbmode, 0644);
@@ -288,7 +289,7 @@ rpmProblemSet rpmtsGetProblems(rpmTransactionSet ts)
return ps;
}
-void rpmtransClean(rpmTransactionSet ts)
+void rpmtsClean(rpmTransactionSet ts)
{
if (ts) {
teIterator pi; transactionElement p;
@@ -315,7 +316,7 @@ void rpmtransClean(rpmTransactionSet ts)
}
}
-rpmTransactionSet rpmtransFree(rpmTransactionSet ts)
+rpmTransactionSet rpmtsFree(rpmTransactionSet ts)
{
if (ts) {
teIterator pi; transactionElement p;
@@ -338,7 +339,7 @@ rpmTransactionSet rpmtransFree(rpmTransactionSet ts)
ts->removedPackages = _free(ts->removedPackages);
if (ts->scriptFd != NULL) {
ts->scriptFd =
- fdFree(ts->scriptFd, "rpmtransSetScriptFd (rpmtransFree");
+ fdFree(ts->scriptFd, "rpmtsFree");
ts->scriptFd = NULL;
}
ts->rootDir = _free(ts->rootDir);
@@ -360,7 +361,7 @@ rpmTransactionSet rpmtransFree(rpmTransactionSet ts)
memset(ts->pksignid, 0, sizeof(ts->pksignid));
/*@-nullstate@*/ /* FIX: partial annotations */
- rpmtransClean(ts);
+ rpmtsClean(ts);
/*@=nullstate@*/
/*@-refcounttrans@*/ ts = _free(ts); /*@=refcounttrans@*/
@@ -369,29 +370,150 @@ rpmTransactionSet rpmtransFree(rpmTransactionSet ts)
return NULL;
}
-rpmTransactionSet rpmtransCreateSet(rpmdb db, const char * rootDir)
+int rpmtsSetVerifySigFlags(rpmTransactionSet ts, int vsflags)
+ /*@modifies ts @*/
+{
+ int ret = 0;
+ if (ts != NULL) {
+ ret = ts->vsflags;
+ ts->vsflags = vsflags;
+ }
+ return ret;
+}
+
+const char * rpmtsGetRootDir(rpmTransactionSet ts)
+{
+ const char * rootDir = NULL;
+ if (ts != NULL) {
+ rootDir = ts->rootDir;
+ }
+ return rootDir;
+}
+
+void rpmtsSetRootDir(rpmTransactionSet ts, const char * rootDir)
+{
+ if (ts != NULL) {
+ size_t rootLen;
+
+ ts->rootDir = _free(ts->rootDir);
+
+ if (rootDir == NULL) {
+#ifndef DYING
+ ts->rootDir = xstrdup("");
+#endif
+ return;
+ }
+ rootLen = strlen(rootDir);
+
+/*@-branchstate@*/
+ /* Make sure that rootDir has trailing / */
+ if (!(rootLen && rootDir[rootLen - 1] == '/')) {
+ char * t = alloca(rootLen + 2);
+ *t = '\0';
+ (void) stpcpy( stpcpy(t, rootDir), "/");
+ rootDir = t;
+ }
+/*@=branchstate@*/
+ ts->rootDir = xstrdup(rootDir);
+ }
+}
+
+FD_t rpmtsGetScriptFd(rpmTransactionSet ts)
+{
+ FD_t scriptFd = NULL;
+ if (ts != NULL) {
+ scriptFd = ts->scriptFd;
+ }
+/*@-compdef -refcounttrans -usereleased@*/
+ return scriptFd;
+/*@=compdef =refcounttrans =usereleased@*/
+}
+
+void rpmtsSetScriptFd(rpmTransactionSet ts, FD_t scriptFd)
{
- rpmTransactionSet ts;
- int rootLen;
- /*@-branchstate@*/
- if (!rootDir) rootDir = "";
- /*@=branchstate@*/
+ if (ts != NULL) {
+ if (ts->scriptFd != NULL) {
+ ts->scriptFd = fdFree(ts->scriptFd, "rpmtsSetScriptFd");
+ ts->scriptFd = NULL;
+ }
+ if (scriptFd != NULL)
+ ts->scriptFd = fdLink(scriptFd, "rpmtsSetScriptFd");
+ }
+}
+
+rpmtsFlags rpmtsGetFlags(rpmTransactionSet ts)
+{
+ rpmtsFlags otransFlags = 0;
+ if (ts != NULL) {
+ otransFlags = ts->transFlags;
+ }
+ return otransFlags;
+}
+
+rpmtsFlags rpmtsSetFlags(rpmTransactionSet ts, rpmtsFlags ntransFlags)
+{
+ rpmtsFlags otransFlags = 0;
+ if (ts != NULL) {
+ otransFlags = ts->transFlags;
+ ts->transFlags = ntransFlags;
+ }
+ return otransFlags;
+}
+
+int rpmtsSetNotifyCallback(rpmTransactionSet ts,
+ rpmCallbackFunction notify, rpmCallbackData notifyData)
+{
+ if (ts != NULL) {
+ ts->notify = notify;
+ ts->notifyData = notifyData;
+ }
+ return 0;
+}
+
+int rpmtsGetKeys(const rpmTransactionSet ts, fnpyKey ** ep, int * nep)
+{
+ int rc = 0;
+
+ if (nep) *nep = ts->orderCount;
+ if (ep) {
+ teIterator pi; transactionElement p;
+ fnpyKey * e;
+
+ *ep = e = xmalloc(ts->orderCount * sizeof(*e));
+ pi = teInitIterator(ts);
+ while ((p = teNextIterator(pi)) != NULL) {
+ switch (teGetType(p)) {
+ case TR_ADDED:
+ /*@-dependenttrans@*/
+ *e = teGetKey(p);
+ /*@=dependenttrans@*/
+ /*@switchbreak@*/ break;
+ case TR_REMOVED:
+ default:
+ *e = NULL;
+ /*@switchbreak@*/ break;
+ }
+ e++;
+ }
+ pi = teFreeIterator(pi);
+ }
+ return rc;
+}
+
+rpmTransactionSet rpmtsCreate(void)
+{
+ rpmTransactionSet ts;
ts = xcalloc(1, sizeof(*ts));
ts->goal = TSM_UNKNOWN;
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->rpmdb = NULL;
+ ts->dbmode = O_RDONLY;
+
ts->scriptFd = NULL;
ts->id = (int_32) time(NULL);
ts->delta = 5;
@@ -401,18 +523,7 @@ rpmTransactionSet rpmtransCreateSet(rpmdb db, const char * rootDir)
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->rootDir = NULL;
ts->currDir = NULL;
ts->chrootDone = 0;
@@ -443,32 +554,3 @@ rpmTransactionSet rpmtransCreateSet(rpmdb db, const char * rootDir)
return rpmtsLink(ts, "tsCreate");
}
-
-rpmtransFlags rpmtsGetFlags(rpmTransactionSet ts)
-{
- rpmtransFlags otransFlags = 0;
- if (ts != NULL) {
- otransFlags = ts->transFlags;
- }
- return otransFlags;
-}
-
-rpmtransFlags rpmtsSetFlags(rpmTransactionSet ts, rpmtransFlags ntransFlags)
-{
- rpmtransFlags otransFlags = 0;
- if (ts != NULL) {
- otransFlags = ts->transFlags;
- ts->transFlags = ntransFlags;
- }
- return otransFlags;
-}
-
-int rpmtsSetNotifyCallback(rpmTransactionSet ts,
- rpmCallbackFunction notify, rpmCallbackData notifyData)
-{
- if (ts != NULL) {
- ts->notify = notify;
- ts->notifyData = notifyData;
- }
- return 0;
-}
diff --git a/lib/rpmts.h b/lib/rpmts.h
index 2c8696a73..cd341db8f 100644
--- a/lib/rpmts.h
+++ b/lib/rpmts.h
@@ -1,7 +1,7 @@
#ifndef H_RPMTS
#define H_RPMTS
-/** \ingroup rpmdep rpmtrans
+/** \ingroup rpmts
* \file lib/rpmts.h
* Structures and prototypes used for an rpmTransactionSet
*/
@@ -25,11 +25,11 @@ typedef enum tsStage_e {
TSM_ERASE = 8,
} tsmStage;
-/** \ingroup rpmdep
+/** \ingroup rpmts
* The set of packages to be installed/removed atomically.
*/
struct rpmTransactionSet_s {
- rpmtransFlags transFlags; /*!< Bit(s) to control operation. */
+ rpmtsFlags transFlags; /*!< Bit(s) to control operation. */
tsmStage goal; /*!< Transaction goal (i.e. mode) */
/*@null@*/
@@ -95,6 +95,10 @@ struct rpmTransactionSet_s {
int verify_legacy; /*!< Verify legacy signatures? */
int nodigests; /*!< Verify digests? */
int nosignatures; /*!< Verify signatures? */
+ int vsflags; /*!< Signature verification flags. */
+#define _RPMTS_VSF_NODIGESTS (1 << 0)
+#define _RPMTS_VSF_NOSIGNATURES (1 << 1)
+#define _RPMTS_VSF_VERIFY_LEGACY (1 << 2)
/*@observer@*/ /*@dependent@*/ /*@null@*/
const char * fn; /*!< Current package fn. */
@@ -114,10 +118,320 @@ struct rpmTransactionSet_s {
/*@refs@*/ int nrefs; /*!< Reference count. */
};
+
#ifdef __cplusplus
extern "C" {
#endif
+/** \ingroup rpmts
+ * Check that all dependencies can be resolved.
+ * @param ts transaction set
+ * @return 0 on success
+ */
+int rpmtsCheck(rpmTransactionSet ts)
+ /*@globals fileSystem, internalState @*/
+ /*@modifies ts, fileSystem, internalState @*/;
+
+/** \ingroup rpmts
+ * Determine package order in a transaction set according to dependencies.
+ *
+ * Order packages, returning error if circular dependencies cannot be
+ * eliminated by removing PreReq's from the loop(s). Only dependencies from
+ * added or removed packages are used to determine ordering using a
+ * topological sort (Knuth vol. 1, p. 262). Use rpmtsCheck() to verify
+ * that all dependencies can be resolved.
+ *
+ * The final order ends up as installed packages followed by removed packages,
+ * with packages removed for upgrades immediately following the new package
+ * to be installed.
+ *
+ * The operation would be easier if we could sort the addedPackages array in the
+ * transaction set, but we store indexes into the array in various places.
+ *
+ * @param ts transaction set
+ * @return no. of (added) packages that could not be ordered
+ */
+int rpmtsOrder(rpmTransactionSet ts)
+ /*@globals fileSystem, internalState@*/
+ /*@modifies ts, fileSystem, internalState @*/;
+
+/** \ingroup rpmts
+ * Process all packages in a transaction set.
+ *
+ * @param ts transaction set
+ * @param okProbs previously known problems (or NULL)
+ * @param ignoreSet bits to filter problem types
+ * @return 0 on success, -1 on error, >0 with newProbs set
+ */
+int rpmtsRun(rpmTransactionSet ts,
+ rpmProblemSet okProbs,
+ rpmprobFilterFlags ignoreSet)
+ /*@globals rpmGlobalMacroContext,
+ fileSystem, internalState@*/
+ /*@modifies ts, rpmGlobalMacroContext,
+ fileSystem, internalState @*/;
+
+/** \ingroup rpmts
+ * Unreference a transaction instance.
+ * @param ts transaction set
+ * @param msg
+ * @return NULL always
+ */
+/*@unused@*/ /*@null@*/
+rpmTransactionSet rpmtsUnlink (/*@killref@*/ /*@only@*/ rpmTransactionSet ts,
+ const char * msg)
+ /*@modifies ts @*/;
+
+/** @todo Remove debugging entry from the ABI. */
+/*@null@*/
+rpmTransactionSet XrpmtsUnlink (/*@killref@*/ /*@only@*/ rpmTransactionSet ts,
+ const char * msg, const char * fn, unsigned ln)
+ /*@modifies ts @*/;
+#define rpmtsUnlink(_ts, _msg) XrpmtsUnlink(_ts, _msg, __FILE__, __LINE__)
+
+/** \ingroup rpmts
+ * Reference a transaction set instance.
+ * @param ts transaction set
+ * @param msg
+ * @return new transaction set reference
+ */
+/*@unused@*/
+rpmTransactionSet rpmtsLink (rpmTransactionSet ts, const char * msg)
+ /*@modifies ts @*/;
+
+/** @todo Remove debugging entry from the ABI. */
+rpmTransactionSet XrpmtsLink (rpmTransactionSet ts,
+ const char * msg, const char * fn, unsigned ln)
+ /*@modifies ts @*/;
+#define rpmtsLink(_ts, _msg) XrpmtsLink(_ts, _msg, __FILE__, __LINE__)
+
+/** \ingroup rpmts
+ * Close the database used by the transaction.
+ * @param ts transaction set
+ * @return 0 on success
+ */
+int rpmtsCloseDB(rpmTransactionSet ts)
+ /*@globals fileSystem @*/
+ /*@modifies ts, fileSystem @*/;
+
+/** \ingroup rpmts
+ * Open the database used by the transaction.
+ * @param ts transaction set
+ * @param dbmode O_RDONLY or O_RDWR
+ * @return 0 on success
+ */
+int rpmtsOpenDB(rpmTransactionSet ts, int dbmode)
+ /*@globals fileSystem, internalState @*/
+ /*@modifies ts, fileSystem, internalState @*/;
+
+/** \ingroup rpmts
+ * Return transaction database iterator.
+ * @param ts transaction set
+ * @param rpmtag rpm tag
+ * @param keyp key data (NULL for sequential access)
+ * @param keylen key data length (0 will use strlen(keyp))
+ * @return NULL on failure
+ */
+/*@only@*/ /*@null@*/
+rpmdbMatchIterator rpmtsInitIterator(const rpmTransactionSet ts, int rpmtag,
+ /*@null@*/ const void * keyp, size_t keylen)
+ /*@globals fileSystem @*/
+ /*@modifies ts, fileSystem @*/;
+
+/**
+ * Attempt to solve a needed dependency.
+ * @param ts transaction set
+ * @param ds dependency set
+ * @return 0 if resolved (and added to ts), 1 not found
+ */
+/*@-exportlocal@*/
+int rpmtsSolve(rpmTransactionSet ts, rpmDepSet ds)
+ /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
+ /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/;
+/*@=exportlocal@*/
+
+/**
+ * Attempt to solve a needed dependency.
+ * @param ts transaction set
+ * @param ds dependency set
+ * @return 0 if resolved (and added to ts), 1 not found
+ */
+/*@unused@*/
+int rpmtsAvailable(rpmTransactionSet ts, const rpmDepSet ds)
+ /*@globals fileSystem @*/
+ /*@modifies ts, fileSystem @*/;
+
+/**
+ * Return (and clear) current transaction set problems.
+ * @param ts transaction set
+ * @return current problem set (or NULL)
+ */
+/*@null@*/
+rpmProblemSet rpmtsGetProblems(rpmTransactionSet ts)
+ /*@modifies ts @*/;
+
+/** \ingroup rpmts
+ * Re-create an empty transaction set.
+ * @param ts transaction set
+ */
+void rpmtsClean(rpmTransactionSet ts)
+ /*@modifies ts @*/;
+
+/** \ingroup rpmts
+ * Destroy transaction set, closing the database as well.
+ * @param ts transaction set
+ * @return NULL always
+ */
+/*@null@*/
+rpmTransactionSet
+rpmtsFree(/*@killref@*/ /*@only@*//*@null@*/ rpmTransactionSet ts)
+ /*@globals fileSystem @*/
+ /*@modifies ts, fileSystem @*/;
+
+/** \ingroup rpmts
+ * Set verify signatures flag(s).
+ * @param ts transaction set
+ * @param vsflags new verify signatures flags
+ * @retrun previous value
+ */
+int rpmtsSetVerifySigFlags(rpmTransactionSet ts, int vsflags)
+ /*@modifies ts @*/;
+
+/** \ingroup rpmts
+ * Get transaction rootDir, i.e. path to chroot(2).
+ * @param ts transaction set
+ * @return transaction rootDir
+ */
+/*@observer@*/ /*@null@*/
+const char * rpmtsGetRootDir(rpmTransactionSet ts)
+ /*@*/;
+
+/** \ingroup rpmts
+ * Set transaction rootDir, i.e. path to chroot(2).
+ * @param ts transaction set
+ * @param rootDir new transaction rootDir (or NULL)
+ */
+void rpmtsSetRootDir(rpmTransactionSet ts,
+ /*@null@*/ const char * rootDir)
+ /*@modifies ts @*/;
+
+/** \ingroup rpmts
+ * Get transaction script file handle, i.e. stdout/stderr on scriptlet execution
+ * @param ts transaction set
+ * @return transaction script file handle
+ */
+/*@null@*/
+FD_t rpmtsGetScriptFd(rpmTransactionSet ts)
+ /*@*/;
+
+/** \ingroup rpmts
+ * Set transaction script file handle, i.e. stdout/stderr on scriptlet execution
+ * @param ts transaction set
+ * @param scriptFd new script file handle (or NULL)
+ */
+void rpmtsSetScriptFd(rpmTransactionSet ts, /*@null@*/ FD_t scriptFd)
+ /*@modifies ts, scriptFd @*/;
+
+/** \ingroup rpmts
+ * Get transaction flags, i.e. bits to control rpmtsRun().
+ * @param ts transaction set
+ * @return transaction flags
+ */
+rpmtsFlags rpmtsGetFlags(rpmTransactionSet ts)
+ /*@*/;
+
+/** \ingroup rpmts
+ * Set transaction flags, i.e. bits to control rpmtsRun().
+ * @param ts transaction set
+ * @param ntransFlags new transaction flags
+ * @return previous transaction flags
+ */
+rpmtsFlags rpmtsSetFlags(rpmTransactionSet ts, rpmtsFlags ntransFlags)
+ /*@modifies ts @*/;
+
+/** \ingroup rpmts
+ * Set transaction notify callback function and argument.
+ *
+ * @warning This call must be made before rpmtsRun() for
+ * install/upgrade/freshen to "work".
+ *
+ * @param ts transaction set
+ * @param notify progress callback
+ * @param notifyData progress callback private data
+ * @return 0 on success
+ */
+int rpmtsSetNotifyCallback(rpmTransactionSet ts,
+ /*@observer@*/ rpmCallbackFunction notify,
+ /*@observer@*/ rpmCallbackData notifyData)
+ /*@modifies ts @*/;
+
+/** \ingroup rpmts
+ * Create an empty transaction set.
+ * @return new transaction set
+ */
+/*@only@*/
+rpmTransactionSet rpmtsCreate(void)
+ /*@*/;
+
+/** \ingroup rpmts
+ * Add package to be installed to transaction set.
+ *
+ * If fd is NULL, the callback set by rpmtsSetNotifyCallback() is used to
+ * open and close the file descriptor. If Header is NULL, the fd is always
+ * used, otherwise fd is only needed (and only opened) for actual package
+ * installation.
+ *
+ * @warning The fd argument has been eliminated, and is assumed always NULL.
+ *
+ * @param ts transaction set
+ * @param h header
+ * @param key package retrieval key (e.g. file name)
+ * @param upgrade is package being upgraded?
+ * @param relocs package file relocations
+ * @return 0 on success, 1 on I/O error, 2 needs capabilities
+ */
+int rpmtsAddPackage(rpmTransactionSet ts, Header h,
+ /*@exposed@*/ /*@null@*/ const fnpyKey key, int upgrade,
+ /*@null@*/ rpmRelocation * relocs)
+ /*@globals fileSystem, internalState @*/
+ /*@modifies ts, h, fileSystem, internalState @*/;
+
+/** \ingroup rpmts
+ * Add package to universe of possible packages to install in transaction set.
+ * @warning The key parameter is non-functional.
+ * @param ts transaction set
+ * @param h header
+ * @param key package private data
+ */
+/*@unused@*/
+void rpmtsAvailablePackage(rpmTransactionSet ts, Header h,
+ /*@exposed@*/ /*@null@*/ fnpyKey key)
+ /*@modifies h, ts @*/;
+
+/** \ingroup rpmts
+ * Add package to be erased to transaction set.
+ * @param ts transaction set
+ * @param h header
+ * @param dboffset rpm database instance
+ * @return 0 on success
+ */
+int rpmtsRemovePackage(rpmTransactionSet ts, Header h, int dboffset)
+ /*@modifies ts, h @*/;
+
+/** \ingroup rpmts
+ * Retrieve keys from ordered transaction set.
+ * @todo Removed packages have no keys, returned as interleaved NULL pointers.
+ * @param ts transaction set
+ * @retval ep address of returned element array pointer (or NULL)
+ * @retval nep address of no. of returned elements (or NULL)
+ * @return 0 always
+ */
+/*@unused@*/
+int rpmtsGetKeys(rpmTransactionSet ts,
+ /*@null@*/ /*@out@*/ fnpyKey ** ep,
+ /*@null@*/ /*@out@*/ int * nep)
+ /*@modifies ts, ep, nep @*/;
+
/**
* Return (malloc'd) header name-version-release string.
* @param h header
diff --git a/lib/rpmvercmp.c b/lib/rpmvercmp.c
index 361f432e2..27969d47e 100644
--- a/lib/rpmvercmp.c
+++ b/lib/rpmvercmp.c
@@ -1,4 +1,4 @@
-/** \ingroup rpmtrans
+/** \ingroup rpmts
* \file lib/rpmvercmp.c
*/
diff --git a/lib/transaction.c b/lib/transaction.c
index 0447d69a3..366cd2d87 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -1,4 +1,4 @@
-/** \ingroup rpmtrans
+/** \ingroup rpmts
* \file lib/transaction.c
*/
@@ -84,12 +84,13 @@ struct diskspaceInfo {
probably right :-( */
#define BLOCK_ROUND(size, block) (((size) + (block) - 1) / (block))
-void rpmtransSetScriptFd(rpmTransactionSet ts, FD_t fd)
+#ifdef DYING
+void rpmtsSetScriptFd(rpmTransactionSet ts, FD_t fd)
{
- ts->scriptFd = (fd ? fdLink(fd, "rpmtransSetScriptFd") : NULL);
+ ts->scriptFd = (fd ? fdLink(fd, "rpmtsSetScriptFd") : NULL);
}
-int rpmtransGetKeys(const rpmTransactionSet ts, fnpyKey ** ep, int * nep)
+int rpmtsGetKeys(const rpmTransactionSet ts, fnpyKey ** ep, int * nep)
{
int rc = 0;
@@ -118,6 +119,7 @@ int rpmtransGetKeys(const rpmTransactionSet ts, fnpyKey ** ep, int * nep)
}
return rc;
}
+#endif
/**
*/
@@ -1041,9 +1043,8 @@ TFI_t teiGetFi(const teIterator tei)
#define NOTIFY(_ts, _al) if ((_ts)->notify) (void) (_ts)->notify _al
-int rpmRunTransactions( rpmTransactionSet ts,
- rpmProblemSet okProbs,
- rpmprobFilterFlags ignoreSet)
+int rpmtsRun(rpmTransactionSet ts,
+ rpmProblemSet okProbs, rpmprobFilterFlags ignoreSet)
{
int i, j;
int ourrc = 0;
@@ -1549,7 +1550,7 @@ int rpmRunTransactions( rpmTransactionSet ts,
rpmRC rpmrc;
rpmrc = rpmReadPackageFile(ts, teGetFd(p),
- "rpmRunTransactions", &h);
+ "rpmtsRun", &h);
if (!(rpmrc == RPMRC_OK || rpmrc == RPMRC_BADSIZE)) {
/*@-noeffectuncon@*/ /* FIX: notify annotations */
@@ -1627,7 +1628,9 @@ fi->actions = actions;
(void) rpmfiUnlink(psm->fi, "tsInstall");
psm->fi = NULL;
psm->te = NULL;
+/*@-type@*/ /* FIX: p is almost opaque */
p->fi = fiFree(fi, 1);
+/*@=type@*/
}
/*@=branchstate@*/
pi = teFreeIterator(pi);
diff --git a/lib/ts.c b/lib/ts.c
index d7092a5f7..4e1fd1f57 100644
--- a/lib/ts.c
+++ b/lib/ts.c
@@ -185,7 +185,7 @@ static int ftsPrint(FTS * ftsp, FTSENT * fts, rpmTransactionSet ts)
indent * (fts->fts_level < 0 ? 0 : fts->fts_level), "",
n, v, r);
#ifdef NOTYET
- xx = rpmtransAddPackage(ts, h, fts->fts_path, 1, NULL);
+ xx = rpmtsAddPackage(ts, h, fts->fts_path, 1, NULL);
#endif
break;
@@ -290,7 +290,6 @@ main(int argc, const char *argv[])
{
poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
const char * rootDir = "";
- rpmdb db = NULL;
rpmTransactionSet ts = NULL;
FTS * ftsp;
int ftsOpts = (FTS_COMFOLLOW | FTS_LOGICAL | FTS_NOSTAT);
@@ -320,7 +319,8 @@ main(int argc, const char *argv[])
rpmIncreaseVerbosity();
}
- ts = rpmtransCreateSet(db, rootDir);
+ ts = rpmtsCreate();
+ (void) rpmtsSetRootDir(rootDir);
(void) rpmtsOpenDB(ts, O_RDONLY);
args = poptGetArgs(optCon);
@@ -372,7 +372,7 @@ if (!_debug) {
if (!_debug) {
{ rpmProblemSet ps;
- xx = rpmdepCheck(ts);
+ xx = rpmtsCheck(ts);
ps = rpmtsGetProblems(ts);
if (ps) {
@@ -382,12 +382,12 @@ if (!_debug) {
ps = rpmProblemSetFree(ts);
}
- (void) rpmdepOrder(ts);
+ (void) rpmtsOrder(ts);
}
#endif
exit:
- ts = rpmtransFree(ts);
+ ts = rpmtsFree(ts);
return ec;
}
diff --git a/lib/verify.c b/lib/verify.c
index babc64bfc..4e1396243 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -21,7 +21,6 @@
/*@access rpmProblemSet @*/
/*@access rpmProblem @*/
-/*@access rpmTransactionSet @*/
/*@access PSM_t @*/ /* XXX for %verifyscript through psmStage() */
/*@access FD_t @*/ /* XXX compared with NULL */
@@ -34,20 +33,22 @@ int rpmVerifyFile(const rpmTransactionSet ts, const TFI_t fi,
rpmfileAttrs fileAttrs = tfiGetFFlags(fi);
rpmVerifyAttrs flags = tfiGetVFlags(fi);
const char * filespec = tfiGetFN(fi);
+ const char * rootDir;
int rc;
struct stat sb;
/* Prepend the path to root (if specified). */
- if (ts->rootDir && *ts->rootDir != '\0'
- && !(ts->rootDir[0] == '/' && ts->rootDir[1] == '\0'))
+ rootDir = rpmtsGetRootDir(ts);
+ if (rootDir && *rootDir != '\0'
+ && !(rootDir[0] == '/' && rootDir[1] == '\0'))
{
- int nb = strlen(filespec) + strlen(ts->rootDir) + 1;
+ int nb = strlen(filespec) + strlen(rootDir) + 1;
char * tb = alloca(nb);
char * t;
t = tb;
*t = '\0';
- t = stpcpy(t, ts->rootDir);
+ t = stpcpy(t, rootDir);
while (t > tb && t[-1] == '/') {
--t;
*t = '\0';
@@ -212,20 +213,17 @@ int rpmVerifyFile(const rpmTransactionSet ts, const TFI_t fi,
static int rpmVerifyScript(/*@unused@*/ QVA_t qva, rpmTransactionSet ts,
TFI_t fi, /*@null@*/ FD_t scriptFd)
/*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
- /*@modifies ts, fi, rpmGlobalMacroContext,
+ /*@modifies ts, fi, scriptFd, rpmGlobalMacroContext,
fileSystem, internalState @*/
{
int rc = 0;
- FD_t savefd = NULL;
PSM_t psm;
psm = memset(alloca(sizeof(*psm)), 0, sizeof(*psm));
psm->ts = rpmtsLink(ts, "rpmVerifyScript");
- if (scriptFd != NULL) {
- savefd = ts->scriptFd;
- ts->scriptFd = fdLink(scriptFd, "rpmVerifyScript");
- }
+ if (scriptFd != NULL)
+ rpmtsSetScriptFd(ts, scriptFd);
psm->fi = rpmfiLink(fi, "rpmVerifyScript");
psm->stepName = "verify";
@@ -234,59 +232,14 @@ static int rpmVerifyScript(/*@unused@*/ QVA_t qva, rpmTransactionSet ts,
rc = psmStage(psm, PSM_SCRIPT);
psm->fi = rpmfiUnlink(fi, "rpmVerifyScript");
- if (scriptFd != NULL) {
- ts->scriptFd = fdFree(ts->scriptFd, "rpmVerifyScript");
- ts->scriptFd = savefd;
- }
+ if (scriptFd != NULL)
+ rpmtsSetScriptFd(ts, NULL);
psm->ts = rpmtsUnlink(ts, "rpmVerifyScript");
return rc;
}
-int rpmVerifyDigest(Header h)
-{
- HGE_t hge = (HGE_t)headerGetEntry; /* XXX headerGetEntryMinMemory? */
- HFD_t hfd = headerFreeData;
- void * uh = NULL;
- rpmTagType uht;
- int_32 uhc;
- const char * hdigest;
- rpmTagType hdt;
- int ec = 0; /* assume no problems */
-
- /* Retrieve header digest. */
- if (!hge(h, RPMTAG_SHA1HEADER, &hdt, (void **) &hdigest, NULL)
- && !hge(h, RPMTAG_SHA1RHN, &hdt, (void **) &hdigest, NULL))
- {
- return 0;
- }
- /* Regenerate original header. */
- if (!hge(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc))
- return 0;
-
- if (hdigest == NULL || uh == NULL)
- return 0;
-
- /* Compute header digest. */
- { DIGEST_CTX ctx = rpmDigestInit(PGPHASHALGO_SHA1, RPMDIGEST_NONE);
- const char * digest;
- size_t digestlen;
-
- (void) rpmDigestUpdate(ctx, uh, uhc);
- (void) rpmDigestFinal(ctx, (void **)&digest, &digestlen, 1);
-
- /* XXX can't happen: report NULL malloc return as a digest failure. */
- ec = (digest == NULL || strcmp(hdigest, digest)) ? 1 : 0;
- digest = _free(digest);
- }
-
- uh = hfd(uh, uht);
- hdigest = hfd(hdigest, hdt);
-
- return ec;
-}
-
/**
* Check file info from header against what's actually installed.
* @param qva parsed query/verify options
@@ -402,10 +355,10 @@ static int verifyDependencies(/*@unused@*/ QVA_t qva, rpmTransactionSet ts,
int xx;
int i;
- rpmtransClean(ts);
- (void) rpmtransAddPackage(ts, h, NULL, 0, NULL);
+ rpmtsClean(ts);
+ (void) rpmtsAddPackage(ts, h, NULL, 0, NULL);
- xx = rpmdepCheck(ts);
+ xx = rpmtsCheck(ts);
ps = rpmtsGetProblems(ts);
/*@-branchstate@*/
@@ -445,7 +398,7 @@ static int verifyDependencies(/*@unused@*/ QVA_t qva, rpmTransactionSet ts,
}
/*@=branchstate@*/
- rpmtransClean(ts);
+ rpmtsClean(ts);
return rc;
}
@@ -457,19 +410,6 @@ int showVerifyPackage(QVA_t qva, rpmTransactionSet ts, Header h)
int ec = 0;
int rc;
-#ifdef DYING
- if (qva->qva_flags & VERIFY_DIGEST) {
- if ((rc = rpmVerifyDigest(h)) != 0) {
- const char *n, *v, *r;
- (void) headerNVR(h, &n, &v, &r);
- rpmMessage(RPMMESS_NORMAL,
- _("%s-%s-%s: immutable header region digest check failed\n"),
- n, v, r);
- ec = rc;
- }
- }
-#endif
-
fi = fiNew(ts, NULL, h, RPMTAG_BASENAMES, scareMem);
if (fi != NULL) {
@@ -500,6 +440,7 @@ int showVerifyPackage(QVA_t qva, rpmTransactionSet ts, Header h)
int rpmcliVerify(rpmTransactionSet ts, QVA_t qva, const char ** argv)
{
const char * arg;
+ int vsflags;
int ec = 0;
if (qva->qva_showPackage == NULL)
@@ -518,10 +459,15 @@ int rpmcliVerify(rpmTransactionSet ts, QVA_t qva, const char ** argv)
break;
}
- /* XXX verifyFlags are inverted */
- ts->nodigests = (qva->qva_flags & VERIFY_DIGEST);
- ts->nosignatures = (qva->qva_flags & VERIFY_SIGNATURE);
+ /* XXX verify flags are inverted from query. */
+ vsflags = 0;
+ if (!(qva->qva_flags & VERIFY_DIGEST))
+ vsflags |= _RPMTS_VSF_NODIGESTS;
+ if (!(qva->qva_flags & VERIFY_SIGNATURE))
+ vsflags |= _RPMTS_VSF_NOSIGNATURES;
+ vsflags |= _RPMTS_VSF_VERIFY_LEGACY;
+ (void) rpmtsSetVerifySigFlags(ts, vsflags);
if (qva->qva_source == RPMQV_ALL) {
/*@-nullpass@*/ /* FIX: argv can be NULL, cast to pass argv array */
ec = rpmQueryVerify(qva, ts, (const char *) argv);
@@ -530,9 +476,10 @@ int rpmcliVerify(rpmTransactionSet ts, QVA_t qva, const char ** argv)
if (argv != NULL)
while ((arg = *argv++) != NULL) {
ec += rpmQueryVerify(qva, ts, arg);
- rpmtransClean(ts);
+ rpmtsClean(ts);
}
}
+ (void) rpmtsSetVerifySigFlags(ts, 0);
if (qva->qva_showPackage == showVerifyPackage)
qva->qva_showPackage = NULL;
diff --git a/misc/Makefile.am b/misc/Makefile.am
index e52e8a432..f3569c7b1 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = 1.4 foreign
-INCLUDES = -I$(top_srcdir) @INCPATH@
+INCLUDES = -I. @INCPATH@
EXTRA_DIST = \
alloca.c basename.c err.c error.c \
diff --git a/po/cs.po b/po/cs.po
index b84534cc8..99214cab2 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-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\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"
@@ -9,54 +9,54 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:38
+#: build.c:39
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "chybné závislosti pøi sestavování:\n"
-#: build.c:69
+#: build.c:70
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "Nelze otevøít spec soubor %s: %s\n"
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "Nelze otevøít rouru pro tar: %m\n"
#. Give up
-#: build.c:168
+#: build.c:169
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr "Nelze èíst spec soubor z %s\n"
-#: build.c:196
+#: build.c:197
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "Nelze pøejmenovat %s na %s: %m\n"
-#: build.c:236
+#: build.c:237
#, c-format
msgid "failed to stat %s: %m\n"
msgstr "nemohu zjistit stav %s: %m\n"
-#: build.c:241
+#: build.c:242
#, c-format
msgid "File %s is not a regular file.\n"
msgstr "Soubor %s není obyèejný soubor.\n"
-#: build.c:250
+#: build.c:251
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr "Nezdá se, ¾e by %s byl spec soubor.\n"
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Sestavuji cílové platformy: %s\n"
-#: build.c:320
+#: build.c:321
#, c-format
msgid "Building for target %s\n"
msgstr "Sestavuji pro cíl %s\n"
@@ -74,254 +74,254 @@ msgstr "chyba pøi pøi ètení hlavièky balíèku\n"
msgid "cannot re-open payload: %s\n"
msgstr "nemohu znovu otevøít payload: %s\n"
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr "vypsat pou¾ívanou verzi rpm"
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr "poskytnout výstu s ménì detaily"
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr "poskytnout detailnìj¹í výstup"
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr "definování makra <jméno> s obsahem <tìlo>"
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr "'<jméno> <tìlo>'"
-#: rpmqv.c:118
+#: rpmqv.c:121
msgid "print macro expansion of <expr>+"
msgstr "vypsat expanzi makra <výraz>+"
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr "<výraz>+"
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr "odeslat stdout do <pøíkazu>"
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr "<pøík>"
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr "pou¾ít <adr> jako adresáø nejvy¹¹í úrovnì"
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr "<adresáø>"
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr "èíst <soubor:...> místo implicitního makro souboru"
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr "<soubor:...>"
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "èíst <soubor:...> místo implicitního rpmrc souboru"
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr "zobrazit finální konfiguraci rpmrc a maker"
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr "zakázat pou¾ití libio(3) API"
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr "ladit protokol datového toku"
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr "ladit rpmio I/O"
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr "ladit manipulaci s URL cache"
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr "Volby dotazù (s -q or --query):"
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr "Vollby kontroly (s -V or --verify):"
-#: rpmqv.c:180
+#: rpmqv.c:183
msgid "Signature options:"
msgstr "Volby signatury:"
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr "Volby databáze:"
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"Sestavovací volby s [ <spec_soubor> | <tar_soubor> | <zdrojový_balíèek> ]:"
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr "Volby pro Instalaci/Aktualizaci/Mazání:"
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr "Spoleèné volby pro v¹echny módy:"
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verze %s\n"
-#: rpmqv.c:235
+#: rpmqv.c:238
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (c) 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:236
+#: rpmqv.c:239
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Tento program lze volnì ¹íøit podle podmínek GNU GPL."
-#: rpmqv.c:248
+#: rpmqv.c:251
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Pou¾ití: %s {--help}\n"
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr "Volba --rcfile byla odstranìna.\n"
-#: rpmqv.c:602
+#: rpmqv.c:605
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Pou¾ijte volbu \"--macros <soubor:...>\".\n"
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Interní chyba pøi zpracování parametrù (%d) :-(\n"
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr "specifikovat lze jen jeden hlavní re¾im"
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr "najednou lze provést jen jeden typ dotazu èi ovìøení"
-#: rpmqv.c:682
+#: rpmqv.c:685
msgid "unexpected query flags"
msgstr "neoèekávaný pøíznak pro dotaz"
-#: rpmqv.c:685
+#: rpmqv.c:688
msgid "unexpected query format"
msgstr "neoèekávaný formát dotazu"
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr "neoèekávaný zdroj dotazu"
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath zadána pro operaci, která databázi nepou¾ívá"
-#: rpmqv.c:735
+#: rpmqv.c:738
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"vynucena mù¾e být jen instalace, aktualizace, smazání zdrojových kódù a spec "
"souboru"
-#: rpmqv.c:737
+#: rpmqv.c:740
msgid "files may only be relocated during package installation"
msgstr "soubory mohou být pøemístìny jen pøi instalaci balíèkù"
-#: rpmqv.c:740
+#: rpmqv.c:743
msgid "only one of --prefix or --relocate may be used"
msgstr "pou¾ít lze jen jeden z parametrù --prefix nebo --relocate"
-#: rpmqv.c:743
+#: rpmqv.c:746
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate a --excludepath je mo¾no pou¾ít jen pøi instalaci nových balíèkù"
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix je mo¾no pou¾ít jen pøi instalaci nových balíèkù"
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr "parametry pro --prefix musejí zaèínat znakem /"
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr "--percent mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "pou¾ít lze jen jeden z parametrù --excludedocs a --includedocs"
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpmqv.c:790
+#: rpmqv.c:793
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpmqv.c:798
+#: rpmqv.c:801
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpmqv.c:803
+#: rpmqv.c:806
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb mù¾e být pou¾it jen pøi instalaci a odstraòování balíèkù"
-#: rpmqv.c:808
+#: rpmqv.c:811
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -329,7 +329,7 @@ msgstr ""
"volba pro potlaèení skriptù mù¾e být pou¾ita jen pøi instalaci nebo pøi "
"odstraòování balíèkù"
-#: rpmqv.c:813
+#: rpmqv.c:816
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -337,7 +337,7 @@ msgstr ""
"volba pro potlaèení triggerù mù¾e být pou¾ita jen pøi instalaci nebo "
"odstraòování balíèkù"
-#: rpmqv.c:817
+#: rpmqv.c:820
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -345,13 +345,13 @@ msgstr ""
"--nodeps mù¾e být pou¾it jen pøi sestavování, rekompilaci, instalaci, "
"odstraòování a kontrole"
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test mù¾e být pou¾it jen pøi instalaci, odstraòování a sestavování"
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -359,87 +359,87 @@ msgstr ""
"--root (-r) mù¾e být pou¾it jen pøi instalaci, odstraòování, dotazech nebo "
"znovuvytvoøení databáze"
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr "parametry pro --root (-r) musejí zaèínat znakem /"
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr "¾ádné soubory k podepsání\n"
-#: rpmqv.c:868
+#: rpmqv.c:871
#, c-format
msgid "cannot access file %s\n"
msgstr "pøístup k souboru %s se nezdaøil\n"
-#: rpmqv.c:887
+#: rpmqv.c:890
msgid "pgp not found: "
msgstr "pgp nenalezeno: "
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr "Vlo¾te heslovou frázi: "
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr "Chybná heslová fráze\n"
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr "Heslová fráze je v poøádku.\n"
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "©patná %%_signature spec v souboru maker.\n"
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr "--sign mù¾e být pou¾it jen pøi sestavování balíèkù"
-#: rpmqv.c:927
+#: rpmqv.c:930
msgid "exec failed\n"
msgstr "spu¹tìní selhalo\n"
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr "ke znovusestavení nezadány ¾ádné balíèky"
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr "pro sestavení nezadány ¾ádné spec soubory"
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr "pro sestavení nezadány ¾ádné tar soubory"
-#: rpmqv.c:1051
+#: rpmqv.c:1055
#, fuzzy
msgid "no packages given for erase"
msgstr "k podepsání nezadány ¾ádné balíèky"
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr "nezadány ¾ádné balíèky pro instalaci"
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr "k dotazu nezadány ¾ádné parametry"
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr "pro kontrolu nezadány ¾ádné balíèky"
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr "neoèekávané parametry pro --querytags "
-#: rpmqv.c:1145
+#: rpmqv.c:1149
#, fuzzy
msgid "no arguments given"
msgstr "k dotazu nezadány ¾ádné parametry"
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
msgid "Unable to open temp file.\n"
msgstr "Nelze otevøít doèasný soubor.\n"
@@ -649,7 +649,7 @@ msgstr "Soubor nenalezen globem: %s\n"
msgid "Could not open %%files file %s: %s\n"
msgstr "Nemohu otevøít %%files soubor %s: %s\n"
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, c-format
msgid "line: %s\n"
msgstr "øádek: %s\n"
@@ -724,156 +724,156 @@ msgstr "getGidS: pøíli¹ mnoho GID\n"
msgid "Could not canonicalize hostname: %s\n"
msgstr "Nemohu získat jméno poèítaèe: %s\n"
-#: build/pack.c:83
+#: build/pack.c:85
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "vytváøení archívu selhalo na souboru %s: %s\n"
-#: build/pack.c:86
+#: build/pack.c:88
#, c-format
msgid "create archive failed: %s\n"
msgstr "vytváøení archívu selhalo: %s\n"
-#: build/pack.c:108
+#: build/pack.c:110
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "zápis cpio_copy selhal: %s\n"
-#: build/pack.c:115
+#: build/pack.c:117
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "ètení cpio_copy selhalo: %s\n"
-#: build/pack.c:218
+#: build/pack.c:220
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "Nemohu otevøít PreIn soubor: %s\n"
-#: build/pack.c:225
+#: build/pack.c:227
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "Nemohu otevøít PreUn soubor: %s\n"
-#: build/pack.c:232
+#: build/pack.c:234
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "Nemohu otevøít PostIn soubor: %s\n"
-#: build/pack.c:239
+#: build/pack.c:241
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "Nemohu otevøít PostUn soubor: %s\n"
-#: build/pack.c:247
+#: build/pack.c:249
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "Nemohu otevøít VerifyScript soubor: %s\n"
-#: build/pack.c:262
+#: build/pack.c:264
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "Nemohu otevøít soubor se spu¹tí (trigger): %s\n"
-#: build/pack.c:290
+#: build/pack.c:292
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr "readRPM: otevøení %s: %s\n"
-#: build/pack.c:300
+#: build/pack.c:302
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr "readRPM: ètení %s: %s\n"
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: Fseek selhal: %s\n"
-#: build/pack.c:337
+#: build/pack.c:339
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s není RPM balíèek\n"
-#: build/pack.c:346
+#: build/pack.c:348
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: ètení hlavièky z %s\n"
-#: build/pack.c:475
+#: build/pack.c:477
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "Nemohu pøeèíst hlavièku z %s: %s\n"
-#: build/pack.c:494
+#: build/pack.c:496
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "Nemohu zapsat hlavièku do %s: %s\n"
-#: build/pack.c:504
+#: build/pack.c:506
msgid "Bad CSA data\n"
msgstr "©patná CSA data\n"
-#: build/pack.c:540
+#: build/pack.c:542
#, fuzzy
msgid "Unable to write final header\n"
msgstr "Nemohu zapsat hlavièku do %s: %s\n"
-#: build/pack.c:560
+#: build/pack.c:562
#, c-format
msgid "Generating signature: %d\n"
msgstr "Generuji podpis: %d\n"
-#: build/pack.c:578
+#: build/pack.c:580
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "Nemohu pøeèíst hlavièku z %s: %s\n"
-#: build/pack.c:586
+#: build/pack.c:588
#, c-format
msgid "Could not open %s: %s\n"
msgstr "Nemohu otevøít %s: %s\n"
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Nemohu zapsat balíèek: %s\n"
-#: build/pack.c:637
+#: build/pack.c:639
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Nemohu otevøít cíl pro podepsání %s: %s\n"
-#: build/pack.c:648
+#: build/pack.c:650
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "Nemohu pøeèíst hlavièku z %s: %s\n"
-#: build/pack.c:662
+#: build/pack.c:664
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Nemohu zapsat hlavièku do %s: %s\n"
-#: build/pack.c:672
+#: build/pack.c:674
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Nemohu pøeèíst payload z %s: %s\n"
-#: build/pack.c:678
+#: build/pack.c:680
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Nemohu zapsat payload do %s: %s\n"
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr "Zapsáno: %s\n"
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Nemohu vygenerovat jméno souboru pro balíèek %s: %s\n"
-#: build/pack.c:787
+#: build/pack.c:789
#, c-format
msgid "cannot create %s: %s\n"
msgstr "nemohu vytvoøit %s: %s\n"
@@ -1439,52 +1439,52 @@ msgstr "selhal - "
msgid "package %s was already added, replacing with %s\n"
msgstr "balíèek %s je ji¾ nainstalován"
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s ANO (rpmrc poskytuje)\n"
-#: lib/depends.c:423
+#: lib/depends.c:425
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s ANO (rpmlib poskytuje)\n"
-#: lib/depends.c:444
+#: lib/depends.c:446
#, fuzzy
msgid "(db files)"
msgstr "¹patný db soubor %s\n"
-#: lib/depends.c:456
+#: lib/depends.c:458
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s ANO (db poskytuje)\n"
-#: lib/depends.c:469
+#: lib/depends.c:471
#, fuzzy
msgid "(db package)"
msgstr "¾ádné balíèky\n"
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:927
+#: lib/depends.c:931
#, 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:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr "========== ukládání tsort relací\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1492,26 +1492,26 @@ msgid ""
msgstr ""
"========== tsorting balíèkù (poøadí, #pøedchùdce, #následovník, hloubka)\n"
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n"
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr "SMYÈKA:\n"
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr "========== pokraèuje tsort ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr "(není èíslo)"
@@ -1604,46 +1604,41 @@ msgstr "%s vytvoøen jako %s\n"
msgid "error creating temporary file %s\n"
msgstr "chyba pøi vytváøení doèasného souboru %s\n"
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead selhalo\n"
-#: lib/package.c:174
-#, fuzzy, c-format
-msgid "%s: bad magic\n"
-msgstr "©patné magické èíslo"
-
-#: lib/package.c:182
+#: lib/package.c:181
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "práce s balíèky verze 1 není podporována touto verzí RPM\n"
-#: lib/package.c:190
+#: lib/package.c:189
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "tato verze RPM podporuje práci s balíèky s verzí <= 4\n"
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature selhalo\n"
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Není dostupný ¾ádný podpis\n"
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead selhalo\n"
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread selhalo: %s\n"
@@ -2073,87 +2068,87 @@ msgid "generate signature"
msgstr "generovat PGP/GPG podpis"
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, fuzzy, c-format
msgid "package %s is intended for a %s architecture"
msgstr "balíèek %s je pro jinou architekturu"
-#: lib/problems.c:224
+#: lib/problems.c:226
#, fuzzy, c-format
msgid "package %s is intended for a %s operating system"
msgstr "balíèek %s je pro jiný operaèní systém"
-#: lib/problems.c:229
+#: lib/problems.c:231
#, c-format
msgid "package %s is already installed"
msgstr "balíèek %s je ji¾ nainstalován"
-#: lib/problems.c:234
+#: lib/problems.c:236
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr "cesta %s v balíèku %s není pøemístitelná"
-#: lib/problems.c:239
+#: lib/problems.c:241
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr "soubor %s zpùsobuje konflikt mezi instalovaným %s a %s"
-#: lib/problems.c:244
+#: lib/problems.c:246
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr "soubor %s z instalace %s koliduje se souborem z balíèku %s"
-#: lib/problems.c:249
+#: lib/problems.c:251
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "balíèek %s (který je novìj¹í, ne¾ %s) je ji¾ nainstalován"
-#: lib/problems.c:254
+#: lib/problems.c:256
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr "instalace balíèku %s potøebuje %ld%cB na systému souborù %s"
-#: lib/problems.c:264
+#: lib/problems.c:266
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr "instalace balíèku %s potøebuje %ld inodù na systému souborù %s"
-#: lib/problems.c:269
+#: lib/problems.c:271
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr "pøedtransakèní syscall v balíèku %s: %s selhalo: %s"
-#: lib/problems.c:273
+#: lib/problems.c:275
#, fuzzy, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n"
-#: lib/problems.c:277
+#: lib/problems.c:279
#, fuzzy, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n"
-#: lib/problems.c:282
+#: lib/problems.c:284
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "neznámá chyba %d vznikla pøi manipulaci s balíèkem %s"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "conflicts with"
msgstr " koliduje s %s-%s-%s\n"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "is needed by"
msgstr " je nutné pro %s-%s-%s\n"
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr "Datový typ %d není podporován\n"
@@ -2168,25 +2163,25 @@ msgstr "nemohu vytvoøit %s: %s\n"
msgid "cannot write to %%%s %s\n"
msgstr "nemohu zapsat do %%%s %s\n"
-#: lib/psm.c:487
+#: lib/psm.c:485
msgid "source package expected, binary found\n"
msgstr "oèekávám balíèek se zdrojovými kódy, nalezen v¹ak binární\n"
-#: lib/psm.c:603
+#: lib/psm.c:601
msgid "source package contains no .spec file\n"
msgstr "zdrojový balíèek neobsahuje .spec soubor\n"
-#: lib/psm.c:722
+#: lib/psm.c:720
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "%s: spou¹tím %s skript(y) (pokud existují)\n"
-#: lib/psm.c:888
+#: lib/psm.c:890
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "provedení skripletu %s z %s-%s-%s selhalo, návratový kód byl: %s\n"
-#: lib/psm.c:895
+#: lib/psm.c:897
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "provedení %s skripletu z %s-%s-%s selhalo, návratový kód: %d\n"
@@ -2230,213 +2225,213 @@ msgstr "nemohu otevøít %s: %s\n"
msgid "%s failed: %s\n"
msgstr "%s selhalo\n"
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, c-format
msgid "incorrect format: %s\n"
msgstr "nesprávný formát: %s\n"
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr "(neobsahuje ¾ádné soubory)"
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr "normální "
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr "nahrazen "
-#: lib/query.c:290
+#: lib/query.c:289
msgid "not installed "
msgstr "neinstalován "
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr "sdílen v síti "
-#: lib/query.c:296
+#: lib/query.c:295
#, c-format
msgid "(unknown %3d) "
msgstr "(neznámý %3d) "
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr "(chybí stav) "
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
msgid "package has neither file owner or id lists\n"
msgstr "balíèek nemá vlastníka souboru ani seznamy id\n"
-#: lib/query.c:466
+#: lib/query.c:465
#, c-format
msgid "can't query %s: %s\n"
msgstr "nemohu provést dotaz %s: %s\n"
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, c-format
msgid "open of %s failed: %s\n"
msgstr "otevøení %s selhalo: %s\n"
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr "dotaz na %s se nezdaøil\n"
-#: lib/query.c:642
+#: lib/query.c:637
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:668 lib/rpminstall.c:507
-#, c-format
-msgid "%s: read manifest failed: %s\n"
-msgstr "%s: Fread selhalo: %s\n"
+#: lib/query.c:663 lib/rpminstall.c:514
+#, fuzzy, c-format
+msgid "%s: not a package manifest: %s\n"
+msgstr "¾ádný balíèek neaktivuje %s\n"
-#: lib/query.c:712
+#: lib/query.c:707
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "dotaz na spec soubor %s selhal, nemohu parsovat\n"
-#: lib/query.c:733
+#: lib/query.c:728
msgid "no packages\n"
msgstr "¾ádné balíèky\n"
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "skupina %s neobsahuje ¾ádné balíèky\n"
-#: lib/query.c:763
+#: lib/query.c:758
#, c-format
msgid "no package triggers %s\n"
msgstr "¾ádný balíèek neaktivuje %s\n"
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "Nemohu èíst %s: %s.\n"
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "¾ádný balíèek neaktivuje %s\n"
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr "¾ádný balíèek nevy¾aduje %s\n"
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr "¾ádný balíèek neposkytuje %s\n"
-#: lib/query.c:916
+#: lib/query.c:911
#, c-format
msgid "file %s: %s\n"
msgstr "soubor %s: %s\n"
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "soubor %s nevlastní ¾ádný balíèek\n"
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr "neplatné èíslo balíèku: %s\n"
-#: lib/query.c:950
+#: lib/query.c:945
#, c-format
msgid "package record number: %u\n"
msgstr "záznam balíèku èíslo: %u\n"
-#: lib/query.c:955
+#: lib/query.c:950
#, c-format
msgid "record %u could not be read\n"
msgstr "záznam %d nelze pøeèíst\n"
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, c-format
msgid "package %s is not installed\n"
msgstr "balíèek %s není nainstalován\n"
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
#, fuzzy
msgid "(added files)"
msgstr "¹patný db soubor %s\n"
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
#, fuzzy
msgid "(added provide)"
msgstr "%s: %-45s ANO (db poskytuje)\n"
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: otevøení selhalo: %s\n"
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
msgid "makeTempFile failed\n"
msgstr "makeTempFile selhalo\n"
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite selhalo: %s\n"
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: RPM v1.0 nelze podepsat\n"
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: Nemohu znovu podepsat RPM v2.0\n"
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead selhalo: %s\n"
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature selhalo: %s\n"
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead selhalo\n"
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Není dostupný ¾ádný podpis (RPM v1.0)\n"
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr "NENÍ OK"
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
msgid " (MISSING KEYS:"
msgstr " (CHYBÍ KLÍÈ:"
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr " (NEDÙVÌRYHODNÝ KLÍÈ:"
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr "OK"
@@ -2469,94 +2464,94 @@ msgstr " %s A %s\tB %s\n"
msgid "package %s has unsatisfied %s: %s\n"
msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n"
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr "Pøipravuji..."
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr "Pøipravuji balíèky pro instalaci..."
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, c-format
msgid "Retrieving %s\n"
msgstr "Stahuji %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr " ... jako %s\n"
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "pøeskakuji %s - pøenos selhal - %s\n"
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, c-format
msgid "package %s is not relocateable\n"
msgstr "balíèek %s není pøemístitelný\n"
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, c-format
msgid "error reading from file %s\n"
msgstr "chyba pøi ètení ze souboru %s\n"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, 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:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nemù¾e být nainstalován\n"
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, 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:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "nevyøe¹ené závislosti:\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
msgid "installing binary packages\n"
msgstr "instaluji binární balíèky\n"
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "nemohu otevøít soubor %s: %s\n"
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" urèuje více balíèkù\n"
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
msgid "removing these packages would break dependencies:\n"
msgstr "odstranìní tìchto balíèkù by poru¹ilo závislosti:\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, c-format
msgid "cannot open %s: %s\n"
msgstr "nemohu otevøít %s: %s\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr "Instaluji %s\n"
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2661,7 +2656,7 @@ 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:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "nemohu otevøít databázi balíèkù v %s\n"
@@ -2805,36 +2800,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Podpisu: velikost(%d)+vata(%d)\n"
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s pøeskoèeno, proto¾e chybí pøíznak\n"
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, c-format
msgid "excluding directory %s\n"
msgstr "vynechávám adresáø %s\n"
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr "získávám seznam pøipojených systémù souborù\n"
-#: lib/verify.c:330
+#: lib/verify.c:283
#, c-format
msgid "missing %s"
msgstr "chybí %s"
-#: lib/verify.c:426
+#: lib/verify.c:379
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: "
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr "%s-%s-%s: kontrola digestu v hlavièce selhala\n"
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -2893,99 +2883,99 @@ msgstr "sdílený"
msgid "locked db index %s/%s\n"
msgstr "uzamèen db index %s/%s\n"
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr "neznámá db volba: \"%s\" ignorována\n"
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr "%s má neplatnou numerickou hodnotu, pøeskoèeno\n"
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr "%s má moc velkou nebo moc malou long hodnotu, pøeskoèeno\n"
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr "%s má pøíli¹ velkou nebo moc malou celoèíselnou hodnotu, pøeskoèeno\n"
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr "Poèet dataLength() RPM_STRING_TYPE musí být 1.\n"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr "chybí { po %"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr "po %{ chybí }"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr "prázdný formát znaèky"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr "prázdné jméno znaèky"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr "neznámá znaèka"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr "na konci pole oèekáváno ]"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
msgid "unexpected ]"
msgstr "neoèekávaná ]"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
msgid "unexpected }"
msgstr "neoèekávaná }"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr "ve výrazu oèekáván ?"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
msgid "{ expected after ? in expression"
msgstr "ve výrazu je po ? oèekávána {"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr "ve výrazu je oèekávána }"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr "v podvýrazu je po ? oèekávána :"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
msgid "{ expected after : in expression"
msgstr "ve výrazu je po : oèekávána {"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr "na konci výrazu je oèekáváno |"
@@ -3006,236 +2996,246 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr "generovat hlavièky kompatibilní RPM verze 2 a 3"
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: neznámá znaèka: \"%s\" ignorována\n"
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "nemohu otevøít index %s pøi pou¾ívání db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "cannot open %s index\n"
msgstr "nemohu otevøít index %s\n"
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
msgid "no dbpath has been set\n"
msgstr "nebyla nastavena dbpath\n"
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "chyba(%d) pøi získávání záznamu \"%s\" z indexu %s\n"
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, fuzzy, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "chyba(%d) pøi ukládání záznamu %s do %s\n"
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr "rpmdb: poru¹ená polo¾ka hlavièky #%u, pøeskakuji.\n"
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: nemohu èíst hlavièku na adrese 0x%x\n"
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstraòuji \"%s\" z indexu %s.\n"
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "odstraòuji %d polo¾ek z indexu %s.\n"
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
-#, c-format
-msgid "error(%d) storing record %s into %s\n"
+#: rpmdb/rpmdb.c:2440
+#, fuzzy, c-format
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "chyba(%d) pøi ukládání záznamu %s do %s\n"
-#: rpmdb/rpmdb.c:2416
-#, c-format
-msgid "error(%d) removing record %s from %s\n"
+#: rpmdb/rpmdb.c:2450
+#, fuzzy, c-format
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "chyba(%d) pøi odstraòování záznamu %s z %s\n"
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "chyba(%d) pøi alokaci nové instance balíèku\n"
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "pøidávám \"%s\" do indexu %s\n"
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "pøidávám %d polo¾ek do indexu %s.\n"
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr "chyba(%d) pøi ukládání záznamu %s do %s\n"
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "odstraòuji %s po úspì¹ném znovusestavení db3.\n"
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr "nebyla nastavena dbpath"
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "databázi %s pøevádím do %s\n"
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, c-format
msgid "temporary database %s already exists\n"
msgstr "doèasná databáze %s ji¾ existuje\n"
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, c-format
msgid "creating directory %s\n"
msgstr "vytváøím adresáø %s\n"
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, c-format
msgid "creating directory %s: %s\n"
msgstr "vytváøím adresáø %s: %s\n"
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "otevírám starou databázi s dbapi %d\n"
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "otevírám novou databázi s dbapi %d\n"
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "záznam èíslo %d v databázi je chybný -- vynechávám.\n"
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "nemohu pøidat záznam - pùvodnì u %d\n"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"databázi nelze zvovu vytvoøit; pùvodní databáze zùstává na svém místì\n"
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr "starou databázi nelze nahradit novou databází!\n"
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "pro obnovení nahraïte soubory v %s soubory z %s"
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, c-format
msgid "removing directory %s\n"
msgstr "ma¾u adresáø %s\n"
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "nemohu odstranit adresáø %s: %s\n"
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== aktivní %d prázdný %d\n"
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr "%3d>%*s(prázdný)"
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr "%3d<%*s(prázdný)\n"
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr "Makro %%%s má neukonèené tìlo\n"
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr "Makro %%%s má neplatné jméno (%%define)\n"
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr "Makro %%%s má neukonèené parametry\n"
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, c-format
msgid "Macro %%%s has empty body\n"
msgstr "Makro %%%s má prázdné tìlo\n"
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, c-format
msgid "Macro %%%s failed to expand\n"
msgstr "Expanze makra %%%s selhala\n"
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr "Makro %%%s má neplatné jméno (%%undefine)\n"
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr "Makro %%%s (%s) nebylo pou¾ito pod úrovní %d\n"
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr "Neznámá volba: %c v %s(%s)\n"
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr "Hloubka rekurze(%d) je vìt¹í, ne¾ max(%d)\n"
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, c-format
msgid "Unterminated %c: %s\n"
msgstr "Neukonèené %c: %s\n"
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr "Za %% následuje neparsovatelné makro\n"
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr "makro %%%.*s nenalezeno, pøeskakuji\n"
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
msgid "Target buffer overflow\n"
msgstr "Cílový buffer pøetekl\n"
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, c-format
msgid "File %s: %s\n"
msgstr "Soubor %s: %s\n"
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr "Soubor %s je men¹í, ne¾ %d bajtù\n"
@@ -3356,6 +3356,16 @@ msgstr "url port musí být èíslo\n"
msgid "failed to create %s: %s\n"
msgstr "nemohu vytvoøit %s: %s\n"
+#, fuzzy
+#~ msgid "%s: bad magic\n"
+#~ msgstr "©patné magické èíslo"
+
+#~ msgid "%s: read manifest failed: %s\n"
+#~ msgstr "%s: Fread selhalo: %s\n"
+
+#~ msgid "%s-%s-%s: immutable header region digest check failed\n"
+#~ msgstr "%s-%s-%s: kontrola digestu v hlavièce selhala\n"
+
#~ msgid ""
#~ "Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n"
#~ msgstr ""
diff --git a/po/da.po b/po/da.po
index c1cad410b..c70ffb702 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-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\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"
@@ -10,54 +10,54 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9alpha\n"
-#: build.c:38
+#: build.c:39
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "afhængighedskrav for pakkeopbygning kunne ikke imødekommes:\n"
-#: build.c:69
+#: build.c:70
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "Kan ikke åbne spec-fil %s: %s\n"
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "Kunne ikke åbne tar-videreførsel: %m\n"
#. Give up
-#: build.c:168
+#: build.c:169
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr "Kunne ikke læse spec-fil fra %s\n"
-#: build.c:196
+#: build.c:197
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "Kunne ikke omdøbe %s til %s: %m\n"
-#: build.c:236
+#: build.c:237
#, c-format
msgid "failed to stat %s: %m\n"
msgstr "kunne ikke finde %s: %m\n"
-#: build.c:241
+#: build.c:242
#, c-format
msgid "File %s is not a regular file.\n"
msgstr "Filen %s er ikke en regulær fil.\n"
-#: build.c:250
+#: build.c:251
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr "Filen %s synes ikke at være en spec-fil.\n"
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Opbygger mål-platforme: %s\n"
-#: build.c:320
+#: build.c:321
#, c-format
msgid "Building for target %s\n"
msgstr "Opbygger for mål %s\n"
@@ -75,264 +75,264 @@ msgstr "fejl ved læsning af hovedet på pakke\n"
msgid "cannot re-open payload: %s\n"
msgstr "kan ikke genåbne pakkeindhold: %s\n"
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr "vis versionen af rpm som benyttes"
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr "medtag mindre detaljerede oplysninger"
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr "medtag mere detaljerede oplysninger"
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr "definér makro <navn> med værdi <vrdi>"
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr "'<navn> <indhold>'"
-#: rpmqv.c:118
+#: rpmqv.c:121
msgid "print macro expansion of <expr>+"
msgstr "udlæs makroudvidelse af <udtryk>+"
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr "<udtryk>+"
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr "send standard-ud til <kmd>"
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr "<kmd>"
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr "brug <katalog> som topniveau-katalog"
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr "<katalog>"
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr "læs <fil:...> i stedet for standard makrofil(er)"
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr "<fil:...>"
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "læs <fil:...> i stedet for standard rpmrc-fil(er)"
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr "vis den endelige rpmrc og makrokonfiguration"
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr "undlad at benytte libio(3)-API"
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr "aflus protokol-datastrøm"
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr "aflus rpmio I/O"
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr "aflus URL-bufferhåndtering"
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr "Forespørgselstilvalg (med -q eller --query):"
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr "Verifikationstilvalg (med -V eller --verify):"
-#: rpmqv.c:180
+#: rpmqv.c:183
msgid "Signature options:"
msgstr "Signaturtilvalg"
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr "Databasetilvalg:"
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr "Opbygningstilvalg med [ <spec-fil> | <tararkiv> | <kildepakke> ]:"
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr "Fælles tilvalg for alle rpm-tilstande:"
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "fil %s: %s\n"
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr "RPM version %s\n"
-#: rpmqv.c:235
+#: rpmqv.c:238
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:236
+#: rpmqv.c:239
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Dette program kan frit distribueres under betingelserne i GNU GPL"
-#: rpmqv.c:248
+#: rpmqv.c:251
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Brug: %s {--help}\n"
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr "Tilvalget --rcfile er fjernet.\n"
-#: rpmqv.c:602
+#: rpmqv.c:605
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Brug \"--macros <fil:...>\" i stedet..\n"
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Intern fejl i parameterfortolkningen (%d) :-(\n"
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr "kun ét hovedtilvalg kan angives"
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr "kun én af forespørgsel/verificér kan udføres ad gangen"
-#: rpmqv.c:682
+#: rpmqv.c:685
msgid "unexpected query flags"
msgstr "uventet forespørgselsflag"
-#: rpmqv.c:685
+#: rpmqv.c:688
msgid "unexpected query format"
msgstr "uventet forespørgselsformat"
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr "uventet forespørgselskilde"
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath angivet ved en operation, der ikke benytter en database"
-#: rpmqv.c:735
+#: rpmqv.c:738
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "kun installation, opgradering, rmsource og rmspec kan tvinges igennem"
-#: rpmqv.c:737
+#: rpmqv.c:740
msgid "files may only be relocated during package installation"
msgstr "filer kan kun omrokeres under installation"
-#: rpmqv.c:740
+#: rpmqv.c:743
msgid "only one of --prefix or --relocate may be used"
msgstr "kun én af --prefix eller --relocate kan bruges"
-#: rpmqv.c:743
+#: rpmqv.c:746
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate og --excludepath kan kun bruges, når nye pakker installeres"
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix kan kun bruges, når nye pakker installeres"
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr "parametre til --prefix skal starte med et /"
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) kan kun angives ved installation"
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr "--percent kan kun angives ved installation"
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles kan kun angives ved installation"
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs kan kun angives ved installation"
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs kan kun angives ved installation"
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs kan kun angives ved installation"
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "kun én af --excludedocs og --includedocs kan angives"
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch kan kun angives ved installation"
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos kan kun angives ved installation"
-#: rpmqv.c:790
+#: rpmqv.c:793
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize kan kun angives ved installation"
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches kan kun angives ved installation"
-#: rpmqv.c:798
+#: rpmqv.c:801
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles kan kun angives ved installation"
-#: rpmqv.c:803
+#: rpmqv.c:806
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb kan kun angives ved installation og sletning"
-#: rpmqv.c:808
+#: rpmqv.c:811
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb kan kun angives ved installation og sletning"
-#: rpmqv.c:813
+#: rpmqv.c:816
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--notriggers kan kun angives ved installation og sletning af pakker"
-#: rpmqv.c:817
+#: rpmqv.c:820
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -340,13 +340,13 @@ msgstr ""
"--nodeps kan kun angives ved opbygning, genopbygning, genoversættelse, "
"installation, sletning og verifikation"
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test kan kun angives ved installation, sletning og opbygning"
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -354,87 +354,87 @@ msgstr ""
"--root (-r) kan kun angives ved installation, sletning, forespørgsel og "
"genopbygning af databasen"
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr "parameteren til --root (-r) skal starte med et /"
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr "ingen filer at underskrive\n"
-#: rpmqv.c:868
+#: rpmqv.c:871
#, c-format
msgid "cannot access file %s\n"
msgstr "kan ikke tilgå filen %s\n"
-#: rpmqv.c:887
+#: rpmqv.c:890
msgid "pgp not found: "
msgstr "pgp ikke fundet: "
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr "Indtast adgangskode: "
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr "Adgangskode ikke godkendt\n"
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr "Adgangskode godkendt.\n"
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Ugyldig angivelse af %%_signature i makrofil.\n"
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr "--sign kan kun bruges ved pakkeopbygning"
-#: rpmqv.c:927
+#: rpmqv.c:930
msgid "exec failed\n"
msgstr "eksekvering mislykkedes\n"
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr "ingen pakkefiler angivet til genopbygning"
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr "ingen spec-fil angivet til opbygning"
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr "ingen tar-arkiver angivet til opbygning"
-#: rpmqv.c:1051
+#: rpmqv.c:1055
#, fuzzy
msgid "no packages given for erase"
msgstr "ingen pakker angivet ved signering"
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr "ingen pakker angivet ved installation"
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr "ingen parametre angivet ved forespørgsel"
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr "ingen parametre angivet ved verifikation"
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr "uventede parametre til --querytags "
-#: rpmqv.c:1145
+#: rpmqv.c:1149
#, fuzzy
msgid "no arguments given"
msgstr "ingen parametre angivet ved forespørgsel"
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
msgid "Unable to open temp file.\n"
msgstr "Kunne ikke åbne midlertidig fil.\n"
@@ -644,7 +644,7 @@ msgstr "Fil ikke fundet med glob: %s\n"
msgid "Could not open %%files file %s: %s\n"
msgstr "Kunne ikke åbne '%%files'-fil %s: %s\n"
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, c-format
msgid "line: %s\n"
msgstr "linie: %s\n"
@@ -721,156 +721,156 @@ msgstr "getGnameS: for mange gid'er\n"
msgid "Could not canonicalize hostname: %s\n"
msgstr "Kunne ikke kanonisere værtsnavn: %s\n"
-#: build/pack.c:83
+#: build/pack.c:85
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "arkivoprettelse mislykkedes ved fil %s: %s\n"
-#: build/pack.c:86
+#: build/pack.c:88
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "arkivoprettelse mislykkedes ved fil %s: %s\n"
-#: build/pack.c:108
+#: build/pack.c:110
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "cpio_copy-skrivning mislykkedes: %s\n"
-#: build/pack.c:115
+#: build/pack.c:117
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "cpio_copy-læsning mislykkedes: %s\n"
-#: build/pack.c:218
+#: build/pack.c:220
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "Kunne ikke åbne 'PreIn'-fil: %s\n"
-#: build/pack.c:225
+#: build/pack.c:227
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "Kunne ikke åbne 'PreUn'-fil: %s\n"
-#: build/pack.c:232
+#: build/pack.c:234
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "Kunne ikke åbne 'PostIn'-fil: %s\n"
-#: build/pack.c:239
+#: build/pack.c:241
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "Kunne ikke åbne 'PostUn'-fil: %s\n"
-#: build/pack.c:247
+#: build/pack.c:249
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "Kunne ikke åbne 'VerifyScript'-fil: %s\n"
-#: build/pack.c:262
+#: build/pack.c:264
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "Kunne ikke åbne skriptfilen Trigger: %s\n"
-#: build/pack.c:290
+#: build/pack.c:292
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr "readRPM: åbn %s: %s\n"
-#: build/pack.c:300
+#: build/pack.c:302
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr "readRPM: læs %s: %s\n"
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: Fread mislykkedes: %s\n"
-#: build/pack.c:337
+#: build/pack.c:339
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s er ikke nogen RPM-pakke\n"
-#: build/pack.c:346
+#: build/pack.c:348
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: læser hoved fra %s\n"
-#: build/pack.c:475
+#: build/pack.c:477
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "Kunne ikke læse hoved fra %s: %s\n"
-#: build/pack.c:494
+#: build/pack.c:496
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "Kunne ikke skrive hoved til %s: %s\n"
-#: build/pack.c:504
+#: build/pack.c:506
msgid "Bad CSA data\n"
msgstr "Ugyldige CSA-data\n"
-#: build/pack.c:540
+#: build/pack.c:542
#, fuzzy
msgid "Unable to write final header\n"
msgstr "Kunne ikke skrive hoved til %s: %s\n"
-#: build/pack.c:560
+#: build/pack.c:562
#, c-format
msgid "Generating signature: %d\n"
msgstr "Genererer signatur: %d\n"
-#: build/pack.c:578
+#: build/pack.c:580
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "Kunne ikke læse hoved fra %s: %s\n"
-#: build/pack.c:586
+#: build/pack.c:588
#, c-format
msgid "Could not open %s: %s\n"
msgstr "Kunne ikke åbne %s: %s\n"
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Kunne ikke skrive pakke: %s\n"
-#: build/pack.c:637
+#: build/pack.c:639
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Kunne ikke åbne sigtarget %s: %s\n"
-#: build/pack.c:648
+#: build/pack.c:650
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "Kunne ikke læse hoved fra %s: %s\n"
-#: build/pack.c:662
+#: build/pack.c:664
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Kunne ikke skrive hoved til %s: %s\n"
-#: build/pack.c:672
+#: build/pack.c:674
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Kunne ikke læse pakkeindhold fra %s: %s\n"
-#: build/pack.c:678
+#: build/pack.c:680
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n"
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr "Skrev: %s\n"
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Kunne ikke generere filnavn til oprettelse af pakke %s: %s\n"
-#: build/pack.c:787
+#: build/pack.c:789
#, c-format
msgid "cannot create %s: %s\n"
msgstr "kan ikke oprette %s: %s\n"
@@ -1440,77 +1440,77 @@ msgstr " mislykkedes - "
msgid "package %s was already added, replacing with %s\n"
msgstr "pakken %s er allerede installeret"
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s JA (rpmrc tilfører)\n"
-#: lib/depends.c:423
+#: lib/depends.c:425
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s JA (rpmlib tilfører)\n"
-#: lib/depends.c:444
+#: lib/depends.c:446
#, fuzzy
msgid "(db files)"
msgstr "ugyldig db-fil %s\n"
-#: lib/depends.c:456
+#: lib/depends.c:458
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s JA (db tilfører)\n"
-#: lib/depends.c:469
+#: lib/depends.c:471
#, fuzzy
msgid "(db package)"
msgstr "ingen pakker\n"
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:927
+#: lib/depends.c:931
#, 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:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr "========== gemmer tsort-relationer\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n"
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr "LØKKE:\n"
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr "========== fortsætter tsort ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr "(ikke et tal)"
@@ -1602,47 +1602,42 @@ msgstr "%s oprettet som %s\n"
msgid "error creating temporary file %s\n"
msgstr "fejl ved oprettelse af midlertidig fil %s\n"
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/package.c:174
-#, fuzzy, c-format
-msgid "%s: bad magic\n"
-msgstr "Ugyldigt magisk tal"
-
-#: lib/package.c:182
+#: lib/package.c:181
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "indpakningsversion 1 understøttes ikke af denne udgave af RPM\n"
-#: lib/package.c:190
+#: lib/package.c:189
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"kun indpakninger med hovedversion <= 4 understøttes af denne udgave af RPM\n"
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature mislykkedes\n"
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen tilgængelig signatur\n"
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread mislykkedes: %s\n"
@@ -2087,88 +2082,88 @@ msgid "generate signature"
msgstr "generér PGP/GPG-signatur"
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, fuzzy, c-format
msgid "package %s is intended for a %s architecture"
msgstr "pakken %s hører til en anden arkitektur"
-#: lib/problems.c:224
+#: lib/problems.c:226
#, fuzzy, c-format
msgid "package %s is intended for a %s operating system"
msgstr "pakken %s hører til et andet operativsystem"
-#: lib/problems.c:229
+#: lib/problems.c:231
#, c-format
msgid "package %s is already installed"
msgstr "pakken %s er allerede installeret"
-#: lib/problems.c:234
+#: lib/problems.c:236
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr "sti %s i pakke %s kan ikke omrokeres"
-#: lib/problems.c:239
+#: lib/problems.c:241
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr "filen %s skaber konflikt mellem den forsøgte installation af %s og %s"
-#: lib/problems.c:244
+#: lib/problems.c:246
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
"filen %s fra installationen af %s skaber konflikt med fil fra pakken %s"
-#: lib/problems.c:249
+#: lib/problems.c:251
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "pakke %s (som er nyere end %s) er allerede installeret"
-#: lib/problems.c:254
+#: lib/problems.c:256
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr "installation af pakke %s kræver %ld%cb på %s-filsystemet"
-#: lib/problems.c:264
+#: lib/problems.c:266
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr "installation af pakken %s kræver %ld inode'r på %s-filsystemet"
-#: lib/problems.c:269
+#: lib/problems.c:271
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr "pakke %s prætransaktion-systemkald: %s mislykkedes: %s"
-#: lib/problems.c:273
+#: lib/problems.c:275
#, fuzzy, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n"
-#: lib/problems.c:277
+#: lib/problems.c:279
#, fuzzy, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n"
-#: lib/problems.c:282
+#: lib/problems.c:284
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "ukendt fejl %d under arbejdet med pakken %s"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "conflicts with"
msgstr " skaber konflikt med %s-%s-%s\n"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "is needed by"
msgstr " kræves af %s-%s-%s\n"
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr "Datatype %d understøttes ikke\n"
@@ -2183,26 +2178,26 @@ msgstr "kan ikke oprette %s: %s\n"
msgid "cannot write to %%%s %s\n"
msgstr "kunne ikke skrive til %s\n"
-#: lib/psm.c:487
+#: lib/psm.c:485
msgid "source package expected, binary found\n"
msgstr "kildepakke forventet, binær fundet\n"
-#: lib/psm.c:603
+#: lib/psm.c:601
msgid "source package contains no .spec file\n"
msgstr "kildepakke indeholder ingen .spec-fil\n"
-#: lib/psm.c:722
+#: lib/psm.c:720
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "kører postinstallations-skript (hvis det findes)\n"
-#: lib/psm.c:888
+#: lib/psm.c:890
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
"kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n"
-#: lib/psm.c:895
+#: lib/psm.c:897
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
@@ -2247,213 +2242,213 @@ msgstr "kunne ikke åbne %s: %s\n"
msgid "%s failed: %s\n"
msgstr "%s mislykkedes\n"
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, c-format
msgid "incorrect format: %s\n"
msgstr "ugyldigt format: %s\n"
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr "(indeholder ingen filer)"
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr "normal "
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr "erstattet "
-#: lib/query.c:290
+#: lib/query.c:289
msgid "not installed "
msgstr "ej installeret"
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr "ej delt "
-#: lib/query.c:296
+#: lib/query.c:295
#, c-format
msgid "(unknown %3d) "
msgstr "(ukendt %3d) "
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr "(ingen status)"
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
msgid "package has neither file owner or id lists\n"
msgstr "pakke har hverken filejerskabs- eller id-lister\n"
-#: lib/query.c:466
+#: lib/query.c:465
#, c-format
msgid "can't query %s: %s\n"
msgstr "kunne ikke forespørge %s: %s\n"
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, c-format
msgid "open of %s failed: %s\n"
msgstr "åbning af %s mislykkedes %s\n"
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr "forespørgsel af %s mislykkedes\n"
-#: lib/query.c:642
+#: lib/query.c:637
msgid "old format source packages cannot be queried\n"
msgstr "pakke med gammelt kildeformat kan ikke forespørges\n"
-#: lib/query.c:668 lib/rpminstall.c:507
-#, c-format
-msgid "%s: read manifest failed: %s\n"
-msgstr "%s: læs manifest mislykkedes: %s\n"
+#: lib/query.c:663 lib/rpminstall.c:514
+#, fuzzy, c-format
+msgid "%s: not a package manifest: %s\n"
+msgstr "ingen pakker udløser %s\n"
-#: lib/query.c:712
+#: lib/query.c:707
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "forespørgsel af spec-fil %s mislykkedes, kunne ikke tolkes\n"
-#: lib/query.c:733
+#: lib/query.c:728
msgid "no packages\n"
msgstr "ingen pakker\n"
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "gruppe %s indeholder ingen pakker\n"
-#: lib/query.c:763
+#: lib/query.c:758
#, c-format
msgid "no package triggers %s\n"
msgstr "ingen pakker udløser %s\n"
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "Kunne ikke læse %s: %s.\n"
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "ingen pakker udløser %s\n"
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr "ingen pakker kræver %s\n"
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr "ingen pakker tilfører %s\n"
-#: lib/query.c:916
+#: lib/query.c:911
#, c-format
msgid "file %s: %s\n"
msgstr "fil %s: %s\n"
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "filen %s tilhører ingen pakke\n"
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr "ugyldigt pakkenummer: %s\n"
-#: lib/query.c:950
+#: lib/query.c:945
#, c-format
msgid "package record number: %u\n"
msgstr "pakkens post-nummer: %u\n"
-#: lib/query.c:955
+#: lib/query.c:950
#, fuzzy, c-format
msgid "record %u could not be read\n"
msgstr "post %d kunne ikke læses\n"
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, c-format
msgid "package %s is not installed\n"
msgstr "pakken %s er ikke installeret\n"
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
#, fuzzy
msgid "(added files)"
msgstr "ugyldig db-fil %s\n"
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
#, fuzzy
msgid "(added provide)"
msgstr "%s: %-45s JA (db tilfører)\n"
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: åbning mislykkedes: %s\n"
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
msgid "makeTempFile failed\n"
msgstr "makeTempFile mislykkedes\n"
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite mislykkedes: %s\n"
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: Kan ikke underskrive v1.0 RPM\n"
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: Kan ikke genunderskrive v2.0 RPM\n"
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead mislykkedes: %s\n"
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature mislykkedes: %s\n"
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ingen tilgængelig signatur (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr "IKKE O.K."
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
msgid " (MISSING KEYS:"
msgstr " (MANGLENDE NØGLER: "
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr " (IKKE-BETROEDE NØGLER:"
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr "O.K."
@@ -2487,94 +2482,94 @@ msgstr " %s A %s\tB %s\n"
msgid "package %s has unsatisfied %s: %s\n"
msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n"
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr "Forbereder..."
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr "Forbereder pakker til installation..."
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, c-format
msgid "Retrieving %s\n"
msgstr "Modtager %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "overspringer %s - overførsel mislykkedes - %s\n"
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakke %s kan ikke omrokeres\n"
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, c-format
msgid "error reading from file %s\n"
msgstr "fejl ved læsning fra filen %s\n"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, 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:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kunne ikke installeres\n"
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "fandt %d kilde- og %d binærpakker\n"
-#: lib/rpminstall.c:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "afhængighedskrav, der ikke kunne imødekommes:\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
msgid "installing binary packages\n"
msgstr "installerer binærpakker\n"
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "kunne ikke åbne fil %s: %s\n"
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" angiver flere pakker\n"
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
msgid "removing these packages would break dependencies:\n"
msgstr "fjernelse af disse pakker ville bryde afhængighederne:\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kunne ikke åbne %s: %s\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2681,7 +2676,7 @@ 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:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "kunne ikke åbne Packages-database i %s\n"
@@ -2824,36 +2819,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Signaturfyld : %d\n"
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s oversprunget grundet manglende ok-flag\n"
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, c-format
msgid "excluding directory %s\n"
msgstr "ekskluderer kataloget %s\n"
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr "henter liste over monterede filsystemer\n"
-#: lib/verify.c:330
+#: lib/verify.c:283
#, c-format
msgid "missing %s"
msgstr "manglende %s"
-#: lib/verify.c:426
+#: lib/verify.c:379
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "Ikke-tilfredsstillede afhængighedskrav for %s-%s-%s: "
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr ""
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -2912,99 +2902,99 @@ msgstr "delt"
msgid "locked db index %s/%s\n"
msgstr "låste db-index %s/%s\n"
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, fuzzy, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr "ukendt db-tilvalg: \"%s\" ignoreret\n"
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr "%s har ugyldig talværdi, overspringes\n"
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr "%s har for stor eller lille 'long'-værdi, overspringes\n"
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr "%s har for stor eller lille heltalsværdi, overspringes\n"
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr "dataLength() RPM_STRING_TYPE-antal skal være 1.\n"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr "manglende { efter %"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr "manglende } efter %{"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr "tomt mærkeformat"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr "tomt mærkenavn"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr "ukendt mærke"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr "] forventet ved slutningen af tabel"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
msgid "unexpected ]"
msgstr "uventet ]"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
msgid "unexpected }"
msgstr "uventet }"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr "? forventet i udtryk"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
msgid "{ expected after ? in expression"
msgstr "{ forventet efter ? i udtryk"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr "} forventet i udtryk"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr ": forventet efter ?-underudtryk"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
msgid "{ expected after : in expression"
msgstr "{ forventet efter : i udtryk"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr "| forventet ved slutningen af udtryk"
@@ -3027,239 +3017,249 @@ msgstr ""
"generér hoveder, der er kompatible med (gamle) rpm[23]-indpakningsversioner"
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: ukendt mærkenavn: \"%s\" ignoreret\n"
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "kan ikke åbne '%s'-indeks ved brug af db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "cannot open %s index\n"
msgstr "kan ikke åbne '%s'-indeks\n"
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
msgid "no dbpath has been set\n"
msgstr "der er ikke sat nogen dbpath\n"
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, fuzzy, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "fejl(%d) ved gemning af post %s i %s\n"
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: kan ikke læse hoved ved 0x%x\n"
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "fjerner \"%s\" fra %s-indekset.\n"
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "fjerne %d indgange fra %s-indekset.\n"
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
-#, c-format
-msgid "error(%d) storing record %s into %s\n"
+#: rpmdb/rpmdb.c:2440
+#, fuzzy, c-format
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "fejl(%d) ved gemning af post %s i %s\n"
-#: rpmdb/rpmdb.c:2416
-#, c-format
-msgid "error(%d) removing record %s from %s\n"
+#: rpmdb/rpmdb.c:2450
+#, fuzzy, c-format
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "fejl(%d) ved fjernelse af post %s fra %s\n"
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "fejl(%d) under allokering af ny pakkeinstans\n"
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
"tilføjer \"%s\" til '%s'-indekset.\n"
"\n"
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "tilføjer %d indgange til '%s'-indekset.\n"
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr "fejl(%d) ved gemning af post %s i %s\n"
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "fjerner %s efter vellykket genopbygning af db3.\n"
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr "der ikke sat nogen dbpath"
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "genopbygger database %s over i %s\n"
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, c-format
msgid "temporary database %s already exists\n"
msgstr "den midlertidige database %s eksisterer allerede\n"
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, c-format
msgid "creating directory %s\n"
msgstr ""
"opretter kataloget %s\n"
"\n"
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, c-format
msgid "creating directory %s: %s\n"
msgstr "opretter kataloget %s: %s\n"
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "åbner gammel database med dbapi %d\n"
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "åbner ny database med dbapi %d\n"
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "post nummer %d i databasen er fejlbehæftet -- overspringer.\n"
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "kunne ikke tilføje posten, der tidligere var ved %d\n"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
msgid "failed to rebuild database: original database remains in place\n"
msgstr "kunne ikke genopbygge database: original-databasen beholdes\n"
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr "kunne ikke erstatte gammel database med ny database!\n"
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "erstat filer i %s med filer fra %s for at genoprette"
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, c-format
msgid "removing directory %s\n"
msgstr "fjerner kataloget %s\n"
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "kunne ikke fjerne katalog %s: %s\n"
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== aktiv %d tom %d\n"
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr "%3d>%*s(tom)"
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr "%3d<%*s(tom)\n"
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr "Makroen %%%s har et uafsluttet indhold (body)\n"
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr "Makroen %%%s har et ugyldig navn (%%define)\n"
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr "Makroen %%%s har uafsluttede parametre\n"
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, c-format
msgid "Macro %%%s has empty body\n"
msgstr "Makroen %%%s har intet indhold\n"
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, c-format
msgid "Macro %%%s failed to expand\n"
msgstr "Makroen %%%s kunne ikke udfoldes\n"
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr "Makroen %%%s har ugyldigt navn (%%undefine)\n"
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr "Makro %%%s (%s) blev ikke brugt under niveau %d\n"
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr "Ukendt tilvalg %c i %s(%s)\n"
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr "Rekursionsdybde(%d) overskrider maks(%d)\n"
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, c-format
msgid "Unterminated %c: %s\n"
msgstr "Uafsluttet %c: %s\n"
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr "Et %% efterfølges af en makro, der ikke kan tolkes\n"
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr "Makroen %%%.*s blev ikke fundet, overspringer\n"
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
msgid "Target buffer overflow\n"
msgstr "Overløb i målbuffer\n"
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, c-format
msgid "File %s: %s\n"
msgstr "Fil %s: %s\n"
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr "Filen %s er mindre end %u byte\n"
@@ -3380,6 +3380,13 @@ msgstr "url-port skal være et tal\n"
msgid "failed to create %s: %s\n"
msgstr "kunne ikke oprette %s: %s\n"
+#, fuzzy
+#~ msgid "%s: bad magic\n"
+#~ msgstr "Ugyldigt magisk tal"
+
+#~ msgid "%s: read manifest failed: %s\n"
+#~ msgstr "%s: læs manifest mislykkedes: %s\n"
+
#~ msgid "closed db file %s\n"
#~ msgstr "lukket db-fil %s\n"
diff --git a/po/de.po b/po/de.po
index dd97d66cf..94ab27f29 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-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\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"
@@ -45,59 +45,59 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:38
+#: build.c:39
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n"
# , c-format
-#: build.c:69
+#: build.c:70
#, fuzzy, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
# , c-format
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, fuzzy, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "Öffnen von %s fehlgeschlagen\n"
# , c-format
#. Give up
-#: build.c:168
+#: build.c:169
#, fuzzy, c-format
msgid "Failed to read spec file from %s\n"
msgstr "Lesen von %s fehlgeschlagen: %s."
# , c-format
-#: build.c:196
+#: build.c:197
#, fuzzy, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "Lesen von %s fehlgeschlagen: %s."
# , c-format
-#: build.c:236
+#: build.c:237
#, fuzzy, c-format
msgid "failed to stat %s: %m\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: build.c:241
+#: build.c:242
#, fuzzy, c-format
msgid "File %s is not a regular file.\n"
msgstr "%s scheint kein RPM-Paket zu sein\n"
-#: build.c:250
+#: build.c:251
#, fuzzy, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr "%s scheint kein RPM-Paket zu sein\n"
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:320
+#: build.c:321
#, fuzzy, c-format
msgid "Building for target %s\n"
msgstr "Fehler beim Suchen nach Paket %s\n"
@@ -116,265 +116,265 @@ msgstr "Fehler beim Suchen nach Paket %s\n"
msgid "cannot re-open payload: %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr "Die benutzte RPM-Version anzeigen"
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:121
#, fuzzy
msgid "print macro expansion of <expr>+"
msgstr "Die benutzte RPM-Version anzeigen"
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr "Standard-Ausgabe nach <BEFEHL> umleiten"
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr "<VERZ> als Stammverzeichnis benutzen"
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:180
+#: rpmqv.c:183
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr ""
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr ""
# , c-format
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
# , c-format
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr "RPM Version %s\n"
-#: rpmqv.c:235
+#: rpmqv.c:238
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright © 1998 - Red Hat Software"
-#: rpmqv.c:236
+#: rpmqv.c:239
#, fuzzy
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Dies darf unter den Bedingungen der »GNU GPL« frei verteilt werden"
-#: rpmqv.c:248
+#: rpmqv.c:251
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "Benutzung: rpm {--help}"
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:605
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Benutzen Sie stattdessen -e oder --erase\n"
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr "Es darf nur ein Hauptmodus angegeben werden"
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr ""
"Nur nur eine Art der Anfrage/Überprüfung kann pro Programmlauf durchgeführt "
"werden"
-#: rpmqv.c:682
+#: rpmqv.c:685
#, fuzzy
msgid "unexpected query flags"
msgstr "Unerwartete Quelle der Anfrage"
-#: rpmqv.c:685
+#: rpmqv.c:688
#, fuzzy
msgid "unexpected query format"
msgstr "Unerwartete Quelle der Anfrage"
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr "Unerwartete Quelle der Anfrage"
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath wurde für eine Operation angeben, die keine Datenbank benutzt"
-#: rpmqv.c:735
+#: rpmqv.c:738
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "nur die Installation und Aktualisierung darf erzwungen werden"
-#: rpmqv.c:737
+#: rpmqv.c:740
msgid "files may only be relocated during package installation"
msgstr "Dateien können nur während der Paketinstallation verschoben werden"
-#: rpmqv.c:740
+#: rpmqv.c:743
msgid "only one of --prefix or --relocate may be used"
msgstr "nur eines der Argumente --prefix oder --relocate darf angegeben werden"
-#: rpmqv.c:743
+#: rpmqv.c:746
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate darf nur bei der Installation neuer Pakete benutzt werden"
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix darf nur bei der Installation neuer Pakete benutzt werden"
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr "Argumente zu --prefix müssen mit einem / beginnen"
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr "--percent darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
"nur eines der Argumente --excludedocs und --includedocs darf angegeben werden"
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:790
+#: rpmqv.c:793
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches darf nur während der Paketdeinstallaiton angegeben werden"
-#: rpmqv.c:798
+#: rpmqv.c:801
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:803
+#: rpmqv.c:806
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb kann nur während der Paketinstallation und -deinstallation "
"angegeben werden"
-#: rpmqv.c:808
+#: rpmqv.c:811
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
@@ -383,7 +383,7 @@ msgstr ""
"--justdb kann nur während der Paketinstallation und -deinstallation "
"angegeben werden"
-#: rpmqv.c:813
+#: rpmqv.c:816
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
@@ -392,7 +392,7 @@ msgstr ""
"--justdb kann nur während der Paketinstallation und -deinstallation "
"angegeben werden"
-#: rpmqv.c:817
+#: rpmqv.c:820
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -401,7 +401,7 @@ msgstr ""
"--nodeps darf nur während der Paketinstallation, -deinstallation und -"
"überprüfung angegeben werden"
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -409,7 +409,7 @@ msgstr ""
"--test darf nur während der Paketinstallation, -deinstallation und -"
"erstellung angegeben werden"
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -417,90 +417,90 @@ msgstr ""
"--root (-r) darf nur während der Paketinstallation, -deinstallation, -"
"anfrage und Datenbankneuerstellungen angegeben werden"
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr "Argumente zu --root (-r) müssen mit einem / beginnen"
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:868
+#: rpmqv.c:871
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: rpmqv.c:887
+#: rpmqv.c:890
#, fuzzy
msgid "pgp not found: "
msgstr "Datei auf dem Server nicht gefunden"
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr "Die Passwortüberprüfung ist fehlgeschlagen\n"
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr "Das Passwort ist richtig.\n"
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr "--sign darf nur während der Paketerstellung benutzt werden"
-#: rpmqv.c:927
+#: rpmqv.c:930
#, fuzzy
msgid "exec failed\n"
msgstr "%s: Öffnen fehlgeschlagen\n"
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr "Es wurden keine Paketdateien für die Neuerstellung angegeben"
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr "Es wurde kein spec-Datei für die Erstellung angegeben"
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr "Es wurde keine tar-Datei für die Erstellung angegeben"
-#: rpmqv.c:1051
+#: rpmqv.c:1055
#, fuzzy
msgid "no packages given for erase"
msgstr "Es wurden keine Pakete für die Signatur angeben"
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr "Es wurden keine Pakete für die Installation angegeben"
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr "Es wurden keine Argumente für die Anfrage angegeben"
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr "Es wurden keine Argumente für die Überprüfung angegeben"
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr "Unerwartete Argumente zu --querytags "
-#: rpmqv.c:1145
+#: rpmqv.c:1149
#, fuzzy
msgid "no arguments given"
msgstr "Es wurden keine Argumente für die Anfrage angegeben"
# , c-format
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
#, fuzzy
msgid "Unable to open temp file.\n"
msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
@@ -723,7 +723,7 @@ msgid "Could not open %%files file %s: %s\n"
msgstr "Fehler: kann Datei %s nicht öffnen\n"
# , c-format
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, fuzzy, c-format
msgid "line: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
@@ -803,170 +803,170 @@ msgid "Could not canonicalize hostname: %s\n"
msgstr ""
# , c-format
-#: build/pack.c:83
+#: build/pack.c:85
#, fuzzy, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
# , c-format
-#: build/pack.c:86
+#: build/pack.c:88
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: build/pack.c:108
+#: build/pack.c:110
#, fuzzy, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "lesen fehlgeschlagen: %s (%d)"
-#: build/pack.c:115
+#: build/pack.c:117
#, fuzzy, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "lesen fehlgeschlagen: %s (%d)"
-#: build/pack.c:218
+#: build/pack.c:220
#, fuzzy, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "Fehler: kann Datei %s nicht öffnen\n"
-#: build/pack.c:225
+#: build/pack.c:227
#, fuzzy, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "Fehler: kann Datei %s nicht öffnen\n"
-#: build/pack.c:232
+#: build/pack.c:234
#, fuzzy, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "Fehler: kann Datei %s nicht öffnen\n"
-#: build/pack.c:239
+#: build/pack.c:241
#, fuzzy, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "Fehler: kann Datei %s nicht öffnen\n"
-#: build/pack.c:247
+#: build/pack.c:249
#, fuzzy, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "Fehler: kann Datei %s nicht öffnen\n"
-#: build/pack.c:262
+#: build/pack.c:264
#, fuzzy, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "Fehler: kann Datei %s nicht öffnen\n"
# , c-format
-#: build/pack.c:290
+#: build/pack.c:292
#, fuzzy, c-format
msgid "readRPM: open %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
# , c-format
-#: build/pack.c:300
+#: build/pack.c:302
#, fuzzy, c-format
msgid "readRPM: read %s: %s\n"
msgstr "Lesen von %s fehlgeschlagen: %s."
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: build/pack.c:337
+#: build/pack.c:339
#, fuzzy, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "Fehler: %s scheint zu keinem RPM-Paket zu gehören\n"
-#: build/pack.c:346
+#: build/pack.c:348
#, fuzzy, c-format
msgid "readRPM: reading header from %s\n"
msgstr "Fehler beim Eintrag %s von %s"
# , c-format
-#: build/pack.c:475
+#: build/pack.c:477
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "Nicht möglich %s zu schreiben"
# , c-format
-#: build/pack.c:494
+#: build/pack.c:496
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "Nicht möglich %s zu schreiben"
-#: build/pack.c:504
+#: build/pack.c:506
msgid "Bad CSA data\n"
msgstr ""
# , c-format
-#: build/pack.c:540
+#: build/pack.c:542
#, fuzzy
msgid "Unable to write final header\n"
msgstr "Nicht möglich %s zu schreiben"
-#: build/pack.c:560
+#: build/pack.c:562
#, fuzzy, c-format
msgid "Generating signature: %d\n"
msgstr "PGP-Signatur generieren"
# , c-format
-#: build/pack.c:578
+#: build/pack.c:580
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "Nicht möglich %s zu schreiben"
# , c-format
-#: build/pack.c:586
+#: build/pack.c:588
#, fuzzy, c-format
msgid "Could not open %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen\n"
# , c-format
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Nicht möglich %s zu schreiben"
# , c-format
-#: build/pack.c:637
+#: build/pack.c:639
#, fuzzy, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Nicht möglich %s zu schreiben"
# , c-format
-#: build/pack.c:648
+#: build/pack.c:650
#, fuzzy, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "Nicht möglich %s zu schreiben"
# , c-format
-#: build/pack.c:662
+#: build/pack.c:664
#, fuzzy, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Nicht möglich %s zu schreiben"
# , c-format
-#: build/pack.c:672
+#: build/pack.c:674
#, fuzzy, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Nicht möglich %s zu schreiben"
# , c-format
-#: build/pack.c:678
+#: build/pack.c:680
#, fuzzy, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Nicht möglich %s zu schreiben"
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr ""
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:787
+#: build/pack.c:789
#, fuzzy, c-format
msgid "cannot create %s: %s\n"
msgstr "kann Datei %s nicht öffnen: "
@@ -1573,79 +1573,79 @@ msgstr "pgp fehlgeschlagen"
msgid "package %s was already added, replacing with %s\n"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
#, fuzzy
msgid "(rpmrc provides)"
msgstr "die Datei »%s« gehört zu keinem Paket\n"
-#: lib/depends.c:423
+#: lib/depends.c:425
#, fuzzy
msgid "(rpmlib provides)"
msgstr "die Datei »%s« gehört zu keinem Paket\n"
# , c-format
-#: lib/depends.c:444
+#: lib/depends.c:446
#, fuzzy
msgid "(db files)"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: lib/depends.c:456
+#: lib/depends.c:458
#, fuzzy
msgid "(db provides)"
msgstr "die Datei »%s« gehört zu keinem Paket\n"
-#: lib/depends.c:469
+#: lib/depends.c:471
#, fuzzy
msgid "(db package)"
msgstr "Anfrage an alle Pakete"
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
# FIXME
-#: lib/depends.c:927
+#: lib/depends.c:931
#, 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:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr "(keine Zahl)"
@@ -1741,50 +1741,45 @@ msgstr "kann Datei %s nicht öffnen: "
msgid "error creating temporary file %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/package.c:174
-#, c-format
-msgid "%s: bad magic\n"
-msgstr ""
-
-#: lib/package.c:182
+#: lib/package.c:181
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
"Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
-#: lib/package.c:190
+#: lib/package.c:189
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Keine Signatur verfügbar\n"
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
@@ -2251,91 +2246,91 @@ msgid "generate signature"
msgstr "PGP-Signatur generieren"
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
# FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:219
+#: lib/problems.c:221
#, fuzzy, c-format
msgid "package %s is intended for a %s architecture"
msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
# FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:224
+#: lib/problems.c:226
#, fuzzy, c-format
msgid "package %s is intended for a %s operating system"
msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
-#: lib/problems.c:229
+#: lib/problems.c:231
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/problems.c:234
+#: lib/problems.c:236
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/problems.c:239
+#: lib/problems.c:241
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:244
+#: lib/problems.c:246
#, fuzzy, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr " steht im Konflikt mit %s-%s-%s\n"
# FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:249
+#: lib/problems.c:251
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
-#: lib/problems.c:254
+#: lib/problems.c:256
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:264
+#: lib/problems.c:266
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
# FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:269
+#: lib/problems.c:271
#, fuzzy, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
-#: lib/problems.c:273
+#: lib/problems.c:275
#, fuzzy, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr "Paket %s wird nicht in %s aufgeführt"
-#: lib/problems.c:277
+#: lib/problems.c:279
#, fuzzy, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr "Paket %s wird nicht in %s aufgeführt"
-#: lib/problems.c:282
+#: lib/problems.c:284
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "conflicts with"
msgstr " steht im Konflikt mit %s-%s-%s\n"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "is needed by"
msgstr " wird von %s-%s-%s gebraucht\n"
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
@@ -2350,26 +2345,26 @@ msgstr "kann Datei %s nicht öffnen: "
msgid "cannot write to %%%s %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: lib/psm.c:487
+#: lib/psm.c:485
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:603
+#: lib/psm.c:601
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
-#: lib/psm.c:722
+#: lib/psm.c:720
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "Keine Stufen ausführen"
-#: lib/psm.c:888
+#: lib/psm.c:890
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "Ausführung des Skripts fehlgeschlagen"
-#: lib/psm.c:895
+#: lib/psm.c:897
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "Ausführung des Skripts fehlgeschlagen"
@@ -2415,222 +2410,222 @@ msgstr "Öffnen von %s fehlgeschlagen: %s"
msgid "%s failed: %s\n"
msgstr "pgp fehlgeschlagen"
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "Fehler beim Format %s\n"
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr "(beinhaltet keine Dateien)"
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr ""
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr ""
-#: lib/query.c:290
+#: lib/query.c:289
#, fuzzy
msgid "not installed "
msgstr "Paket %s ist nicht installiert\n"
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr ""
-#: lib/query.c:296
+#: lib/query.c:295
#, fuzzy, c-format
msgid "(unknown %3d) "
msgstr "(unbekannter Typ)"
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr ""
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "Paket hat keinen Namen"
-#: lib/query.c:466
+#: lib/query.c:465
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "Fehler: kann %s nicht öffnen\n"
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "öffnen von %s fehlgeschlagen: %s\n"
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr "Anfrage von %s fehlgeschlagen\n"
-#: lib/query.c:642
+#: lib/query.c:637
msgid "old format source packages cannot be queried\n"
msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n"
-#: lib/query.c:668 lib/rpminstall.c:507
+#: lib/query.c:663 lib/rpminstall.c:514
#, fuzzy, c-format
-msgid "%s: read manifest failed: %s\n"
-msgstr "%s: »readLead« fehlgeschlagen\n"
+msgid "%s: not a package manifest: %s\n"
+msgstr "kein Paket triggert %s\n"
-#: lib/query.c:712
+#: lib/query.c:707
#, fuzzy, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "Anfrage von %s fehlgeschlagen\n"
-#: lib/query.c:733
+#: lib/query.c:728
#, fuzzy
msgid "no packages\n"
msgstr "Anfrage an alle Pakete"
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
-#: lib/query.c:763
+#: lib/query.c:758
#, c-format
msgid "no package triggers %s\n"
msgstr "kein Paket triggert %s\n"
# , c-format
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "Lesen von %s fehlgeschlagen: %s."
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "kein Paket triggert %s\n"
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr "kein Paket verlangt %s\n"
# oder besser: ... listet %s auf? -ke-
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr "kein Paket stellt %s bereit\n"
# , c-format
-#: lib/query.c:916
+#: lib/query.c:911
#, fuzzy, c-format
msgid "file %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "die Datei »%s« gehört zu keinem Paket\n"
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr "ungültige Paket-Nummer: %s\n"
-#: lib/query.c:950
+#: lib/query.c:945
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "ungültige Paket-Nummer: %s\n"
-#: lib/query.c:955
+#: lib/query.c:950
#, fuzzy, c-format
msgid "record %u could not be read\n"
msgstr "Eintrag %d konnte nicht gelesen werden\n"
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, c-format
msgid "package %s is not installed\n"
msgstr "Paket %s ist nicht installiert\n"
# , c-format
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
#, fuzzy
msgid "(added files)"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
#, fuzzy
msgid "(added provide)"
msgstr "die Datei »%s« gehört zu keinem Paket\n"
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: Öffnen fehlgeschlagen\n"
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "%s: Öffnen fehlgeschlagen\n"
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: Kann v1.0-RPM nicht signieren\n"
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: Kann v2.0-RPM nicht erneuert signieren\n"
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, fuzzy, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
#, fuzzy
msgid " (MISSING KEYS:"
msgstr " (FEHLENDE SCHLüSSEL)"
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr ""
@@ -2661,98 +2656,98 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr "Paket %s wird nicht in %s aufgeführt"
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "Es wurden keine Pakete für die Installation angegeben"
# , c-format
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, 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:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "Fehler: %s kann nicht installiert werden\n"
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
-#: lib/rpminstall.c:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
#, fuzzy
msgid "installing binary packages\n"
msgstr "Paket installieren"
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" bezeichnet mehrere Pakete\n"
# oder besser: "... verletzen" ?
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
msgid "removing these packages would break dependencies:\n"
msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "Fehler: kann %s nicht öffnen\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr "Installiere %s\n"
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
@@ -2860,7 +2855,7 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
-#: lib/rpmts.c:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
@@ -3010,36 +3005,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, fuzzy, c-format
msgid "excluding directory %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr ""
-#: lib/verify.c:330
+#: lib/verify.c:283
#, fuzzy, c-format
msgid "missing %s"
msgstr "fehlende { nach %{"
-#: lib/verify.c:426
+#: lib/verify.c:379
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: "
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr ""
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -3098,102 +3088,102 @@ msgstr "geteilt"
msgid "locked db index %s/%s\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr ""
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr "fehlende { nach %{"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr "fehlende } nach %{"
# »Tag« übersetzen??? -ke-
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr "leeres »Tag«-Format"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr "leerer »Tag«-Name"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr "unbekannter »Tag«"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr "] am Ende des Arrays erwartet"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
msgid "unexpected ]"
msgstr "unerwartete ]"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
msgid "unexpected }"
msgstr "unerwartete }"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr "? im Ausdruck erwartet"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
#, fuzzy
msgid "{ expected after ? in expression"
msgstr "{ nach ? im Ausdruck erwartet"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr "} im Ausdruck erwartet"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr ": nach ? Unterausdruck erwartet"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
#, fuzzy
msgid "{ expected after : in expression"
msgstr "{ nach : im Ausdruck erwartet"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr "| am Ende des Ausdrucks erwartet"
@@ -3216,243 +3206,253 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "kann Datei %s nicht öffnen: "
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "Fehler: kann %s nicht öffnen\n"
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
#, fuzzy
msgid "no dbpath has been set\n"
msgstr "»dbpath« ist nicht gesetzt"
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "Fehler beim Eintrag %s von %s"
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, fuzzy, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen"
# FIXME
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
# FIXME
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
-msgid "error(%d) storing record %s into %s\n"
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
# FIXME
-#: rpmdb/rpmdb.c:2416
+#: rpmdb/rpmdb.c:2450
#, fuzzy, c-format
-msgid "error(%d) removing record %s from %s\n"
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "Fehler beim Suchen nach Paket %s\n"
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
# FIXME
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, fuzzy, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr "»dbpath« ist nicht gesetzt"
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "die temporäre Datenbank %s existiert schon"
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
"Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen"
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
# , c-format
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr ""
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr ""
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr ""
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, c-format
msgid "Macro %%%s has empty body\n"
msgstr ""
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, c-format
msgid "Macro %%%s failed to expand\n"
msgstr ""
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr ""
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr ""
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, fuzzy, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr "(unbekannter Typ)"
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr ""
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, fuzzy, c-format
msgid "Unterminated %c: %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr ""
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, fuzzy, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr "Paket %s in %s nicht gefunden"
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
msgid "Target buffer overflow\n"
msgstr ""
# , c-format
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, fuzzy, c-format
msgid "File %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr ""
@@ -3585,6 +3585,10 @@ msgstr "Fehler: der FTP-Port muss eine Zahl sein\n"
msgid "failed to create %s: %s\n"
msgstr "anlegen von %s fehlgeschlagen\n"
+#, fuzzy
+#~ msgid "%s: read manifest failed: %s\n"
+#~ msgstr "%s: »readLead« fehlgeschlagen\n"
+
# , c-format
#, fuzzy
#~ msgid "bad db file %s\n"
diff --git a/po/fi.po b/po/fi.po
index ceb399c58..6819486a9 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,60 +1,60 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-05-02 21:41:47-0400\n"
-#: build.c:38
+#: build.c:39
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "puuttuvat riippuvuudet:\n"
-#: build.c:69
+#: build.c:70
#, fuzzy, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "En voi avata %s luettavaksi: %s."
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, fuzzy, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "%s:n avaus epäonnistui\n"
#. Give up
-#: build.c:168
+#: build.c:169
#, fuzzy, c-format
msgid "Failed to read spec file from %s\n"
msgstr "En voi lukea %s: %s."
-#: build.c:196
+#: build.c:197
#, fuzzy, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "En voi lukea %s: %s."
-#: build.c:236
+#: build.c:237
#, fuzzy, c-format
msgid "failed to stat %s: %m\n"
msgstr "en voinut avata %s: %s"
-#: build.c:241
+#: build.c:242
#, fuzzy, c-format
msgid "File %s is not a regular file.\n"
msgstr "%s ei vaikuta RPM-paketilta\n"
-#: build.c:250
+#: build.c:251
#, fuzzy, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr "%s ei vaikuta RPM-paketilta\n"
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:320
+#: build.c:321
#, fuzzy, c-format
msgid "Building for target %s\n"
msgstr "virhe etsittäessä pakettia %s\n"
@@ -73,258 +73,258 @@ msgstr "virhe etsittäessä pakettia %s\n"
msgid "cannot re-open payload: %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr "tulosta käytetyn rpm:n versio"
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:121
#, fuzzy
msgid "print macro expansion of <expr>+"
msgstr "tulosta käytetyn rpm:n versio"
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr "lähetä vakiotuloste <komento>:lle"
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr "käytä <hakem> ylimpänä hakemistona"
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:180
+#: rpmqv.c:183
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr ""
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "en voinut avata %s: %s"
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versio %s\n"
-#: rpmqv.c:235
+#: rpmqv.c:238
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:236
+#: rpmqv.c:239
#, fuzzy
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Tätä ohjelmaa voi vapaasti levittää GNU GPL:n puittessa"
-#: rpmqv.c:248
+#: rpmqv.c:251
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "käyttö: rpm {--help}"
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:605
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Käytä sen sijaan -e tai --erase .\n"
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr "vain yksi päämoodi voidaan määritellä"
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr "yhden tyyppinen kysely/tarkistus voidaan suorittaa kerralla"
-#: rpmqv.c:682
+#: rpmqv.c:685
#, fuzzy
msgid "unexpected query flags"
msgstr "odottamaton kyselyn lähde"
-#: rpmqv.c:685
+#: rpmqv.c:688
#, fuzzy
msgid "unexpected query format"
msgstr "odottamaton kyselyn lähde"
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr "odottamaton kyselyn lähde"
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath parametri annettu toiminnolle, joka ei käytä tietokantaa"
-#: rpmqv.c:735
+#: rpmqv.c:738
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "vain asennus tai päivitys voidaan pakottaa"
-#: rpmqv.c:737
+#: rpmqv.c:740
msgid "files may only be relocated during package installation"
msgstr "tiedostoja voidaan siirtää toiselle polulle vain asennettaessa"
-#: rpmqv.c:740
+#: rpmqv.c:743
msgid "only one of --prefix or --relocate may be used"
msgstr "vain toinen --prefix tai --relocate voidaan antaa"
-#: rpmqv.c:743
+#: rpmqv.c:746
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate: voidaan käyttää vain uusia paketteja asennettaessa"
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix: voidaan käyttää vain uusia paketteja asennettaessa"
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix parametrien pitää alkaa /-merkillä"
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h): voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr "--percent: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "vain toinen --excludedocs tai --includedocs voidaan antaa"
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:790
+#: rpmqv.c:793
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches: voidaan käyttää vain paketteja poistettaessa"
-#: rpmqv.c:798
+#: rpmqv.c:801
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:803
+#: rpmqv.c:806
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
-#: rpmqv.c:808
+#: rpmqv.c:811
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
@@ -332,7 +332,7 @@ msgid ""
msgstr ""
"--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
-#: rpmqv.c:813
+#: rpmqv.c:816
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
@@ -340,7 +340,7 @@ msgid ""
msgstr ""
"--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
-#: rpmqv.c:817
+#: rpmqv.c:820
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -349,7 +349,7 @@ msgstr ""
"--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
"tarkistettaessa"
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -357,7 +357,7 @@ msgstr ""
"--test: voidaan käyttää vain paketteja asennettaessa, poistettaessa ja "
"käännettäessä"
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -365,89 +365,89 @@ msgstr ""
"--root (-r): voidaan käyttää vain paketteja asennettaessa, poistettaessa, "
"kyseltäessä ja tietokannan uudelleenluonnissa"
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr "parametrit --root (-r):lle alettava /-merkillä"
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:868
+#: rpmqv.c:871
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: rpmqv.c:887
+#: rpmqv.c:890
#, fuzzy
msgid "pgp not found: "
msgstr "Tiedostoa ei löytynyt palvelimelta"
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr "--sign: voidaan käyttää vain paketteja käännettäessä"
-#: rpmqv.c:927
+#: rpmqv.c:930
#, fuzzy
msgid "exec failed\n"
msgstr "%s: avaus ei onnistunut\n"
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr "uudelleenkäännolle ei määritelty paketteja"
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr "käännökselle ei annettu määrittelytiedostoja"
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr "käännökselle ei määritelty tar-tiedostoja"
-#: rpmqv.c:1051
+#: rpmqv.c:1055
#, fuzzy
msgid "no packages given for erase"
msgstr "allekirjoitukselle ei määritelty paketteja"
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr "asennukselle ei määritelty paketteja"
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr "kyselylle ei annettu parametrejä"
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr "tarkistukselle ei annettu parametrejä"
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr "--querytags: odottamattomia parametrejä"
-#: rpmqv.c:1145
+#: rpmqv.c:1149
#, fuzzy
msgid "no arguments given"
msgstr "kyselylle ei annettu parametrejä"
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
#, fuzzy
msgid "Unable to open temp file.\n"
msgstr "En voi avata %s luettavaksi: %s."
@@ -660,7 +660,7 @@ msgstr "Tiedostoa ei löytynyt palvelimelta"
msgid "Could not open %%files file %s: %s\n"
msgstr "virhe: tiedostoa %s ei voi avata\n"
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, fuzzy, c-format
msgid "line: %s\n"
msgstr "en voinut avata %s: %s"
@@ -735,156 +735,156 @@ msgstr ""
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
-#: build/pack.c:83
+#: build/pack.c:85
#, fuzzy, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "en voinut avata %s: %s"
-#: build/pack.c:86
+#: build/pack.c:88
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "en voinut avata %s: %s"
-#: build/pack.c:108
+#: build/pack.c:110
#, fuzzy, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "luku epäonnistui: %s (%d)"
-#: build/pack.c:115
+#: build/pack.c:117
#, fuzzy, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "luku epäonnistui: %s (%d)"
-#: build/pack.c:218
+#: build/pack.c:220
#, fuzzy, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "virhe: tiedostoa %s ei voi avata\n"
-#: build/pack.c:225
+#: build/pack.c:227
#, fuzzy, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "virhe: tiedostoa %s ei voi avata\n"
-#: build/pack.c:232
+#: build/pack.c:234
#, fuzzy, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "virhe: tiedostoa %s ei voi avata\n"
-#: build/pack.c:239
+#: build/pack.c:241
#, fuzzy, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "virhe: tiedostoa %s ei voi avata\n"
-#: build/pack.c:247
+#: build/pack.c:249
#, fuzzy, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "virhe: tiedostoa %s ei voi avata\n"
-#: build/pack.c:262
+#: build/pack.c:264
#, fuzzy, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "virhe: tiedostoa %s ei voi avata\n"
-#: build/pack.c:290
+#: build/pack.c:292
#, fuzzy, c-format
msgid "readRPM: open %s: %s\n"
msgstr "en voinut avata %s: %s"
-#: build/pack.c:300
+#: build/pack.c:302
#, fuzzy, c-format
msgid "readRPM: read %s: %s\n"
msgstr "En voi lukea %s: %s."
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
-#: build/pack.c:337
+#: build/pack.c:339
#, fuzzy, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "virhe: %s ei vaikuta RPM paketilta\n"
-#: build/pack.c:346
+#: build/pack.c:348
#, fuzzy, c-format
msgid "readRPM: reading header from %s\n"
msgstr "virhe luettaessa tietuetta %s %s:stä"
-#: build/pack.c:475
+#: build/pack.c:477
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:494
+#: build/pack.c:496
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:504
+#: build/pack.c:506
msgid "Bad CSA data\n"
msgstr ""
-#: build/pack.c:540
+#: build/pack.c:542
#, fuzzy
msgid "Unable to write final header\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:560
+#: build/pack.c:562
#, fuzzy, c-format
msgid "Generating signature: %d\n"
msgstr "generoi PGP-allekirjoitus"
-#: build/pack.c:578
+#: build/pack.c:580
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:586
+#: build/pack.c:588
#, fuzzy, c-format
msgid "Could not open %s: %s\n"
msgstr "%s:n avaus epäonnistui\n"
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:637
+#: build/pack.c:639
#, fuzzy, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:648
+#: build/pack.c:650
#, fuzzy, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:662
+#: build/pack.c:664
#, fuzzy, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:672
+#: build/pack.c:674
#, fuzzy, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:678
+#: build/pack.c:680
#, fuzzy, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr ""
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:787
+#: build/pack.c:789
#, fuzzy, c-format
msgid "cannot create %s: %s\n"
msgstr "en voinut avata tiedostoa %s: "
@@ -1465,77 +1465,77 @@ msgstr "pgp epäonnistui"
msgid "package %s was already added, replacing with %s\n"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
#, fuzzy
msgid "(rpmrc provides)"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/depends.c:423
+#: lib/depends.c:425
#, fuzzy
msgid "(rpmlib provides)"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/depends.c:444
+#: lib/depends.c:446
#, fuzzy
msgid "(db files)"
msgstr "en voinut avata %s: %s"
-#: lib/depends.c:456
+#: lib/depends.c:458
#, fuzzy
msgid "(db provides)"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/depends.c:469
+#: lib/depends.c:471
#, fuzzy
msgid "(db package)"
msgstr "kysele kaikki paketit"
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:927
+#: lib/depends.c:931
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
#. Record all relations.
-#: lib/depends.c:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr "(ei ole luku)"
@@ -1627,50 +1627,45 @@ msgstr "en voinut avata tiedostoa %s: "
msgid "error creating temporary file %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/package.c:174
-#, c-format
-msgid "%s: bad magic\n"
-msgstr ""
-
-#: lib/package.c:182
+#: lib/package.c:181
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
"tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
-#: lib/package.c:190
+#: lib/package.c:189
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature epäonnistui\n"
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ei allekirjoitusta saatavilla\n"
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
@@ -2134,87 +2129,87 @@ msgid "generate signature"
msgstr "generoi PGP-allekirjoitus"
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, fuzzy, c-format
msgid "package %s is intended for a %s architecture"
msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n"
-#: lib/problems.c:224
+#: lib/problems.c:226
#, fuzzy, c-format
msgid "package %s is intended for a %s operating system"
msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n"
-#: lib/problems.c:229
+#: lib/problems.c:231
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/problems.c:234
+#: lib/problems.c:236
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/problems.c:239
+#: lib/problems.c:241
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:244
+#: lib/problems.c:246
#, fuzzy, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr " on ristiriidassa %s-%s-%s:n kanssa\n"
-#: lib/problems.c:249
+#: lib/problems.c:251
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n"
-#: lib/problems.c:254
+#: lib/problems.c:256
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:264
+#: lib/problems.c:266
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:269
+#: lib/problems.c:271
#, fuzzy, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n"
-#: lib/problems.c:273
+#: lib/problems.c:275
#, fuzzy, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr "paketti %s ei ole %s:ssä"
-#: lib/problems.c:277
+#: lib/problems.c:279
#, fuzzy, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr "paketti %s ei ole %s:ssä"
-#: lib/problems.c:282
+#: lib/problems.c:284
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "conflicts with"
msgstr " on ristiriidassa %s-%s-%s:n kanssa\n"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "is needed by"
msgstr "vaatii %s-%s-%s\n"
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
@@ -2229,26 +2224,26 @@ msgstr "en voinut avata tiedostoa %s: "
msgid "cannot write to %%%s %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: lib/psm.c:487
+#: lib/psm.c:485
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:603
+#: lib/psm.c:601
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: lib/psm.c:722
+#: lib/psm.c:720
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "älä suorita mitään vaiheita"
-#: lib/psm.c:888
+#: lib/psm.c:890
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "skriptin ajo epäonnistui"
-#: lib/psm.c:895
+#: lib/psm.c:897
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "skriptin ajo epäonnistui"
@@ -2292,218 +2287,218 @@ msgstr "en voinut avata %s: %s"
msgid "%s failed: %s\n"
msgstr "pgp epäonnistui"
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "virhe formaatissa: %s\n"
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr "(ei tiedostoja)"
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr ""
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr ""
-#: lib/query.c:290
+#: lib/query.c:289
#, fuzzy
msgid "not installed "
msgstr "paketti %s ei ole asennettu\n"
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr ""
-#: lib/query.c:296
+#: lib/query.c:295
#, fuzzy, c-format
msgid "(unknown %3d) "
msgstr "(tuntematon tyyppi)"
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr ""
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "paketilla ei ole nimeä"
-#: lib/query.c:466
+#: lib/query.c:465
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "virhe: en voi avata %s\n"
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "%s:n avaus ei onnistunut: %s\n"
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr "%s:n kysely ei onnistunut\n"
-#: lib/query.c:642
+#: lib/query.c:637
msgid "old format source packages cannot be queried\n"
msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n"
-#: lib/query.c:668 lib/rpminstall.c:507
+#: lib/query.c:663 lib/rpminstall.c:514
#, fuzzy, c-format
-msgid "%s: read manifest failed: %s\n"
-msgstr "%s: readLead epäonnistui\n"
+msgid "%s: not a package manifest: %s\n"
+msgstr "mikään paketti ei laukaise %s:a\n"
-#: lib/query.c:712
+#: lib/query.c:707
#, fuzzy, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "%s:n kysely ei onnistunut\n"
-#: lib/query.c:733
+#: lib/query.c:728
#, fuzzy
msgid "no packages\n"
msgstr "kysele kaikki paketit"
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "ryhmässä %s ei ole paketteja\n"
-#: lib/query.c:763
+#: lib/query.c:758
#, c-format
msgid "no package triggers %s\n"
msgstr "mikään paketti ei laukaise %s:a\n"
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "En voi lukea %s: %s."
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "mikään paketti ei laukaise %s:a\n"
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr "mikään pakettie ei tarvitse %s:a\n"
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr "mikään paketti ei tarjoa %s:a\n"
-#: lib/query.c:916
+#: lib/query.c:911
#, fuzzy, c-format
msgid "file %s: %s\n"
msgstr "en voinut avata %s: %s"
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr "virheellinen paketin numero: %s\n"
-#: lib/query.c:950
+#: lib/query.c:945
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "virheellinen paketin numero: %s\n"
-#: lib/query.c:955
+#: lib/query.c:950
#, fuzzy, c-format
msgid "record %u could not be read\n"
msgstr "tietuetta %d ei voitu lukea\n"
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, c-format
msgid "package %s is not installed\n"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
#, fuzzy
msgid "(added files)"
msgstr "en voinut avata %s: %s"
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
#, fuzzy
msgid "(added provide)"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: avaus ei onnistunut\n"
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "%s: avaus ei onnistunut\n"
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: En voi allekirjoittaa v1.0 RPM:ää\n"
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: En voi uudelleen allekirjoittaa v2.0 RPM:ää\n"
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, fuzzy, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmReadSignature epäonnistui\n"
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
#, fuzzy
msgid " (MISSING KEYS:"
msgstr "(PUUTTUVAT AVAIMET)"
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr ""
@@ -2534,96 +2529,96 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr "paketti %s ei ole %s:ssä"
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "asennukselle ei määritelty paketteja"
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, c-format
msgid "Retrieving %s\n"
msgstr "Haen: %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "virhe: %s ei voida asentaa\n"
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "ryhmässä %s ei ole paketteja\n"
-#: lib/rpminstall.c:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "puuttuvat riippuvuudet:\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
#, fuzzy
msgid "installing binary packages\n"
msgstr "asenna paketti"
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" määrittää useita paketteja\n"
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
msgid "removing these packages would break dependencies:\n"
msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "virhe: en voi avata %s\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr "Asennan: %s\n"
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "poistolle ei määritelty paketteja"
@@ -2728,7 +2723,7 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "En voi avata %s luettavaksi: %s."
-#: lib/rpmts.c:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "virhe: en voi avata %s%s/packages.rpm\n"
@@ -2878,36 +2873,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, fuzzy, c-format
msgid "excluding directory %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr ""
-#: lib/verify.c:330
+#: lib/verify.c:283
#, fuzzy, c-format
msgid "missing %s"
msgstr "puuttuva '{' '%':n jälkeen"
-#: lib/verify.c:426
+#: lib/verify.c:379
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:"
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr ""
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -2966,101 +2956,101 @@ msgstr "jaettua"
msgid "locked db index %s/%s\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr ""
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr "puuttuva '{' '%':n jälkeen"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr "puuttuva '{' '%{':n jälkeen"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr "tyhjä nimiön formaatti"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr "tyhjä nimiön nimi"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr "tuntematon nimiö"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr "']' puuttuu taulukkomäärittelyn lopusta"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
msgid "unexpected ]"
msgstr "odottamaton ']'"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
msgid "unexpected }"
msgstr "odottamaton '}'"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr "odotin '?'-merkkiä ilmauksessa"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
#, fuzzy
msgid "{ expected after ? in expression"
msgstr "odotin '{' '?'-merkin jälkeen ilmauksessa "
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr "odotin '}'-merkkiä ilmauksessa"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr "odotin ':' '?'-merkin jälkeen ali-ilmauksessa "
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
#, fuzzy
msgid "{ expected after : in expression"
msgstr "odotin '{' ':'-merkin jälkeen ilmauksessa "
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr "odotin '}'-merkkiä ilmauksen lopussa"
@@ -3083,236 +3073,246 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "en voinut avata tiedostoa %s: "
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "virhe: en voi avata %s\n"
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
#, fuzzy
msgid "no dbpath has been set\n"
msgstr "dbpath ei ole asetettu"
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "virhe luettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, fuzzy, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "virhe talletettaessa tietuetta %s %s:ään"
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "en voi lukea headeria %d:stä päivittäessä"
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
-msgid "error(%d) storing record %s into %s\n"
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "virhe talletettaessa tietuetta %s %s:ään"
-#: rpmdb/rpmdb.c:2416
+#: rpmdb/rpmdb.c:2450
#, fuzzy, c-format
-msgid "error(%d) removing record %s from %s\n"
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "virhe etsittäessä pakettia %s\n"
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, fuzzy, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr "virhe talletettaessa tietuetta %s %s:ään"
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr "dbpath ei ole asetettu"
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "väliaikainen tietokanta %s on jo olemassa"
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen"
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "en voi lisätä tietuetta %d:stä"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "en voinut avata %s: %s"
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr ""
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr ""
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr ""
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, c-format
msgid "Macro %%%s has empty body\n"
msgstr ""
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, c-format
msgid "Macro %%%s failed to expand\n"
msgstr ""
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr ""
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr ""
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, fuzzy, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr "(tuntematon tyyppi)"
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr ""
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, fuzzy, c-format
msgid "Unterminated %c: %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr ""
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, fuzzy, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr "paketti %s ei ole %s:ssä"
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
msgid "Target buffer overflow\n"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, fuzzy, c-format
msgid "File %s: %s\n"
msgstr "en voinut avata %s: %s"
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr ""
@@ -3445,6 +3445,10 @@ msgid "failed to create %s: %s\n"
msgstr "%s:n luonti epäonnistui\n"
#, fuzzy
+#~ msgid "%s: read manifest failed: %s\n"
+#~ msgstr "%s: readLead epäonnistui\n"
+
+#, fuzzy
#~ msgid "bad db file %s\n"
#~ msgstr "en voinut avata %s: %s"
diff --git a/po/fr.po b/po/fr.po
index b14c601e9..0a0853f99 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-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\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,54 +14,54 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:38
+#: build.c:39
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build.c:69
+#: build.c:70
#, fuzzy, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, fuzzy, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "impossible d'ouvrir: %s\n"
#. Give up
-#: build.c:168
+#: build.c:169
#, fuzzy, c-format
msgid "Failed to read spec file from %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build.c:196
+#: build.c:197
#, fuzzy, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build.c:236
+#: build.c:237
#, fuzzy, c-format
msgid "failed to stat %s: %m\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build.c:241
+#: build.c:242
#, fuzzy, c-format
msgid "File %s is not a regular file.\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: build.c:250
+#: build.c:251
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:320
+#: build.c:321
#, fuzzy, c-format
msgid "Building for target %s\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -79,278 +79,278 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmqv.c:108
+#: rpmqv.c:111
#, fuzzy
msgid "print the version of rpm being used"
msgstr " --version\t\t- affiche la version de rpm utilise"
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:121
#, fuzzy
msgid "print macro expansion of <expr>+"
msgstr " --version\t\t- affiche la version de rpm utilise"
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:127
#, fuzzy
msgid "use <dir> as the top level directory"
msgstr " --root <dir>\t- utilise <dir> comme rpertoire racine"
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:180
+#: rpmqv.c:183
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr ""
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:235
+#: rpmqv.c:238
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:236
+#: rpmqv.c:239
#, fuzzy
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Peut tre redistribu librement selon les termes de la GNU GPL"
-#: rpmqv.c:248
+#: rpmqv.c:251
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:605
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Utilisez de prfrence -e ou --erase.\n"
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr "un seul mode majeur peut tre spcifi"
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr "un seul type de requte/vrification peut tre effectu la fois"
-#: rpmqv.c:682
+#: rpmqv.c:685
#, fuzzy
msgid "unexpected query flags"
msgstr "source de requte inattendue"
-#: rpmqv.c:685
+#: rpmqv.c:688
#, fuzzy
msgid "unexpected query format"
msgstr "source de requte inattendue"
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr "source de requte inattendue"
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:735
+#: rpmqv.c:738
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "seules l'installation et la mise jour peuvent tre forces"
-#: rpmqv.c:737
+#: rpmqv.c:740
#, fuzzy
msgid "files may only be relocated during package installation"
msgstr ""
"--replacefiles ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:740
+#: rpmqv.c:743
#, fuzzy
msgid "only one of --prefix or --relocate may be used"
msgstr "un seul mode majeur peut tre spcifi"
-#: rpmqv.c:743
+#: rpmqv.c:746
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--clean ne peut tre spcifi que lors de la construction d'un package"
-#: rpmqv.c:746
+#: rpmqv.c:749
#, fuzzy
msgid "--prefix may only be used when installing new packages"
msgstr "--sign ne peut tre spcifi que lors de la construction d'un package"
-#: rpmqv.c:749
+#: rpmqv.c:752
#, fuzzy
msgid "arguments to --prefix must begin with a /"
msgstr "les arguments de --root (-r) doivent commencer par un /"
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr ""
"--replacefiles ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
"--replacepkgs ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:769
+#: rpmqv.c:772
#, fuzzy
msgid "--excludedocs may only be specified during package installation"
msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:773
+#: rpmqv.c:776
#, fuzzy
msgid "--includedocs may only be specified during package installation"
msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:777
+#: rpmqv.c:780
#, fuzzy
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "un seul mode majeur peut tre spcifi"
-#: rpmqv.c:781
+#: rpmqv.c:784
#, fuzzy
msgid "--ignorearch may only be specified during package installation"
msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:785
+#: rpmqv.c:788
#, fuzzy
msgid "--ignoreos may only be specified during package installation"
msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:790
+#: rpmqv.c:793
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:794
+#: rpmqv.c:797
#, fuzzy
msgid "--allmatches may only be specified during package erasure"
msgstr ""
"--replacepkgs ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:798
+#: rpmqv.c:801
#, fuzzy
msgid "--allfiles may only be specified during package installation"
msgstr ""
"--replacefiles ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:803
+#: rpmqv.c:806
#, fuzzy
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
"package"
-#: rpmqv.c:808
+#: rpmqv.c:811
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
@@ -359,7 +359,7 @@ msgstr ""
"--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
"package"
-#: rpmqv.c:813
+#: rpmqv.c:816
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
@@ -368,7 +368,7 @@ msgstr ""
"--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
"package"
-#: rpmqv.c:817
+#: rpmqv.c:820
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -377,7 +377,7 @@ msgstr ""
"--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
"package"
-#: rpmqv.c:822
+#: rpmqv.c:825
#, fuzzy
msgid ""
"--test may only be specified during package installation, erasure, and "
@@ -386,7 +386,7 @@ msgstr ""
"--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
"package"
-#: rpmqv.c:827
+#: rpmqv.c:830
#, fuzzy
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
@@ -395,90 +395,90 @@ msgstr ""
"--root (-r) ne peut tre spcifi que lors de l'installation, de la "
"dsinstallation ou de l'interrogation d'un package"
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr "les arguments de --root (-r) doivent commencer par un /"
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:868
+#: rpmqv.c:871
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:887
+#: rpmqv.c:890
#, fuzzy
msgid "pgp not found: "
msgstr "aucun package n'a t spcifi pour la dsinstallation"
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr "La vrification du mot de passe a chou\n"
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr "Mot de passe correct.\n"
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr "--sign ne peut tre spcifi que lors de la construction d'un package"
-#: rpmqv.c:927
+#: rpmqv.c:930
#, fuzzy
msgid "exec failed\n"
msgstr "La construction a chou.\n"
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr "aucun package n'a t spcifi pour la reconstruction"
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr "aucun package n'a t spcifi pour la construction"
-#: rpmqv.c:1029
+#: rpmqv.c:1033
#, fuzzy
msgid "no tar files given for build"
msgstr "aucun package n'a t spcifi pour la construction"
-#: rpmqv.c:1051
+#: rpmqv.c:1055
#, fuzzy
msgid "no packages given for erase"
msgstr "aucun package n'a t spcifi pour la dsinstallation"
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr "aucun argument n'a t fourni pour la requte"
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr "aucun argument n'a t fourni pour la vrification"
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1145
+#: rpmqv.c:1149
#, fuzzy
msgid "no arguments given"
msgstr "aucun argument n'a t fourni pour la requte"
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
#, fuzzy
msgid "Unable to open temp file.\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -686,7 +686,7 @@ msgstr "aucun package n'a t spcifi pour la dsinstallation"
msgid "Could not open %%files file %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, fuzzy, c-format
msgid "line: %s\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -761,156 +761,156 @@ msgstr ""
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
-#: build/pack.c:83
+#: build/pack.c:85
#, fuzzy, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:86
+#: build/pack.c:88
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:108
+#: build/pack.c:110
#, fuzzy, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:115
+#: build/pack.c:117
#, fuzzy, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:218
+#: build/pack.c:220
#, fuzzy, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:225
+#: build/pack.c:227
#, fuzzy, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:232
+#: build/pack.c:234
#, fuzzy, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:239
+#: build/pack.c:241
#, fuzzy, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:247
+#: build/pack.c:249
#, fuzzy, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:262
+#: build/pack.c:264
#, fuzzy, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:290
+#: build/pack.c:292
#, fuzzy, c-format
msgid "readRPM: open %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:300
+#: build/pack.c:302
#, fuzzy, c-format
msgid "readRPM: read %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:337
+#: build/pack.c:339
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr ""
-#: build/pack.c:346
+#: build/pack.c:348
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr ""
-#: build/pack.c:475
+#: build/pack.c:477
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:494
+#: build/pack.c:496
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:504
+#: build/pack.c:506
msgid "Bad CSA data\n"
msgstr ""
-#: build/pack.c:540
+#: build/pack.c:542
#, fuzzy
msgid "Unable to write final header\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:560
+#: build/pack.c:562
#, fuzzy, c-format
msgid "Generating signature: %d\n"
msgstr " --sign - genre une signature PGP"
-#: build/pack.c:578
+#: build/pack.c:580
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:586
+#: build/pack.c:588
#, fuzzy, c-format
msgid "Could not open %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:637
+#: build/pack.c:639
#, fuzzy, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:648
+#: build/pack.c:650
#, fuzzy, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:662
+#: build/pack.c:664
#, fuzzy, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:672
+#: build/pack.c:674
#, fuzzy, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:678
+#: build/pack.c:680
#, fuzzy, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr ""
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:787
+#: build/pack.c:789
#, fuzzy, c-format
msgid "cannot create %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -1496,74 +1496,74 @@ msgstr "La construction a chou.\n"
msgid "package %s was already added, replacing with %s\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:423
+#: lib/depends.c:425
msgid "(rpmlib provides)"
msgstr ""
-#: lib/depends.c:444
+#: lib/depends.c:446
#, fuzzy
msgid "(db files)"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/depends.c:456
+#: lib/depends.c:458
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:469
+#: lib/depends.c:471
#, fuzzy
msgid "(db package)"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:927
+#: lib/depends.c:931
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "impossible d'ouvrir: %s\n"
#. Record all relations.
-#: lib/depends.c:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr ""
@@ -1653,46 +1653,41 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "error creating temporary file %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:174
-#, c-format
-msgid "%s: bad magic\n"
-msgstr ""
-
-#: lib/package.c:182
+#: lib/package.c:181
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:190
+#: lib/package.c:189
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -2172,85 +2167,85 @@ msgid "generate signature"
msgstr " --sign - genre une signature PGP"
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, fuzzy, c-format
msgid "package %s is intended for a %s architecture"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/problems.c:224
+#: lib/problems.c:226
#, fuzzy, c-format
msgid "package %s is intended for a %s operating system"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/problems.c:229
+#: lib/problems.c:231
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/problems.c:234
+#: lib/problems.c:236
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/problems.c:239
+#: lib/problems.c:241
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:244
+#: lib/problems.c:246
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:249
+#: lib/problems.c:251
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/problems.c:254
+#: lib/problems.c:256
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:264
+#: lib/problems.c:266
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:269
+#: lib/problems.c:271
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:273
+#: lib/problems.c:275
#, fuzzy, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/problems.c:277
+#: lib/problems.c:279
#, fuzzy, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/problems.c:282
+#: lib/problems.c:284
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/problems.c:363
+#: lib/problems.c:365
msgid "conflicts with"
msgstr ""
-#: lib/problems.c:363
+#: lib/problems.c:365
msgid "is needed by"
msgstr ""
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
@@ -2265,27 +2260,27 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "cannot write to %%%s %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/psm.c:487
+#: lib/psm.c:485
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:603
+#: lib/psm.c:601
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr ""
" -f <file>+ - interroge le package qui appartient <file>"
-#: lib/psm.c:722
+#: lib/psm.c:720
#, c-format
msgid "%s: running %s scriptlet\n"
msgstr ""
-#: lib/psm.c:888
+#: lib/psm.c:890
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:895
+#: lib/psm.c:897
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
@@ -2329,216 +2324,216 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "%s failed: %s\n"
msgstr "La construction a chou.\n"
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr ""
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr ""
-#: lib/query.c:290
+#: lib/query.c:289
#, fuzzy
msgid "not installed "
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr ""
-#: lib/query.c:296
+#: lib/query.c:295
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr ""
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/query.c:466
+#: lib/query.c:465
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "La construction a chou.\n"
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:642
+#: lib/query.c:637
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:668 lib/rpminstall.c:507
+#: lib/query.c:663 lib/rpminstall.c:514
#, fuzzy, c-format
-msgid "%s: read manifest failed: %s\n"
-msgstr "impossible d'ouvrir: %s\n"
+msgid "%s: not a package manifest: %s\n"
+msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/query.c:712
+#: lib/query.c:707
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:733
+#: lib/query.c:728
#, fuzzy
msgid "no packages\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:763
+#: lib/query.c:758
#, fuzzy, c-format
msgid "no package triggers %s\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:916
+#: lib/query.c:911
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:950
+#: lib/query.c:945
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:955
+#: lib/query.c:950
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, fuzzy, c-format
msgid "package %s is not installed\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
#, fuzzy
msgid "(added files)"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
msgid "(added provide)"
msgstr ""
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "La construction a chou.\n"
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr ""
@@ -2569,95 +2564,95 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "aucun package n'a t spcifi pour la dsinstallation"
@@ -2762,7 +2757,7 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmts.c:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -2909,36 +2904,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, c-format
msgid "excluding directory %s\n"
msgstr ""
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr ""
-#: lib/verify.c:330
+#: lib/verify.c:283
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:426
+#: lib/verify.c:379
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "impossible d'ouvrir: %s\n"
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr ""
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -2997,101 +2987,101 @@ msgstr ""
msgid "locked db index %s/%s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr ""
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
#, fuzzy
msgid "unexpected ]"
msgstr "source de requte inattendue"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
#, fuzzy
msgid "unexpected }"
msgstr "source de requte inattendue"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr ""
@@ -3114,235 +3104,245 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, fuzzy, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "aucun package n'a t spcifi pour la dsinstallation"
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
-msgid "error(%d) storing record %s into %s\n"
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:2416
+#: rpmdb/rpmdb.c:2450
#, fuzzy, c-format
-msgid "error(%d) removing record %s from %s\n"
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, fuzzy, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr ""
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr ""
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr ""
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, c-format
msgid "Macro %%%s has empty body\n"
msgstr ""
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, c-format
msgid "Macro %%%s failed to expand\n"
msgstr ""
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr ""
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr ""
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr ""
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr ""
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, fuzzy, c-format
msgid "Unterminated %c: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr ""
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, fuzzy, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr "aucun package n'a t spcifi pour la dsinstallation"
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
msgid "Target buffer overflow\n"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, fuzzy, c-format
msgid "File %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr ""
@@ -3464,6 +3464,10 @@ msgid "failed to create %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
#, fuzzy
+#~ msgid "%s: read manifest failed: %s\n"
+#~ msgstr "impossible d'ouvrir: %s\n"
+
+#, fuzzy
#~ msgid "bad db file %s\n"
#~ msgstr "impossible d'ouvrir: %s\n"
diff --git a/po/gl.po b/po/gl.po
index 387d964c7..2e996b0cb 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-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\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"
@@ -9,53 +9,53 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: build.c:38
+#: build.c:39
msgid "Failed build dependencies:\n"
msgstr ""
-#: build.c:69
+#: build.c:70
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr ""
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr ""
#. Give up
-#: build.c:168
+#: build.c:169
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr ""
-#: build.c:196
+#: build.c:197
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr ""
-#: build.c:236
+#: build.c:237
#, c-format
msgid "failed to stat %s: %m\n"
msgstr ""
-#: build.c:241
+#: build.c:242
#, c-format
msgid "File %s is not a regular file.\n"
msgstr ""
-#: build.c:250
+#: build.c:251
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:320
+#: build.c:321
#, c-format
msgid "Building for target %s\n"
msgstr ""
@@ -73,357 +73,357 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:121
msgid "print macro expansion of <expr>+"
msgstr ""
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:180
+#: rpmqv.c:183
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr ""
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:235
+#: rpmqv.c:238
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:236
+#: rpmqv.c:239
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:248
+#: rpmqv.c:251
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:605
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:682
+#: rpmqv.c:685
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:685
+#: rpmqv.c:688
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:735
+#: rpmqv.c:738
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:737
+#: rpmqv.c:740
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:740
+#: rpmqv.c:743
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:743
+#: rpmqv.c:746
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:793
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:798
+#: rpmqv.c:801
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:806
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:808
+#: rpmqv.c:811
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:813
+#: rpmqv.c:816
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:820
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:868
+#: rpmqv.c:871
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:887
+#: rpmqv.c:890
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:927
+#: rpmqv.c:930
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1051
+#: rpmqv.c:1055
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1145
+#: rpmqv.c:1149
msgid "no arguments given"
msgstr ""
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
msgid "Unable to open temp file.\n"
msgstr ""
@@ -630,7 +630,7 @@ msgstr ""
msgid "Could not open %%files file %s: %s\n"
msgstr ""
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, c-format
msgid "line: %s\n"
msgstr ""
@@ -705,152 +705,152 @@ msgstr ""
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
-#: build/pack.c:83
+#: build/pack.c:85
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr ""
-#: build/pack.c:86
+#: build/pack.c:88
#, c-format
msgid "create archive failed: %s\n"
msgstr ""
-#: build/pack.c:108
+#: build/pack.c:110
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr ""
-#: build/pack.c:115
+#: build/pack.c:117
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr ""
-#: build/pack.c:218
+#: build/pack.c:220
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr ""
-#: build/pack.c:225
+#: build/pack.c:227
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr ""
-#: build/pack.c:232
+#: build/pack.c:234
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr ""
-#: build/pack.c:239
+#: build/pack.c:241
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr ""
-#: build/pack.c:247
+#: build/pack.c:249
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr ""
-#: build/pack.c:262
+#: build/pack.c:264
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr ""
-#: build/pack.c:290
+#: build/pack.c:292
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr ""
-#: build/pack.c:300
+#: build/pack.c:302
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr ""
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr ""
-#: build/pack.c:337
+#: build/pack.c:339
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr ""
-#: build/pack.c:346
+#: build/pack.c:348
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr ""
-#: build/pack.c:475
+#: build/pack.c:477
msgid "Unable to create immutable header region.\n"
msgstr ""
-#: build/pack.c:494
+#: build/pack.c:496
msgid "Unable to write temp header\n"
msgstr ""
-#: build/pack.c:504
+#: build/pack.c:506
msgid "Bad CSA data\n"
msgstr ""
-#: build/pack.c:540
+#: build/pack.c:542
msgid "Unable to write final header\n"
msgstr ""
-#: build/pack.c:560
+#: build/pack.c:562
#, c-format
msgid "Generating signature: %d\n"
msgstr ""
-#: build/pack.c:578
+#: build/pack.c:580
msgid "Unable to reload signature header.\n"
msgstr ""
-#: build/pack.c:586
+#: build/pack.c:588
#, c-format
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
-#: build/pack.c:637
+#: build/pack.c:639
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr ""
-#: build/pack.c:648
+#: build/pack.c:650
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr ""
-#: build/pack.c:662
+#: build/pack.c:664
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr ""
-#: build/pack.c:672
+#: build/pack.c:674
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr ""
-#: build/pack.c:678
+#: build/pack.c:680
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr ""
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr ""
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:787
+#: build/pack.c:789
#, c-format
msgid "cannot create %s: %s\n"
msgstr ""
@@ -1409,72 +1409,72 @@ msgstr ""
msgid "package %s was already added, replacing with %s\n"
msgstr ""
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:423
+#: lib/depends.c:425
msgid "(rpmlib provides)"
msgstr ""
-#: lib/depends.c:444
+#: lib/depends.c:446
msgid "(db files)"
msgstr ""
-#: lib/depends.c:456
+#: lib/depends.c:458
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:469
+#: lib/depends.c:471
msgid "(db package)"
msgstr ""
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:927
+#: lib/depends.c:931
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr ""
@@ -1564,46 +1564,41 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:174
-#, c-format
-msgid "%s: bad magic\n"
-msgstr ""
-
-#: lib/package.c:182
+#: lib/package.c:181
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:190
+#: lib/package.c:189
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2012,85 +2007,85 @@ msgid "generate signature"
msgstr ""
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, c-format
msgid "package %s is intended for a %s architecture"
msgstr ""
-#: lib/problems.c:224
+#: lib/problems.c:226
#, c-format
msgid "package %s is intended for a %s operating system"
msgstr ""
-#: lib/problems.c:229
+#: lib/problems.c:231
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:234
+#: lib/problems.c:236
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:239
+#: lib/problems.c:241
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:244
+#: lib/problems.c:246
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:249
+#: lib/problems.c:251
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:254
+#: lib/problems.c:256
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:264
+#: lib/problems.c:266
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:269
+#: lib/problems.c:271
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:273
+#: lib/problems.c:275
#, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr ""
-#: lib/problems.c:277
+#: lib/problems.c:279
#, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr ""
-#: lib/problems.c:282
+#: lib/problems.c:284
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/problems.c:363
+#: lib/problems.c:365
msgid "conflicts with"
msgstr ""
-#: lib/problems.c:363
+#: lib/problems.c:365
msgid "is needed by"
msgstr ""
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
@@ -2105,25 +2100,25 @@ msgstr ""
msgid "cannot write to %%%s %s\n"
msgstr ""
-#: lib/psm.c:487
+#: lib/psm.c:485
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:603
+#: lib/psm.c:601
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:722
+#: lib/psm.c:720
#, c-format
msgid "%s: running %s scriptlet\n"
msgstr ""
-#: lib/psm.c:888
+#: lib/psm.c:890
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:895
+#: lib/psm.c:897
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
@@ -2167,211 +2162,211 @@ msgstr ""
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr ""
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr ""
-#: lib/query.c:290
+#: lib/query.c:289
msgid "not installed "
msgstr ""
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr ""
-#: lib/query.c:296
+#: lib/query.c:295
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr ""
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:466
+#: lib/query.c:465
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:642
+#: lib/query.c:637
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:668 lib/rpminstall.c:507
+#: lib/query.c:663 lib/rpminstall.c:514
#, c-format
-msgid "%s: read manifest failed: %s\n"
+msgid "%s: not a package manifest: %s\n"
msgstr ""
-#: lib/query.c:712
+#: lib/query.c:707
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:733
+#: lib/query.c:728
msgid "no packages\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:763
+#: lib/query.c:758
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, c-format
msgid "malformed %s: %s\n"
msgstr ""
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, c-format
msgid "no package matches %s: %s\n"
msgstr ""
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:916
+#: lib/query.c:911
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:950
+#: lib/query.c:945
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:955
+#: lib/query.c:950
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, c-format
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
msgid "(added files)"
msgstr ""
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
msgid "(added provide)"
msgstr ""
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr ""
@@ -2402,93 +2397,93 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2593,7 +2588,7 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/rpmts.c:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
@@ -2733,36 +2728,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, c-format
msgid "excluding directory %s\n"
msgstr ""
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr ""
-#: lib/verify.c:330
+#: lib/verify.c:283
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:426
+#: lib/verify.c:379
#, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr ""
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr ""
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -2821,99 +2811,99 @@ msgstr ""
msgid "locked db index %s/%s\n"
msgstr ""
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr ""
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
msgid "unexpected ]"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
msgid "unexpected }"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr ""
@@ -2934,235 +2924,245 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr ""
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "cannot open %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
+#: rpmdb/rpmdb.c:2440
#, c-format
-msgid "error(%d) storing record %s into %s\n"
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2416
+#: rpmdb/rpmdb.c:2450
#, c-format
-msgid "error(%d) removing record %s from %s\n"
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr ""
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr ""
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr ""
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, c-format
msgid "Macro %%%s has empty body\n"
msgstr ""
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, c-format
msgid "Macro %%%s failed to expand\n"
msgstr ""
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr ""
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr ""
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr ""
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr ""
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, c-format
msgid "Unterminated %c: %s\n"
msgstr ""
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr ""
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr ""
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
msgid "Target buffer overflow\n"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, c-format
msgid "File %s: %s\n"
msgstr ""
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr ""
diff --git a/po/is.po b/po/is.po
index 1b79a0579..8052847be 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-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\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"
@@ -9,54 +9,54 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:38
+#: build.c:39
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "gat ekki útbúið pakkaskilyrði:\n"
-#: build.c:69
+#: build.c:70
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "Get ekki opnað spec skrána %s: %s\n"
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "Gat ekki opnað pípu í tar: %m\n"
#. Give up
-#: build.c:168
+#: build.c:169
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr "Gat ekki lesið spec skrá frá %s\n"
-#: build.c:196
+#: build.c:197
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "Gat ekki endurnefnt %s sem %s: %m\n"
-#: build.c:236
+#: build.c:237
#, c-format
msgid "failed to stat %s: %m\n"
msgstr "gat ekki skoðað %s: %m\n"
-#: build.c:241
+#: build.c:242
#, c-format
msgid "File %s is not a regular file.\n"
msgstr "Skráin %s er ekki venjuleg skrá.\n"
-#: build.c:250
+#: build.c:251
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr "Skráin %s virðist ekki vera specskrá.\n"
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Þýði fyrir markkerfi: %s\n"
-#: build.c:320
+#: build.c:321
#, c-format
msgid "Building for target %s\n"
msgstr "Þýði fyrir markkerfi %s\n"
@@ -74,358 +74,358 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr "prenta útgáfunúmer rpm sem verið er að nota"
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr "skilgreina fjölva <nafn> með gildinu <gildi>"
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr "'<nafn> <gildi>'"
-#: rpmqv.c:118
+#: rpmqv.c:121
msgid "print macro expansion of <expr>+"
msgstr "prenta útvíkkun fjölva <expr>+"
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr "<expr>+"
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr "senda frálag í <skipun>"
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr "sýna endanlega rpmrc og stillingar fjölva"
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:180
+#: rpmqv.c:183
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr ""
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr "RPM útgáfa %s\n"
-#: rpmqv.c:235
+#: rpmqv.c:238
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Höfundarréttur (C) 1998-2000 - Red Hat Inc"
-#: rpmqv.c:236
+#: rpmqv.c:239
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Þessu má dreifa frjálst samkvæmt skilmálum GNU GPL"
-#: rpmqv.c:248
+#: rpmqv.c:251
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:605
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:682
+#: rpmqv.c:685
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:685
+#: rpmqv.c:688
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:735
+#: rpmqv.c:738
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:737
+#: rpmqv.c:740
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:740
+#: rpmqv.c:743
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:743
+#: rpmqv.c:746
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:793
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:798
+#: rpmqv.c:801
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:806
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:808
+#: rpmqv.c:811
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:813
+#: rpmqv.c:816
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:820
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:868
+#: rpmqv.c:871
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:887
+#: rpmqv.c:890
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:927
+#: rpmqv.c:930
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1051
+#: rpmqv.c:1055
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1145
+#: rpmqv.c:1149
msgid "no arguments given"
msgstr ""
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
msgid "Unable to open temp file.\n"
msgstr "Get ekki opnað tempi skrá.\n"
@@ -632,7 +632,7 @@ msgstr "Skráin fannst ekki með 'glob': %s\n"
msgid "Could not open %%files file %s: %s\n"
msgstr "Gat ekki opnað %%files skrána %s: %s\n"
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, c-format
msgid "line: %s\n"
msgstr "lína: %s\n"
@@ -707,156 +707,156 @@ msgstr ""
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
-#: build/pack.c:83
+#: build/pack.c:85
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "safnskráarsmíð brást á skrá %s: %s\n"
-#: build/pack.c:86
+#: build/pack.c:88
#, c-format
msgid "create archive failed: %s\n"
msgstr "safnskráarsmíð brást: %s\n"
-#: build/pack.c:108
+#: build/pack.c:110
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr ""
-#: build/pack.c:115
+#: build/pack.c:117
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr ""
-#: build/pack.c:218
+#: build/pack.c:220
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "Gat ekki opnað PreIn skrá: %s\n"
-#: build/pack.c:225
+#: build/pack.c:227
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "Gat ekki opnað PreUn skrá: %s\n"
-#: build/pack.c:232
+#: build/pack.c:234
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "Gat ekki opnað PostIn skrá: %s\n"
-#: build/pack.c:239
+#: build/pack.c:241
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "Gat ekki opnað PostUn skrá: %s\n"
-#: build/pack.c:247
+#: build/pack.c:249
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "Get ekki opnað VerifyScript skrá: %s\n"
-#: build/pack.c:262
+#: build/pack.c:264
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr ""
-#: build/pack.c:290
+#: build/pack.c:292
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr ""
-#: build/pack.c:300
+#: build/pack.c:302
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr ""
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: Fseek brást: %s\n"
-#: build/pack.c:337
+#: build/pack.c:339
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr ""
-#: build/pack.c:346
+#: build/pack.c:348
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr ""
-#: build/pack.c:475
+#: build/pack.c:477
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "Get ekki lesið haus úr %s: %s\n"
-#: build/pack.c:494
+#: build/pack.c:496
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "Gat ekki ritað haus í %s: %s\n"
-#: build/pack.c:504
+#: build/pack.c:506
msgid "Bad CSA data\n"
msgstr ""
-#: build/pack.c:540
+#: build/pack.c:542
#, fuzzy
msgid "Unable to write final header\n"
msgstr "Gat ekki ritað haus í %s: %s\n"
-#: build/pack.c:560
+#: build/pack.c:562
#, c-format
msgid "Generating signature: %d\n"
msgstr ""
-#: build/pack.c:578
+#: build/pack.c:580
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "Get ekki lesið haus úr %s: %s\n"
-#: build/pack.c:586
+#: build/pack.c:588
#, c-format
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Get ekki ritað í pakka: %s\n"
-#: build/pack.c:637
+#: build/pack.c:639
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Get ekki opnað sigtarget %s: %s\n"
-#: build/pack.c:648
+#: build/pack.c:650
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "Get ekki lesið haus úr %s: %s\n"
-#: build/pack.c:662
+#: build/pack.c:664
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Gat ekki ritað haus í %s: %s\n"
-#: build/pack.c:672
+#: build/pack.c:674
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Get ekki lesið innihald %s: %s\n"
-#: build/pack.c:678
+#: build/pack.c:680
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Get ekki ritað innihald í %s: %s\n"
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr "Skrifaði: %s\n"
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:787
+#: build/pack.c:789
#, c-format
msgid "cannot create %s: %s\n"
msgstr ""
@@ -1416,73 +1416,73 @@ msgstr ""
msgid "package %s was already added, replacing with %s\n"
msgstr ""
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:423
+#: lib/depends.c:425
msgid "(rpmlib provides)"
msgstr ""
-#: lib/depends.c:444
+#: lib/depends.c:446
msgid "(db files)"
msgstr ""
-#: lib/depends.c:456
+#: lib/depends.c:458
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:469
+#: lib/depends.c:471
#, fuzzy
msgid "(db package)"
msgstr "uppfæra pakka"
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:927
+#: lib/depends.c:931
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr ""
@@ -1572,46 +1572,41 @@ msgstr "%s búið til sem %s\n"
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:174
-#, c-format
-msgid "%s: bad magic\n"
-msgstr ""
-
-#: lib/package.c:182
+#: lib/package.c:181
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:190
+#: lib/package.c:189
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: Fseek brást: %s\n"
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2030,85 +2025,85 @@ msgid "generate signature"
msgstr "búa til undirskrift"
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, c-format
msgid "package %s is intended for a %s architecture"
msgstr ""
-#: lib/problems.c:224
+#: lib/problems.c:226
#, c-format
msgid "package %s is intended for a %s operating system"
msgstr ""
-#: lib/problems.c:229
+#: lib/problems.c:231
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:234
+#: lib/problems.c:236
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:239
+#: lib/problems.c:241
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:244
+#: lib/problems.c:246
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:249
+#: lib/problems.c:251
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:254
+#: lib/problems.c:256
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:264
+#: lib/problems.c:266
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:269
+#: lib/problems.c:271
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:273
+#: lib/problems.c:275
#, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr ""
-#: lib/problems.c:277
+#: lib/problems.c:279
#, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr ""
-#: lib/problems.c:282
+#: lib/problems.c:284
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/problems.c:363
+#: lib/problems.c:365
msgid "conflicts with"
msgstr ""
-#: lib/problems.c:363
+#: lib/problems.c:365
msgid "is needed by"
msgstr ""
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
@@ -2123,25 +2118,25 @@ msgstr "gat ekki búið til %%%s %s\n"
msgid "cannot write to %%%s %s\n"
msgstr "get ekki ritað í %%%s %s\n"
-#: lib/psm.c:487
+#: lib/psm.c:485
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:603
+#: lib/psm.c:601
msgid "source package contains no .spec file\n"
msgstr "pakkinn inniheldur enga .spec skrá\n"
-#: lib/psm.c:722
+#: lib/psm.c:720
#, c-format
msgid "%s: running %s scriptlet\n"
msgstr ""
-#: lib/psm.c:888
+#: lib/psm.c:890
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:895
+#: lib/psm.c:897
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
@@ -2185,211 +2180,211 @@ msgstr "gat ekki opnað %s: %s\n"
msgid "%s failed: %s\n"
msgstr "%s brást\n"
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr ""
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr ""
-#: lib/query.c:290
+#: lib/query.c:289
msgid "not installed "
msgstr ""
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr ""
-#: lib/query.c:296
+#: lib/query.c:295
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr ""
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:466
+#: lib/query.c:465
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:642
+#: lib/query.c:637
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:668 lib/rpminstall.c:507
-#, c-format
-msgid "%s: read manifest failed: %s\n"
-msgstr "%s: gat ekki lesið manifest: %s\n"
+#: lib/query.c:663 lib/rpminstall.c:514
+#, fuzzy, c-format
+msgid "%s: not a package manifest: %s\n"
+msgstr "gat ekki búið til %%%s %s\n"
-#: lib/query.c:712
+#: lib/query.c:707
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:733
+#: lib/query.c:728
msgid "no packages\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:763
+#: lib/query.c:758
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "Get ekki lesið %s: %s.\n"
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "gat ekki búið til %%%s %s\n"
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:916
+#: lib/query.c:911
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:950
+#: lib/query.c:945
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:955
+#: lib/query.c:950
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, c-format
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
msgid "(added files)"
msgstr ""
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
msgid "(added provide)"
msgstr ""
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: Fseek brást: %s\n"
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr ""
@@ -2420,94 +2415,94 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "gat ekki útbúið pakkaskilyrði:\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2612,7 +2607,7 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Get ekki opnað %s til lesturs: %s.\n"
-#: lib/rpmts.c:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "get ekki opnað pakka gagnagrunn í\n"
@@ -2752,36 +2747,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, c-format
msgid "excluding directory %s\n"
msgstr ""
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr ""
-#: lib/verify.c:330
+#: lib/verify.c:283
#, c-format
msgid "missing %s"
msgstr "vantar %s"
-#: lib/verify.c:426
+#: lib/verify.c:379
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "Óuppfyllt pakkaskilyrði fyrir %s-%s-%s: "
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr ""
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -2840,99 +2830,99 @@ msgstr "deildann"
msgid "locked db index %s/%s\n"
msgstr ""
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr ""
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
msgid "unexpected ]"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
msgid "unexpected }"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr ""
@@ -2953,235 +2943,245 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "get ekki opnað %s index með db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "cannot open %s index\n"
msgstr "get ekki opnað %s index\n"
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
+#: rpmdb/rpmdb.c:2440
#, c-format
-msgid "error(%d) storing record %s into %s\n"
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2416
+#: rpmdb/rpmdb.c:2450
#, c-format
-msgid "error(%d) removing record %s from %s\n"
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== virkt %d tómt %d\n"
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr "%3d>%*s(tómt)"
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr "%3d<%*s(tómt)\n"
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr ""
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr ""
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr ""
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, c-format
msgid "Macro %%%s has empty body\n"
msgstr ""
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, c-format
msgid "Macro %%%s failed to expand\n"
msgstr ""
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr ""
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr ""
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr "Óþekkt viðfang %c í %s(%s)\n"
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr ""
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, c-format
msgid "Unterminated %c: %s\n"
msgstr ""
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr ""
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr "Fjölvi %%%.*s fannst ekki. Sleppi\n"
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
msgid "Target buffer overflow\n"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, c-format
msgid "File %s: %s\n"
msgstr "Skrá %s: %s\n"
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr "Skráin %s er minni en %u bæti\n"
@@ -3302,6 +3302,9 @@ msgstr "gátt slóðar verður að vera tala\n"
msgid "failed to create %s: %s\n"
msgstr "gat ekki búið til %s: %s\n"
+#~ msgid "%s: read manifest failed: %s\n"
+#~ msgstr "%s: gat ekki lesið manifest: %s\n"
+
#~ msgid "cannot get %s lock on database\n"
#~ msgstr "get ekki fengið %s lás á gagnagrunninn\n"
diff --git a/po/ja.po b/po/ja.po
index 1018fd6b5..5e8e57a9a 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-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\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"
@@ -14,54 +14,54 @@ msgstr ""
"Content-Type: text/plain; charset=EUC-JP\n"
"Content-Transfer-Encoding: EUC-JP\n"
-#: build.c:38
+#: build.c:39
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "°Í¸À­¤Î·çÇ¡:\n"
-#: build.c:69
+#: build.c:70
#, fuzzy, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "spec ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, fuzzy, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "tar ¥Ñ¥¤¥×¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n"
#. Give up
-#: build.c:168
+#: build.c:169
#, fuzzy, c-format
msgid "Failed to read spec file from %s\n"
msgstr "%s ¤«¤é spec ¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: build.c:196
+#: build.c:197
#, fuzzy, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "%s ¤ò %s ¤Ë¤¹¤ë̾Á°¤ÎÊѹ¹¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: build.c:236
+#: build.c:237
#, fuzzy, c-format
msgid "failed to stat %s: %m\n"
msgstr "stat %s ¤Ë¼ºÇÔ: %s"
-#: build.c:241
+#: build.c:242
#, fuzzy, c-format
msgid "File %s is not a regular file.\n"
msgstr "ÉáÄ̤Υե¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s\n"
-#: build.c:250
+#: build.c:251
#, fuzzy, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï ¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹¡£\n"
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr "ºîÀ®Ã楿¡¼¥²¥Ã¥È¥×¥é¥Ã¥È¥Õ¥©¡¼¥à: %s\n"
-#: build.c:320
+#: build.c:321
#, fuzzy, c-format
msgid "Building for target %s\n"
msgstr "¥¿¡¼¥²¥Ã¥È %s ÍѤ˺îÀ®Ãæ\n"
@@ -81,124 +81,124 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤«¤é¥Ø¥Ã¥À¤ÎÆɤ߹þ¤ß¤Î¥¨¥é¡¼\n"
msgid "cannot re-open payload: %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹"
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:121
#, fuzzy
msgid "print macro expansion of <expr>+"
msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹"
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr "ɸ½à½ÐÎϤò <cmd> ¤Ø¥Ñ¥¤¥×¤·¤Þ¤¹"
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr "¥È¥Ã¥×¥Ç¥£¥ì¥¯¥È¥ê¤È¤·¤Æ <dir> ¤ò»ÈÍѤ·¤Þ¤¹"
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:180
+#: rpmqv.c:183
#, fuzzy
msgid "Signature options:"
msgstr "½ð̾¥µ¥¤¥º: %d\n"
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr ""
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s: %s\n"
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr "RPM ¥Ð¡¼¥¸¥ç¥ó %s\n"
-#: rpmqv.c:235
+#: rpmqv.c:238
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
@@ -206,72 +206,72 @@ msgstr ""
"ËÝÌõ¼Ô ¿ÀÅÄ ½¼ <kanda@nn.iij4u.or.jp>\n"
"¸íÌõÅù¤Ï¿ÀÅĤޤÇ"
-#: rpmqv.c:236
+#: rpmqv.c:239
#, fuzzy
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "GNU°ìÈ̸øÍ­»ÈÍѵöÂú½ñ¤Î²¼¤Ç¼«Í³¤ËÇÛÉۤǤ­¤Þ¤¹"
-#: rpmqv.c:248
+#: rpmqv.c:251
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "»ÈÍÑË¡: rpm {--help}"
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:605
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "-e ¤« --erase ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤\n"
-#: rpmqv.c:608
+#: rpmqv.c:611
#, fuzzy, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "°ú¿ô½èÍý(%d)¤Ç¤ÎÆâÉô¥¨¥é¡¼ :-(\n"
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr "°ì¤Ä¤Î¥á¥¸¥ã¡¼¥â¡¼¥É¤Î¤ß¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤"
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr "Ì䤤¹ç¤ï¤»/¸¡¾Ú¤Ï°ìÅ٤˰ì¤Ä¤·¤«¼Â¹Ô¤Ç¤­¤Þ¤»¤ó"
-#: rpmqv.c:682
+#: rpmqv.c:685
#, fuzzy
msgid "unexpected query flags"
msgstr "ͽ´ü¤»¤ÌÌ䤤¹ç¤ï¤»¤Î¥Õ¥é¥°"
-#: rpmqv.c:685
+#: rpmqv.c:688
#, fuzzy
msgid "unexpected query format"
msgstr "ͽ´ü¤»¤ÌÌ䤤¹ç¤ï¤»¤Î¥Õ¥©¡¼¥Þ¥Ã¥È"
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr "ͽ´ü¤»¤ÌÌ䤤¹ç¤ï¤»¤Î¥½¡¼¥¹"
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò»ÈÍѤ·¤Ê¤¤¤Î¤Ë --dbpath ¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤¹"
-#: rpmqv.c:735
+#: rpmqv.c:738
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"¥¤¥ó¥¹¥È¡¼¥ë¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¡¢¥½¡¼¥¹ºï½ü¡¢¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ëºï½ü»þ¤Î¤ß¶¯À©¤Ç¤­"
"¤Þ¤¹"
-#: rpmqv.c:737
+#: rpmqv.c:740
msgid "files may only be relocated during package installation"
msgstr "¥Õ¥¡¥¤¥ë¤Ï¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ßºÆÇÛÃ֤Ǥ­¤Þ¤¹"
-#: rpmqv.c:740
+#: rpmqv.c:743
msgid "only one of --prefix or --relocate may be used"
msgstr "--prefix ¤â¤·¤¯¤Ï --relocate ¤Î¤¤¤º¤ì¤«¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
-#: rpmqv.c:743
+#: rpmqv.c:746
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
@@ -279,82 +279,82 @@ msgstr ""
"--relocate ¤È --excludepath ¤Ï¿·¤·¤¤¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¤­¤Î¤ß»ÈÍÑ"
"¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix ¤Ï¿·µ¬¤Ë¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¤­¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix ¤Ø¤Î°ú¿ô¤Ï / ¤«¤é»Ï¤Þ¤é¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó"
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr "--percent ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "--excludedocs ¤È --includedocs ¤Ï¤É¤Á¤é¤«°ìÊý¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr "-ignoreos ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:790
+#: rpmqv.c:793
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "-ignoresize ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Îºï½ü»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:798
+#: rpmqv.c:801
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:803
+#: rpmqv.c:806
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:808
+#: rpmqv.c:811
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:813
+#: rpmqv.c:816
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:817
+#: rpmqv.c:820
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -362,13 +362,13 @@ msgid ""
msgstr ""
"--nodeps ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤ÎºîÀ®¡¢¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢¸¡¾Ú»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢ºîÀ®»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -376,88 +376,88 @@ msgstr ""
"--root (-r) ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢Ì䤤¹ç¤ï¤»¡¢¥Ç¡¼¥¿¥Ù¡¼¥¹ºÆ¹½ÃÛ»þ¤Î¤ß»ØÄê¤Ç"
"¤­¤Þ¤¹"
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) ¤Î°ú¿ô¤Ï / ¤«¤é»Ï¤Þ¤é¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó"
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr "½ð̾¤¹¤ë¤¿¤á¤Î¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó\n"
-#: rpmqv.c:868
+#: rpmqv.c:871
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó\n"
-#: rpmqv.c:887
+#: rpmqv.c:890
#, fuzzy
msgid "pgp not found: "
msgstr "pgp ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: "
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¥Á¥§¥Ã¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÏÀµ¾ï¤Ç¤¹¡¥\n"
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ëÃæ¤Î̵¸ú¤Ê %%_signature ¡£\n"
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr "--sign ¤Ï¥Ñ¥Ã¥±¡¼¥¸ºîÀ®»þ¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
-#: rpmqv.c:927
+#: rpmqv.c:930
msgid "exec failed\n"
msgstr "¼Â¹Ô¼ºÇÔ\n"
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr "ºÆºîÀ®¤¹¤ë¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr "ºîÀ®¤Î¤¿¤á¤Î spec ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr "ºîÀ®(build)¤Î¤¿¤á¤Î tar ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1051
+#: rpmqv.c:1055
#, fuzzy
msgid "no packages given for erase"
msgstr "½ð̾¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr "¸¡¾Ú¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr "--querytags ¤Î°ú¿ô¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
-#: rpmqv.c:1145
+#: rpmqv.c:1149
#, fuzzy
msgid "no arguments given"
msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
#, fuzzy
msgid "Unable to open temp file.\n"
msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
@@ -677,7 +677,7 @@ msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó(by glob): %s"
msgid "Could not open %%files file %s: %s\n"
msgstr "%%files ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, fuzzy, c-format
msgid "line: %s\n"
msgstr "¹ÔÌÜ: %s"
@@ -752,157 +752,157 @@ msgstr ""
msgid "Could not canonicalize hostname: %s\n"
msgstr "¥Û¥¹¥È̾¤òÀµ¼°¤Ê¤â¤Î¤Ë¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: build/pack.c:83
+#: build/pack.c:85
#, fuzzy, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤Ç¥¢¡¼¥«¥¤¥Ö¤ÎºîÀ®¤Ë¼ºÇÔ: %s"
-#: build/pack.c:86
+#: build/pack.c:88
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤Ç¥¢¡¼¥«¥¤¥Ö¤ÎºîÀ®¤Ë¼ºÇÔ: %s"
-#: build/pack.c:108
+#: build/pack.c:110
#, fuzzy, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "cpio_copy ¤Ç½ñ¤­¹þ¤ß¼ºÇÔ: %s"
-#: build/pack.c:115
+#: build/pack.c:117
#, fuzzy, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "cpio_copy ¤ÇÆɤ߹þ¤ß¼ºÇÔ: %s"
-#: build/pack.c:218
+#: build/pack.c:220
#, fuzzy, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "PreIn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-#: build/pack.c:225
+#: build/pack.c:227
#, fuzzy, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "PreUn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-#: build/pack.c:232
+#: build/pack.c:234
#, fuzzy, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "PostIn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-#: build/pack.c:239
+#: build/pack.c:241
#, fuzzy, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "PostUn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-#: build/pack.c:247
+#: build/pack.c:249
#, fuzzy, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "VerifyScript ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-#: build/pack.c:262
+#: build/pack.c:264
#, fuzzy, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "¥È¥ê¥¬¡¼¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-#: build/pack.c:290
+#: build/pack.c:292
#, fuzzy, c-format
msgid "readRPM: open %s: %s\n"
msgstr "readRPM: %s ¤Î¥ª¡¼¥×¥ó: %s\n"
-#: build/pack.c:300
+#: build/pack.c:302
#, fuzzy, c-format
msgid "readRPM: read %s: %s\n"
msgstr "readRPM: %s ¤ÎÆɤ߹þ¤ß: %s\n"
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: build/pack.c:337
+#: build/pack.c:339
#, fuzzy, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s ¤Ï RPM ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
-#: build/pack.c:346
+#: build/pack.c:348
#, fuzzy, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: %s ¤«¤é¤Î¥Ø¥Ã¥À¤ÎÆɤ߹þ¤ß\n"
-#: build/pack.c:475
+#: build/pack.c:477
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s"
-#: build/pack.c:494
+#: build/pack.c:496
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
-#: build/pack.c:504
+#: build/pack.c:506
#, fuzzy
msgid "Bad CSA data\n"
msgstr "ÉÔÀµ¤Ê CSA ¥Ç¡¼¥¿"
-#: build/pack.c:540
+#: build/pack.c:542
#, fuzzy
msgid "Unable to write final header\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
-#: build/pack.c:560
+#: build/pack.c:562
#, c-format
msgid "Generating signature: %d\n"
msgstr "½ð̾¤ÎÀ¸À®Ãæ: %d\n"
-#: build/pack.c:578
+#: build/pack.c:580
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s"
-#: build/pack.c:586
+#: build/pack.c:588
#, fuzzy, c-format
msgid "Could not open %s: %s\n"
msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
-#: build/pack.c:637
+#: build/pack.c:639
#, fuzzy, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "sigtarget ¤ÎÆɤ߹þ¤ß¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-#: build/pack.c:648
+#: build/pack.c:650
#, fuzzy, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s"
-#: build/pack.c:662
+#: build/pack.c:664
#, fuzzy, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
-#: build/pack.c:672
+#: build/pack.c:674
#, fuzzy, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s"
-#: build/pack.c:678
+#: build/pack.c:680
#, fuzzy, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr "½ñ¤­¹þ¤ßÃæ: %s\n"
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î ½ÐÎÏ¥Õ¥¡¥¤¥ë̾¤òÀ¸À®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s\n"
-#: build/pack.c:787
+#: build/pack.c:789
#, fuzzy, c-format
msgid "cannot create %s: %s\n"
msgstr "%s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
@@ -1488,77 +1488,77 @@ msgstr "¼ºÇÔ - "
msgid "package %s was already added, replacing with %s\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
-#: lib/depends.c:423
+#: lib/depends.c:425
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
-#: lib/depends.c:444
+#: lib/depends.c:446
#, fuzzy
msgid "(db files)"
msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s"
-#: lib/depends.c:456
+#: lib/depends.c:458
#, fuzzy
msgid "(db provides)"
msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
-#: lib/depends.c:469
+#: lib/depends.c:471
#, fuzzy
msgid "(db package)"
msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n"
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:927
+#: lib/depends.c:931
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
#. Record all relations.
-#: lib/depends.c:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr "(¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)"
@@ -1650,50 +1650,45 @@ msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆºîÀ®¤µ¤ì¤Þ¤¹"
msgid "error creating temporary file %s\n"
msgstr "°ì»þ¥Õ¥¡¥¤¥ë %s ¤ÎºîÀ®¥¨¥é¡¼"
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: lib/package.c:174
-#, fuzzy, c-format
-msgid "%s: bad magic\n"
-msgstr "ÉÔÀµ¤Ê¥Þ¥¸¥Ã¥¯"
-
-#: lib/package.c:182
+#: lib/package.c:181
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
"¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹"
-#: lib/package.c:190
+#: lib/package.c:189
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹"
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Í­¸ú¤Ê½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó\n"
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
@@ -2168,96 +2163,96 @@ msgid "generate signature"
msgstr "PGP/GPG ½ð̾¤òÀ¸À®¤·¤Þ¤¹"
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, fuzzy, c-format
msgid "package %s is intended for a %s architecture"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¸þ¤±¤Ç¤¹"
-#: lib/problems.c:224
+#: lib/problems.c:226
#, fuzzy, c-format
msgid "package %s is intended for a %s operating system"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë OS ¸þ¤±¤Ç¤¹"
-#: lib/problems.c:229
+#: lib/problems.c:231
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
-#: lib/problems.c:234
+#: lib/problems.c:236
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Þ¤»¤ó"
-#: lib/problems.c:239
+#: lib/problems.c:241
#, fuzzy, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
"¥Õ¥¡¥¤¥ë %s ¤Ï %s-%s-%s ¤È %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Î¥Õ¥¡¥¤¥ë¤È¶¥¹ç¤·¤Æ¤¤¤Þ¤¹"
-#: lib/problems.c:244
+#: lib/problems.c:246
#, fuzzy, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
"%s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤«¤é¤Î¥Õ¥¡¥¤¥ë %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤«¤é¤Î¥Õ¥¡¥¤¥ë"
"¤È¶¥¹ç¤·¤Æ¤¤¤Þ¤¹"
-#: lib/problems.c:249
+#: lib/problems.c:251
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
"¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s (%s-%s-%s¤è¤ê¤â¿·¤·¤¤¤â¤Î) ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ"
"¤¹"
-#: lib/problems.c:254
+#: lib/problems.c:256
#, fuzzy, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
"¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å"
"¤Ç)"
-#: lib/problems.c:264
+#: lib/problems.c:266
#, fuzzy, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
"¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å"
"¤Ç)"
-#: lib/problems.c:269
+#: lib/problems.c:271
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:273
+#: lib/problems.c:275
#, fuzzy, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n"
-#: lib/problems.c:277
+#: lib/problems.c:279
#, fuzzy, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n"
-#: lib/problems.c:282
+#: lib/problems.c:284
#, fuzzy, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼ %d ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ÎÁàºîÃæ¤Ë¤ª¤­¤Þ¤·¤¿"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "conflicts with"
msgstr " %s-%s-%s ¤È¶¥¹ç¤·¤Þ¤¹\n"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "is needed by"
msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Þ¤¹\n"
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr "¥Ç¡¼¥¿¥¿¥¤¥× %d ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
@@ -2272,27 +2267,27 @@ msgstr "%s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
msgid "cannot write to %%%s %s\n"
msgstr "%s ¤Ø½ñ¤­¹þ¤á¤Þ¤»¤ó"
-#: lib/psm.c:487
+#: lib/psm.c:485
#, fuzzy
msgid "source package expected, binary found\n"
msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Þ¤¹¡¢¥Ð¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Þ¤·¤¿"
-#: lib/psm.c:603
+#: lib/psm.c:601
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó"
-#: lib/psm.c:722
+#: lib/psm.c:720
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "¥Ý¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n"
-#: lib/psm.c:888
+#: lib/psm.c:890
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ"
-#: lib/psm.c:895
+#: lib/psm.c:897
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ"
@@ -2337,217 +2332,217 @@ msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
msgid "%s failed: %s\n"
msgstr "%s ¼ºÇÔ"
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "¥Õ¥©¡¼¥Þ¥Ã¥ÈÃæ¤Î¥¨¥é¡¼: %s\n"
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr "¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó"
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr "Ä̾ï"
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr "ÃÖ¤­´¹¤¨¤é¤ì¤Æ¤¤¤Þ¤¹"
-#: lib/query.c:290
+#: lib/query.c:289
msgid "not installed "
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr "¥Í¥Ã¥È¶¦Í­"
-#: lib/query.c:296
+#: lib/query.c:295
#, c-format
msgid "(unknown %3d) "
msgstr "(̤ÃΤΠ%3d)"
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr "(²¿¤Î¾õÂ֤⤢¤ê¤Þ¤»¤ó)"
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥Õ¥¡¥¤¥ë½êÍ­¼Ô¤ä id ¥ê¥¹¥È¤ò¤É¤Á¤é¤â»ý¤Ã¤Æ¤¤¤Þ¤»¤ó"
-#: lib/query.c:466
+#: lib/query.c:465
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n"
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr "%s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: lib/query.c:642
+#: lib/query.c:637
msgid "old format source packages cannot be queried\n"
msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n"
-#: lib/query.c:668 lib/rpminstall.c:507
+#: lib/query.c:663 lib/rpminstall.c:514
#, fuzzy, c-format
-msgid "%s: read manifest failed: %s\n"
-msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+msgid "%s: not a package manifest: %s\n"
+msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n"
-#: lib/query.c:712
+#: lib/query.c:707
#, fuzzy, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡¢¥Ñ¡¼¥¹¤Ç¤­¤Þ¤»¤ó\n"
-#: lib/query.c:733
+#: lib/query.c:728
#, fuzzy
msgid "no packages\n"
msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n"
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "¥°¥ë¡¼¥× %s ¤Ë°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n"
-#: lib/query.c:763
+#: lib/query.c:758
#, c-format
msgid "no package triggers %s\n"
msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n"
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "%s ¤òÆɤà¤Î¤Ë¼ºÇÔ: $s¡£"
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n"
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr "%s ¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n"
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr "%s ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n"
-#: lib/query.c:916
+#: lib/query.c:911
#, c-format
msgid "file %s: %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s: %s\n"
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï¤É¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤â°¤·¤Æ¤¤¤Þ¤»¤ó\n"
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr "̵¸ú¤Ê¥Ñ¥Ã¥±¡¼¥¸ÈÖ¹æ: %s\n"
-#: lib/query.c:950
+#: lib/query.c:945
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥ÉÈÖ¹æ %d\n"
-#: lib/query.c:955
+#: lib/query.c:950
#, fuzzy, c-format
msgid "record %u could not be read\n"
msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, c-format
msgid "package %s is not installed\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
#, fuzzy
msgid "(added files)"
msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s"
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
#, fuzzy
msgid "(added provide)"
msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: fdOpen ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "makeTempFile ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: v1.0 ¤Î RPM ¤Ë¤Ï½ð̾¤Ç¤­¤Þ¤»¤ó\n"
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: v2.0 ¤Î RPM ¤Ë¤ÏºÆ½ð̾¤Ç¤­¤Þ¤»¤ó\n"
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, fuzzy, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writedLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Í­¸ú¤Ê½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó(v1.0 RPM)\n"
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
#, fuzzy
msgid " (MISSING KEYS:"
msgstr " (¥­¡¼¤Îʶ¼º) "
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr " (¿®Íê¤Ç¤­¤Ê¤¤¸°:"
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr ""
@@ -2580,95 +2575,95 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n"
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, c-format
msgid "Retrieving %s\n"
msgstr "%s ¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr "%s ¤È¤·¤Æ...\n"
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s ¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹ - žÁ÷¼ºÇÔ - %s\n"
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Þ¤»¤ó"
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤«¤é¤ÎÆɤ߹þ¤ß¥¨¥é¡¼ "
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¤è¤ê¿·¤·¤¤ RPM ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹\n"
-#: lib/rpminstall.c:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó\n"
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿\n"
-#: lib/rpminstall.c:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "°Í¸À­¤Î·çÇ¡:\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
msgid "installing binary packages\n"
msgstr "¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n"
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ¤ÏÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n"
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
msgid "removing these packages would break dependencies:\n"
msgstr "¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤È°Í¸À­¤òÇ˲õ¤·¤Þ¤¹:\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n"
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2773,7 +2768,7 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Æɤ߹þ¤à¤¿¤á¤Ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s¡£"
-#: lib/rpmts.c:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
@@ -2923,36 +2918,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr "½ð̾¥Ñ¥Ã¥É: %d\n"
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Þ¤¹\n"
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, fuzzy, c-format
msgid "excluding directory %s\n"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n"
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr "¥Þ¥¦¥ó¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ê¥¹¥È¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹\n"
-#: lib/verify.c:330
+#: lib/verify.c:283
#, fuzzy, c-format
msgid "missing %s"
msgstr "%s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
-#: lib/verify.c:426
+#: lib/verify.c:379
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À­¤òËþ¤¿¤·¤Æ¤¤¤Þ¤»¤ó:"
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr ""
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -3011,100 +3001,100 @@ msgstr "¶¦Í­"
msgid "locked db index %s/%s\n"
msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr ""
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
#, fuzzy
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr "grabDate() RPM_STRING_TYPE ¥«¥¦¥ó¥È¤Ï 1 ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr "% ¤Î¸å¤Ë { ¤¬¤¢¤ê¤Þ¤»¤ó"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr "%{ ¤Î¸å¤Ë } ¤¬¤¢¤ê¤Þ¤»¤ó"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr "¶õ¤Î¥¿¥°¥Õ¥©¡¼¥Þ¥Ã¥È"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr "¶õ¤Î¥¿¥°Ì¾"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr "ÉÔÌÀ¤Ê¥¿¥°"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr "ÇÛÎó¤Î¸å¤Ë ] ¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
msgid "unexpected ]"
msgstr "ͽ´ü¤»¤Ì ]"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
msgid "unexpected }"
msgstr "ͽ´ü¤»¤Ì }"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr "¼°Ãæ¤Ç ? ¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
msgid "{ expected after ? in expression"
msgstr "¼°Ãæ¤Ç ? ¤Î¸å¤Ë { ¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr "¼°Ãæ¤Ë } ¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr "°Ê²¼¤Î ? ¥µ¥Ö¼°¤Î ¤Ë: ¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
msgid "{ expected after : in expression"
msgstr "¼°Ãæ¤Ç : ¤Î¸å¤Ë { ¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr "¼°¤Î½ª¤ê¤Ë | ¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
@@ -3127,239 +3117,249 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó %s:%d"
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
#, fuzzy
msgid "no dbpath has been set\n"
msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)"
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, fuzzy, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ "
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó"
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n"
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
-msgid "error(%d) storing record %s into %s\n"
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ "
-#: rpmdb/rpmdb.c:2416
+#: rpmdb/rpmdb.c:2450
#, fuzzy, c-format
-msgid "error(%d) removing record %s from %s\n"
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼"
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n"
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n"
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n"
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, fuzzy, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ "
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n"
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹"
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n"
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n"
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Þ¤¹"
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ­¤Þ¤»¤ó"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
#, fuzzy
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n"
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤­´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n"
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤­´¹¤¨¤Þ¤¹"
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n"
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== ¥¢¥¯¥Æ¥£¥Ö %d ¥¨¥ó¥×¥Æ¥£ %d\n"
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, fuzzy, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr "¥Þ¥¯¥í %%%s ¤Ï¥Ü¥Ç¥£¤¬½ªÃ¼¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, fuzzy, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr "¥Þ¥¯¥í %%%s ¤Ï°ãË¡¤Ê̾Á°¤Ç¤¹(%%define)"
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, fuzzy, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr "¥Þ¥¯¥í %%%s ¤Ï opts ¤¬½ªÃ¼¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, fuzzy, c-format
msgid "Macro %%%s has empty body\n"
msgstr "¥Þ¥¯¥í %%%s ¤Ï¶õ¤Î¥Ü¥Ç¥£¤Ç¤¹"
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, fuzzy, c-format
msgid "Macro %%%s failed to expand\n"
msgstr "¥Þ¥¯¥í %%%s ¤Ï¿­Ä¹¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, fuzzy, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr "¥Þ¥¯¥í %%%s ¤Ï°ãË¡¤Ê̾Á°¤Ç¤¹(%%undefine)"
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, fuzzy, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr "¥Þ¥¯¥í %%%s (%s) ¤Ï¥ì¥Ù¥ë %d °Ê²¼¤Ç»ÈÍѤµ¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, fuzzy, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %c (%s(%s)Ãæ¤Ë)"
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, fuzzy, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr "ºÆµ¢¤Î¿¼¤µ(%d)¤¬ºÇÂçÃÍ(%d)¤è¤ê¤âÂ礭¤¤"
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, fuzzy, c-format
msgid "Unterminated %c: %s\n"
msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤ %c: %s"
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, fuzzy, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr "A %% ¤Ï¹½Ê¸²òÀϤǤ­¤Ê¤¤¥Þ¥¯¥í¤¬Â³¤¤¤Æ¤¤¤Þ¤¹"
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, fuzzy, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr "¥Þ¥¯¥í %%%.*s ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¡¢¥¹¥­¥Ã¥×¤·¤Þ¤¹"
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
#, fuzzy
msgid "Target buffer overflow\n"
msgstr "¥¿¡¼¥²¥Ã¥È¥Ð¥Ã¥Õ¥¡¥ª¡¼¥Ð¡¼¥Õ¥í¡¼"
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, fuzzy, c-format
msgid "File %s: %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s: %s"
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, fuzzy, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr "¥Õ¥¡¥¤¥ë %s: ¤Ï %d ¥Ð¥¤¥È¤è¤ê¾®¤µ¤¤¤Ç¤¹"
@@ -3492,6 +3492,14 @@ msgid "failed to create %s: %s\n"
msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
#, fuzzy
+#~ msgid "%s: bad magic\n"
+#~ msgstr "ÉÔÀµ¤Ê¥Þ¥¸¥Ã¥¯"
+
+#, fuzzy
+#~ msgid "%s: read manifest failed: %s\n"
+#~ msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+
+#, fuzzy
#~ msgid "removed db file %s\n"
#~ msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
diff --git a/po/ko.po b/po/ko.po
index 352fe5523..c24551c82 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-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\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"
@@ -9,54 +9,54 @@ msgstr ""
"Content-Type: text/plain; charset=EUC-KR\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:38
+#: build.c:39
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "ÀÇÁ¸¼º ¹®Á¦·Î Á¦ÀÛ¿¡ ½ÇÆÐÇÔ:\n"
-#: build.c:69
+#: build.c:70
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "%s spec ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "tar ÆÄÀÌÇÁ¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %m\n"
#. Give up
-#: build.c:168
+#: build.c:169
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr "%s ¿¡¼­ spec ÆÄÀÏÀ» Àдµ¥ ½ÇÆÐÇß½À´Ï´Ù\n"
-#: build.c:196
+#: build.c:197
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "%s ¿¡¼­ %s (À¸)·Î À̸§ º¯°æÇϴµ¥ ½ÇÆÐÇÔ: %m\n"
-#: build.c:236
+#: build.c:237
#, c-format
msgid "failed to stat %s: %m\n"
msgstr "%s ÀÇ »óÅÂ(stat)¸¦ Ç¥½ÃÇϴµ¥ ½ÇÆÐÇÔ: %m\n"
-#: build.c:241
+#: build.c:242
#, c-format
msgid "File %s is not a regular file.\n"
msgstr "%s ÆÄÀÏÀº Á¤±Ô(regular) ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù.\n"
-#: build.c:250
+#: build.c:251
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr "%s ÆÄÀÏÀº spec ÆÄÀÏÀÌ ¾Æ´Ñ °Í °°½À´Ï´Ù.\n"
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr "¸ñÇ¥´ë»ó(target) Ç÷§ÆûÀ¸·Î Á¦ÀÛ Áß: %s\n"
-#: build.c:320
+#: build.c:321
#, c-format
msgid "Building for target %s\n"
msgstr "%s (À»)¸¦ Á¦ÀÛÇÏ°í ÀÖ½À´Ï´Ù\n"
@@ -74,265 +74,265 @@ msgstr "ÆÐÅ°ÁöÀÇ Çì´õ¸¦ Àд µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n"
msgid "cannot re-open payload: %s\n"
msgstr "payload¸¦ ´Ù½Ã ¿­ ¼ö ¾øÀ½: %s\n"
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr "ÇöÀç »ç¿ë ÁßÀÎ rpm ¹öÀüÀ» Ç¥½ÃÇÕ´Ï´Ù"
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr "ÀÚ¼¼ÇÑ Ãâ·ÂÀ» Á¦°øÇÕ´Ï´Ù"
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr "¾ÆÁÖ »ó¼¼ÇÑ Ãâ·ÂÀ» Á¦°øÇÕ´Ï´Ù"
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr "<º»¹®> ÀÇ ³»¿ë(value)À¸·Î <À̸§> ¸ÅÅ©·Î¸¦ Á¤ÀÇÇÕ´Ï´Ù"
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr "'<À̸§> <º»¹®>'"
-#: rpmqv.c:118
+#: rpmqv.c:121
msgid "print macro expansion of <expr>+"
msgstr "<Ç¥Çö½Ä>+ ÀÇ ¸ÅÅ©·Î È®ÀåÀ» Ãâ·ÂÇÕ´Ï´Ù"
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr "<Ç¥Çö½Ä>+"
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr "Ç¥ÁØÃâ·ÂÀ» <¸í·É> À¸·Î º¸³À´Ï´Ù"
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr "<¸í·É>"
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr "<µð·ºÅ丮> ¸¦ ÃÖ»óÀ§ µð·ºÅ丮·Î »ç¿ëÇÕ´Ï´Ù"
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr "<µð·ºÅ丮>"
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr "±âº» ¸ÅÅ©·Î ÆÄÀÏ ´ë½Å <ÆÄÀÏ:..> À» ÀоîµéÀÔ´Ï´Ù"
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr "<ÆÄÀÏ:..>"
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "±âº» rpmrc ÆÄÀÏ ´ë½Å <ÆÄÀÏ:..> À» ÀоîµéÀÔ´Ï´Ù"
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr "ÇöÀç ¼³Á¤µÇ¾î ÀÖ´Â rpmrcÀÇ ³»¿ë°ú ¸ÅÅ©·Î¸¦ º¸¿©ÁÝ´Ï´Ù"
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr "libio(3) APIÀÇ »ç¿ëÀ» ÇØÁ¦ÇÕ´Ï´Ù"
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr "µ¥ÀÌÅÍ ½ºÆ®¸² ÇÁ·ÎÅäÄÝÀ» µð¹ö±× ÇÕ´Ï´Ù"
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr "rpmio ÀÔ/Ãâ·ÂÀ» µð¹ö±× ÇÕ´Ï´Ù"
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr "URL ij½Ã Çڵ鸵À» µð¹ö±× ÇÕ´Ï´Ù"
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr "ÁúÀÇ ¿É¼Ç (-q ¶Ç´Â --query ¿Í ÇÔ²² »ç¿ë):"
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr "°ËÁõ ¿É¼Ç (-V ¶Ç´Â --verify ¿Í ÇÔ²² »ç¿ë):"
-#: rpmqv.c:180
+#: rpmqv.c:183
msgid "Signature options:"
msgstr "¼­¸í ¿É¼Ç:"
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr "µ¥ÀÌÅͺ£À̽º ¿É¼Ç:"
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"´ÙÀ½°ú ÇÔ²² »ç¿ëµÉ Á¦ÀÛ ¿É¼Ç [ <specÆÄÀÏ> | <tarÆÄÀÏ> | <¼Ò½º ÆÐÅ°Áö> ]:"
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr "¼³Ä¡/¾÷±×·¹À̵å/»èÁ¦ ¿É¼Ç:"
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr "¸ðµç rpm ¸ðµå¿¡¼­ÀÇ ÀϹÝÀûÀÎ ¿É¼Ç:"
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr "RPM - %s\n"
-#: rpmqv.c:235
+#: rpmqv.c:238
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:236
+#: rpmqv.c:239
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "ÀÌ ÇÁ·Î±×·¥Àº GNU Public License ³»¿¡¼­ ÀÚÀ¯·Ó°Ô Àç¹èÆ÷µÉ ¼ö ÀÖ½À´Ï´Ù."
-#: rpmqv.c:248
+#: rpmqv.c:251
#, c-format
msgid "Usage: %s {--help}\n"
msgstr " »ç¿ë¹ý: %s {--help}\n"
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr "--rcfile ¿É¼ÇÀÌ Á¦°ÅµÇ¾ú½À´Ï´Ù.\n"
-#: rpmqv.c:602
+#: rpmqv.c:605
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "´ë½Å \"--macros <ÆÄÀÏ:..>\" À» »ç¿ëÇÕ´Ï´Ù.\n"
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "(%d) ÀÇ Àμö ó¸® °úÁ¤ Áß ³»ºÎ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù :-(\n"
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr "ÇϳªÀÇ ÁÖ¿ä(major) ¸ðµå¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr "ÁúÀÇ/°ËÁõ Áß¿¡¼­ ÇÑ°¡Áö À¯ÇüÀº µ¿½Ã¿¡ ¼öÇàµÉ ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:682
+#: rpmqv.c:685
msgid "unexpected query flags"
msgstr "ºÎÀûÀýÇÑ ÁúÀÇ Ç÷¡±× ÀÔ´Ï´Ù"
-#: rpmqv.c:685
+#: rpmqv.c:688
msgid "unexpected query format"
msgstr "ºÎÀûÀýÇÑ ÁúÀÇ Çü½Ä ÀÔ´Ï´Ù"
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr "ºÎÀûÀýÇÑ ÁúÀÇ ¼Ò½º ÀÔ´Ï´Ù"
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath ´Â µ¥ÀÌÅͺ£À̽º¸¦ »ç¿ëÇÏÁö ¾Ê±â À§ÇÑ ¿É¼ÇÀÔ´Ï´Ù"
-#: rpmqv.c:735
+#: rpmqv.c:738
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "¼³Ä¡, ¾÷±×·¹À̵å, ¼Ò½º »èÁ¦, spec ÆÄÀÏ »èÁ¦½Ã¿¡¸¸ ¼öÇàµË´Ï´Ù"
-#: rpmqv.c:737
+#: rpmqv.c:740
msgid "files may only be relocated during package installation"
msgstr "ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÆÄÀÏÀ» Àç¹èÄ¡ÇÒ ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:740
+#: rpmqv.c:743
msgid "only one of --prefix or --relocate may be used"
msgstr "--prefix ¶Ç´Â --relocate ¿É¼Ç Áß Çϳª¸¸ »ç¿ëÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:743
+#: rpmqv.c:746
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate ¿Í --excludepath ¿É¼ÇÀº ÃÖ½ÅÀÇ ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÒ ¶§¿¡¸¸ »ç¿ëÇÏ½Ç ¼ö "
"ÀÖ½À´Ï´Ù"
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix ¿É¼ÇÀº ÃÖ½ÅÀÇ ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÒ ¶§¿¡¸¸ »ç¿ëÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix ¿É¼ÇÀÇ Àμö´Â ¹Ýµå½Ã '/' ·Î ½ÃÀ۵Ǿî¾ß ÇÕ´Ï´Ù"
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr "--percent ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "--excludedocs ¿Í --includedocs ¿É¼Ç¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:790
+#: rpmqv.c:793
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches ¿É¼ÇÀº ÆÐÅ°Áö »èÁ¦½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:798
+#: rpmqv.c:801
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:803
+#: rpmqv.c:806
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡¿Í »èÁ¦½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:808
+#: rpmqv.c:811
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "½ºÅ©¸³Æ® ÇØÁ¦ ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡¿Í »èÁ¦½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:813
+#: rpmqv.c:816
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "Æ®¸®°Å ÇØÁ¦ ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡¿Í »èÁ¦½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:817
+#: rpmqv.c:820
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -340,13 +340,13 @@ msgstr ""
"--nodeps ¿É¼ÇÀº ÆÐÅ°Áö Á¦ÀÛ, ÀçÁ¦ÀÛ(rebuild), ÀçÄÄÆÄÀÏ(recompile), ¼³Ä¡, »è"
"Á¦, °ËÁõ½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡, »èÁ¦, Á¦À۽ÿ¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -354,87 +354,87 @@ msgstr ""
"--root (-r) ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡, »èÁ¦, ÁúÀÇ, µ¥ÀÌÅͺ£À̽º À籸Ãà½Ã¿¡¸¸ ÁöÁ¤ÇÏ"
"½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) ¿É¼ÇÀÇ Àμö´Â ¹Ýµå½Ã '/' ·Î ½ÃÀ۵Ǿî¾ß ÇÕ´Ï´Ù"
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr "¼­¸íÇÒ ÆÄÀÏÀÌ ¾ø½À´Ï´Ù\n"
-#: rpmqv.c:868
+#: rpmqv.c:871
#, c-format
msgid "cannot access file %s\n"
msgstr "%s ÆÄÀÏ¿¡ Á¢±ÙÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: rpmqv.c:887
+#: rpmqv.c:890
msgid "pgp not found: "
msgstr "pgp¸¦ ãÀ» ¼ö ¾øÀ½: "
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr "Æнº ±¸¹®(pass phrase) ÀÔ·Â: "
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr "Æнº ±¸¹®(pass phrase) °Ë»ç¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr "Æнº ±¸¹®(pass phrase)ÀÌ ¿Ã¹Ù¸¨´Ï´Ù.\n"
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ ºÎÀûÇÕÇÑ %%_signatureÀÇ ³»¿ëÀÌ ÀÖ½À´Ï´Ù.\n"
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr "--sign ¿É¼ÇÀº ÆÐÅ°Áö Á¦À۽ÿ¡¸¸ »ç¿ëÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:927
+#: rpmqv.c:930
msgid "exec failed\n"
msgstr "½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr "ÀçÁ¦ÀÛ(rebuild)ÇÒ ÆÐÅ°Áö ÆÄÀÏÀ» ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr "ÆÐÅ°Áö Á¦ÀÛ¿¡ ÇÊ¿äÇÑ spec ÆÄÀÏÀ» ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr "ÆÐÅ°Áö Á¦ÀÛ¿¡ ÇÊ¿äÇÑ tar ÆÄÀÏÀ» ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
-#: rpmqv.c:1051
+#: rpmqv.c:1055
#, fuzzy
msgid "no packages given for erase"
msgstr "¼­¸íÇÒ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr "¼³Ä¡ÇÒ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr "°ËÁõ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr "--querytags ¿É¼Ç¿¡ ºÎÀûÀýÇÑ Àμö°¡ ÁöÁ¤µÇ¾ú½À´Ï´Ù "
-#: rpmqv.c:1145
+#: rpmqv.c:1149
#, fuzzy
msgid "no arguments given"
msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
msgid "Unable to open temp file.\n"
msgstr "Àӽà ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù.\n"
@@ -644,7 +644,7 @@ msgstr "globÀ¸·Î ÆÄÀÏÀ» ãÀ» ¼ö ¾øÀ½: %s\n"
msgid "Could not open %%files file %s: %s\n"
msgstr "%s ÆÄÀÏÀÇ %%files¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, c-format
msgid "line: %s\n"
msgstr "ÁÙ(line): %s\n"
@@ -719,152 +719,152 @@ msgstr "±×·ì id ¼³Á¤[getGidS]: gid°¡ ³Ê¹« ¸¹½À´Ï´Ù\n"
msgid "Could not canonicalize hostname: %s\n"
msgstr "È£½ºÆ® ¸íÀ» Á¤±ÔÈ­(canonicalize) ÇÒ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:83
+#: build/pack.c:85
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "%s ÆÄÀÏ¿¡ ¾ÆÄ«À̺긦 »ý¼ºÇϴµ¥ ½ÇÆÐÇÔ: %s\n"
-#: build/pack.c:86
+#: build/pack.c:88
#, c-format
msgid "create archive failed: %s\n"
msgstr "¾ÆÄ«ÀÌºê »ý¼º¿¡ ½ÇÆÐÇÔ: %s\n"
-#: build/pack.c:108
+#: build/pack.c:110
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "cpio_copy ÀÛ¼º¿¡ ½ÇÆÐÇÔ: %s\n"
-#: build/pack.c:115
+#: build/pack.c:117
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "cpio_copy Àб⿡ ½ÇÆÐÇÔ: %s\n"
-#: build/pack.c:218
+#: build/pack.c:220
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "PreIn ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:225
+#: build/pack.c:227
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "PreUn ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:232
+#: build/pack.c:234
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "PostIn ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:239
+#: build/pack.c:241
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "PostUn ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:247
+#: build/pack.c:249
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "VerifyScript ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:262
+#: build/pack.c:264
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "Æ®¸®°Å ½ºÅ©¸³Æ® ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:290
+#: build/pack.c:292
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr "RPM Àбâ(readRPM): %s (À»)¸¦ ¿±´Ï´Ù: %s\n"
-#: build/pack.c:300
+#: build/pack.c:302
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr "RPM Àбâ(readRPM): %s (À»)¸¦ ÀнÀ´Ï´Ù: %s\n"
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: Fseek¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
-#: build/pack.c:337
+#: build/pack.c:339
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "RPM Àбâ(readRPM): %s (Àº)´Â RPM ÆÐÅ°Áö°¡ ¾Æ´Õ´Ï´Ù\n"
-#: build/pack.c:346
+#: build/pack.c:348
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "RPM Àбâ(readRPM): %s ¿¡¼­ Çì´õ¸¦ Àаí ÀÖ½À´Ï´Ù\n"
-#: build/pack.c:475
+#: build/pack.c:477
msgid "Unable to create immutable header region.\n"
msgstr "°íÁ¤ Çì´õ ¿µ¿ª(immutable header region)À» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
-#: build/pack.c:494
+#: build/pack.c:496
msgid "Unable to write temp header\n"
msgstr "ÀÓ½Ã(temp) Çì´õ¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: build/pack.c:504
+#: build/pack.c:506
msgid "Bad CSA data\n"
msgstr "À߸øµÈ CSA µ¥ÀÌÅÍ\n"
-#: build/pack.c:540
+#: build/pack.c:542
msgid "Unable to write final header\n"
msgstr "¸¶Áö¸·(final) Çì´õ¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: build/pack.c:560
+#: build/pack.c:562
#, c-format
msgid "Generating signature: %d\n"
msgstr "¼­¸í »ý¼º Áß: %d\n"
-#: build/pack.c:578
+#: build/pack.c:580
msgid "Unable to reload signature header.\n"
msgstr "¼­¸í(signature) Çì´õ¸¦ ´Ù½Ã Àоî¿Ã ¼ö ¾ø½À´Ï´Ù.\n"
-#: build/pack.c:586
+#: build/pack.c:588
#, c-format
msgid "Could not open %s: %s\n"
msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, c-format
msgid "Unable to write package: %s\n"
msgstr "ÆÐÅ°Áö¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:637
+#: build/pack.c:639
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "¼­¸íÇÒ ´ë»ó %s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:648
+#: build/pack.c:650
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "%s ÀÇ Çì´õ¸¦ ÀÐÀ» ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:662
+#: build/pack.c:664
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "%s ¿¡ Çì´õ¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:672
+#: build/pack.c:674
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "%s ÀÇ payload¸¦ ÀÐÀ» ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:678
+#: build/pack.c:680
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "%s ¿¡ payload¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr "ÀÛ¼º: %s\n"
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "%s ÆÐÅ°ÁöÀÇ Ãâ·Â ÆÄÀϸíÀ» »ý¼ºÇÒ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:787
+#: build/pack.c:789
#, c-format
msgid "cannot create %s: %s\n"
msgstr "%s (À»)¸¦ »ý¼ºÇÒ ¼ö ¾øÀ½: %s\n"
@@ -1430,52 +1430,52 @@ msgstr " ½ÇÆÐÇÔ - "
msgid "package %s was already added, replacing with %s\n"
msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n"
-#: lib/depends.c:423
+#: lib/depends.c:425
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n"
-#: lib/depends.c:444
+#: lib/depends.c:446
#, fuzzy
msgid "(db files)"
msgstr "À߸øµÈ db ÆÄÀÏ %s\n"
-#: lib/depends.c:456
+#: lib/depends.c:458
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n"
-#: lib/depends.c:469
+#: lib/depends.c:471
#, fuzzy
msgid "(db package)"
msgstr "ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:927
+#: lib/depends.c:931
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n"
#. Record all relations.
-#: lib/depends.c:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1483,26 +1483,26 @@ msgid ""
msgstr ""
"========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n"
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n"
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr "·çÇÁ(LOOP):\n"
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr "(¼ýÀÚ°¡ ¾Æ´Õ´Ï´Ù)"
@@ -1595,47 +1595,42 @@ msgstr "%s (ÀÌ)°¡ %s (À¸)·Î »ý¼ºµÇ¾ú½À´Ï´Ù\n"
msgid "error creating temporary file %s\n"
msgstr "Àӽà ÆÄÀÏ %s (À»)¸¦ »ý¼ºÇÏ´Â µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n"
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
-#: lib/package.c:174
-#, fuzzy, c-format
-msgid "%s: bad magic\n"
-msgstr "À߸øµÈ magic ÀÔ´Ï´Ù"
-
-#: lib/package.c:182
+#: lib/package.c:181
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "ÀÌ RPM ¹öÀü¿¡¼­´Â ÆÐŰ¡ ¹öÀü '1' ÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù\n"
-#: lib/package.c:190
+#: lib/package.c:189
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"ÀÌ RPM ¹öÀü¿¡¼­´Â ÁÖ¿ä ¹øÈ£(major number) <= 4 ÀÇ ÆÐŰ¡ ¸¸À» Áö¿øÇÕ´Ï´Ù\n"
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù\n"
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
@@ -2067,93 +2062,93 @@ msgid "generate signature"
msgstr "¼­¸íÀ» ÀÛ¼ºÇÕ´Ï´Ù"
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, fuzzy, c-format
msgid "package %s is intended for a %s architecture"
msgstr "%s (Àº)´Â ´Ù¸¥ ¾ÆÅ°ÅØÃĸ¦ À§ÇÑ ÆÐÅ°ÁöÀÔ´Ï´Ù"
-#: lib/problems.c:224
+#: lib/problems.c:226
#, fuzzy, c-format
msgid "package %s is intended for a %s operating system"
msgstr "%s (Àº)´Â ´Ù¸¥ ¿î¿µÃ¼Á¦¸¦ À§ÇÑ ÆÐÅ°ÁöÀÔ´Ï´Ù"
-#: lib/problems.c:229
+#: lib/problems.c:231
#, c-format
msgid "package %s is already installed"
msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
-#: lib/problems.c:234
+#: lib/problems.c:236
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr "%2$s ÆÐÅ°Áö ¾ÈÀÇ %1$s °æ·Î´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù"
-#: lib/problems.c:239
+#: lib/problems.c:241
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr "%2$s (¿Í)°ú %3$s ÀÇ ¼³Ä¡ °úÁ¤¿¡¼­ %1$s ÆÄÀÏÀÌ ¼­·Î Ãæµ¹ÇÕ´Ï´Ù"
-#: lib/problems.c:244
+#: lib/problems.c:246
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr "%2$s ¿¡¼­ ¼³Ä¡µÇ´Â %1$s ÆÄÀÏÀº %3$s ÆÐÅ°ÁöÀÇ ÆÄÀÏ°ú Ãæµ¹ÇÕ´Ï´Ù"
-#: lib/problems.c:249
+#: lib/problems.c:251
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "%s ÆÐÅ°Áö (%s º¸´Ù ÃÖ½ÅÀÇ ÆÐÅ°Áö)´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
-#: lib/problems.c:254
+#: lib/problems.c:256
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
"%4$s ÆÄÀϽýºÅÛ »ó¿¡¼­ %1$s ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld%3$cb (ÀÌ)°¡ ÇÊ¿äÇÕ"
"´Ï´Ù"
-#: lib/problems.c:264
+#: lib/problems.c:266
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
"%3$s ÆÄÀϽýºÅÛ »ó¿¡¼­ %1$s ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld ÀÇ ¾ÆÀ̳ëµå(inode)"
"°¡ ÇÊ¿äÇÕ´Ï´Ù"
-#: lib/problems.c:269
+#: lib/problems.c:271
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
"%s ÆÐÅ°ÁöÀÇ ¼±(pre)-Æ®·£Àè¼Ç ½Ã½ºÅÛÄÝ(syscall): %s (ÀÌ)°¡ ½ÇÆÐÇß½À´Ï´Ù: %s"
-#: lib/problems.c:273
+#: lib/problems.c:275
#, fuzzy, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr "%s-%s-%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n"
-#: lib/problems.c:277
+#: lib/problems.c:279
#, fuzzy, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr "%s-%s-%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n"
-#: lib/problems.c:282
+#: lib/problems.c:284
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
"%2$s ÆÐÅ°Áö¸¦ ó¸®ÇÏ´Â °úÁ¤¿¡¼­ ¾Ë ¼ö ¾ø´Â ¿À·ù %1$d (ÀÌ)°¡ ¹ß»ýÇß½À´Ï´Ù"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "conflicts with"
msgstr " %s-%s-%s (¿Í)°ú Ãæµ¹ÇÕ´Ï´Ù\n"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "is needed by"
msgstr " (Àº)´Â %s-%s-%s ¿¡¼­ ÇÊ¿ä·Î ÇÕ´Ï´Ù\n"
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr "%d µ¥ÀÌÅÍ À¯ÇüÀº »ç¿ëÇÏ½Ç ¼ö ¾ø½À´Ï´Ù\n"
@@ -2168,27 +2163,27 @@ msgstr "%%%s %s (À»)¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
msgid "cannot write to %%%s %s\n"
msgstr "%%%s %s (À»)¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/psm.c:487
+#: lib/psm.c:485
msgid "source package expected, binary found\n"
msgstr "¼Ò½º ÆÐÅ°Áö°¡ ¿ä±¸µË´Ï´Ù, ¹ÙÀ̳ʸ®¸¦ ã¾Ò½À´Ï´Ù\n"
-#: lib/psm.c:603
+#: lib/psm.c:601
msgid "source package contains no .spec file\n"
msgstr "¼Ò½º ÆÐÅ°Áö¿¡ .spec ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n"
-#: lib/psm.c:722
+#: lib/psm.c:720
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "%s: %s ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÕ´Ï´Ù (ÀÖÀ» °æ¿ì)\n"
-#: lib/psm.c:888
+#: lib/psm.c:890
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
"%2$s-%3$s-%4$s ÀÇ %1$s ½ºÅ©¸³Æ®¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù, waitpid°¡ %"
"5$s (À»)¸¦ ¹ÝȯÇÏ¿´½À´Ï´Ù \n"
-#: lib/psm.c:895
+#: lib/psm.c:897
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
@@ -2236,213 +2231,213 @@ msgstr "%2$s ÆÄÀÏÀÇ %1$s (ÀÌ)°¡ ½ÇÆÐÇÔ: %3$s\n"
msgid "%s failed: %s\n"
msgstr "%s (ÀÌ)°¡ ½ÇÆÐÇÔ: %s\n"
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, c-format
msgid "incorrect format: %s\n"
msgstr "¿Ã¹Ù¸£Áö ¸øÇÑ Çü½Ä: %s\n"
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr "(ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾ÊÀ½)"
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr "Á¤»ó(normal) "
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr "±³Ã¼µÊ(replaced) "
-#: lib/query.c:290
+#: lib/query.c:289
msgid "not installed "
msgstr "¼³Ä¡µÇ¾î ÀÖÁö ¾ÊÀ½ "
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr "net °øÀ¯µÊ "
-#: lib/query.c:296
+#: lib/query.c:295
#, c-format
msgid "(unknown %3d) "
msgstr "(¾Ë ¼ö ¾ø´Â %3d) "
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr "(»óŸ¦ ¾Ë ¼ö ¾øÀ½) "
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
msgid "package has neither file owner or id lists\n"
msgstr "ÆÐÅ°Áö¿¡ ÆÄÀÏ ¼ÒÀ¯ÀÚ ¶Ç´Â id ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù\n"
-#: lib/query.c:466
+#: lib/query.c:465
#, c-format
msgid "can't query %s: %s\n"
msgstr "%s (À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n"
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s (À»)¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %s\n"
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr "%s (À»)¸¦ ÁúÀÇÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n"
-#: lib/query.c:642
+#: lib/query.c:637
msgid "old format source packages cannot be queried\n"
msgstr "ÀÌÀü Çü½ÄÀÇ ¼Ò½º ÆÐÅ°Áö´Â ÁúÀÇÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/query.c:668 lib/rpminstall.c:507
-#, c-format
-msgid "%s: read manifest failed: %s\n"
-msgstr "%s: Àдµ¥ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
+#: lib/query.c:663 lib/rpminstall.c:514
+#, fuzzy, c-format
+msgid "%s: not a package manifest: %s\n"
+msgstr "%s (À»)¸¦ ¹ß»ý½ÃÅ°´Â ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
-#: lib/query.c:712
+#: lib/query.c:707
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "%s spec ÆÄÀÏÀ» ÁúÀÇÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù, ÆÄÀÏÀ» ºÐ¼®ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/query.c:733
+#: lib/query.c:728
msgid "no packages\n"
msgstr "ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "%s ±×·ìÀº ¾î¶² ÆÐÅ°Áö¿¡µµ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n"
-#: lib/query.c:763
+#: lib/query.c:758
#, c-format
msgid "no package triggers %s\n"
msgstr "%s (À»)¸¦ ¹ß»ý½ÃÅ°´Â ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "%s (À»)¸¦ Àдµ¥ ½ÇÆÐÇÔ: %s.\n"
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "%s (À»)¸¦ ¹ß»ý½ÃÅ°´Â ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr "%s (À»)¸¦ ÇÊ¿ä·Î ÇÏ´Â ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr "%s (À»)¸¦ Á¦°øÇÏ´Â ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
-#: lib/query.c:916
+#: lib/query.c:911
#, c-format
msgid "file %s: %s\n"
msgstr "%s ÆÄÀÏ: %s\n"
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "%s ÆÄÀÏÀº ¾î¶² ÆÐÅ°Áö¿¡µµ ¼ÓÇØ ÀÖÁö ¾Ê½À´Ï´Ù\n"
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr "ºÎÀûÇÕÇÑ ÆÐÅ°Áö ¹øÈ£: %s\n"
-#: lib/query.c:950
+#: lib/query.c:945
#, c-format
msgid "package record number: %u\n"
msgstr "ÆÐÅ°Áö ±â·Ï(record) ¹øÈ£: %u\n"
-#: lib/query.c:955
+#: lib/query.c:950
#, c-format
msgid "record %u could not be read\n"
msgstr "±â·Ï(record) ¹øÈ£ %u (Àº)´Â ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, c-format
msgid "package %s is not installed\n"
msgstr "%s ÆÐÅ°Áö´Â ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n"
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
#, fuzzy
msgid "(added files)"
msgstr "À߸øµÈ db ÆÄÀÏ %s\n"
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
#, fuzzy
msgid "(added provide)"
msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n"
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: ¿©´Âµ¥ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
msgid "makeTempFile failed\n"
msgstr "makeTempFile¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: v1.0 RPMÀº ¼­¸íÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: v2.0 RPMÀº Àç-¼­¸íÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr "¿Ã¹Ù¸£Áö ¾ÊÀ½"
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
msgid " (MISSING KEYS:"
msgstr " (Å°¸¦ ãÀ» ¼ö ¾øÀ½:"
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr " (Å°¸¦ ½Å·ÚÇÒ ¼ö ¾øÀ½:"
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr "È®ÀÎ"
@@ -2475,94 +2470,94 @@ msgstr " %s A %s\tB %s\n"
msgid "package %s has unsatisfied %s: %s\n"
msgstr "%s-%s-%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n"
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr "Áغñ Áß..."
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr "¼³Ä¡ÇÒ ÆÐÅ°Áö¸¦ ÁغñÇÏ°í ÀÖ½À´Ï´Ù..."
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, c-format
msgid "Retrieving %s\n"
msgstr "%s (À»)¸¦ º¹±¸ÇÕ´Ï´Ù\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr " ... %s (À¸)·Î\n"
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s (À»)¸¦ »ý·«ÇÕ´Ï´Ù - Àü¼Û(transfer)¿¡ ½ÇÆÐÇÔ - %s\n"
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, c-format
msgid "package %s is not relocateable\n"
msgstr "%s ÆÐÅ°Áö´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, c-format
msgid "error reading from file %s\n"
msgstr "%s ÆÄÀÏÀ» Àд µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "%s ÆÄÀÏÀÌ ÃֽŠ¹öÀüÀÇ RPMÀ» ÇÊ¿ä·Î ÇÕ´Ï´Ù\n"
-#: lib/rpminstall.c:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s (Àº)´Â ¼³Ä¡µÉ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%d ÀÇ ¼Ò½º¿Í %d ÀÇ ¹ÙÀ̳ʸ® ÆÐÅ°Áö¸¦ ã¾Ò½À´Ï´Ù\n"
-#: lib/rpminstall.c:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆÐÇÔ:\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
msgid "installing binary packages\n"
msgstr "¹ÙÀ̳ʸ® ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n"
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "%s ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ¿©·¯°³ÀÇ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÕ´Ï´Ù\n"
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
msgid "removing these packages would break dependencies:\n"
msgstr "ÀÌ ÆÐÅ°ÁöµéÀ» Á¦°ÅÇϸé ÀÇÁ¸¼ºÀÌ ±úÁú ¼ö ÀÖÀ½:\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr "%s (À»)¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n"
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2667,7 +2662,7 @@ msgstr "%s (À»)¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù, HOMEÀÌ ³Ê¹« Å®´Ï´Ù.\n"
msgid "Unable to open %s for reading: %s.\n"
msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s.\n"
-#: lib/rpmts.c:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n"
@@ -2810,37 +2805,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr "¼­¸í: size(%d)+pad(%d)\n"
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s (À»)¸¦ »ý·«ÇÕ´Ï´Ù\n"
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, c-format
msgid "excluding directory %s\n"
msgstr "%s µð·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n"
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr "¸¶¿îÆ®µÈ ÆÄÀϽýºÅÛÀÇ ¸ñ·ÏÀ» ¼öÁýÇÏ°í ÀÖ½À´Ï´Ù\n"
-#: lib/verify.c:330
+#: lib/verify.c:283
#, c-format
msgid "missing %s"
msgstr "´ÙÀ½À» ãÀ» ¼ö ¾ø½À´Ï´Ù %s"
-#: lib/verify.c:426
+#: lib/verify.c:379
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "%s-%s-%s ¿¡ ÀÇÁ¸¼º ¹®Á¦ ¹ß»ý: "
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr ""
-"%s-%s-%s: °íÁ¤ Çì´õ ¿µ¿ª Ãà¾à(immutable header region digest) °Ë»ç¿¡ ½ÇÆÐÇÔ\n"
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -2899,99 +2888,99 @@ msgstr "°øÀ¯µÊ"
msgid "locked db index %s/%s\n"
msgstr "Àá±ä db À妽º %s/%s\n"
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr "ÀÎÁõµÇÁö ¾ÊÀº db ¿É¼Ç: \"%s\" (À»)¸¦ ¹«½ÃÇÕ´Ï´Ù.\n"
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr "%s (Àº)´Â ºÎÀûÇÕÇÑ ¼öÄ¡ °ªÀÔ´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n"
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr "%s (Àº)´Â ³Ê¹« Å©°Å³ª ³Ê¹« ÀÛÀº Á¤¼ö(long) °ªÀÔ´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n"
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr "%s (Àº)´Â ³Ê¹« Å©°Å³ª ³Ê¹« ÀÛÀº Á¤¼ö(int) °ªÀÔ´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n"
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr "dataLength() RPM_STRING_TYPE Ä«¿îÆ®´Â ¹Ýµå½Ã '1' À̾î¾ß ÇÕ´Ï´Ù.\n"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr "'%' µÚ¿¡ '{' ¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr "'%{' µÚ¿¡ '}' ¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr "ÅÂ±× Çü½ÄÀÌ ºñ¾îÀÖ½À´Ï´Ù"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr "ÅÂ±× À̸§ÀÌ ºñ¾îÀÖ½À´Ï´Ù"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr "¾Ë ¼ö ¾ø´Â ÅÂ±× ÀÔ´Ï´Ù"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr "¹è¿­ÀÇ ³¡ºÎºÐ¿¡ ']' °¡ ÇÊ¿äÇÕ´Ï´Ù"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
msgid "unexpected ]"
msgstr "ºÒÇÊ¿äÇÑ ']' °¡ »ç¿ëµÇ°í ÀÖ½À´Ï´Ù"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
msgid "unexpected }"
msgstr "ºÒÇÊ¿äÇÑ '}' °¡ »ç¿ëµÇ°í ÀÖ½À´Ï´Ù"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr "Ç¥Çö½Ä¿¡ '?' °¡ ÇÊ¿äÇÕ´Ï´Ù"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
msgid "{ expected after ? in expression"
msgstr "Ç¥Çö½Ä¿¡¼­ '?' µÚ¿¡ '{' °¡ ÇÊ¿äÇÕ´Ï´Ù"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr "Ç¥Çö½Ä¿¡ '}' °¡ ÇÊ¿äÇÕ´Ï´Ù"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr "ÇϺΠǥÇö½Ä(subexpression)ÀÇ '?' ´ÙÀ½¿¡ ':' ÀÌ ÇÊ¿äÇÕ´Ï´Ù"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
msgid "{ expected after : in expression"
msgstr "Ç¥Çö½Ä¿¡¼­ ':' µÚ¿¡ '{' °¡ ÇÊ¿äÇÕ´Ï´Ù"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr "Ç¥Çö½ÄÀÇ ³¡ºÎºÐ¿¡ '|' °¡ ÇÊ¿äÇÕ´Ï´Ù"
@@ -3014,239 +3003,249 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr "(±âÁ¸ÀÇ) rpm[23] ÆÐŰ¡°ú ȣȯÇÏ´Â Çì´õ¸¦ »ý¼ºÇÕ´Ï´Ù"
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
"DB ÅÂ±× ÃʱâÈ­[dbiTagsInit]: ÀÎÁõµÇÁö ¾ÊÀº ÅÂ±× À̸§: \"%s\" (Àº)´Â ¹«½ÃµË´Ï"
"´Ù\n"
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "db%2$d (À»)¸¦ ÀÌ¿ëÇÏ¿© %1$s À妽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù - %3$s (%4$d)\n"
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "cannot open %s index\n"
msgstr "%s À妽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
msgid "no dbpath has been set\n"
msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
"%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, fuzzy, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "%3$s (À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr "rpmdb: ¼Õ»óµÈ Çì´õ #%u (ÀÌ)°¡ º¹±¸(retrieved)µÇ¾ú½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù.\n"
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: 0x%x ÀÇ Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "%2$s À妽º¿¡¼­ \"%1$s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n"
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "%2$s À妽º¿¡¼­ %1$d Ç׸ñµé(entries)À» »èÁ¦ÇÕ´Ï´Ù.\n"
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
-#, c-format
-msgid "error(%d) storing record %s into %s\n"
+#: rpmdb/rpmdb.c:2440
+#, fuzzy, c-format
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "%3$s (À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:2416
-#, c-format
-msgid "error(%d) removing record %s from %s\n"
+#: rpmdb/rpmdb.c:2450
+#, fuzzy, c-format
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "%3$s ¿¡¼­ %2$s ·¹Äڵ带 »èÁ¦ÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "»õ·Î¿î ÆÐÅ°Áö¸¦ ¹èÄ¡ÇÏ´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "%2$s À妽º¿¡ \"%1$s\" (À»)¸¦ Ãß°¡ÇÕ´Ï´Ù.\n"
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "%2$s À妽º¿¡ %1$d Ç׸ñµé(entries)À» Ãß°¡ÇÕ´Ï´Ù.\n"
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr "%3$s (À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "db3¸¦ À籸Ãà ÇÑ ÈÄ¿¡ %s (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n"
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù"
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "%2$s ¿¡ µ¥ÀÌÅͺ£À̽º %1$s (À»)¸¦ À籸Ãà ÇÕ´Ï´Ù\n"
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, c-format
msgid "temporary database %s already exists\n"
msgstr "Àӽà µ¥ÀÌÅͺ£À̽º %s (ÀÌ)°¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù\n"
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, c-format
msgid "creating directory %s\n"
msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÕ´Ï´Ù\n"
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, c-format
msgid "creating directory %s: %s\n"
msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÔ: %s\n"
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "dbapi %d (À»)¸¦ ÅëÇØ ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n"
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "dbapi %d (À»)¸¦ ÅëÇØ »õ·Î¿î µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n"
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "µ¥ÀÌÅͺ£À̽ºÀÇ ·¹ÄÚµå ¹øÈ£ %u (ÀÌ)°¡ À߸øµÇ¾ú½À´Ï´Ù -- »ý·«ÇÕ´Ï´Ù.\n"
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "%u ¿¡ ·¹Äڵ带 Ãß°¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"µ¥ÀÌÅͺ£À̽º¸¦ À籸ÃàÇϴµ¥ ½ÇÆÐÇÔ: ¿øº» µ¥ÀÌÅͺ£À̽º´Â ±×´ë·Î À¯ÁöµË´Ï´Ù\n"
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr "ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ »õ·Î¿î µ¥ÀÌÅͺ£À̽º·Î ±³Ã¼Çϴµ¥ ½ÇÆÐÇß½À´Ï´Ù!\n"
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "º¹±¸Çϱâ À§ÇØ $2$s ÀÇ ÆÄÀÏÀ» $1$s ÀÇ ÆÄÀÏ·Î ±³Ã¼ÇÕ´Ï´Ù"
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, c-format
msgid "removing directory %s\n"
msgstr "%s µð·ºÅ丮¸¦ »èÁ¦ÇÕ´Ï´Ù\n"
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "%s µð·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆÐÇÔ: %s\n"
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== %d È°¼º, %d ºñ¾îÀÖÀ½\n"
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr "%3d>%*s(ºñ¾îÀÖÀ½)"
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr "%3d<%*s(ºñ¾îÀÖÀ½)\n"
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr "¸ÅÅ©·Î %%%s ¿¡ Á¾·áµÇÁö ¾ÊÀº ³»¿ë(body)ÀÌ ÀÖ½À´Ï´Ù\n"
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr "¸ÅÅ©·Î %%%s ¿¡ ºÎÀûÇÕÇÑ À̸§ÀÌ ÀÖ½À´Ï´Ù (%%define)\n"
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr "¸ÅÅ©·Î %%%s ¿¡ Á¾·áµÇÁö ¾ÊÀº ¿É¼ÇÀÌ ÀÖ½À´Ï´Ù\n"
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, c-format
msgid "Macro %%%s has empty body\n"
msgstr "¸ÅÅ©·Î %%%s ¿¡ ºñ¾îÀÖ´Â ³»¿ë(body)ÀÌ ÀÖ½À´Ï´Ù\n"
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, c-format
msgid "Macro %%%s failed to expand\n"
msgstr "¸ÅÅ©·Î %%%s (À»)¸¦ È®Àå(expand)Çϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n"
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr "¸ÅÅ©·Î %%%s ¿¡ ºÎÀûÇÕÇÑ À̸§ÀÌ ÀÖ½À´Ï´Ù (%%undefine)\n"
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr "¸ÅÅ©·Î %%%s (%s) (Àº)´Â ·¹º§ %d ÀÌÇÏ¿¡¼­´Â »ç¿ëµÉ ¼ö ¾ø½À´Ï´Ù\n"
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr "%2$s(%3$s) ¿¡ ¾Ë ¼ö ¾ø´Â ¿É¼Ç %1$c (ÀÌ)°¡ ÀÖ½À´Ï´Ù\n"
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr "¹Ýº¹ Ƚ¼ö(%d)°¡ ÃÖ´ëÄ¡(%d) º¸´Ù Å®´Ï´Ù\n"
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, c-format
msgid "Unterminated %c: %s\n"
msgstr "Á¾·áµÇÁö ¾ÊÀº %c: %s\n"
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr "ºÐ¼®ÇÒ ¼ö ¾ø´Â ¸ÅÅ©·Î ´ÙÀ½¿¡ '%%' °¡ ÀÖ½À´Ï´Ù\n"
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr "¸ÅÅ©·Î %%%.*s (À»)¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n"
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
msgid "Target buffer overflow\n"
msgstr "¸ñÇ¥´ë»ó(Target) ¹öÆÛ ¿À¹öÇ÷οì\n"
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, c-format
msgid "File %s: %s\n"
msgstr "%s ÆÄÀÏ: %s\n"
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr "%s ÆÄÀÏÀÌ %u ¹ÙÀÌÆ® ¿ë·®º¸´Ù Àû½À´Ï´Ù\n"
@@ -3368,6 +3367,18 @@ msgstr "URL Æ÷Æ®´Â ¹Ýµå½Ã ¼ýÀÚÀ̾î¾ß ÇÕ´Ï´Ù\n"
msgid "failed to create %s: %s\n"
msgstr "%s (À»)¸¦ »ý¼ºÇϴµ¥ ½ÇÆÐÇÔ: %s\n"
+#, fuzzy
+#~ msgid "%s: bad magic\n"
+#~ msgstr "À߸øµÈ magic ÀÔ´Ï´Ù"
+
+#~ msgid "%s: read manifest failed: %s\n"
+#~ msgstr "%s: Àдµ¥ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
+
+#~ msgid "%s-%s-%s: immutable header region digest check failed\n"
+#~ msgstr ""
+#~ "%s-%s-%s: °íÁ¤ Çì´õ ¿µ¿ª Ãà¾à(immutable header region digest) °Ë»ç¿¡ ½ÇÆÐ"
+#~ "ÇÔ\n"
+
#~ msgid ""
#~ "Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n"
#~ msgstr ""
diff --git a/po/no.po b/po/no.po
index c968f5b7d..7512b3f00 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-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\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"
@@ -9,54 +9,54 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:38
+#: build.c:39
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "feil med avhengigheter under bygging:\n"
-#: build.c:69
+#: build.c:70
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "Kunne ikke åpne spec fil %s: %s\n"
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "Kunne ikke åpne tar-rør: %m\n"
#. Give up
-#: build.c:168
+#: build.c:169
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr "Feil under lesing av spec-fil fra %s\n"
-#: build.c:196
+#: build.c:197
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "Feil under endring av navn fra %s til %s: %m\n"
-#: build.c:236
+#: build.c:237
#, c-format
msgid "failed to stat %s: %m\n"
msgstr "kunne ikke kjøre stat på %s: %m\n"
-#: build.c:241
+#: build.c:242
#, c-format
msgid "File %s is not a regular file.\n"
msgstr "Fil %s er ikke en vanlig fil.\n"
-#: build.c:250
+#: build.c:251
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr "Fil %s ser ikke ut til å være en spec-fil.\n"
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Bygger målplattformene: %s\n"
-#: build.c:320
+#: build.c:321
#, c-format
msgid "Building for target %s\n"
msgstr "Bygger for mål %s\n"
@@ -74,252 +74,252 @@ msgstr "feil under lesing av header fra pakke\n"
msgid "cannot re-open payload: %s\n"
msgstr "kan ikke gjenåpne \"payload\": %s\n"
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr "skriv ut hvilken versjon av rpm som brukes"
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr "gi mindre detaljert info"
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr "gi mer detaljert info"
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr "definer makro <navn> med verdi <kropp>"
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr "'<navn> <kropp>'"
-#: rpmqv.c:118
+#: rpmqv.c:121
msgid "print macro expansion of <expr>+"
msgstr "skriv ut makroutvidelsen av <uttr>+"
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr "<uttr>+"
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr "send stdout til <kmd>"
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr "<kmd>"
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr "bruk <katalog> som toppnivåkatalog"
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr "<kat>"
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr "les <fil:...> i stedet for standard makrofil(er)"
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr "<fil:...>"
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "les <fil:...> i stedet for standard rpmrc-fil(er)"
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr "vis endelig rpmrc og makrokonfigurasjon"
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr "slå av bruk av libio(3) API"
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr "feilsøking på protokoll-datastrøm"
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr "feilsøk rpmio I/U"
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr "feilsøk URL-cache håndtering"
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:180
+#: rpmqv.c:183
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr ""
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versjon %s\n"
-#: rpmqv.c:235
+#: rpmqv.c:238
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright © 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:236
+#: rpmqv.c:239
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
"Dette progeammet kan redistribueres fritt under betingelsene gitt i GNU GPL"
-#: rpmqv.c:248
+#: rpmqv.c:251
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Bruk: %s {--help}\n"
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:605
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Bruk -e eller --erase i stedet.\n"
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Intern feil i argumentprosesseringen (%d) :-(\n"
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr "kun ett større modi kan spesifiseres"
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr "én type spørring/verifisering kan utføres om gangen"
-#: rpmqv.c:682
+#: rpmqv.c:685
msgid "unexpected query flags"
msgstr "uventede flagg for spørring"
-#: rpmqv.c:685
+#: rpmqv.c:688
msgid "unexpected query format"
msgstr "ventet spørringsformat"
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr "uventet spørringskilde"
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath oppgitt for operasjon som ikke bruker en database"
-#: rpmqv.c:735
+#: rpmqv.c:738
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "kun installasjon, oppgradering, rmsource og rmspec kan tvinges"
-#: rpmqv.c:737
+#: rpmqv.c:740
msgid "files may only be relocated during package installation"
msgstr "filer kan kun omplasseres under pakkeinstallasjon"
-#: rpmqv.c:740
+#: rpmqv.c:743
msgid "only one of --prefix or --relocate may be used"
msgstr "kune en av --prefix eller --relocate kan brukes"
-#: rpmqv.c:743
+#: rpmqv.c:746
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate og --excludepath kan kun brukes ved installasjon av nye pakker"
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix kan kun brukes ved installasjon av nye pakker"
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr "argumenter til --prefix må begynne med en /"
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) kan kun spesifiseres under pakkeinstallasjon"
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr "--percent kan kun spesifiseres under pakkeinstallasjon"
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles kan kun spesifiseres under pakkeinstallasjon"
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:793
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:798
+#: rpmqv.c:801
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:806
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:808
+#: rpmqv.c:811
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -327,7 +327,7 @@ msgstr ""
"skript som slår av alternativer kan kun spesifiseres under pakkeinstallasjon "
"og sletting"
-#: rpmqv.c:813
+#: rpmqv.c:816
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -335,105 +335,105 @@ msgstr ""
"alternativer som slår av utløsing kan kun spesifiseres under "
"pakkeinstallasjon, og sletting"
-#: rpmqv.c:817
+#: rpmqv.c:820
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr "ingen filer å signere\n"
-#: rpmqv.c:868
+#: rpmqv.c:871
#, c-format
msgid "cannot access file %s\n"
msgstr "kan ikke aksessere fil %s\n"
-#: rpmqv.c:887
+#: rpmqv.c:890
msgid "pgp not found: "
msgstr "pgp ikke funnet: "
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr "Skriv inn passord: "
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr "Passordsjekk feilet\n"
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr "Passord er ok.\n"
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:927
+#: rpmqv.c:930
msgid "exec failed\n"
msgstr "kjøring feilet\n"
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr "ingen pakkefiler oppgitt for ombygging"
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr "ingen spec-fil oppgitt for bygging"
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr "ingen tar-fil oppgitt for bygging"
-#: rpmqv.c:1051
+#: rpmqv.c:1055
#, fuzzy
msgid "no packages given for erase"
msgstr "ingen pakker oppgitt for signering"
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr "ingen pakker oppgitt for installering"
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr "ingen argumenter oppgitt for spørring"
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr "ingen argumenter oppgitt for verifisering"
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr "uventede argumenter til --querytags "
-#: rpmqv.c:1145
+#: rpmqv.c:1149
#, fuzzy
msgid "no arguments given"
msgstr "ingen argumenter oppgitt for spørring"
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
msgid "Unable to open temp file.\n"
msgstr "Kunne ikke åpne spec fil %s: %s\n"
@@ -643,7 +643,7 @@ msgstr ""
msgid "Could not open %%files file %s: %s\n"
msgstr "Kunne ikke åpne spec fil %s: %s\n"
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, c-format
msgid "line: %s\n"
msgstr "Installerer %s\n"
@@ -718,156 +718,156 @@ msgstr ""
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
-#: build/pack.c:83
+#: build/pack.c:85
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "klarte ikke å åpne %s: %s\n"
-#: build/pack.c:86
+#: build/pack.c:88
#, c-format
msgid "create archive failed: %s\n"
msgstr "feil under oppretting av arkiv %s\n"
-#: build/pack.c:108
+#: build/pack.c:110
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "cpio_copy skriving feilet: %s\n"
-#: build/pack.c:115
+#: build/pack.c:117
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "cpio_copy: feil under lesing: %s\n"
-#: build/pack.c:218
+#: build/pack.c:220
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "Kunne ikke åpne PreIn-fil: %s\n"
-#: build/pack.c:225
+#: build/pack.c:227
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "Kunne ikke åpne PreUn-fil: %s\n"
-#: build/pack.c:232
+#: build/pack.c:234
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "Kunne ikke åpne PostIn-fil: %s\n"
-#: build/pack.c:239
+#: build/pack.c:241
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "Kunne ikke åpne PostUn-fil: %s\n"
-#: build/pack.c:247
+#: build/pack.c:249
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "Kunne ikke åpne VerifyScript-fil: %s\n"
-#: build/pack.c:262
+#: build/pack.c:264
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr ""
-#: build/pack.c:290
+#: build/pack.c:292
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr ""
-#: build/pack.c:300
+#: build/pack.c:302
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr ""
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: Fseek feilet: %s\n"
-#: build/pack.c:337
+#: build/pack.c:339
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s er ikke en RPM-pakke\n"
-#: build/pack.c:346
+#: build/pack.c:348
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: leser header fra %s\n"
-#: build/pack.c:475
+#: build/pack.c:477
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "Kunne ikke åpne spec fil %s: %s\n"
-#: build/pack.c:494
+#: build/pack.c:496
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "Kunne ikke skrive header til %s: %s\n"
-#: build/pack.c:504
+#: build/pack.c:506
msgid "Bad CSA data\n"
msgstr "Ugyldige CSA-data\n"
-#: build/pack.c:540
+#: build/pack.c:542
#, fuzzy
msgid "Unable to write final header\n"
msgstr "Kunne ikke skrive header til %s: %s\n"
-#: build/pack.c:560
+#: build/pack.c:562
#, c-format
msgid "Generating signature: %d\n"
msgstr "Genererer signatur: %d\n"
-#: build/pack.c:578
+#: build/pack.c:580
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "Kunne ikke åpne spec fil %s: %s\n"
-#: build/pack.c:586
+#: build/pack.c:588
#, c-format
msgid "Could not open %s: %s\n"
msgstr "Kunne ikke åpne %s: %s\n"
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Kunne ikke skrive pakke: %s\n"
-#: build/pack.c:637
+#: build/pack.c:639
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Kunne ikke åpne sigmål %s: %s\n"
-#: build/pack.c:648
+#: build/pack.c:650
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "Kunne ikke åpne spec fil %s: %s\n"
-#: build/pack.c:662
+#: build/pack.c:664
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Kunne ikke skrive header til %s: %s\n"
-#: build/pack.c:672
+#: build/pack.c:674
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Kunne ikke lese \"payload\" fra %s: %s\n"
-#: build/pack.c:678
+#: build/pack.c:680
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Kunne ikke skrive \"payload\" til %s: %s\n"
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr "Skrev: %s\n"
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:787
+#: build/pack.c:789
#, c-format
msgid "cannot create %s: %s\n"
msgstr ""
@@ -1431,73 +1431,73 @@ msgstr " feilet - "
msgid "package %s was already added, replacing with %s\n"
msgstr "pakke %s er allerede installert"
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:423
+#: lib/depends.c:425
msgid "(rpmlib provides)"
msgstr ""
-#: lib/depends.c:444
+#: lib/depends.c:446
msgid "(db files)"
msgstr ""
-#: lib/depends.c:456
+#: lib/depends.c:458
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:469
+#: lib/depends.c:471
#, fuzzy
msgid "(db package)"
msgstr "ingen pakker\n"
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:927
+#: lib/depends.c:931
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr ""
@@ -1587,46 +1587,41 @@ msgstr "%s opprettet som %s\n"
msgid "error creating temporary file %s\n"
msgstr "feil under oppretting av midlertidig fil %s\n"
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead feilet\n"
-#: lib/package.c:174
-#, fuzzy, c-format
-msgid "%s: bad magic\n"
-msgstr "Ugyldig magi"
-
-#: lib/package.c:182
+#: lib/package.c:181
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:190
+#: lib/package.c:189
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature feilet\n"
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen signatur tilgjengelig\n"
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead feilet\n"
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread feilet: %s\n"
@@ -2053,87 +2048,87 @@ msgid "generate signature"
msgstr "generer signatur"
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, fuzzy, c-format
msgid "package %s is intended for a %s architecture"
msgstr "pakke %s er for en annen arkitektur"
-#: lib/problems.c:224
+#: lib/problems.c:226
#, fuzzy, c-format
msgid "package %s is intended for a %s operating system"
msgstr "pakke %s er for et annet operativsystem"
-#: lib/problems.c:229
+#: lib/problems.c:231
#, c-format
msgid "package %s is already installed"
msgstr "pakke %s er allerede installert"
-#: lib/problems.c:234
+#: lib/problems.c:236
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr "sti %s i pakke %s kan ikke relokeres"
-#: lib/problems.c:239
+#: lib/problems.c:241
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:244
+#: lib/problems.c:246
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:249
+#: lib/problems.c:251
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:254
+#: lib/problems.c:256
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:264
+#: lib/problems.c:266
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:269
+#: lib/problems.c:271
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:273
+#: lib/problems.c:275
#, fuzzy, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr "pakke %s er i konflikt: %s\n"
-#: lib/problems.c:277
+#: lib/problems.c:279
#, fuzzy, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr "pakke %s er i konflikt: %s\n"
-#: lib/problems.c:282
+#: lib/problems.c:284
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "conflicts with"
msgstr " er i konflikt med %s-%s-%s\n"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "is needed by"
msgstr " kreves av %s-%s-%s\n"
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr "Datatype %d ikke støttet\n"
@@ -2148,25 +2143,25 @@ msgstr "kan ikke opprette %%%s %s\n"
msgid "cannot write to %%%s %s\n"
msgstr "kan ikke skrive til %%%s %s\n"
-#: lib/psm.c:487
+#: lib/psm.c:485
msgid "source package expected, binary found\n"
msgstr "kildepakke forventet, binær funnet\n"
-#: lib/psm.c:603
+#: lib/psm.c:601
msgid "source package contains no .spec file\n"
msgstr "kildepakke inneholder ikke en .spec-fil\n"
-#: lib/psm.c:722
+#: lib/psm.c:720
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "%s: kjører %s-skript (hvis noen)\n"
-#: lib/psm.c:888
+#: lib/psm.c:890
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:895
+#: lib/psm.c:897
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
@@ -2210,211 +2205,211 @@ msgstr "klarte ikke å åpne %s: %s\n"
msgid "%s failed: %s\n"
msgstr "%s feilet\n"
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, c-format
msgid "incorrect format: %s\n"
msgstr "ukorrekt format: %s\n"
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr "(inneholder ingen filer)"
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr "normal "
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr "erstattet "
-#: lib/query.c:290
+#: lib/query.c:289
msgid "not installed "
msgstr "ikke installert"
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr "delt via nett "
-#: lib/query.c:296
+#: lib/query.c:295
#, c-format
msgid "(unknown %3d) "
msgstr "(ukjent %3d) "
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr "(ingen tilstand)"
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
msgid "package has neither file owner or id lists\n"
msgstr "pakken har verken fileier eller id-lister\n"
-#: lib/query.c:466
+#: lib/query.c:465
#, c-format
msgid "can't query %s: %s\n"
msgstr "kan ikke spørre på %s: %s\n"
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, c-format
msgid "open of %s failed: %s\n"
msgstr "feil under åpning av %s: %s\n"
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr "spørring på %s feilet\n"
-#: lib/query.c:642
+#: lib/query.c:637
msgid "old format source packages cannot be queried\n"
msgstr "kildepakker i gammelt format kan ikke spørres\n"
-#: lib/query.c:668 lib/rpminstall.c:507
-#, c-format
-msgid "%s: read manifest failed: %s\n"
-msgstr "%s: lesing av manifest feilet: %s\n"
+#: lib/query.c:663 lib/rpminstall.c:514
+#, fuzzy, c-format
+msgid "%s: not a package manifest: %s\n"
+msgstr "ingen pakke utløser %s\n"
-#: lib/query.c:712
+#: lib/query.c:707
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:733
+#: lib/query.c:728
msgid "no packages\n"
msgstr "ingen pakker\n"
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "gruppe %s inneholder ingen pakker\n"
-#: lib/query.c:763
+#: lib/query.c:758
#, c-format
msgid "no package triggers %s\n"
msgstr "ingen pakke utløser %s\n"
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "kunne ikke opprette %s: %s\n"
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "ingen pakke utløser %s\n"
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr "ingen pakke krever %s\n"
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr "ingen pakke gir %s\n"
-#: lib/query.c:916
+#: lib/query.c:911
#, c-format
msgid "file %s: %s\n"
msgstr "fil %s: %s\n"
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "filen %s eies ikke av noen pakke\n"
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr "ugyldig pakkenummer: %s\n"
-#: lib/query.c:950
+#: lib/query.c:945
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:955
+#: lib/query.c:950
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, c-format
msgid "package %s is not installed\n"
msgstr "pakke %s er ikke installert\n"
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
msgid "(added files)"
msgstr ""
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
msgid "(added provide)"
msgstr ""
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: åpne feilet: %s\n"
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
msgid "makeTempFile failed\n"
msgstr "makeTempFile feilet\n"
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite feilet: %s\n"
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: kan ikke signere v1.0 RPM\n"
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: Kan ikke signere v2.0 RPM på nytt\n"
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead feilet: %s\n"
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature feilet: %s\n"
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead feilet\n"
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ingen signatur tilgjengelig (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr "IKKE OK"
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr "OK"
@@ -2445,94 +2440,94 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr "pakke %s er i konflikt: %s\n"
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr "Forbereder..."
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr "Forbereder pakker for installasjon..."
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, c-format
msgid "Retrieving %s\n"
msgstr "Henter %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "hopper over %s - overføring feilet - %s\n"
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakke %s kan ikke relokeres\n"
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, c-format
msgid "error reading from file %s\n"
msgstr "feil under lesing fra fil %s\n"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, 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:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "fant %d kilde- og %d binærpakker\n"
-#: lib/rpminstall.c:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "feilede avhengigheter:\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
msgid "installing binary packages\n"
msgstr "installerer binærpakker\n"
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" spesifiserer flere pakker\n"
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
msgid "removing these packages would break dependencies:\n"
msgstr "fjerning av disse pakkene vil ødelegge avhengigheter:\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan ikke åpne %s: %s\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2637,7 +2632,7 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Kunne ikke åpne spec fil %s: %s\n"
-#: lib/rpmts.c:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "kan ikke åpne pakkedatabase i %s\n"
@@ -2779,36 +2774,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, c-format
msgid "excluding directory %s\n"
msgstr "ekskluderer katalog %s\n"
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr "henter liste over monterte filsystemer\n"
-#: lib/verify.c:330
+#: lib/verify.c:283
#, c-format
msgid "missing %s"
msgstr "mangler %s"
-#: lib/verify.c:426
+#: lib/verify.c:379
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "feilede avhengigheter:\n"
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr ""
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -2867,99 +2857,99 @@ msgstr ""
msgid "locked db index %s/%s\n"
msgstr ""
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr ""
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr "mangler { etter %"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr "mangler } etter %{"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
msgid "unexpected ]"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
msgid "unexpected }"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr ""
@@ -2980,235 +2970,245 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr "generer headere som er kompatible med (gamle) rpm[23] pakker"
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "kan ikke åpne %s-indeks ved bruk av db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "cannot open %s index\n"
msgstr "kan ikke åpne %s indeks\n"
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, fuzzy, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "feil(%d) under lagring av post %s til %s\n"
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
-#, c-format
-msgid "error(%d) storing record %s into %s\n"
+#: rpmdb/rpmdb.c:2440
+#, fuzzy, c-format
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "feil(%d) under lagring av post %s til %s\n"
-#: rpmdb/rpmdb.c:2416
-#, c-format
-msgid "error(%d) removing record %s from %s\n"
+#: rpmdb/rpmdb.c:2450
+#, fuzzy, c-format
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "feil(%d) under fjerning av post %s fra %s\n"
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr "feil(%d) under lagring av post %s til %s\n"
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr ""
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr ""
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr ""
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, c-format
msgid "Macro %%%s has empty body\n"
msgstr ""
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, c-format
msgid "Macro %%%s failed to expand\n"
msgstr ""
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr ""
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr ""
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr ""
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr ""
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, c-format
msgid "Unterminated %c: %s\n"
msgstr ""
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr ""
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr ""
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
msgid "Target buffer overflow\n"
msgstr "Overflyt i målbuffer\n"
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, c-format
msgid "File %s: %s\n"
msgstr "Fil %s: %s\n"
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr "Fil %s er mindre enn %u bytes\n"
@@ -3329,6 +3329,13 @@ msgstr "url-port må være et tall\n"
msgid "failed to create %s: %s\n"
msgstr "kunne ikke opprette %s: %s\n"
+#, fuzzy
+#~ msgid "%s: bad magic\n"
+#~ msgstr "Ugyldig magi"
+
+#~ msgid "%s: read manifest failed: %s\n"
+#~ msgstr "%s: lesing av manifest feilet: %s\n"
+
#~ msgid "cannot get %s lock on database\n"
#~ msgstr "kan ikke åpne pakkedatabase i %s\n"
diff --git a/po/pl.po b/po/pl.po
index fe83435b8..d7c033ff4 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-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\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"
@@ -16,54 +16,54 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:38
+#: build.c:39
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "niespe³nione zale¿no¶ci:\n"
-#: build.c:69
+#: build.c:70
#, fuzzy, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "Nie mo¿na otworzyæ pliku spec: %s\n"
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, fuzzy, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "Otwarcie potoku tara nie powiod³o siê: %s\n"
#. Give up
-#: build.c:168
+#: build.c:169
#, fuzzy, c-format
msgid "Failed to read spec file from %s\n"
msgstr "Odczytanie pliku spec z %s nie powiod³o siê\n"
-#: build.c:196
+#: build.c:197
#, fuzzy, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "Zmiana nazwy %s na %s nie powiod³a siê\n"
-#: build.c:236
+#: build.c:237
#, fuzzy, c-format
msgid "failed to stat %s: %m\n"
msgstr "stat nie powiod³o siê %s: %s"
-#: build.c:241
+#: build.c:242
#, fuzzy, c-format
msgid "File %s is not a regular file.\n"
msgstr "Plik: %s nie jest regularnym plikiem\n"
-#: build.c:250
+#: build.c:251
#, fuzzy, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr "%s nie wygl±da na pakiet RPM\n"
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Budowanie dla platform: %s\n"
-#: build.c:320
+#: build.c:321
#, c-format
msgid "Building for target %s\n"
msgstr "Budowanie dla %s\n"
@@ -81,270 +81,270 @@ msgstr "b³±d odczytu nag³ówka z pakietu\n"
msgid "cannot re-open payload: %s\n"
msgstr "nie mo¿na otworzyæ pliku %s\n"
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr "wy¶wietl wersjê u¿ywanego rpm-a"
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:121
#, fuzzy
msgid "print macro expansion of <expr>+"
msgstr "wy¶wietl wersjê u¿ywanego rpm-a"
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr "przeka¿ standartowe wyj¶cie do <komenda>"
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr "u¿yj <katalogu> jako katalogu najwy¿szego poziomu"
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:180
+#: rpmqv.c:183
#, fuzzy
msgid "Signature options:"
msgstr "Rozmiar sygnatury: %d\n"
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr ""
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "plik %s: %s\n"
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr "RPM wersja %s\n"
-#: rpmqv.c:235
+#: rpmqv.c:238
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998 - Red Hat Software"
-#: rpmqv.c:236
+#: rpmqv.c:239
#, fuzzy
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Program mo¿e byæ swobodnie rozpowszechniany na warunkach licencji GNU"
-#: rpmqv.c:248
+#: rpmqv.c:251
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "U¿ycie: rpm {--help}"
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:605
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "U¿yj -e lub --erase\n"
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "B³±d wewnêtrzny w przetwarzaniu argumentu (%d) :-(\n"
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr "tylko jeden g³ówny tryb pracy mo¿e byæ podany"
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr "tylko jeden typ odpytywania/sprawdzania mo¿na wykonaæ na raz"
-#: rpmqv.c:682
+#: rpmqv.c:685
msgid "unexpected query flags"
msgstr "b³êdna konstrukcja argumentów odpytywania"
-#: rpmqv.c:685
+#: rpmqv.c:688
msgid "unexpected query format"
msgstr "b³êdna konstrukcja argumentów odpytywania"
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr "b³êdna konstrukcja argumentów odpytywania"
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath podano dla operacji nie u¿ywaj±cej bazy"
-#: rpmqv.c:735
+#: rpmqv.c:738
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "tylko instalacjê, uaktualnienie i usuwanie ¼róde³ mo¿na wymusiæ"
-#: rpmqv.c:737
+#: rpmqv.c:740
msgid "files may only be relocated during package installation"
msgstr "przesuwania plików mo¿na dokonaæ tylko w trakcie instalacji"
-#: rpmqv.c:740
+#: rpmqv.c:743
msgid "only one of --prefix or --relocate may be used"
msgstr "nie mo¿na jednocze¶nie u¿yæ --prefix i --relocate"
-#: rpmqv.c:743
+#: rpmqv.c:746
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate i --excludepath mo¿na u¿yæ tylko w trakcie instalacji nowych "
"pakietów"
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix mo¿na u¿yæ tylko w trakcie instalacji nowych pakietów"
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr "argumenty dla --prefix musz± siê rozpoczynaæ od /"
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr "--percent mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "nie mo¿na jednocze¶nie u¿yæ --excludedocs i --includedocs"
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:790
+#: rpmqv.c:793
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches mo¿na u¿yæ tylko w trakcie usuwania pakietów"
-#: rpmqv.c:798
+#: rpmqv.c:801
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:803
+#: rpmqv.c:806
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb mo¿na u¿yæ tylko w trakcie instalacji lub usuwania pakietów"
-#: rpmqv.c:808
+#: rpmqv.c:811
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb mo¿na u¿yæ tylko w trakcie instalacji lub usuwania pakietów"
-#: rpmqv.c:813
+#: rpmqv.c:816
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb mo¿na u¿yæ tylko w trakcie instalacji lub usuwania pakietów"
-#: rpmqv.c:817
+#: rpmqv.c:820
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -353,14 +353,14 @@ msgstr ""
"--nodeps mo¿na u¿yæ tylko w trakcie budowania, instalacji, usuwania lub "
"sprawdzania pakietów"
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test mo¿na u¿yæ tylko w trakcie instalacji, usuwania lub budowania pakietów"
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -368,87 +368,87 @@ msgstr ""
"--root (-r) mo¿na u¿yæ tylko w trakcie instalacji, usuwania, sprawdzania "
"pakietów lub przebudowywania bazy"
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenty dla --root (-r) musz± siê rozpoczynaæ od /"
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:868
+#: rpmqv.c:871
#, c-format
msgid "cannot access file %s\n"
msgstr "brak dostêpu do pliku %s\n"
-#: rpmqv.c:887
+#: rpmqv.c:890
msgid "pgp not found: "
msgstr "nie znaleziono pgp: "
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr "Podaj has³o: "
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr "Weryfikacja has³a nieudana\n"
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr "Has³o jest prawid³owe.\n"
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "B³êdny %%_signature spec w pliku makra.\n"
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr "--sign mo¿na u¿yæ tylko w trakcie budowania pakietu"
-#: rpmqv.c:927
+#: rpmqv.c:930
msgid "exec failed\n"
msgstr "wykonanie nie powiod³o siê\n"
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr "nie podano nazw pakietów do przebudowania"
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr "nie podano nazw plików spec do budowania"
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr "nie podano nazw plików tar do budowania"
-#: rpmqv.c:1051
+#: rpmqv.c:1055
#, fuzzy
msgid "no packages given for erase"
msgstr "nie podano nazwy pakietu do podpisania"
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr "nie podano nazw plików do zainstalowania"
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr "nie podano argumentów dla trybu zapytañ"
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr "nie podano argumentów dla sprawdzania"
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr "nieoczekiwane argumenty dla --querytags "
-#: rpmqv.c:1145
+#: rpmqv.c:1149
#, fuzzy
msgid "no arguments given"
msgstr "nie podano argumentów dla trybu zapytañ"
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
#, fuzzy
msgid "Unable to open temp file.\n"
msgstr "Nie mo¿na otworzyæ pliku tymczasowego"
@@ -668,7 +668,7 @@ msgstr "Nie znaleziono pliku: %s"
msgid "Could not open %%files file %s: %s\n"
msgstr "Nie mo¿na otworzyæ %%files pliku: %s"
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, fuzzy, c-format
msgid "line: %s\n"
msgstr "linia: %s"
@@ -743,157 +743,157 @@ msgstr ""
msgid "Could not canonicalize hostname: %s\n"
msgstr "Nie mo¿na rozwi±zaæ nazwy systemu: %s\n"
-#: build/pack.c:83
+#: build/pack.c:85
#, fuzzy, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "utworzenie archiwum pliku %s nie powiod³o siê: %s"
-#: build/pack.c:86
+#: build/pack.c:88
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "utworzenie archiwum pliku %s nie powiod³o siê: %s"
-#: build/pack.c:108
+#: build/pack.c:110
#, fuzzy, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "zapis w trybie cpio_copy nie powiód³ siê: %s"
-#: build/pack.c:115
+#: build/pack.c:117
#, fuzzy, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "odczyt w trybie cpio_copy nie powiód³ siê: %s"
-#: build/pack.c:218
+#: build/pack.c:220
#, fuzzy, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "Nie mo¿na otworzyæ pliku PreIn: %s"
-#: build/pack.c:225
+#: build/pack.c:227
#, fuzzy, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "Nie mo¿na otworzyæ pliku PreUn: %s"
-#: build/pack.c:232
+#: build/pack.c:234
#, fuzzy, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "Nie mo¿na otworzyæ pliku PostIn: %s"
-#: build/pack.c:239
+#: build/pack.c:241
#, fuzzy, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "Nie mo¿na otworzyæ pliku PostUn: %s"
-#: build/pack.c:247
+#: build/pack.c:249
#, fuzzy, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "Nie mo¿na otworzyæ pliku VerifyScript: %s"
-#: build/pack.c:262
+#: build/pack.c:264
#, fuzzy, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "Nie mo¿na otworzyæ skryptu Trigger: %s"
-#: build/pack.c:290
+#: build/pack.c:292
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr "readRPM: otwieranie %s: %s\n"
-#: build/pack.c:300
+#: build/pack.c:302
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr "readRPM: czytanie %s: %s\n"
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: build/pack.c:337
+#: build/pack.c:339
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s nie jest pakietem RPM\n"
-#: build/pack.c:346
+#: build/pack.c:348
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: czytanie nag³ówka z %s\n"
-#: build/pack.c:475
+#: build/pack.c:477
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "Nie mo¿na odczytaæ ikony: %s"
-#: build/pack.c:494
+#: build/pack.c:496
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "Nie mo¿na zapisaæ %s"
-#: build/pack.c:504
+#: build/pack.c:506
#, fuzzy
msgid "Bad CSA data\n"
msgstr "B³êdne dane CSA"
-#: build/pack.c:540
+#: build/pack.c:542
#, fuzzy
msgid "Unable to write final header\n"
msgstr "Nie mo¿na zapisaæ %s"
-#: build/pack.c:560
+#: build/pack.c:562
#, c-format
msgid "Generating signature: %d\n"
msgstr "Generowanie sygnatury: %d\n"
-#: build/pack.c:578
+#: build/pack.c:580
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "Nie mo¿na odczytaæ ikony: %s"
-#: build/pack.c:586
+#: build/pack.c:588
#, fuzzy, c-format
msgid "Could not open %s: %s\n"
msgstr "Nie mo¿na otworzyæ %s\n"
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Nie mo¿na zapisaæ pakietu: %s"
-#: build/pack.c:637
+#: build/pack.c:639
#, fuzzy, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Nie mo¿na odczytaæ sigtarget: %s"
-#: build/pack.c:648
+#: build/pack.c:650
#, fuzzy, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "Nie mo¿na odczytaæ ikony: %s"
-#: build/pack.c:662
+#: build/pack.c:664
#, fuzzy, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Nie mo¿na zapisaæ pakietu: %s"
-#: build/pack.c:672
+#: build/pack.c:674
#, fuzzy, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Nie mo¿na odczytaæ ikony: %s"
-#: build/pack.c:678
+#: build/pack.c:680
#, fuzzy, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Nie mo¿na zapisaæ pakietu: %s"
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr "Zapisano: %s\n"
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Nie mo¿na wygenerowaæ wyj¶ciowej nazwy dla pakietu %s: %s\n"
-#: build/pack.c:787
+#: build/pack.c:789
#, fuzzy, c-format
msgid "cannot create %s: %s\n"
msgstr "nie mo¿na utworzyæ %s"
@@ -1471,77 +1471,77 @@ msgstr " nie powiod³o siê -"
msgid "package %s was already added, replacing with %s\n"
msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany"
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
#, fuzzy
msgid "(rpmrc provides)"
msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
-#: lib/depends.c:423
+#: lib/depends.c:425
#, fuzzy
msgid "(rpmlib provides)"
msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
-#: lib/depends.c:444
+#: lib/depends.c:446
#, fuzzy
msgid "(db files)"
msgstr "b³êdny status pliku: %s"
-#: lib/depends.c:456
+#: lib/depends.c:458
#, fuzzy
msgid "(db provides)"
msgstr "Udostêpniane zasoby:"
-#: lib/depends.c:469
+#: lib/depends.c:471
#, fuzzy
msgid "(db package)"
msgstr "znaleziono %d pakietów\n"
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:927
+#: lib/depends.c:931
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "usuwanie indeksu grupy\n"
#. Record all relations.
-#: lib/depends.c:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr "(nie jest liczb±)"
@@ -1633,50 +1633,45 @@ msgstr "ostrze¿enie: %s utworzony jako %s"
msgid "error creating temporary file %s\n"
msgstr "b³±d w tworzeniu pliku tymczasowego %s"
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/package.c:174
-#, fuzzy, c-format
-msgid "%s: bad magic\n"
-msgstr "B³êdny magic"
-
-#: lib/package.c:182
+#: lib/package.c:181
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
"tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a"
-#: lib/package.c:190
+#: lib/package.c:189
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a"
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature nie powiod³o siê\n"
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Sygnatura nie jest dostêpna\n"
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead nie powiod³o siê\n"
@@ -2133,89 +2128,89 @@ msgid "generate signature"
msgstr "generuj sygnaturê PGP/GPG"
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, fuzzy, c-format
msgid "package %s is intended for a %s architecture"
msgstr "pakiet %s-%s-%s zbudowano dla innej architektury"
-#: lib/problems.c:224
+#: lib/problems.c:226
#, fuzzy, c-format
msgid "package %s is intended for a %s operating system"
msgstr "pakiet %s-%s-%s zbudowano dla innego systemu operacyjnego"
-#: lib/problems.c:229
+#: lib/problems.c:231
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany"
-#: lib/problems.c:234
+#: lib/problems.c:236
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "pakiet %s nie jest przesuwalny\n"
-#: lib/problems.c:239
+#: lib/problems.c:241
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:244
+#: lib/problems.c:246
#, fuzzy, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
"plik %s z pakietu %s-%s-%s jest w konflikcie z plikiem z pakietu %s-%s-%s"
-#: lib/problems.c:249
+#: lib/problems.c:251
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
"pakiet %s-%s-%s (który jest nowszy ni¿ %s-%s-%s) jest ju¿ zainstalowany"
-#: lib/problems.c:254
+#: lib/problems.c:256
#, fuzzy, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s"
-#: lib/problems.c:264
+#: lib/problems.c:266
#, fuzzy, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s"
-#: lib/problems.c:269
+#: lib/problems.c:271
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:273
+#: lib/problems.c:275
#, fuzzy, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n"
-#: lib/problems.c:277
+#: lib/problems.c:279
#, fuzzy, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n"
-#: lib/problems.c:282
+#: lib/problems.c:284
#, fuzzy, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "wyst±pi³ nieznany b³±d %d w trakcie manipulowania pakietem %s-%s-%s"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "conflicts with"
msgstr " jest w konflikcie z %s-%s-%s\n"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "is needed by"
msgstr " jest wymagany przez %s-%s-%s\n"
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr "Typ danych %d nie jest obs³ugiwany\n"
@@ -2230,27 +2225,27 @@ msgstr "nie mo¿na utworzyæ %s"
msgid "cannot write to %%%s %s\n"
msgstr "nie mo¿na zapisaæ do %s"
-#: lib/psm.c:487
+#: lib/psm.c:485
#, fuzzy
msgid "source package expected, binary found\n"
msgstr "spodziewany pakiet ¼ród³owy a nie binarny"
-#: lib/psm.c:603
+#: lib/psm.c:601
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
-#: lib/psm.c:722
+#: lib/psm.c:720
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n"
-#: lib/psm.c:888
+#: lib/psm.c:890
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "wykonanie skryptu nie powiod³o siê"
-#: lib/psm.c:895
+#: lib/psm.c:897
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "wykonanie skryptu nie powiod³o siê"
@@ -2294,216 +2289,216 @@ msgstr "nie mo¿na otworzyæ %s: %s"
msgid "%s failed: %s\n"
msgstr "%s nie powiod³o siê"
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "b³±d w formacie: %s\n"
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr "(nie zawiera plików)"
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr "normalny "
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr "zast±piony "
-#: lib/query.c:290
+#: lib/query.c:289
msgid "not installed "
msgstr "niezainstalowany"
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr "udostêpniony w sieci"
-#: lib/query.c:296
+#: lib/query.c:295
#, c-format
msgid "(unknown %3d) "
msgstr "(nieznany %3d)"
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr "(brak statusu)"
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "pakiet nie ma ani w³a¶ciciela pliku ani list id"
-#: lib/query.c:466
+#: lib/query.c:465
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "nie mo¿na odwi±zaæ %s: %s\n"
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, c-format
msgid "open of %s failed: %s\n"
msgstr "otwarcie %s nie powiod³o siê\n"
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr "odpytywanie %s nie powiod³o siê\n"
-#: lib/query.c:642
+#: lib/query.c:637
msgid "old format source packages cannot be queried\n"
msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n"
-#: lib/query.c:668 lib/rpminstall.c:507
+#: lib/query.c:663 lib/rpminstall.c:514
#, fuzzy, c-format
-msgid "%s: read manifest failed: %s\n"
-msgstr "%s: readLead nie powiod³o siê\n"
+msgid "%s: not a package manifest: %s\n"
+msgstr "¿aden pakiet nie zahacza %s\n"
-#: lib/query.c:712
+#: lib/query.c:707
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "odpytywanie pliku spec %s nie powiod³o siê, nie mo¿na interpretowaæ\n"
-#: lib/query.c:733
+#: lib/query.c:728
#, fuzzy
msgid "no packages\n"
msgstr "znaleziono %d pakietów\n"
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "grupa %s nie zawiera ¿adnych pakietów\n"
-#: lib/query.c:763
+#: lib/query.c:758
#, c-format
msgid "no package triggers %s\n"
msgstr "¿aden pakiet nie zahacza %s\n"
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "Odczytanie %s nie powiod³o siê: %s."
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "¿aden pakiet nie zahacza %s\n"
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr "¿aden pakiet nie wymaga %s\n"
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr "¿aden pakiet nie udostêpnia %s\n"
-#: lib/query.c:916
+#: lib/query.c:911
#, c-format
msgid "file %s: %s\n"
msgstr "plik %s: %s\n"
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr "b³êdny numer pakietu: %s\n"
-#: lib/query.c:950
+#: lib/query.c:945
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "numer rekordu pakietu: %d\n"
-#: lib/query.c:955
+#: lib/query.c:950
#, fuzzy, c-format
msgid "record %u could not be read\n"
msgstr "nie mo¿na odczytaæ rekordu %d\n"
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, c-format
msgid "package %s is not installed\n"
msgstr "pakiet %s nie jest zainstalowany\n"
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
#, fuzzy
msgid "(added files)"
msgstr "b³êdny status pliku: %s"
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
#, fuzzy
msgid "(added provide)"
msgstr "Udostêpniane zasoby:"
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: Open nie powiod³o siê\n"
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "wykonanie nie powiod³o siê\n"
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: Nie mo¿na podpisaæ v1.0 RPM\n"
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: Nie mo¿na ponownie podpisaæ v2.0 RPM\n"
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, fuzzy, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmReadSignature nie powiod³o siê\n"
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, 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:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr "NIE DOBRZE"
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
msgid " (MISSING KEYS:"
msgstr " (BRAK KLUCZY:"
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr "(NIEWIARYGODNE KLUCZE:"
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr "OK"
@@ -2535,95 +2530,95 @@ msgstr " rpm {--version}"
msgid "package %s has unsatisfied %s: %s\n"
msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n"
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "nie podano nazw plików do zainstalowania"
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, 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:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr "... jako %s\n"
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s pomijany - transmisja %s nie powiod³a siê\n"
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakiet %s nie jest przesuwalny\n"
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, c-format
msgid "error reading from file %s\n"
msgstr "b³±d czytania z pliku %s\n"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "plik %s wymaga nowszej wersji RPM\n"
-#: lib/rpminstall.c:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie mo¿e byæ zainstalowany\n"
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, 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:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "niespe³nione zale¿no¶ci:\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
msgid "installing binary packages\n"
msgstr "instalacja pakietów binarnych\n"
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "nie mo¿na otworzyæ pliku %s: %s"
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" okre¶la wiele pakietów\n"
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
msgid "removing these packages would break dependencies:\n"
msgstr "usuniêcie tych pakietów zerwie zale¿no¶ci:\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nie mo¿na otworzyæ %s\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr "Instalacja %s\n"
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2728,7 +2723,7 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Nie mo¿na otworzyæ %s do odczytu: %s."
-#: lib/rpmts.c:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
@@ -2877,36 +2872,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Blok sygnatury: %d\n"
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s pominiêty z powodu flagi missingok\n"
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, fuzzy, c-format
msgid "excluding directory %s\n"
msgstr "tworzenie katalogu: %s\n"
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr ""
-#: lib/verify.c:330
+#: lib/verify.c:283
#, fuzzy, c-format
msgid "missing %s"
msgstr "brak %s\n"
-#: lib/verify.c:426
+#: lib/verify.c:379
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: "
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr ""
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -2965,100 +2955,100 @@ msgstr ""
msgid "locked db index %s/%s\n"
msgstr "usuwanie indeksu plików dla %s\n"
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr ""
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
#, fuzzy
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr "grabData() RPM_STRING_TYPE licznik musi byæ 1.\n"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr "brak { po %"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr "brak } po %{"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr "pusty format etykiety"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr "pusta nazwa etykiety"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr "nieznana etykieta"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr "spodziewany ] na koñcu tablicy"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
msgid "unexpected ]"
msgstr "nie spodziewany ]"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
msgid "unexpected }"
msgstr "nie spodziewany }"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr "spodziewany ? w wyra¿eniu"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
msgid "{ expected after ? in expression"
msgstr "spodziewany { po ? w wyra¿eniu"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr "spodziewany } w wyra¿eniu"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr "spodziewany : po podwyra¿eniu ?"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
msgid "{ expected after : in expression"
msgstr "spodziewany { po : w wyra¿eniu"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr "spodziewany | na koñcu wyra¿enia"
@@ -3081,238 +3071,248 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "nie mo¿na otworzyæ %s przy %s:%d"
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "nie mo¿na otworzyæ %s\n"
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
#, fuzzy
msgid "no dbpath has been set\n"
msgstr "¶cie¿ka bazy danych nie zosta³a podana"
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "b³±d pobierania rekordu %s z %s"
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, fuzzy, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "b³±d zapisywania rekordu %s do %s"
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla poszukiwania"
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "usuwanie indeksu grupy\n"
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "usuwanie indeksu nazw\n"
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
-msgid "error(%d) storing record %s into %s\n"
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "b³±d zapisywania rekordu %s do %s"
-#: rpmdb/rpmdb.c:2416
+#: rpmdb/rpmdb.c:2450
#, fuzzy, c-format
-msgid "error(%d) removing record %s from %s\n"
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "b³±d usuwania rekordu %s z %s"
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "b³±d szukania pakietu %s\n"
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "zmiana nazwy %s na %s\n"
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "zmiana nazwy %s na %s\n"
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, fuzzy, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr "b³±d zapisywania rekordu %s do %s"
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr "¶cie¿ka bazy danych nie zosta³a podana"
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "odbudowywujê bazê danych w rootdir %s\n"
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "tymczasowa baza danych %s ju¿ istnieje"
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "tworzenie katalogu: %s\n"
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "tworzenie katalogu: %s\n"
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "otwieranie starej bazy danych\n"
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "otwieranie nowej bazy danych\n"
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "rekord numer %d w bazie danych jest b³êdny -- rekord pominiêto"
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
#, fuzzy
msgid "failed to rebuild database: original database remains in place\n"
msgstr "przebudowanie bazy nie powiod³o siê; stara pozosta³a na miejscu\n"
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr "zamiana starej bazy na now± nie powiod³a siê!\n"
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "naprawcze zastêpowanie plików w %s plikami z %s"
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "tworzenie katalogu: %s\n"
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n"
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== aktywny %d pusty %d\n"
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr "%3d>%*s(pusty)"
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr "%3d<%*s(pusty)\n"
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, fuzzy, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr "Makro %%%s ma niezakoñczon± strukturê"
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, fuzzy, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr "Makro %%%s ma niedozwolon± nazwê (%%define)"
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, fuzzy, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr "Makro %%%s ma niezakoñczone opcje"
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, fuzzy, c-format
msgid "Macro %%%s has empty body\n"
msgstr "Makro %%%s nie zawiera ¿adnych poleceñ"
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, fuzzy, c-format
msgid "Macro %%%s failed to expand\n"
msgstr "Rozwiniêcie makra %%%s nie powiod³o siê"
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, fuzzy, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr "Makro %%%s ma niedozwolon± nazwê (%%undefine)"
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, fuzzy, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr "Makro %%%s (%s) nie by³o u¿yte poni¿ej poziomu %d"
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, fuzzy, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr "Nieznana opcja %c in %s(%s)"
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, fuzzy, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr "G³êboko¶æ(%d) rekursji wiêksza mi¿ maks(%d)"
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, fuzzy, c-format
msgid "Unterminated %c: %s\n"
msgstr "Niezakoñczone %c: %s"
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, fuzzy, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr "Napotkano nieprzetwarzalne makro po %%"
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, fuzzy, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr "Nie znaleziono makra %%%.*s, makro pominiête"
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
#, fuzzy
msgid "Target buffer overflow\n"
msgstr "Przepe³nienie bufora docelowego"
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, fuzzy, c-format
msgid "File %s: %s\n"
msgstr "Plik %s: %s"
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, fuzzy, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr "Plik %s jest mniejszy ni¿ %d bajtów"
@@ -3437,6 +3437,14 @@ msgid "failed to create %s: %s\n"
msgstr "utworzenie %s nie powiod³o siê\n"
#, fuzzy
+#~ msgid "%s: bad magic\n"
+#~ msgstr "B³êdny magic"
+
+#, fuzzy
+#~ msgid "%s: read manifest failed: %s\n"
+#~ msgstr "%s: readLead nie powiod³o siê\n"
+
+#, fuzzy
#~ msgid "removed db file %s\n"
#~ msgstr "usuwanie indeksu plików dla %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0a82ee273..41e5885f3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,61 +4,61 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\n"
-#: build.c:38
+#: build.c:39
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "lista dependncias do pacote"
# , c-format
-#: build.c:69
+#: build.c:70
#, fuzzy, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, fuzzy, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "No consegui abrir: %s\n"
# , c-format
#. Give up
-#: build.c:168
+#: build.c:169
#, fuzzy, c-format
msgid "Failed to read spec file from %s\n"
msgstr "No consegui ler o arquivo spec de %s\n"
# , c-format
-#: build.c:196
+#: build.c:197
#, fuzzy, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "No consegui ler o arquivo spec de %s\n"
# , c-format
-#: build.c:236
+#: build.c:237
#, fuzzy, c-format
msgid "failed to stat %s: %m\n"
msgstr "No consegui abrir: %s\n"
-#: build.c:241
+#: build.c:242
#, fuzzy, c-format
msgid "File %s is not a regular file.\n"
msgstr "no foi passado pacote para instalao"
-#: build.c:250
+#: build.c:251
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:320
+#: build.c:321
#, fuzzy, c-format
msgid "Building for target %s\n"
msgstr "instale pacote"
@@ -77,114 +77,114 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr "No consegui abrir: %s\n"
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr "mostra a verso do programa rpm sendo usado"
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:121
#, fuzzy
msgid "print macro expansion of <expr>+"
msgstr "mostra a verso do programa rpm sendo usado"
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr "envia a saida padro para <cmd>"
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr "use <diretrio> como diretrio raiz"
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:180
+#: rpmqv.c:183
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr ""
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr ""
# , c-format
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "No consegui ler o arquivo spec de %s\n"
@@ -197,160 +197,160 @@ msgstr "No consegui ler o arquivo spec de %s\n"
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verso %s\n"
-#: rpmqv.c:235
+#: rpmqv.c:238
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:236
+#: rpmqv.c:239
#, fuzzy
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
"Este Software pode ser livremente redistribuido sob os termos da Licensa "
"Pblica GNU (GPL)"
-#: rpmqv.c:248
+#: rpmqv.c:251
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "uso: rpm {--help}"
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:605
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Use -e ou --erase no lugar.\n"
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr "somente um modo principal pode ser especificado"
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr "um tipo de pesquisa/verificao pode ser feita por vez"
-#: rpmqv.c:682
+#: rpmqv.c:685
#, fuzzy
msgid "unexpected query flags"
msgstr "fonte de pesquisa no esperado"
-#: rpmqv.c:685
+#: rpmqv.c:688
#, fuzzy
msgid "unexpected query format"
msgstr "fonte de pesquisa no esperado"
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr "fonte de pesquisa no esperado"
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath passado para uma operao que no usa um banco de dados"
-#: rpmqv.c:735
+#: rpmqv.c:738
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "somente instalao e atualizao podem ser foradas"
-#: rpmqv.c:737
+#: rpmqv.c:740
#, fuzzy
msgid "files may only be relocated during package installation"
msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:740
+#: rpmqv.c:743
#, fuzzy
msgid "only one of --prefix or --relocate may be used"
msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
-#: rpmqv.c:743
+#: rpmqv.c:746
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--prefix somente pode ser usada quando se est instalando novos pacotes"
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix somente pode ser usada quando se est instalando novos pacotes"
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr "argumentos para --prefix devem comear com uma /"
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
"--hash (-h) somente podem ser especificado durante instalaes de pacotes"
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
"--replacepkgs somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr ""
"--excludedocs somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr ""
"--includedocs somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr ""
"--ignorearch somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:790
+#: rpmqv.c:793
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr ""
"--allmatches somente pode ser especificado durante desinstalaes de pacotes"
-#: rpmqv.c:798
+#: rpmqv.c:801
#, fuzzy
msgid "--allfiles may only be specified during package installation"
msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:803
+#: rpmqv.c:806
#, fuzzy
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--test somente pode ser especificado durante [des]instalaes e construes de "
"pacotes"
-#: rpmqv.c:808
+#: rpmqv.c:811
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
@@ -359,7 +359,7 @@ msgstr ""
"--test somente pode ser especificado durante [des]instalaes e construes de "
"pacotes"
-#: rpmqv.c:813
+#: rpmqv.c:816
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
@@ -368,7 +368,7 @@ msgstr ""
"--test somente pode ser especificado durante [des]instalaes e construes de "
"pacotes"
-#: rpmqv.c:817
+#: rpmqv.c:820
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -377,7 +377,7 @@ msgstr ""
"--nodeps somente pode ser especificado durante [des]instalaes e verificaes "
"de pacotes"
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -385,7 +385,7 @@ msgstr ""
"--test somente pode ser especificado durante [des]instalaes e construes de "
"pacotes"
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -393,90 +393,90 @@ msgstr ""
"--root (-r) somente pode ser especificado durante [des]instalaes, pesquisas "
"e reconstruo de bancos de dados"
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumentos para --root (-r) devem comear com uma /"
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:868
+#: rpmqv.c:871
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:887
+#: rpmqv.c:890
#, fuzzy
msgid "pgp not found: "
msgstr "no foi passado pacote para desinstalao"
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr "Checagem de pass phrase falhou\n"
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr "Pass phrase ok.\n"
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr "--sign somente pode ser usado durante a construo de pacotes"
-#: rpmqv.c:927
+#: rpmqv.c:930
#, fuzzy
msgid "exec failed\n"
msgstr "Construo falhou.\n"
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr "no foram passados pacotes para reconstruo"
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr "no foi passado arquivo spec para construo"
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr "no foram passados arquivos tar para construo"
-#: rpmqv.c:1051
+#: rpmqv.c:1055
#, fuzzy
msgid "no packages given for erase"
msgstr "no foram passados pacotes para assinatura"
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr "no foi passado pacote para instalao"
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr "no foi passado argumento para pesquisa"
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr "no foi passado argumento para verificao"
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr "argumentos no esperados em --querytags"
-#: rpmqv.c:1145
+#: rpmqv.c:1149
#, fuzzy
msgid "no arguments given"
msgstr "no foi passado argumento para pesquisa"
# , c-format
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
#, fuzzy
msgid "Unable to open temp file.\n"
msgstr "No consegui abrir: %s\n"
@@ -704,7 +704,7 @@ msgid "Could not open %%files file %s: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, fuzzy, c-format
msgid "line: %s\n"
msgstr "No consegui ler o arquivo spec de %s\n"
@@ -785,180 +785,180 @@ msgid "Could not canonicalize hostname: %s\n"
msgstr ""
# , c-format
-#: build/pack.c:83
+#: build/pack.c:85
#, fuzzy, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:86
+#: build/pack.c:88
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:108
+#: build/pack.c:110
#, fuzzy, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:115
+#: build/pack.c:117
#, fuzzy, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:218
+#: build/pack.c:220
#, fuzzy, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:225
+#: build/pack.c:227
#, fuzzy, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:232
+#: build/pack.c:234
#, fuzzy, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:239
+#: build/pack.c:241
#, fuzzy, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:247
+#: build/pack.c:249
#, fuzzy, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:262
+#: build/pack.c:264
#, fuzzy, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:290
+#: build/pack.c:292
#, fuzzy, c-format
msgid "readRPM: open %s: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:300
+#: build/pack.c:302
#, fuzzy, c-format
msgid "readRPM: read %s: %s\n"
msgstr "No consegui ler o arquivo spec de %s\n"
# , c-format
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "No consegui abrir: %s\n"
-#: build/pack.c:337
+#: build/pack.c:339
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr ""
-#: build/pack.c:346
+#: build/pack.c:348
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr ""
# , c-format
-#: build/pack.c:475
+#: build/pack.c:477
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:494
+#: build/pack.c:496
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "No consegui abrir: %s\n"
-#: build/pack.c:504
+#: build/pack.c:506
msgid "Bad CSA data\n"
msgstr ""
# , c-format
-#: build/pack.c:540
+#: build/pack.c:542
#, fuzzy
msgid "Unable to write final header\n"
msgstr "No consegui abrir: %s\n"
-#: build/pack.c:560
+#: build/pack.c:562
#, fuzzy, c-format
msgid "Generating signature: %d\n"
msgstr "gere assinatura PGP"
# , c-format
-#: build/pack.c:578
+#: build/pack.c:580
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:586
+#: build/pack.c:588
#, fuzzy, c-format
msgid "Could not open %s: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:637
+#: build/pack.c:639
#, fuzzy, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:648
+#: build/pack.c:650
#, fuzzy, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:662
+#: build/pack.c:664
#, fuzzy, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:672
+#: build/pack.c:674
#, fuzzy, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:678
+#: build/pack.c:680
#, fuzzy, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr ""
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
# , c-format
-#: build/pack.c:787
+#: build/pack.c:789
#, fuzzy, c-format
msgid "cannot create %s: %s\n"
msgstr "No consegui abrir: %s\n"
@@ -1583,76 +1583,76 @@ msgstr "Construo falhou.\n"
msgid "package %s was already added, replacing with %s\n"
msgstr "no foi passado pacote para instalao"
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:423
+#: lib/depends.c:425
msgid "(rpmlib provides)"
msgstr ""
# , c-format
-#: lib/depends.c:444
+#: lib/depends.c:446
#, fuzzy
msgid "(db files)"
msgstr "No consegui abrir: %s\n"
-#: lib/depends.c:456
+#: lib/depends.c:458
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:469
+#: lib/depends.c:471
#, fuzzy
msgid "(db package)"
msgstr "pesquise todos os pacotes"
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
# , c-format
-#: lib/depends.c:927
+#: lib/depends.c:931
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "No consegui abrir: %s\n"
#. Record all relations.
-#: lib/depends.c:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr ""
@@ -1750,48 +1750,43 @@ msgstr "No consegui abrir: %s\n"
msgid "error creating temporary file %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:174
-#, c-format
-msgid "%s: bad magic\n"
-msgstr ""
-
-#: lib/package.c:182
+#: lib/package.c:181
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:190
+#: lib/package.c:189
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr ""
# , c-format
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "No consegui abrir: %s\n"
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
# , c-format
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "No consegui abrir: %s\n"
@@ -2257,85 +2252,85 @@ msgid "generate signature"
msgstr "gere assinatura PGP"
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, fuzzy, c-format
msgid "package %s is intended for a %s architecture"
msgstr "no foi passado pacote para instalao"
-#: lib/problems.c:224
+#: lib/problems.c:226
#, fuzzy, c-format
msgid "package %s is intended for a %s operating system"
msgstr "no foi passado pacote para instalao"
-#: lib/problems.c:229
+#: lib/problems.c:231
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "no foi passado pacote para instalao"
-#: lib/problems.c:234
+#: lib/problems.c:236
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "no foi passado pacote para instalao"
-#: lib/problems.c:239
+#: lib/problems.c:241
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:244
+#: lib/problems.c:246
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:249
+#: lib/problems.c:251
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "no foi passado pacote para instalao"
-#: lib/problems.c:254
+#: lib/problems.c:256
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:264
+#: lib/problems.c:266
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:269
+#: lib/problems.c:271
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:273
+#: lib/problems.c:275
#, fuzzy, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr "no foi passado pacote para instalao"
-#: lib/problems.c:277
+#: lib/problems.c:279
#, fuzzy, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr "no foi passado pacote para instalao"
-#: lib/problems.c:282
+#: lib/problems.c:284
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/problems.c:363
+#: lib/problems.c:365
msgid "conflicts with"
msgstr ""
-#: lib/problems.c:363
+#: lib/problems.c:365
msgid "is needed by"
msgstr ""
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
@@ -2352,26 +2347,26 @@ msgstr "No consegui abrir: %s\n"
msgid "cannot write to %%%s %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/psm.c:487
+#: lib/psm.c:485
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:603
+#: lib/psm.c:601
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: lib/psm.c:722
+#: lib/psm.c:720
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "no execute nenhum estgio"
-#: lib/psm.c:888
+#: lib/psm.c:890
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:895
+#: lib/psm.c:897
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
@@ -2416,224 +2411,223 @@ msgstr "No consegui abrir: %s\n"
msgid "%s failed: %s\n"
msgstr "Construo falhou.\n"
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr ""
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr ""
-#: lib/query.c:290
+#: lib/query.c:289
#, fuzzy
msgid "not installed "
msgstr "no foi passado pacote para instalao"
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr ""
-#: lib/query.c:296
+#: lib/query.c:295
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr ""
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "no foi passado pacote para instalao"
# , c-format
-#: lib/query.c:466
+#: lib/query.c:465
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "Construo falhou.\n"
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:642
+#: lib/query.c:637
msgid "old format source packages cannot be queried\n"
msgstr ""
-# , c-format
-#: lib/query.c:668 lib/rpminstall.c:507
+#: lib/query.c:663 lib/rpminstall.c:514
#, fuzzy, c-format
-msgid "%s: read manifest failed: %s\n"
-msgstr "No consegui abrir: %s\n"
+msgid "%s: not a package manifest: %s\n"
+msgstr "no foram passados pacotes para assinatura"
-#: lib/query.c:712
+#: lib/query.c:707
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:733
+#: lib/query.c:728
#, fuzzy
msgid "no packages\n"
msgstr "pesquise todos os pacotes"
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:763
+#: lib/query.c:758
#, fuzzy, c-format
msgid "no package triggers %s\n"
msgstr "no foram passados pacotes para assinatura"
# , c-format
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "No consegui ler o arquivo spec de %s\n"
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "no foram passados pacotes para assinatura"
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:916
+#: lib/query.c:911
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:950
+#: lib/query.c:945
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:955
+#: lib/query.c:950
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, fuzzy, c-format
msgid "package %s is not installed\n"
msgstr "no foi passado pacote para instalao"
# , c-format
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
#, fuzzy
msgid "(added files)"
msgstr "No consegui abrir: %s\n"
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
msgid "(added provide)"
msgstr ""
# , c-format
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "Construo falhou.\n"
# , c-format
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
# , c-format
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr ""
@@ -2664,11 +2658,11 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr "no foi passado pacote para instalao"
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "no foi passado pacote para instalao"
@@ -2681,90 +2675,90 @@ 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:300
+#: lib/rpminstall.c:307
#, 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:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "no foi passado pacote para instalao"
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "no foi passado pacote para instalao"
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "lista dependncias do pacote"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
#, fuzzy
msgid "installing binary packages\n"
msgstr "instale pacote"
# , c-format
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
#, fuzzy
msgid "removing these packages would break dependencies:\n"
msgstr "lista dependncias do pacote"
# , c-format
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "no foi passado pacote para desinstalao"
@@ -2877,7 +2871,7 @@ msgid "Unable to open %s for reading: %s.\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: lib/rpmts.c:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "No consegui abrir: %s\n"
@@ -3026,7 +3020,7 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
@@ -3040,30 +3034,25 @@ msgstr ""
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, fuzzy, c-format
msgid "excluding directory %s\n"
msgstr "RPM verso %s\n"
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr ""
-#: lib/verify.c:330
+#: lib/verify.c:283
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:426
+#: lib/verify.c:379
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "lista dependncias do pacote"
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr ""
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -3122,101 +3111,101 @@ msgstr ""
msgid "locked db index %s/%s\n"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr ""
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
#, fuzzy
msgid "unexpected ]"
msgstr "fonte de pesquisa no esperado"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
#, fuzzy
msgid "unexpected }"
msgstr "fonte de pesquisa no esperado"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr ""
@@ -3239,143 +3228,155 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
# , c-format
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
msgid "no dbpath has been set\n"
msgstr ""
# , c-format
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:1930
+# , c-format
+#: rpmdb/rpmdb.c:1384
+#, fuzzy, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "No consegui abrir: %s\n"
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "no foi passado pacote para desinstalao"
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
# , c-format
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
-msgid "error(%d) storing record %s into %s\n"
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: rpmdb/rpmdb.c:2416
+#: rpmdb/rpmdb.c:2450
#, fuzzy, c-format
-msgid "error(%d) removing record %s from %s\n"
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "no foi passado pacote para instalao"
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
# , c-format
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:3137
+# , c-format
+#: rpmdb/rpmdb.c:2836
+#, fuzzy, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr "No consegui abrir: %s\n"
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
# , c-format
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
@@ -3388,106 +3389,106 @@ msgstr ""
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "RPM verso %s\n"
# , c-format
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr ""
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr ""
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr ""
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, c-format
msgid "Macro %%%s has empty body\n"
msgstr ""
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, c-format
msgid "Macro %%%s failed to expand\n"
msgstr ""
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr ""
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr ""
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr ""
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr ""
# , c-format
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, fuzzy, c-format
msgid "Unterminated %c: %s\n"
msgstr "No consegui abrir: %s\n"
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr ""
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, fuzzy, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr "no foi passado pacote para desinstalao"
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
msgid "Target buffer overflow\n"
msgstr ""
# , c-format
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, fuzzy, c-format
msgid "File %s: %s\n"
msgstr "No consegui ler o arquivo spec de %s\n"
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr ""
@@ -3611,6 +3612,11 @@ msgstr "No consegui abrir o pipe tar: %s\n"
# , c-format
#, fuzzy
+#~ msgid "%s: read manifest failed: %s\n"
+#~ msgstr "No consegui abrir: %s\n"
+
+# , c-format
+#, fuzzy
#~ msgid "bad db file %s\n"
#~ msgstr "No consegui abrir: %s\n"
diff --git a/po/ro.po b/po/ro.po
index 11eb6f603..98a39102a 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-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\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"
@@ -9,53 +9,53 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:38
+#: build.c:39
msgid "Failed build dependencies:\n"
msgstr ""
-#: build.c:69
+#: build.c:70
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr ""
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr ""
#. Give up
-#: build.c:168
+#: build.c:169
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr ""
-#: build.c:196
+#: build.c:197
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr ""
-#: build.c:236
+#: build.c:237
#, c-format
msgid "failed to stat %s: %m\n"
msgstr ""
-#: build.c:241
+#: build.c:242
#, c-format
msgid "File %s is not a regular file.\n"
msgstr ""
-#: build.c:250
+#: build.c:251
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:320
+#: build.c:321
#, c-format
msgid "Building for target %s\n"
msgstr ""
@@ -73,357 +73,357 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:121
msgid "print macro expansion of <expr>+"
msgstr ""
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:180
+#: rpmqv.c:183
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr ""
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:235
+#: rpmqv.c:238
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:236
+#: rpmqv.c:239
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:248
+#: rpmqv.c:251
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:605
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:682
+#: rpmqv.c:685
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:685
+#: rpmqv.c:688
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:735
+#: rpmqv.c:738
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:737
+#: rpmqv.c:740
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:740
+#: rpmqv.c:743
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:743
+#: rpmqv.c:746
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:793
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:798
+#: rpmqv.c:801
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:806
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:808
+#: rpmqv.c:811
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:813
+#: rpmqv.c:816
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:820
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:868
+#: rpmqv.c:871
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:887
+#: rpmqv.c:890
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:927
+#: rpmqv.c:930
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1051
+#: rpmqv.c:1055
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1145
+#: rpmqv.c:1149
msgid "no arguments given"
msgstr ""
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
msgid "Unable to open temp file.\n"
msgstr ""
@@ -630,7 +630,7 @@ msgstr ""
msgid "Could not open %%files file %s: %s\n"
msgstr ""
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, c-format
msgid "line: %s\n"
msgstr ""
@@ -705,152 +705,152 @@ msgstr ""
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
-#: build/pack.c:83
+#: build/pack.c:85
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr ""
-#: build/pack.c:86
+#: build/pack.c:88
#, c-format
msgid "create archive failed: %s\n"
msgstr ""
-#: build/pack.c:108
+#: build/pack.c:110
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr ""
-#: build/pack.c:115
+#: build/pack.c:117
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr ""
-#: build/pack.c:218
+#: build/pack.c:220
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr ""
-#: build/pack.c:225
+#: build/pack.c:227
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr ""
-#: build/pack.c:232
+#: build/pack.c:234
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr ""
-#: build/pack.c:239
+#: build/pack.c:241
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr ""
-#: build/pack.c:247
+#: build/pack.c:249
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr ""
-#: build/pack.c:262
+#: build/pack.c:264
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr ""
-#: build/pack.c:290
+#: build/pack.c:292
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr ""
-#: build/pack.c:300
+#: build/pack.c:302
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr ""
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr ""
-#: build/pack.c:337
+#: build/pack.c:339
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr ""
-#: build/pack.c:346
+#: build/pack.c:348
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr ""
-#: build/pack.c:475
+#: build/pack.c:477
msgid "Unable to create immutable header region.\n"
msgstr ""
-#: build/pack.c:494
+#: build/pack.c:496
msgid "Unable to write temp header\n"
msgstr ""
-#: build/pack.c:504
+#: build/pack.c:506
msgid "Bad CSA data\n"
msgstr ""
-#: build/pack.c:540
+#: build/pack.c:542
msgid "Unable to write final header\n"
msgstr ""
-#: build/pack.c:560
+#: build/pack.c:562
#, c-format
msgid "Generating signature: %d\n"
msgstr ""
-#: build/pack.c:578
+#: build/pack.c:580
msgid "Unable to reload signature header.\n"
msgstr ""
-#: build/pack.c:586
+#: build/pack.c:588
#, c-format
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
-#: build/pack.c:637
+#: build/pack.c:639
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr ""
-#: build/pack.c:648
+#: build/pack.c:650
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr ""
-#: build/pack.c:662
+#: build/pack.c:664
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr ""
-#: build/pack.c:672
+#: build/pack.c:674
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr ""
-#: build/pack.c:678
+#: build/pack.c:680
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr ""
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr ""
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:787
+#: build/pack.c:789
#, c-format
msgid "cannot create %s: %s\n"
msgstr ""
@@ -1409,72 +1409,72 @@ msgstr ""
msgid "package %s was already added, replacing with %s\n"
msgstr ""
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:423
+#: lib/depends.c:425
msgid "(rpmlib provides)"
msgstr ""
-#: lib/depends.c:444
+#: lib/depends.c:446
msgid "(db files)"
msgstr ""
-#: lib/depends.c:456
+#: lib/depends.c:458
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:469
+#: lib/depends.c:471
msgid "(db package)"
msgstr ""
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:927
+#: lib/depends.c:931
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr ""
@@ -1564,46 +1564,41 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:174
-#, c-format
-msgid "%s: bad magic\n"
-msgstr ""
-
-#: lib/package.c:182
+#: lib/package.c:181
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:190
+#: lib/package.c:189
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2012,85 +2007,85 @@ msgid "generate signature"
msgstr ""
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, c-format
msgid "package %s is intended for a %s architecture"
msgstr ""
-#: lib/problems.c:224
+#: lib/problems.c:226
#, c-format
msgid "package %s is intended for a %s operating system"
msgstr ""
-#: lib/problems.c:229
+#: lib/problems.c:231
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:234
+#: lib/problems.c:236
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:239
+#: lib/problems.c:241
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:244
+#: lib/problems.c:246
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:249
+#: lib/problems.c:251
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:254
+#: lib/problems.c:256
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:264
+#: lib/problems.c:266
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:269
+#: lib/problems.c:271
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:273
+#: lib/problems.c:275
#, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr ""
-#: lib/problems.c:277
+#: lib/problems.c:279
#, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr ""
-#: lib/problems.c:282
+#: lib/problems.c:284
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/problems.c:363
+#: lib/problems.c:365
msgid "conflicts with"
msgstr ""
-#: lib/problems.c:363
+#: lib/problems.c:365
msgid "is needed by"
msgstr ""
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
@@ -2105,25 +2100,25 @@ msgstr ""
msgid "cannot write to %%%s %s\n"
msgstr ""
-#: lib/psm.c:487
+#: lib/psm.c:485
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:603
+#: lib/psm.c:601
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:722
+#: lib/psm.c:720
#, c-format
msgid "%s: running %s scriptlet\n"
msgstr ""
-#: lib/psm.c:888
+#: lib/psm.c:890
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:895
+#: lib/psm.c:897
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
@@ -2167,211 +2162,211 @@ msgstr ""
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr ""
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr ""
-#: lib/query.c:290
+#: lib/query.c:289
msgid "not installed "
msgstr ""
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr ""
-#: lib/query.c:296
+#: lib/query.c:295
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr ""
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:466
+#: lib/query.c:465
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:642
+#: lib/query.c:637
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:668 lib/rpminstall.c:507
+#: lib/query.c:663 lib/rpminstall.c:514
#, c-format
-msgid "%s: read manifest failed: %s\n"
+msgid "%s: not a package manifest: %s\n"
msgstr ""
-#: lib/query.c:712
+#: lib/query.c:707
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:733
+#: lib/query.c:728
msgid "no packages\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:763
+#: lib/query.c:758
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, c-format
msgid "malformed %s: %s\n"
msgstr ""
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, c-format
msgid "no package matches %s: %s\n"
msgstr ""
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:916
+#: lib/query.c:911
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:950
+#: lib/query.c:945
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:955
+#: lib/query.c:950
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, c-format
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
msgid "(added files)"
msgstr ""
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
msgid "(added provide)"
msgstr ""
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr ""
@@ -2402,93 +2397,93 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2593,7 +2588,7 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/rpmts.c:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
@@ -2733,36 +2728,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, c-format
msgid "excluding directory %s\n"
msgstr ""
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr ""
-#: lib/verify.c:330
+#: lib/verify.c:283
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:426
+#: lib/verify.c:379
#, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr ""
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr ""
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -2821,99 +2811,99 @@ msgstr ""
msgid "locked db index %s/%s\n"
msgstr ""
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr ""
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
msgid "unexpected ]"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
msgid "unexpected }"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr ""
@@ -2934,235 +2924,245 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr ""
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "cannot open %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
+#: rpmdb/rpmdb.c:2440
#, c-format
-msgid "error(%d) storing record %s into %s\n"
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2416
+#: rpmdb/rpmdb.c:2450
#, c-format
-msgid "error(%d) removing record %s from %s\n"
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr ""
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr ""
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr ""
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, c-format
msgid "Macro %%%s has empty body\n"
msgstr ""
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, c-format
msgid "Macro %%%s failed to expand\n"
msgstr ""
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr ""
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr ""
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr ""
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr ""
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, c-format
msgid "Unterminated %c: %s\n"
msgstr ""
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr ""
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr ""
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
msgid "Target buffer overflow\n"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, c-format
msgid "File %s: %s\n"
msgstr ""
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index f953649b4..621587651 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\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"
@@ -15,53 +15,53 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: build.c:38
+#: build.c:39
msgid "Failed build dependencies:\n"
msgstr ""
-#: build.c:69
+#: build.c:70
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr ""
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr ""
#. Give up
-#: build.c:168
+#: build.c:169
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr ""
-#: build.c:196
+#: build.c:197
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr ""
-#: build.c:236
+#: build.c:237
#, c-format
msgid "failed to stat %s: %m\n"
msgstr ""
-#: build.c:241
+#: build.c:242
#, c-format
msgid "File %s is not a regular file.\n"
msgstr ""
-#: build.c:250
+#: build.c:251
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:320
+#: build.c:321
#, c-format
msgid "Building for target %s\n"
msgstr ""
@@ -79,357 +79,357 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:121
msgid "print macro expansion of <expr>+"
msgstr ""
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:180
+#: rpmqv.c:183
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr ""
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:235
+#: rpmqv.c:238
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:236
+#: rpmqv.c:239
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:248
+#: rpmqv.c:251
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:605
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:682
+#: rpmqv.c:685
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:685
+#: rpmqv.c:688
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:735
+#: rpmqv.c:738
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:737
+#: rpmqv.c:740
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:740
+#: rpmqv.c:743
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:743
+#: rpmqv.c:746
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:793
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:798
+#: rpmqv.c:801
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:806
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:808
+#: rpmqv.c:811
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:813
+#: rpmqv.c:816
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:820
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:868
+#: rpmqv.c:871
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:887
+#: rpmqv.c:890
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:927
+#: rpmqv.c:930
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1051
+#: rpmqv.c:1055
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1145
+#: rpmqv.c:1149
msgid "no arguments given"
msgstr ""
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
msgid "Unable to open temp file.\n"
msgstr ""
@@ -636,7 +636,7 @@ msgstr ""
msgid "Could not open %%files file %s: %s\n"
msgstr ""
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, c-format
msgid "line: %s\n"
msgstr ""
@@ -711,152 +711,152 @@ msgstr ""
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
-#: build/pack.c:83
+#: build/pack.c:85
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr ""
-#: build/pack.c:86
+#: build/pack.c:88
#, c-format
msgid "create archive failed: %s\n"
msgstr ""
-#: build/pack.c:108
+#: build/pack.c:110
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr ""
-#: build/pack.c:115
+#: build/pack.c:117
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr ""
-#: build/pack.c:218
+#: build/pack.c:220
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr ""
-#: build/pack.c:225
+#: build/pack.c:227
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr ""
-#: build/pack.c:232
+#: build/pack.c:234
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr ""
-#: build/pack.c:239
+#: build/pack.c:241
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr ""
-#: build/pack.c:247
+#: build/pack.c:249
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr ""
-#: build/pack.c:262
+#: build/pack.c:264
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr ""
-#: build/pack.c:290
+#: build/pack.c:292
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr ""
-#: build/pack.c:300
+#: build/pack.c:302
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr ""
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr ""
-#: build/pack.c:337
+#: build/pack.c:339
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr ""
-#: build/pack.c:346
+#: build/pack.c:348
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr ""
-#: build/pack.c:475
+#: build/pack.c:477
msgid "Unable to create immutable header region.\n"
msgstr ""
-#: build/pack.c:494
+#: build/pack.c:496
msgid "Unable to write temp header\n"
msgstr ""
-#: build/pack.c:504
+#: build/pack.c:506
msgid "Bad CSA data\n"
msgstr ""
-#: build/pack.c:540
+#: build/pack.c:542
msgid "Unable to write final header\n"
msgstr ""
-#: build/pack.c:560
+#: build/pack.c:562
#, c-format
msgid "Generating signature: %d\n"
msgstr ""
-#: build/pack.c:578
+#: build/pack.c:580
msgid "Unable to reload signature header.\n"
msgstr ""
-#: build/pack.c:586
+#: build/pack.c:588
#, c-format
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
-#: build/pack.c:637
+#: build/pack.c:639
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr ""
-#: build/pack.c:648
+#: build/pack.c:650
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr ""
-#: build/pack.c:662
+#: build/pack.c:664
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr ""
-#: build/pack.c:672
+#: build/pack.c:674
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr ""
-#: build/pack.c:678
+#: build/pack.c:680
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr ""
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr ""
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:787
+#: build/pack.c:789
#, c-format
msgid "cannot create %s: %s\n"
msgstr ""
@@ -1415,72 +1415,72 @@ msgstr ""
msgid "package %s was already added, replacing with %s\n"
msgstr ""
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:423
+#: lib/depends.c:425
msgid "(rpmlib provides)"
msgstr ""
-#: lib/depends.c:444
+#: lib/depends.c:446
msgid "(db files)"
msgstr ""
-#: lib/depends.c:456
+#: lib/depends.c:458
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:469
+#: lib/depends.c:471
msgid "(db package)"
msgstr ""
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:927
+#: lib/depends.c:931
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr ""
@@ -1570,46 +1570,41 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:174
-#, c-format
-msgid "%s: bad magic\n"
-msgstr ""
-
-#: lib/package.c:182
+#: lib/package.c:181
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:190
+#: lib/package.c:189
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2018,85 +2013,85 @@ msgid "generate signature"
msgstr ""
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, c-format
msgid "package %s is intended for a %s architecture"
msgstr ""
-#: lib/problems.c:224
+#: lib/problems.c:226
#, c-format
msgid "package %s is intended for a %s operating system"
msgstr ""
-#: lib/problems.c:229
+#: lib/problems.c:231
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:234
+#: lib/problems.c:236
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:239
+#: lib/problems.c:241
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:244
+#: lib/problems.c:246
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:249
+#: lib/problems.c:251
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:254
+#: lib/problems.c:256
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:264
+#: lib/problems.c:266
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:269
+#: lib/problems.c:271
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:273
+#: lib/problems.c:275
#, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr ""
-#: lib/problems.c:277
+#: lib/problems.c:279
#, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr ""
-#: lib/problems.c:282
+#: lib/problems.c:284
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/problems.c:363
+#: lib/problems.c:365
msgid "conflicts with"
msgstr ""
-#: lib/problems.c:363
+#: lib/problems.c:365
msgid "is needed by"
msgstr ""
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
@@ -2111,25 +2106,25 @@ msgstr ""
msgid "cannot write to %%%s %s\n"
msgstr ""
-#: lib/psm.c:487
+#: lib/psm.c:485
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:603
+#: lib/psm.c:601
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:722
+#: lib/psm.c:720
#, c-format
msgid "%s: running %s scriptlet\n"
msgstr ""
-#: lib/psm.c:888
+#: lib/psm.c:890
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:895
+#: lib/psm.c:897
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
@@ -2173,211 +2168,211 @@ msgstr ""
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr ""
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr ""
-#: lib/query.c:290
+#: lib/query.c:289
msgid "not installed "
msgstr ""
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr ""
-#: lib/query.c:296
+#: lib/query.c:295
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr ""
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:466
+#: lib/query.c:465
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:642
+#: lib/query.c:637
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:668 lib/rpminstall.c:507
+#: lib/query.c:663 lib/rpminstall.c:514
#, c-format
-msgid "%s: read manifest failed: %s\n"
+msgid "%s: not a package manifest: %s\n"
msgstr ""
-#: lib/query.c:712
+#: lib/query.c:707
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:733
+#: lib/query.c:728
msgid "no packages\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:763
+#: lib/query.c:758
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, c-format
msgid "malformed %s: %s\n"
msgstr ""
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, c-format
msgid "no package matches %s: %s\n"
msgstr ""
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:916
+#: lib/query.c:911
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:950
+#: lib/query.c:945
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:955
+#: lib/query.c:950
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, c-format
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
msgid "(added files)"
msgstr ""
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
msgid "(added provide)"
msgstr ""
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr ""
@@ -2408,93 +2403,93 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2599,7 +2594,7 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/rpmts.c:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
@@ -2739,36 +2734,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, c-format
msgid "excluding directory %s\n"
msgstr ""
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr ""
-#: lib/verify.c:330
+#: lib/verify.c:283
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:426
+#: lib/verify.c:379
#, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr ""
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr ""
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -2827,99 +2817,99 @@ msgstr ""
msgid "locked db index %s/%s\n"
msgstr ""
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr ""
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
msgid "unexpected ]"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
msgid "unexpected }"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr ""
@@ -2940,235 +2930,245 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr ""
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "cannot open %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
+#: rpmdb/rpmdb.c:2440
#, c-format
-msgid "error(%d) storing record %s into %s\n"
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2416
+#: rpmdb/rpmdb.c:2450
#, c-format
-msgid "error(%d) removing record %s from %s\n"
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr ""
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr ""
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr ""
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, c-format
msgid "Macro %%%s has empty body\n"
msgstr ""
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, c-format
msgid "Macro %%%s failed to expand\n"
msgstr ""
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr ""
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr ""
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr ""
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr ""
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, c-format
msgid "Unterminated %c: %s\n"
msgstr ""
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr ""
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr ""
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
msgid "Target buffer overflow\n"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, c-format
msgid "File %s: %s\n"
msgstr ""
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 2aacd159d..c4633b4bb 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-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\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"
@@ -11,54 +11,54 @@ msgstr ""
"Date: 1999-04-03 12:20+0200\n"
"X-Generator: KBabel 0.8\n"
-#: build.c:38
+#: build.c:39
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÓÂÏÒËÉ:\n"
-#: build.c:69
+#: build.c:70
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ %s: %s\n"
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ËÁÎÁÌÁ tar: %m\n"
#. Give up
-#: build.c:168
+#: build.c:169
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ ÉÚ %s\n"
-#: build.c:196
+#: build.c:197
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÉÍÅÎÏ×ÁÔØ %s × %s: %m\n"
-#: build.c:236
+#: build.c:237
#, c-format
msgid "failed to stat %s: %m\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï %s: %m\n"
-#: build.c:241
+#: build.c:242
#, c-format
msgid "File %s is not a regular file.\n"
msgstr "îÅ ÏÂÙÞÎÙÊ ÆÁÊÌ: %s.\n"
-#: build.c:250
+#: build.c:251
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr "æÁÊÌ %s ÎÅ ÐÏÈÏÖ ÎÁ ÆÁÊÌ ÓÐÅÃÉÆÉËÁÃÉÉ.\n"
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr "ðÌÁÔÆÏÒÍÙ ÄÌÑ ÓÂÏÒËÉ: %s\n"
-#: build.c:320
+#: build.c:321
#, c-format
msgid "Building for target %s\n"
msgstr "óÂÏÒËÁ ÄÌÑ ÐÌÁÔÆÏÒÍÙ %s\n"
@@ -76,258 +76,258 @@ msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ ÚÁÇÏÌÏ×ËÁ ÉÚ ÐÁËÅÔÁ\n"
msgid "cannot re-open payload: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏ×ÔÏÒÎÏ ÏÔËÒÙÔØ payload: %s\n"
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr "×Ù×ÅÓÔÉ ÎÏÍÅÒ ×ÅÒÓÉÉ ÜÔÏÊ ÐÒÇÒÁÍÍÙ"
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr "×Ù×ÏÄÉÔØ ÍÉÎÉÍÕÍ ÓÏÏÂÝÅÎÉÊ"
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr "×Ù×ÏÄÉÔØ ÂÏÌÅÅ ÄÅÔÁÌØÎÙÅ ÓÏÏÂÝÅÎÉÑ"
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr "ÏÐÒÅÄÅÌÉÔØ ÍÁËÒÏÓ <ÉÍÑ> ÓÏ ÚÎÁÞÅÎÉÅÍ <ÐÏÄÓÔÁÎÏ×ËÁ>"
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr "'<ÉÍÑ> <ÐÏÄÓÔÁÎÏ×ËÁ>'"
-#: rpmqv.c:118
+#: rpmqv.c:121
msgid "print macro expansion of <expr>+"
msgstr "×Ù×ÅÓÔÉ ÚÎÁÞÅÎÉÅ ÍÁËÒÏÓÁ <ÉÍÑ>+"
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr "<ÉÍÑ>+"
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr "ÐÏÓÌÁÔØ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ × <cmd>"
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr "<ËÏÍÁÎÄÁ>"
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ËÁÔÁÌÏÇ> ËÁË ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ"
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr "<ËÁÔÁÌÏÇ>"
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ÆÁÊÌ:...> ×ÍÅÓÔÏ ÍÁËÒÏÆÁÊÌÁ(Ï×) ÐÏ ÕÍÏÌÞÁÎÉÀ"
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr "<ÆÁÊÌ:...>"
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ÆÁÊÌ:...> ×ÍÅÓÔÏ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr "ÐÏËÁÚÁÔØ ÔÅËÕÝÅÅ ÚÎÁÞÅÎÉÅ rpmrc É ÍÁËÒÏÓÏ×"
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr "ÚÁÐÒÅÔÉÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÅ libio(3) API"
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr "ÏÔÌÁÄËÁ ÐÒÏÔÏËÏÌÁ ÐÏÔÏËÁ ÄÁÎÎÙÈ"
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr "ÏÔÌÁÄËÁ ÐÒÏÃÅÓÓÁ ××ÏÄÁ/×Ù×ÏÄÁ rpmio"
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr "ÏÔÌÁÄËÁ ÏÂÒÁÂÏÔËÉ URL ËÜÛ"
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr "ðÁÒÁÍÅÔÒÙ ÚÁÐÒÏÓÁ (Ó -q ÉÌÉ --query):"
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr "ðÁÒÁÍÅÔÒÙ ÐÒÏ×ÅÒËÉ (Ó -V ÉÌÉ --verify):"
-#: rpmqv.c:180
+#: rpmqv.c:183
msgid "Signature options:"
msgstr "ðÁÒÁÍÅÔÒÙ ÐÏÄÐÉÓÉ:"
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr "ðÁÒÁÍÅÔÒÙ ÂÁÚÙ ÄÁÎÎÙÈ"
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"ðÁÒÁÍÅÔÒÙ ÓÂÏÒËÉ Ó [ <ÆÁÊÌ ÓÐÅÃÉÆÉËÁÃÉÉ> | <ÔÁÒ ÁÒÈÉ×> | <ÉÓÈÏÄÎÙÊ ÐÁËÅÔ> ]:"
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr "ðÁÒÁÍÅÔÒÙ õÓÔÁÎÏ×ËÉ/ïÂÎÏ×ÌÅÎÉÑ/õÄÁÌÅÎÉÑ:"
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr "ïÂÝÉÅ ÐÁÒÁÍÅÔÒÙ ÄÌÑ ×ÓÅÈ ÒÅÖÉÍÏ×:"
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr "RPM ×ÅÒÓÉÑ %s\n"
-#: rpmqv.c:235
+#: rpmqv.c:238
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:236
+#: rpmqv.c:239
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "üÔÕ ÐÒÏÇÒÁÍÍÕ ÍÏÖÎÏ Ó×ÏÂÏÄÎÏ ÒÁÓÐÒÏÓÔÒÁÎÑÔØ ÎÁ ÕÓÌÏ×ÉÑÈ GNU GPL"
-#: rpmqv.c:248
+#: rpmqv.c:251
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s {--help}\n"
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr "×ÁÒÉÁÎÔ --rcfile ÂÏÌØÛÅ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ.\n"
-#: rpmqv.c:602
+#: rpmqv.c:605
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "÷ÍÅÓÔÏ ÜÔÏÇÏ ÉÓÐÏÌØÚÕÊÔÅ \"--macros <ÆÁÊÌ:...>\".\n"
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ÐÒÉ ÏÂÒÁÂÏÔËÅ ÁÒÇÕÍÅÎÔÏ× (%d) :-(\n"
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr "ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÏÄÉÎ ÉÚ ÏÓÎÏ×ÎÙÈ ÒÅÖÉÍÏ×"
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr "ÚÁ ÏÄÉÎ ÒÁÚ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌÎÅÎ ÔÏÌØËÏ ÏÄÉÎ ÔÉÐ ÐÒÏ×ÅÒËÉ ÉÌÉ ÚÁÐÒÏÓÁ"
-#: rpmqv.c:682
+#: rpmqv.c:685
msgid "unexpected query flags"
msgstr "ÎÅÏÖÉÄÁÎÎÙÅ ÆÌÁÇÉ ÚÁÐÒÏÓÁ"
-#: rpmqv.c:685
+#: rpmqv.c:688
msgid "unexpected query format"
msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÆÏÒÍÁÔ ÚÁÐÒÏÓÁ"
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÉÓÔÏÞÎÉË ÚÁÐÒÏÓÁ"
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr "ÐÁÒÁÍÅÔÒ --dbpath ÚÁÄÁÎ ÄÌÑ ÏÐÅÒÁÃÉÉ, ÎÅ ÉÓÐÏÌØÚÕÀÝÅÊ ÂÁÚÕ ÄÁÎÎÙÈ"
-#: rpmqv.c:735
+#: rpmqv.c:738
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"ÐÒÉÎÕÄÉÔÅÌØÎÙÍÉ ÍÏÇÕÔ ÂÙÔØ ÔÏÌØËÏ ÕÓÔÁÎÏ×ËÁ, ÏÂÎÏ×ÌÅÎÉÅ, ÕÄÁÌÅÎÉÅ ÉÓÈÏÄÎÉËÏ× "
"É ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ"
-#: rpmqv.c:737
+#: rpmqv.c:740
msgid "files may only be relocated during package installation"
msgstr "ÆÁÊÌÙ ÍÏÇÕÔ ÂÙÔØ ÐÅÒÅÍÅÝÅÎÙ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpmqv.c:740
+#: rpmqv.c:743
msgid "only one of --prefix or --relocate may be used"
msgstr ""
"ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÔÏÌØËÏ ÏÄÉÎ ÉÚ ×ÁÒÉÁÎÔÏ× --prefix ÉÌÉ --relocate"
-#: rpmqv.c:743
+#: rpmqv.c:746
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"×ÁÒÉÁÎÔÙ --relocate É --excludepath ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ "
"ÎÏ×ÙÈ ÐÁËÅÔÏ×"
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr "×ÁÒÉÁÎÔ --prefix ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÎÏ×ÙÈ ÐÁËÅÔÏ×"
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr "ÁÒÇÕÍÅÎÔÙ ÄÌÑ --prefix ÄÏÌÖÎÙ ÎÁÞÉÎÁÔØÓÑ Ó /"
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr "--percent ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
"ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÔÏÌØËÏ ÏÄÉÎ ÉÚ ÐÁÒÁÍÅÔÒÏ× --excludedocs ÉÌÉ --"
"includedocs"
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpmqv.c:790
+#: rpmqv.c:793
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÄÁÌÅÎÉÉ ÐÁËÅÔÁ"
-#: rpmqv.c:798
+#: rpmqv.c:801
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpmqv.c:803
+#: rpmqv.c:806
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÉÌÉ ÕÄÁÌÅÎÉÉ ÐÁËÅÔÁ"
-#: rpmqv.c:808
+#: rpmqv.c:811
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -335,7 +335,7 @@ msgstr ""
"ÐÁÒÁÍÅÔÒÙ ÚÁÐÒÅÔÁ ÓÃÅÎÁÒÉÅ× ÍÏÇÕÔ ÂÙÔØ ÕËÁÚÁÎÙ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÉÌÉ "
"ÕÄÁÌÅÎÉÉ ÐÁËÅÔÁ"
-#: rpmqv.c:813
+#: rpmqv.c:816
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -343,7 +343,7 @@ msgstr ""
"ÐÁÒÁÍÅÔÒÙ ÚÁÐÒÅÔÁ ÔÒÉÇÇÅÒÏ× ÍÏÇÕÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÉÌÉ "
"ÕÄÁÌÅÎÉÉ ÐÁËÅÔÁ(Ï×)"
-#: rpmqv.c:817
+#: rpmqv.c:820
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -351,14 +351,14 @@ msgstr ""
"--nodeps ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÓÂÏÒËÅ, ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ É ÐÒÏ×ÅÒËÉ "
"ÐÁËÅÔÏ×"
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ É ÓÂÏÒËÅ ÐÁËÅÔÁ"
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -366,87 +366,87 @@ msgstr ""
"--root (-r) ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ, ÚÁÐÒÏÓÁÈ "
"ÐÁËÅÔÁ É ÐÅÒÅÓÔÒÏÅÎÉÉ ÂÁÚÙ ÄÁÎÎÙÈ"
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr "ÁÒÇÕÍÅÎÔÙ ÄÌÑ --root (-r) ÄÏÌÖÎÙ ÎÁÞÉÎÁÔØÓÑ Ó /"
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr "ÎÅÔ ÆÁÊÌÏ× ÄÌÑ ÐÏÄÐÉÓÉ\n"
-#: rpmqv.c:868
+#: rpmqv.c:871
#, c-format
msgid "cannot access file %s\n"
msgstr "ÎÅÔ ÄÏÓÔÕÐÁ Ë ÆÁÊÌÕ %s\n"
-#: rpmqv.c:887
+#: rpmqv.c:890
msgid "pgp not found: "
msgstr "pgp ÎÅ ÎÁÊÄÅÎ: "
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr "÷×ÅÄÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ: "
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr "îÅ×ÅÒÎÁÑ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ\n"
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr "ëÌÀÞÅ×ÁÑ ÆÒÁÚÁ ÐÒÉÎÑÔÁ.\n"
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "îÅ×ÅÒÎÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ %%_signature × ÍÁËÒÏÆÁÊÌÅ.\n"
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr "--sign ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÔÏÌØËÏ ÐÒÉ ÓÂÏÒËÅ ÐÁËÅÔÏ×"
-#: rpmqv.c:927
+#: rpmqv.c:930
msgid "exec failed\n"
msgstr "ÚÁÐÕÓË ÎÅ ÕÄÁÌÓÑ\n"
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÐÅÒÅÓÂÏÒËÉ"
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr "ÎÅ ÚÁÄÁÎ ÆÁÊÌ ÓÐÅÃÉÆÉËÁÃÉÉ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÁ"
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr "ÎÅ ÚÁÄÁÎÙ tar-ÆÁÊÌÙ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÁ"
-#: rpmqv.c:1051
+#: rpmqv.c:1055
#, fuzzy
msgid "no packages given for erase"
msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÐÏÄÐÉÓÉ"
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ"
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁÐÒÏÓÁ"
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÄÌÑ ×ÅÒÉÆÉËÁÃÉÉ"
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr "ÎÅÏÖÉÄÁÎÎÙÅ ÁÒÇÕÍÅÎÔÙ ÄÌÑ --querytags "
-#: rpmqv.c:1145
+#: rpmqv.c:1149
#, fuzzy
msgid "no arguments given"
msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁÐÒÏÓÁ"
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
msgid "Unable to open temp file.\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ.\n"
@@ -656,7 +656,7 @@ msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s\n"
msgid "Could not open %%files file %s: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %%files %s: %s\n"
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, c-format
msgid "line: %s\n"
msgstr "ÓÔÒÏËÁ: %s\n"
@@ -731,152 +731,152 @@ msgstr "getGidS: ÓÌÉÛËÏÍ ÍÎÏÇÏ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÇÒÕÐÐ.\n"
msgid "Could not canonicalize hostname: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ËÁÎÏÎÉÚÉÒÏ×ÁÔØ ÉÍÑ ËÏÍÐØÀÔÅÒÁ: %s\n"
-#: build/pack.c:83
+#: build/pack.c:85
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÁÒÈÉ×Á ÎÁ ÆÁÊÌÅ %s: %s\n"
-#: build/pack.c:86
+#: build/pack.c:88
#, c-format
msgid "create archive failed: %s\n"
msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÁÒÈÉ×Á: %s\n"
-#: build/pack.c:108
+#: build/pack.c:110
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "cpio_copy: ÏÛÉÂËÁ ÚÁÐÉÓÉ: %s\n"
-#: build/pack.c:115
+#: build/pack.c:117
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "cpio_copy: ÏÛÉÂËÁ ÞÔÅÎÉÑ: %s\n"
-#: build/pack.c:218
+#: build/pack.c:220
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PreIn: %s\n"
-#: build/pack.c:225
+#: build/pack.c:227
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PreUn: %s\n"
-#: build/pack.c:232
+#: build/pack.c:234
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PostIn: %s\n"
-#: build/pack.c:239
+#: build/pack.c:241
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PostUn: %s\n"
-#: build/pack.c:247
+#: build/pack.c:249
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ VerifyScript: %s\n"
-#: build/pack.c:262
+#: build/pack.c:264
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ Trigger script: %s\n"
-#: build/pack.c:290
+#: build/pack.c:292
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr "readRPM: ÏÔËÒÙÔÉÅ %s: %s\n"
-#: build/pack.c:300
+#: build/pack.c:302
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr "readRPM: ÞÔÅÎÉÅ %s: %s\n"
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ Fseek: %s\n"
-#: build/pack.c:337
+#: build/pack.c:339
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s ÎÅ Ñ×ÌÑÅÔÓÑ ÐÁËÅÔÏÍ RPM\n"
-#: build/pack.c:346
+#: build/pack.c:348
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: ÞÉÔÁÅÔÓÑ ÚÁÇÏÌÏ×ÏË ÉÚ %s\n"
-#: build/pack.c:475
+#: build/pack.c:477
msgid "Unable to create immutable header region.\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÍÅÓÔÉÔØ ÚÁÇÏÌÏ×ÏË × ÎÅÒÐÅÒÙ×ÎÕÀ ÏÂÌÁÓÔØ ÐÁÍÑÔÉ.\n"
-#: build/pack.c:494
+#: build/pack.c:496
msgid "Unable to write temp header\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ×ÒÅÍÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË\n"
-#: build/pack.c:504
+#: build/pack.c:506
msgid "Bad CSA data\n"
msgstr "îÅ×ÅÒÎÙÅ ÄÁÎÎÙÅ CSA\n"
-#: build/pack.c:540
+#: build/pack.c:542
msgid "Unable to write final header\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÏËÏÎÞÁÔÅÌØÎÙÊ ÚÁÇÏÌÏ×ÏË\n"
-#: build/pack.c:560
+#: build/pack.c:562
#, c-format
msgid "Generating signature: %d\n"
msgstr "çÅÎÅÒÉÒÕÅÔÓÑ ÐÏÄÐÉÓØ: %d\n"
-#: build/pack.c:578
+#: build/pack.c:580
msgid "Unable to reload signature header.\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÚÁÇÒÕÚÉÔØ ÚÁÇÏÌÏ×ÏË ÐÏÄÐÉÓÉ.\n"
-#: build/pack.c:586
+#: build/pack.c:588
#, c-format
msgid "Could not open %s: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, c-format
msgid "Unable to write package: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÐÁËÅÔ: %s\n"
-#: build/pack.c:637
+#: build/pack.c:639
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÃÅÌØ ÐÏÄÐÉÓÉ %s: %s\n"
-#: build/pack.c:648
+#: build/pack.c:650
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÚÁÇÏÌÏ×ÏË ÉÚ %s: %s\n"
-#: build/pack.c:662
+#: build/pack.c:664
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÚÁÇÏÌÏ×ÏË × %s: %s\n"
-#: build/pack.c:672
+#: build/pack.c:674
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÓÏÄÅÒÖÉÍÏÅ ÉÚ %s: %s\n"
-#: build/pack.c:678
+#: build/pack.c:680
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÏÄÅÒÖÉÍÏÅ × %s: %s\n"
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr "úÁÐÉÓÁÎ: %s\n"
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÉÍÑ ÆÁÊÌÁ ÄÌÑ ÐÁËÅÔÁ %s: %s\n"
-#: build/pack.c:787
+#: build/pack.c:789
#, c-format
msgid "cannot create %s: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n"
@@ -1448,52 +1448,52 @@ msgstr "ÎÅ ÕÄÁÌÏÓØ - "
msgid "package %s was already added, replacing with %s\n"
msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s YES (rpmrc provides)\n"
-#: lib/depends.c:423
+#: lib/depends.c:425
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s YES (rpmlib provides)\n"
-#: lib/depends.c:444
+#: lib/depends.c:446
#, fuzzy
msgid "(db files)"
msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n"
-#: lib/depends.c:456
+#: lib/depends.c:458
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s YES (db provides)\n"
-#: lib/depends.c:469
+#: lib/depends.c:471
#, fuzzy
msgid "(db package)"
msgstr "ÎÅÔ ÐÁËÅÔÏ×\n"
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:927
+#: lib/depends.c:931
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n"
#. Record all relations.
-#: lib/depends.c:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1502,26 +1502,26 @@ msgstr ""
"========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, "
"ÇÌÕÂÉÎÁ)\n"
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n"
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr "ãéëì:\n"
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr "(ÎÅ ÞÉÓÌÏ)"
@@ -1614,46 +1614,41 @@ msgstr "%s ÓÏÚÄÁÎ ËÁË %s\n"
msgid "error creating temporary file %s\n"
msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ %s\n"
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: ÏÛÉÂËÁ readLead\n"
-#: lib/package.c:174
-#, fuzzy, c-format
-msgid "%s: bad magic\n"
-msgstr "îÅ×ÅÒÎÙÊ magic"
-
-#: lib/package.c:182
+#: lib/package.c:181
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "ÐÁËÅÔÙ ×ÅÒÓÉÉ 1 ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÜÔÏÊ ×ÅÒÓÉÅÊ RPM\n"
-#: lib/package.c:190
+#: lib/package.c:189
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ÐÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ÐÁËÅÔÙ ×ÅÒÓÉÉ <= 4\n"
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: ÏÛÉÂËÁ rpmReadSignature\n"
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: ðÏÄÐÉÓØ ÎÅÄÏÓÔÕÐÎÁ\n"
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: ÏÛÉÂËÁ readLead\n"
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ Fread: %s\n"
@@ -2086,87 +2081,87 @@ msgid "generate signature"
msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ ÐÏÄÐÉÓØ"
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, fuzzy, c-format
msgid "package %s is intended for a %s architecture"
msgstr "ÐÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÁÒÈÉÔÅËÔÕÒÙ"
-#: lib/problems.c:224
+#: lib/problems.c:226
#, fuzzy, c-format
msgid "package %s is intended for a %s operating system"
msgstr "ÐÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ"
-#: lib/problems.c:229
+#: lib/problems.c:231
#, c-format
msgid "package %s is already installed"
msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
-#: lib/problems.c:234
+#: lib/problems.c:236
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr "ÐÕÔØ %s × ÐÁËÅÔÅ %s - ÎÅ ÐÅÒÅÍÅÝÁÅÍÙÊ"
-#: lib/problems.c:239
+#: lib/problems.c:241
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr "ËÏÎÆÌÉËÔ ÆÁÊÌÁ %s ÐÒÉ ÐÏÐÙÔËÁÈ ÕÓÔÁÎÏ×ËÉ %s É %s"
-#: lib/problems.c:244
+#: lib/problems.c:246
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr "ÆÁÊÌ %s ÉÚ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ ÐÁËÅÔÁ %s ËÏÎÆÌÉËÔÕÅÔ Ó ÆÁÊÌÏÍ ÉÚ ÐÁËÅÔÁ %s"
-#: lib/problems.c:249
+#: lib/problems.c:251
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "ÐÁËÅÔ %s (ËÏÔÏÒÙÊ ÎÏ×ÅÅ, ÞÅÍ %s) ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
-#: lib/problems.c:254
+#: lib/problems.c:256
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ %s ÎÕÖÎÏ %ld%cb ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s"
-#: lib/problems.c:264
+#: lib/problems.c:266
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ %s ÎÕÖÎÏ %ld inodes ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s"
-#: lib/problems.c:269
+#: lib/problems.c:271
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr "ÐÁËÅÔ %s pre-transaction syscall(s): %s: ÏÛÉÂËÁ: %s"
-#: lib/problems.c:273
+#: lib/problems.c:275
#, fuzzy, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
-#: lib/problems.c:277
+#: lib/problems.c:279
#, fuzzy, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
-#: lib/problems.c:282
+#: lib/problems.c:284
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ %d ÐÒÉ ÒÁÂÏÔÅ Ó ÐÁËÅÔÏÍ %s"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "conflicts with"
msgstr " ËÏÎÆÌÉËÔÕÅÔ Ó %s-%s-%s\n"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "is needed by"
msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n"
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr "ôÉÐ ÄÁÎÎÙÈ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
@@ -2181,25 +2176,25 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %%%s %s\n"
msgid "cannot write to %%%s %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÉÓÁÔØ × %%%s %s\n"
-#: lib/psm.c:487
+#: lib/psm.c:485
msgid "source package expected, binary found\n"
msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉÞÎÙÊ ÐÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ\n"
-#: lib/psm.c:603
+#: lib/psm.c:601
msgid "source package contains no .spec file\n"
msgstr "ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ\n"
-#: lib/psm.c:722
+#: lib/psm.c:720
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "%s: ×ÙÐÏÌÎÑÅÔÓÑ ÓÃÅÎÁÒÉÊ %s (ÅÓÌÉ ÅÓÔØ)\n"
-#: lib/psm.c:888
+#: lib/psm.c:890
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, waitpid() ×ÏÚ×ÒÁÔÉÌ %s\n"
-#: lib/psm.c:895
+#: lib/psm.c:897
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, ËÏÄ ×ÏÚ×ÒÁÔÁ %d\n"
@@ -2243,213 +2238,213 @@ msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n"
msgid "%s failed: %s\n"
msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n"
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, c-format
msgid "incorrect format: %s\n"
msgstr "ÏÛÉÂËÁ × ÆÏÒÍÁÔÅ: %s\n"
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr "(ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÏ×)"
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr "ÎÏÒÍÁÌØÎÙÊ "
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr "ÚÁÍÅÎÅÎÎÙÊ "
-#: lib/query.c:290
+#: lib/query.c:289
msgid "not installed "
msgstr "ÎÅ ÕÓÔÁÎÏ×ÌÅÎ "
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr "ÓÅÔÅ×ÏÊ "
-#: lib/query.c:296
+#: lib/query.c:295
#, c-format
msgid "(unknown %3d) "
msgstr "(ÎÅÉÚ×. %3d) "
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr "(ÓÏÓÔ. ÎÅÔ) "
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
msgid "package has neither file owner or id lists\n"
msgstr "ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÓÐÉÓËÏ× ÎÉ ÈÏÚÑÅ× ÆÁÊÌÏ×, ÎÉ ÉÈ ID\n"
-#: lib/query.c:466
+#: lib/query.c:465
#, c-format
msgid "can't query %s: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÒÏÓÉÔØ %s: %s\n"
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, c-format
msgid "open of %s failed: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr "ÏÛÉÂËÁ ÚÁÐÒÏÓÁ %s\n"
-#: lib/query.c:642
+#: lib/query.c:637
msgid "old format source packages cannot be queried\n"
msgstr "ÚÁÐÒÏÓÙ Ë ÉÓÈÏÄÎÙÍ ÐÁËÅÔÁÍ × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n"
-#: lib/query.c:668 lib/rpminstall.c:507
-#, c-format
-msgid "%s: read manifest failed: %s\n"
-msgstr "%s: ÏÛÉÂËÁ ÞÔÅÎÉÑ ÓÐÉÓËÁ ÆÁÊÌÏ×: %s\n"
+#: lib/query.c:663 lib/rpminstall.c:514
+#, fuzzy, c-format
+msgid "%s: not a package manifest: %s\n"
+msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ×Ú×ÏÄÉÔ ÔÒÉÇÇÅÒ %s\n"
-#: lib/query.c:712
+#: lib/query.c:707
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "ÚÁÐÒÏÓ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ %s ÎÅ ÕÄÁÌÓÑ, ÎÅ×ÏÚÍÏÖÎÏ ÒÁÚÏÂÒÁÔØ ÆÁÊÌ\n"
-#: lib/query.c:733
+#: lib/query.c:728
msgid "no packages\n"
msgstr "ÎÅÔ ÐÁËÅÔÏ×\n"
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÏÄÅÒÖÉÔ ÎÉËÁËÉÈ ÐÁËÅÔÏ×\n"
-#: lib/query.c:763
+#: lib/query.c:758
#, c-format
msgid "no package triggers %s\n"
msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ×Ú×ÏÄÉÔ ÔÒÉÇÇÅÒ %s\n"
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ %s: %s.\n"
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ×Ú×ÏÄÉÔ ÔÒÉÇÇÅÒ %s\n"
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ÔÒÅÂÕÅÔ %s\n"
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ÐÒÅÄÏÓÔÁ×ÌÑÅÔ %s\n"
-#: lib/query.c:916
+#: lib/query.c:911
#, c-format
msgid "file %s: %s\n"
msgstr "ÆÁÊÌ %s: %s\n"
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n"
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr "ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÐÁËÅÔÁ: %s\n"
-#: lib/query.c:950
+#: lib/query.c:945
#, c-format
msgid "package record number: %u\n"
msgstr "ÎÏÍÅÒ ÚÁÐÉÓÉ ÐÁËÅÔÁ: %u\n"
-#: lib/query.c:955
+#: lib/query.c:950
#, c-format
msgid "record %u could not be read\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÚÁÐÉÓØ %u\n"
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, c-format
msgid "package %s is not installed\n"
msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
#, fuzzy
msgid "(added files)"
msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n"
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
#, fuzzy
msgid "(added provide)"
msgstr "%s: %-45s YES (db provides)\n"
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ: %s\n"
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
msgid "makeTempFile failed\n"
msgstr "ÏÛÉÂËÁ makeTempFile\n"
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ Fwrite: %s\n"
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: îÅ ÍÏÇÕ ÐÏÄÐÉÓÁÔØ RPM v1.0\n"
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: îÅ ÍÏÇÕ ÐÅÒÅÐÏÄÐÉÓÁÔØ RPM v2.0\n"
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ writeLead: %s\n"
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ rpmWriteSignature: %s\n"
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: ÏÛÉÂËÁ readLead\n"
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: ðÏÄÐÉÓÉ ÎÅÔ (RPM v1.0)\n"
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr "îå Oë"
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
msgid " (MISSING KEYS:"
msgstr " (ïôóõôóô÷õàô ëìàþé:"
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr " (îåô äï÷åòéñ ë ëìàþáí:"
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr "Oë"
@@ -2482,94 +2477,94 @@ msgstr " %s A %s\tB %s\n"
msgid "package %s has unsatisfied %s: %s\n"
msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr "ðÏÄÇÏÔÏ×ËÁ..."
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× ÄÌÑ ÕÓÔÁÎÏ×ËÉ..."
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, c-format
msgid "Retrieving %s\n"
msgstr "úÁÇÒÕÖÁÅÔÓÑ %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr " ... ËÁË %s\n"
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s ÐÒÏÐÕÓËÁÅÔÓÑ - ÏÛÉÂËÁ ÐÅÒÅÄÁÞÉ - %s\n"
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, c-format
msgid "package %s is not relocateable\n"
msgstr "ÐÁËÅÔ %s - ÎÅ ÐÅÒÅÍÅÝÁÅÍÙÊ\n"
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, c-format
msgid "error reading from file %s\n"
msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s\n"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "ÄÌÑ ÆÁÊÌÁ %s ÎÅÏÂÈÏÄÉÍÁ ÂÏÌÅÅ ÎÏ×ÁÑ ×ÅÒÓÉÑ RPM\n"
-#: lib/rpminstall.c:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n"
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ÐÁËÅÔÏ×\n"
-#: lib/rpminstall.c:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
msgid "installing binary packages\n"
msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÂÉÎÁÒÎÙÅ ÐÁËÅÔÙ\n"
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s: %s\n"
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ×\n"
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
msgid "removing these packages would break dependencies:\n"
msgstr "ÕÄÁÌÅÎÉÅ ÜÔÉÈ ÐÁËÅÔÏ× ÎÁÒÕÛÉÔ ÚÁ×ÉÓÉÍÏÓÔÉ:\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s\n"
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2674,7 +2669,7 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ %s, ÚÎÁÞÅÎÉÅ HOME ÓÌÉÛËÏÍ ×ÅÌÉËÏ.\n"
msgid "Unable to open %s for reading: %s.\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ: %s.\n"
-#: lib/rpmts.c:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n"
@@ -2818,36 +2813,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr "ðÏÄÐÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁÐÏÌÎÅÎÉÅ(%d)\n"
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s ÐÒÏÐÕÝÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n"
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, c-format
msgid "excluding directory %s\n"
msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n"
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr "ÐÏÌÕÞÅÎÉÅ ÓÐÉÓËÁ ÓÍÏÎÔÉÒÏ×ÁÎÎÙÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ\n"
-#: lib/verify.c:330
+#: lib/verify.c:283
#, c-format
msgid "missing %s"
msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ %s"
-#: lib/verify.c:426
+#: lib/verify.c:379
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: "
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr "%s-%s-%s: ÎÅÐÒÁ×ÉÌØÎÁÑ ÐÏÄÐÉÓØ ÏÂÌÁÓÔÉ ÚÁÇÏÌÏ×ËÁ ÐÁËÅÔÁ\n"
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -2906,22 +2896,22 @@ msgstr "ÒÁÚÄÅÌÑÅÍÙÊ"
msgid "locked db index %s/%s\n"
msgstr "ÚÁÂÌÏËÉÒÏ×ÁÎ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n"
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr "ÎÅÏÐÏÚÎÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÂÁÚÙ ÄÁÎÎÙÈ: \"%s\" ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ\n"
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr "ÎÅ×ÅÒÎÏÅ ÞÉÓÌÏ×ÏÅ ÚÎÁÞÅÎÉÅ %s, ÐÒÏÐÕÝÅÎÏ\n"
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr "%s ÉÍÅÅÔ ÓÌÉÛËÏÍ ÍÁÌÕÀ ÉÌÉ ÓÌÉÛËÏÍ ÂÏÌØÛÕÀ ×ÅÌÉÞÉÎÕ long, ÐÒÏÐÕÝÅÎÏ\n"
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
@@ -2929,77 +2919,77 @@ msgstr ""
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr "dataLength() ÄÏÐÕÓÔÉÍ ÔÏÌØËÏ ÏÄÉÎ ÜÌÅÍÅÎÔ ÔÉÐÁ RPM_STRING_TYPE\n"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"{\" ÐÏÓÌÅ \"%\""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"}\" ÐÏÓÌÅ \"%{\""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr "ÐÕÓÔÏÊ ÆÏÒÍÁÔ ÔÜÇÁ"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr "ÐÕÓÔÏÅ ÉÍÑ ÔÜÇÁ"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÜÇ"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr "× ËÏÎÃÅ ÍÁÓÓÉ×Á ÏÖÉÄÁÌÁÓØ \"]\""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
msgid "unexpected ]"
msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"]\""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
msgid "unexpected }"
msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"}\""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÏÓØ \"?\""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
msgid "{ expected after ? in expression"
msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \"?\" ÏÖÉÄÁÌÏÓØ \"{\""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÏÓØ \"}\""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \"?\" ÏÖÉÄÁÌÏÓØ \":\""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
msgid "{ expected after : in expression"
msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \":\" ÏÖÉÄÁÌÏÓØ \"{\""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr "× ËÏÎÃÅ ×ÙÒÁÖÅÎÉÑ ÏÖÉÄÁÌÓÑ \"|\""
@@ -3022,236 +3012,246 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr "ÓÏÚÄÁÔØ ÚÁÇÏÌÏ×ËÉ, ÓÏ×ÍÅÓÔÉÍÙÅ Ó (ÕÓÔÁÒÅ×ÛÉÍÉ) ÐÁËÅÔÁÍÉ rpm[23]"
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: ÉÍÑ ËÌÀÞÁ \"%s\" ÎÅ ÉÚ×ÅÓÔÎÏ, ÉÇÎÏÒÉÒÕÅÔÓÑ\n"
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s ÉÓÐÏÌØÚÕÑ db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "cannot open %s index\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s\n"
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
msgid "no dbpath has been set\n"
msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n"
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, fuzzy, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n"
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr "rpmdb: ÐÏÌÕÞÅÎ ÐÏ×ÒÅÖÄÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË #%u, ÐÒÏÐÕÓËÁÅÔÓÑ.\n"
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÚÁÇÏÌÏ×ÏË × 0x%x\n"
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n"
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "ÕÄÁÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ ÉÚ ÉÎÄÅËÓÁ %s.\n"
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
-#, c-format
-msgid "error(%d) storing record %s into %s\n"
+#: rpmdb/rpmdb.c:2440
+#, fuzzy, c-format
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n"
-#: rpmdb/rpmdb.c:2416
-#, c-format
-msgid "error(%d) removing record %s from %s\n"
+#: rpmdb/rpmdb.c:2450
+#, fuzzy, c-format
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "ÏÛÉÂËÁ(%d) ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s\n"
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "ÏÛÉÂËÁ(%d) ÒÅÚÅÒ×ÉÒÏ×ÁÎÉÑ ÐÁÍÑÔÉ ÄÌÑ ÏÂÒÁÚÁ ÎÏ×ÏÇÏ ÐÁËÅÔÁ\n"
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ \"%s\" × ÉÎÄÅËÓ %s.\n"
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ × ÉÎÄÅËÓ %s\n"
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n"
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "ÕÄÁÌÑÅÔÓÑ %s ÐÏÓÌÅ ÕÓÐÅÛÎÏÇÏ ÚÁ×ÅÒÛÅÎÉÑ ÐÅÒÅÉÎÄÅËÁÃÉÉ ÂÁÚÙ × db3.\n"
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ"
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÅÔÓÑ ÂÁÚÁ ÄÁÎÎÙÈ %s × %s\n"
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, c-format
msgid "temporary database %s already exists\n"
msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ\n"
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, c-format
msgid "creating directory %s\n"
msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s\n"
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, c-format
msgid "creating directory %s: %s\n"
msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s: %s\n"
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n"
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÎÏ×ÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n"
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %u × ÂÁÚÅ ÄÁÎÎÙÈ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÅÔÓÑ.\n"
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %u)\n"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n"
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÁÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÎÁ ÎÏ×ÕÀ!\n"
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "ÆÁÊÌÙ × %s ÚÁÍÅÎÑÀÔÓÑ ÆÁÊÌÁÍÉ ÉÚ %s ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ"
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, c-format
msgid "removing directory %s\n"
msgstr "ÕÄÁÌÑÅÔÓÑ ËÁÔÁÌÏÇ %s\n"
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n"
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "====================== ÁËÔÉ×ÎÙÈ %d ÐÕÓÔÙÈ %d\n"
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr "%3d>%*s(ÐÕÓÔÏ)"
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr "%3d<%*s(ÐÕÓÔÏ)\n"
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr "îÅÚÁËÒÙÔÙÊ ÍÁËÒÏÓ %%%s\n"
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr "îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ (%%define) ÍÁËÒÏÓÁ %%%s\n"
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr "îÅÚÁËÒÙÔÙÅ ÐÁÒÁÍÅÔÒÙ × ÍÁËÒÏÓÅ %%%s\n"
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, c-format
msgid "Macro %%%s has empty body\n"
msgstr "íÁËÒÏÓ %%%s ÐÕÓÔ\n"
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, c-format
msgid "Macro %%%s failed to expand\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÒÁÓËÒÙÔØ ÍÁËÒÏÓ %%%s\n"
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr "îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ (%%undefine) ÍÁËÒÏÓÁ %%%s\n"
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr "íÁËÒÏÓ %%%s (%s) ÎÅ ÂÙÌ ÉÓÐÏÌØÚÏ×ÁÎ ÎÉÖÅ ÕÒÏ×ÎÑ %d\n"
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÐÁÒÁÍÅÔÒ %c × %s(%s)\n"
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr "çÌÕÂÉÎÁ ÒÅËÕÒÓÉÉ(%d) ÂÏÌØÛÅ ÄÏÐÕÓÔÉÍÏÊ(%d)\n"
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, c-format
msgid "Unterminated %c: %s\n"
msgstr "îÅÚÁËÒÙÔÁÑ %c: %s\n"
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr "ÎÅÐÏÎÑÔÎÙÊ ÍÁËÒÏÓ ÐÏÓÌÅ %%\n"
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr "íÁËÒÏÓ %%%.*s ÎÅ ÎÁÊÄÅÎ, ÐÒÏÐÕÓËÁÀ\n"
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
msgid "Target buffer overflow\n"
msgstr "ðÅÒÅÐÏÌÎÅÎÉÅ ÃÅÌÅ×ÏÇÏ ÂÕÆÅÒÁ\n"
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, c-format
msgid "File %s: %s\n"
msgstr "æÁÊÌ %s: %s\n"
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr "äÌÉÎÁ ÆÁÊÌÁ %s ÍÅÎØÛÅ ÞÅÍ %u ÂÁÊÔ\n"
@@ -3372,6 +3372,16 @@ msgstr "url ÐÏÒÔ ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ\n"
msgid "failed to create %s: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n"
+#, fuzzy
+#~ msgid "%s: bad magic\n"
+#~ msgstr "îÅ×ÅÒÎÙÊ magic"
+
+#~ msgid "%s: read manifest failed: %s\n"
+#~ msgstr "%s: ÏÛÉÂËÁ ÞÔÅÎÉÑ ÓÐÉÓËÁ ÆÁÊÌÏ×: %s\n"
+
+#~ msgid "%s-%s-%s: immutable header region digest check failed\n"
+#~ msgstr "%s-%s-%s: ÎÅÐÒÁ×ÉÌØÎÁÑ ÐÏÄÐÉÓØ ÏÂÌÁÓÔÉ ÚÁÇÏÌÏ×ËÁ ÐÁËÅÔÁ\n"
+
#~ msgid ""
#~ "Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n"
#~ msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 404ad4365..b3faceba4 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-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\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"
@@ -9,54 +9,54 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:38
+#: build.c:39
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "nevyrie¹ené závislosti:\n"
-#: build.c:69
+#: build.c:70
#, fuzzy, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "Nie je mo¾né otvori» spec súbor: %s\n"
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, fuzzy, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "Otvorenie rúry pre tar zlyhalo: %s\n"
#. Give up
-#: build.c:168
+#: build.c:169
#, fuzzy, c-format
msgid "Failed to read spec file from %s\n"
msgstr "Nie je mo¾né preèíta» spec súbor z %s\n"
-#: build.c:196
+#: build.c:197
#, fuzzy, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "Nie je mo¾né premenova» %s na %s: %s\n"
-#: build.c:236
+#: build.c:237
#, fuzzy, c-format
msgid "failed to stat %s: %m\n"
msgstr "nepodarilo sa zisti» stav %s: %s"
-#: build.c:241
+#: build.c:242
#, fuzzy, c-format
msgid "File %s is not a regular file.\n"
msgstr "Súbor nie je obyèajný súbor: %s\n"
-#: build.c:250
+#: build.c:251
#, fuzzy, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr "%s zrejme nie je RPM balík\n"
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, fuzzy, c-format
msgid "Building target platforms: %s\n"
msgstr "predefinova» cieµovú platformu"
-#: build.c:320
+#: build.c:321
#, fuzzy, c-format
msgid "Building for target %s\n"
msgstr "vyhµadáva sa balík %s\n"
@@ -74,273 +74,273 @@ msgstr "chyba pri èítaní hlavièky balíka\n"
msgid "cannot re-open payload: %s\n"
msgstr "nie je mo¾né otvori» súbor %s\n"
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr "vypísa» verziu pou¾ívaného rpm"
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:121
#, fuzzy
msgid "print macro expansion of <expr>+"
msgstr "vypísa» verziu pou¾ívaného rpm"
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr "posla» ¹tandardný výstup do <príkazu>"
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr "pou¾i» <adresár> ako adresár najvy¹¹ej úrovne"
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:180
+#: rpmqv.c:183
#, fuzzy
msgid "Signature options:"
msgstr "Veµkos» podpisu: %d\n"
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr ""
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "súbor %s: %s\n"
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verzia %s\n"
-#: rpmqv.c:235
+#: rpmqv.c:238
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998 - Red Hat Software"
-#: rpmqv.c:236
+#: rpmqv.c:239
#, fuzzy
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Program mô¾e by» voµne redistribuovaný v súlade s podmienkami GNU GPL"
-#: rpmqv.c:248
+#: rpmqv.c:251
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "pou¾itie: rpm {--help}"
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:605
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Namiesto nich pou¾ite -e alebo --erase.\n"
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Vnútorná chyba pri spracovaní argumentu (%d) :-(\n"
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr "mô¾e by» pou¾itý iba jeden hlavný re¾im"
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr "naraz mô¾e by» vykonaný jeden typ otázky alebo overenia"
-#: rpmqv.c:682
+#: rpmqv.c:685
#, fuzzy
msgid "unexpected query flags"
msgstr "neoèakávaný zdroj pre otázku"
-#: rpmqv.c:685
+#: rpmqv.c:688
#, fuzzy
msgid "unexpected query format"
msgstr "neoèakávaný zdroj pre otázku"
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr "neoèakávaný zdroj pre otázku"
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath zadané pre operáciu nepou¾ívajúcu databázu"
-#: rpmqv.c:735
+#: rpmqv.c:738
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "iba in¹talácia, aktualizácia a odstránenie zdrojov mô¾u by» vynútené"
-#: rpmqv.c:737
+#: rpmqv.c:740
msgid "files may only be relocated during package installation"
msgstr "súbory mô¾u by» presunuté iba poèas inètalácie balíka"
-#: rpmqv.c:740
+#: rpmqv.c:743
msgid "only one of --prefix or --relocate may be used"
msgstr "mo¾e by» pou¾itá iba jedna z volieb --prefix a --relocate"
-#: rpmqv.c:743
+#: rpmqv.c:746
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate a --excludepath mô¾u by» pou¾ité iba poèas in¹talácie nových "
"balíkov"
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix mô¾e by» pou¾itý iba poèas in¹talácie nových balíkov"
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr "argumenty pre --prefix musia zaèína» znakom /"
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) mô¾e by» pou¾itý iba poèas in¹talácie balíka"
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr "--percent mô¾e by» pou¾ité iba poèas in¹talácie balíka"
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles mô¾e by» pou¾ité iba poèas in¹talácie balíka"
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs mô¾e by» pou¾ité iba poèas in¹talácie balíka"
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs mô¾e by» pou¾ité iba poèas in¹talácie balíka"
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs mô¾e by» pou¾ité iba poèas in¹talácie balíka"
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "mô¾e by» pou¾itá iba jedna voµba z --excludedocs a --includedocs"
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch mô¾e by» pou¾ité iba poèas in¹talácie balíka"
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos mô¾e by» pou¾ité iba poèas in¹talácie balíka"
-#: rpmqv.c:790
+#: rpmqv.c:793
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize mô¾e by» pou¾ité iba poèas in¹talácie balíka"
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches mô¾e by» pou¾ité iba poèas odstránenia balíkov"
-#: rpmqv.c:798
+#: rpmqv.c:801
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles mô¾e by» pou¾ité iba poèas in¹talácie balíka"
-#: rpmqv.c:803
+#: rpmqv.c:806
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb mô¾e by» pou¾ité iba poèas in¹talácie a odstránenia balíka"
-#: rpmqv.c:808
+#: rpmqv.c:811
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb mô¾e by» pou¾ité iba poèas in¹talácie a odstránenia balíka"
-#: rpmqv.c:813
+#: rpmqv.c:816
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb mô¾e by» pou¾ité iba poèas in¹talácie a odstránenia balíka"
-#: rpmqv.c:817
+#: rpmqv.c:820
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -349,7 +349,7 @@ msgstr ""
"--nodeps mô¾e by» pou¾ité iba poèas in¹talácie, odstránenia alebo overenia "
"balíka"
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -357,7 +357,7 @@ msgstr ""
"--test mô¾e by» pou¾ité iba poèas in¹talácie, odstránenia alebo zostavenia "
"balíka"
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -365,87 +365,87 @@ msgstr ""
"--root (-r) mô¾e by» pou¾ité iba poèas in¹talácie a odstránenia balíka, "
"otázky alebo znovuzostavenia databázy"
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenty pre --root (-r) musia zaèína» znakom /"
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:868
+#: rpmqv.c:871
#, c-format
msgid "cannot access file %s\n"
msgstr "nie je mo¾né pracova» so súborom %s\n"
-#: rpmqv.c:887
+#: rpmqv.c:890
msgid "pgp not found: "
msgstr "pgp nebolo nájdené: "
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr "Kontrola hesla zlyhala\n"
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr "Heslo je v poriadku.\n"
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Chybná ¹pecifikácia %%_signature v makro-súbore.\n"
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr "--sign mô¾e by» pou¾íté iba poèas zostavenia balíka"
-#: rpmqv.c:927
+#: rpmqv.c:930
msgid "exec failed\n"
msgstr "vykonanie zlyhalo\n"
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr "neboli zadané ¾iadne balíky pre znovuzostavenie"
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr "neboli zadané ¾iadne spec-súbory pre zostavenie"
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr "neboli zadané ¾iadne tar-súbory pre zostavenie"
-#: rpmqv.c:1051
+#: rpmqv.c:1055
#, fuzzy
msgid "no packages given for erase"
msgstr "neboli zadané ¾iadne balíky na podpis"
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr "neboli zadané ¾iadne balíky pre in¹taláciu"
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr "neboli zadané ¾iadne argumenty pre otázku"
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr "neboli zadané ¾iadne argumenty pre overenie"
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr "neoèakávané argumenty pre --querytags"
-#: rpmqv.c:1145
+#: rpmqv.c:1149
#, fuzzy
msgid "no arguments given"
msgstr "neboli zadané ¾iadne argumenty pre otázku"
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
#, fuzzy
msgid "Unable to open temp file.\n"
msgstr "Nie je mo¾né otvori» doèasný súbor"
@@ -665,7 +665,7 @@ msgstr "Súbor nebol nájdený: %s"
msgid "Could not open %%files file %s: %s\n"
msgstr "chybe: nie je mo¾né otvori» %%files súbor: %s"
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, fuzzy, c-format
msgid "line: %s\n"
msgstr "riadok: %s"
@@ -740,157 +740,157 @@ msgstr ""
msgid "Could not canonicalize hostname: %s\n"
msgstr "Nie je mo¾né kanonizova» názov poèítaèa: %s\n"
-#: build/pack.c:83
+#: build/pack.c:85
#, fuzzy, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "vytvorenie archívu zlyhalo pri súbore %s: %s"
-#: build/pack.c:86
+#: build/pack.c:88
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "vytvorenie archívu zlyhalo pri súbore %s: %s"
-#: build/pack.c:108
+#: build/pack.c:110
#, fuzzy, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "cpio_copy zápis zlyhal: %s"
-#: build/pack.c:115
+#: build/pack.c:117
#, fuzzy, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "cpio_copy èítanie zlyhalo: %s"
-#: build/pack.c:218
+#: build/pack.c:220
#, fuzzy, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "Nie je mo¾né otvori» PreIn súbor: %s"
-#: build/pack.c:225
+#: build/pack.c:227
#, fuzzy, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "Nie je mo¾né otvori» PreUn súbor: %s"
-#: build/pack.c:232
+#: build/pack.c:234
#, fuzzy, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "Nie je mo¾né otvori» PostIn súbor: %s"
-#: build/pack.c:239
+#: build/pack.c:241
#, fuzzy, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "Nie je mo¾né otvori» PostUn súbor: %s"
-#: build/pack.c:247
+#: build/pack.c:249
#, fuzzy, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "Nie je mo¾né otvori» VerifyScript súbor: %s"
-#: build/pack.c:262
+#: build/pack.c:264
#, fuzzy, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "Nie je mo¾né otvori» Trigger skriptový súbor: %s"
-#: build/pack.c:290
+#: build/pack.c:292
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr "readRPM: otvorenie %s: %s\n"
-#: build/pack.c:300
+#: build/pack.c:302
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr "readRPM: èítanie %s: %s\n"
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
-#: build/pack.c:337
+#: build/pack.c:339
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s nie je RPM balík\n"
-#: build/pack.c:346
+#: build/pack.c:348
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: èítanie hlavièky %s\n"
-#: build/pack.c:475
+#: build/pack.c:477
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "Nie je mo¾né preèíta» ikonu: %s"
-#: build/pack.c:494
+#: build/pack.c:496
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "Nie je mo¾né zapísa» %s"
-#: build/pack.c:504
+#: build/pack.c:506
#, fuzzy
msgid "Bad CSA data\n"
msgstr "Chybné CSA dáta"
-#: build/pack.c:540
+#: build/pack.c:542
#, fuzzy
msgid "Unable to write final header\n"
msgstr "Nie je mo¾né zapísa» %s"
-#: build/pack.c:560
+#: build/pack.c:562
#, c-format
msgid "Generating signature: %d\n"
msgstr "Vytvára sa PGP podpis: %d\n"
-#: build/pack.c:578
+#: build/pack.c:580
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "Nie je mo¾né preèíta» ikonu: %s"
-#: build/pack.c:586
+#: build/pack.c:588
#, fuzzy, c-format
msgid "Could not open %s: %s\n"
msgstr "Otvorenie %s zlyhalo\n"
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Nie je mo¾né zapísa» balík: %s"
-#: build/pack.c:637
+#: build/pack.c:639
#, fuzzy, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Nie je preèíta» sigtarget: %s"
-#: build/pack.c:648
+#: build/pack.c:650
#, fuzzy, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "Nie je mo¾né preèíta» ikonu: %s"
-#: build/pack.c:662
+#: build/pack.c:664
#, fuzzy, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Nie je mo¾né zapísa» balík: %s"
-#: build/pack.c:672
+#: build/pack.c:674
#, fuzzy, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Nie je mo¾né preèíta» ikonu: %s"
-#: build/pack.c:678
+#: build/pack.c:680
#, fuzzy, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Nie je mo¾né zapísa» balík: %s"
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr "Zapísané: %s\n"
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Nie je mo¾né vytvori» meno výstupného súboru pre balík %s: %s\n"
-#: build/pack.c:787
+#: build/pack.c:789
#, fuzzy, c-format
msgid "cannot create %s: %s\n"
msgstr "nie je mo¾né zapísa» do %s: "
@@ -1469,77 +1469,77 @@ msgstr " zlyhalo - "
msgid "package %s was already added, replacing with %s\n"
msgstr "balík %s nie je nain¹talovaný\n"
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
#, fuzzy
msgid "(rpmrc provides)"
msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
-#: lib/depends.c:423
+#: lib/depends.c:425
#, fuzzy
msgid "(rpmlib provides)"
msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
-#: lib/depends.c:444
+#: lib/depends.c:446
#, fuzzy
msgid "(db files)"
msgstr "chybný stav súboru: %s"
-#: lib/depends.c:456
+#: lib/depends.c:458
#, fuzzy
msgid "(db provides)"
msgstr "Poskytuje:"
-#: lib/depends.c:469
+#: lib/depends.c:471
#, fuzzy
msgid "(db package)"
msgstr "nájdených %d balíkov\n"
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:927
+#: lib/depends.c:931
#, 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:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr "(nie je èíslo)"
@@ -1631,48 +1631,43 @@ msgstr "varovanie: %s vytvorené ako %s"
msgid "error creating temporary file %s\n"
msgstr "chyba pri vytváraní doèasného súboru %s"
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/package.c:174
-#, fuzzy, c-format
-msgid "%s: bad magic\n"
-msgstr "Chybné magické èíslo"
-
-#: lib/package.c:182
+#: lib/package.c:181
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "táto verzia RPM podporuje iba balíky s hlavným èíslom <= 3"
-#: lib/package.c:190
+#: lib/package.c:189
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "táto verzia RPM podporuje iba balíky s hlavným èíslom <= 3"
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature zlyhalo\n"
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Podpis nie je k dispozícii\n"
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
@@ -2131,87 +2126,87 @@ msgid "generate signature"
msgstr "vytvori» PGP/GPG podpis"
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, fuzzy, c-format
msgid "package %s is intended for a %s architecture"
msgstr "balík %s nie je nain¹talovaný\n"
-#: lib/problems.c:224
+#: lib/problems.c:226
#, c-format
msgid "package %s is intended for a %s operating system"
msgstr ""
-#: lib/problems.c:229
+#: lib/problems.c:231
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "balík %s nie je nain¹talovaný\n"
-#: lib/problems.c:234
+#: lib/problems.c:236
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "balík %s nie je nain¹talovaný\n"
-#: lib/problems.c:239
+#: lib/problems.c:241
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:244
+#: lib/problems.c:246
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:249
+#: lib/problems.c:251
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "balík %s nie je nain¹talovaný\n"
-#: lib/problems.c:254
+#: lib/problems.c:256
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:264
+#: lib/problems.c:266
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:269
+#: lib/problems.c:271
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:273
+#: lib/problems.c:275
#, fuzzy, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n"
-#: lib/problems.c:277
+#: lib/problems.c:279
#, fuzzy, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n"
-#: lib/problems.c:282
+#: lib/problems.c:284
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "conflicts with"
msgstr " koliduje s %s-%s-%s\n"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "is needed by"
msgstr " je vy¾adované %s-%s-%s\n"
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr "Typ údajov %d nie je podorovaný\n"
@@ -2226,27 +2221,27 @@ msgstr "nie je mo¾né zapísa» do %s: "
msgid "cannot write to %%%s %s\n"
msgstr "nie je mo¾né zapísa» do %s: "
-#: lib/psm.c:487
+#: lib/psm.c:485
#, fuzzy
msgid "source package expected, binary found\n"
msgstr "oèakávaný zdrojový balík, nájdený binárny"
-#: lib/psm.c:603
+#: lib/psm.c:601
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor"
-#: lib/psm.c:722
+#: lib/psm.c:720
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n"
-#: lib/psm.c:888
+#: lib/psm.c:890
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "vykonanie skriptu zlyhalo"
-#: lib/psm.c:895
+#: lib/psm.c:897
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "vykonanie skriptu zlyhalo"
@@ -2290,216 +2285,216 @@ msgstr "nepodarilo sa otvori» %s: %s"
msgid "%s failed: %s\n"
msgstr "%s zlyhalo"
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "chyba formátu: %s\n"
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr "(neobsahuje ¾iadne súbory)"
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr "normálny "
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr "nahradený "
-#: lib/query.c:290
+#: lib/query.c:289
msgid "not installed "
msgstr "nein¹talovaný "
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr "zdieµaný "
-#: lib/query.c:296
+#: lib/query.c:295
#, c-format
msgid "(unknown %3d) "
msgstr "(neznámy %d) "
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr "(¾iadny stav) "
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "balík neobsahuje ani vlastníka súboru, ani zoznamy identifikácií"
-#: lib/query.c:466
+#: lib/query.c:465
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "zmazanie %s zlyhalo: %s\n"
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "otvorenie %s zlyhalo\n"
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr "otázka na %s zlyhala\n"
-#: lib/query.c:642
+#: lib/query.c:637
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:668 lib/rpminstall.c:507
+#: lib/query.c:663 lib/rpminstall.c:514
#, fuzzy, c-format
-msgid "%s: read manifest failed: %s\n"
-msgstr "%s: readLead zlyhalo\n"
+msgid "%s: not a package manifest: %s\n"
+msgstr "¾iadny z balíkov nespú¹»a %s\n"
-#: lib/query.c:712
+#: lib/query.c:707
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "otázka na spec-súbor %s zlyhala, nie je mo¾né analyzova»\n"
-#: lib/query.c:733
+#: lib/query.c:728
#, fuzzy
msgid "no packages\n"
msgstr "nájdených %d balíkov\n"
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "skupina %s neobsahuje ¾iadne balíky\n"
-#: lib/query.c:763
+#: lib/query.c:758
#, c-format
msgid "no package triggers %s\n"
msgstr "¾iadny z balíkov nespú¹»a %s\n"
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "Nie je mo¾né preèíta» %s: %s."
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "¾iadny z balíkov nespú¹»a %s\n"
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr "¾iadny z balíkov nevy¾aduje %s\n"
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr "¾iadny z balíkov neposkytuje %s\n"
-#: lib/query.c:916
+#: lib/query.c:911
#, c-format
msgid "file %s: %s\n"
msgstr "súbor %s: %s\n"
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr "chybné èíslo balíku: %s\n"
-#: lib/query.c:950
+#: lib/query.c:945
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "po¾aduje sa záznam èíslo %d\n"
-#: lib/query.c:955
+#: lib/query.c:950
#, fuzzy, c-format
msgid "record %u could not be read\n"
msgstr "záznam %d nie je mo¾né preèíta»\n"
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, c-format
msgid "package %s is not installed\n"
msgstr "balík %s nie je nain¹talovaný\n"
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
#, fuzzy
msgid "(added files)"
msgstr "chybný stav súboru: %s"
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
#, fuzzy
msgid "(added provide)"
msgstr "Poskytuje:"
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: otvorenie zlyhalo\n"
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "vykonanie zlyhalo\n"
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: Nie je mo¾né podpísa» v1.0 RPM\n"
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: Nie je mo¾né znovu podpísa» v2.0 RPM\n"
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, fuzzy, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmReadSignature zlyhalo\n"
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, 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:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr "NIE JE V PORIADKU"
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
msgid " (MISSING KEYS:"
msgstr " (CHÝBAJÚCE K¥ÚÈE):"
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr " (NEDÔVERUJE SA K¥ÚÈOM: "
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr "V PORIADKU"
@@ -2531,95 +2526,95 @@ msgstr " rpm {--version}"
msgid "package %s has unsatisfied %s: %s\n"
msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n"
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "neboli zadané ¾iadne balíky pre in¹taláciu"
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, 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:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr "... ako %s\n"
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s vynechané - prenos zlyhal - %s\n"
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "balík %s nie je nain¹talovaný\n"
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "chyba pri vytváraní doèasného súboru %s"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie je mo¾né nain¹talova»\n"
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, 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:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "nevyrie¹ené závislosti:\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
msgid "installing binary packages\n"
msgstr "in¹talujú sa binárne balíky\n"
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "nie je mo¾né otvori» súbor %s: %s"
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ¹pecifikuje viac balíkov\n"
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
msgid "removing these packages would break dependencies:\n"
msgstr "odstránenie týchto balíkov by poru¹ilo závislosti:\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nie je mo¾né otvori» %s\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr "In¹taluje sa %s\n"
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2724,7 +2719,7 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Nie je mo¾né otvori» %s pre èítanie: %s."
-#: lib/rpmts.c:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
@@ -2873,36 +2868,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Doplnenie podpisu: %d\n"
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s vynechané kvôli príznaku missingok\n"
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, fuzzy, c-format
msgid "excluding directory %s\n"
msgstr "vytvára sa adresár %s\n"
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr ""
-#: lib/verify.c:330
+#: lib/verify.c:283
#, fuzzy, c-format
msgid "missing %s"
msgstr "chýbajúce %s\n"
-#: lib/verify.c:426
+#: lib/verify.c:379
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: "
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr ""
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -2961,100 +2951,100 @@ msgstr "zdieµaný"
msgid "locked db index %s/%s\n"
msgstr "odstraòuje sa index súborov pre %s\n"
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr ""
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
#, fuzzy
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr "grabData() RPM_STRING_TYPE poèet musí by» 1.\n"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr "chýbajúce { po %"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr "chýbajúce } po %{"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr "prázdny tag formát"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr "prázdne meno tagu"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr "neznámy tag"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr "] oèakávané na konci poµa"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
msgid "unexpected ]"
msgstr "neoèakávané ]"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
msgid "unexpected }"
msgstr "neoèakávané }"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr "? oèakávané vo výraze"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
msgid "{ expected after ? in expression"
msgstr "{ oèakávané po ? vo výraze"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr "} oèakávané vo výraze"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr ": oèakávané po ? podvýraze"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
msgid "{ expected after : in expression"
msgstr "{ oèakávané po : vo výraze"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr "| oèakávené na konci výrazu"
@@ -3077,238 +3067,248 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "nie je mo¾né otvori» %s na %s:%d"
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "nie je mo¾né otvori» %s\n"
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
#, fuzzy
msgid "no dbpath has been set\n"
msgstr "nebola nastavená ¾iadna dbpath"
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "chyba pri naèítaní záznamu %s z %s"
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, fuzzy, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "chyba pri zápise záznamu %s do %s"
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie"
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstraòuje sa index skupín\n"
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "odstraòuje sa index názvov\n"
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
-msgid "error(%d) storing record %s into %s\n"
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "chyba pri zápise záznamu %s do %s"
-#: rpmdb/rpmdb.c:2416
+#: rpmdb/rpmdb.c:2450
#, fuzzy, c-format
-msgid "error(%d) removing record %s from %s\n"
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "chyba pri odstraòovaní záznamu %s z %s"
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "chyba pri hµadaní balíka %s\n"
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "premenováva sa %s na %s\n"
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "premenováva sa %s na %s\n"
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, fuzzy, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr "chyba pri zápise záznamu %s do %s"
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr "nebola nastavená ¾iadna dbpath"
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "znovu sa vytvára databáza v adresári %s\n"
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "doèasná databáza %s u¾ existuje"
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "vytvára sa adresár %s\n"
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "vytvára sa adresár %s\n"
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "otvára sa stará databáza\n"
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "otvára sa nová databáza\n"
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "záznam èíslo %d v databáze je chybný -- bol vynechaný"
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "nie je mo¾né prida» záznam pôvodne na %d"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
#, fuzzy
msgid "failed to rebuild database: original database remains in place\n"
msgstr "nepodarilo sa znovu vytvori» databázu; zostáva pôvodná\n"
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr "nepodarilo sa nahradi» starú databázu novou!\n"
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "nahradí súbory v %s súbormi z %s kvôli obnove"
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "vytvára sa adresár %s\n"
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "nepodarilo sa odstráni» adresár %s: %s\n"
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== aktívnych %d prázdnych %d\n"
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr "%3d>%*s(prázdne)"
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr "%3d<%*s(prázdne)\n"
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, fuzzy, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr "Makro %%%s obsahuje neukonèené telo"
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, fuzzy, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr "Makro %%%s obsahuje chybný názov (%%define)"
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, fuzzy, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr "Makro %%%s obsahuje neukonèené voµby"
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, fuzzy, c-format
msgid "Macro %%%s has empty body\n"
msgstr "Makro %%%s obsahuje prázdne telo"
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, fuzzy, c-format
msgid "Macro %%%s failed to expand\n"
msgstr "Makro %%%s sa nepodarilo expandova»"
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, fuzzy, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr "Makro %%%s obsahuje chybný názov (%%undefine)"
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, fuzzy, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr "Makro %%%s (%s) nebolo pou¾ité pod úrovòou %d "
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, fuzzy, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr "Neznáma voµba %c v %s(%s)"
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, fuzzy, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr "Håbka rekurzie (%d) väè¹ia ako maximálna (%d)"
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, fuzzy, c-format
msgid "Unterminated %c: %s\n"
msgstr "Neukonèené %c: %s"
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr ""
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, fuzzy, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr "balík %%%.*s nebol nájdený, vynecháva sa"
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
#, fuzzy
msgid "Target buffer overflow\n"
msgstr "Preplnenie cieµovej vyrovnávacej pamäti"
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, fuzzy, c-format
msgid "File %s: %s\n"
msgstr "Súbor %s: %s"
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, fuzzy, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr "Súbor %s je men¹í ako %d bajtov"
@@ -3433,6 +3433,14 @@ msgid "failed to create %s: %s\n"
msgstr "nepodarilo sa vytvori» %s\n"
#, fuzzy
+#~ msgid "%s: bad magic\n"
+#~ msgstr "Chybné magické èíslo"
+
+#, fuzzy
+#~ msgid "%s: read manifest failed: %s\n"
+#~ msgstr "%s: readLead zlyhalo\n"
+
+#, fuzzy
#~ msgid "removed db file %s\n"
#~ msgstr "odstraòuje sa index súborov pre %s\n"
diff --git a/po/sl.po b/po/sl.po
index 0ec71d3b0..bdafff27a 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.243 2002/05/07 14:27:08 jbj Exp $
+# $Id: sl.po,v 1.244 2002/05/16 16:56:07 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\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"
@@ -14,54 +14,54 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:38
+#: build.c:39
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "izdelava soodvisnosti je bila neuspe¹na:\n"
-#: build.c:69
+#: build.c:70
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "Datoteke s specifikacijami %s ni mo¾no odpreti: %s\n"
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, fuzzy, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "Povezava s programom tar je bila neuspe¹na: %m\n"
#. Give up
-#: build.c:168
+#: build.c:169
#, fuzzy, c-format
msgid "Failed to read spec file from %s\n"
msgstr "Neuspe¹no branje datoteke s specifikacijami iz %s"
-#: build.c:196
+#: build.c:197
#, fuzzy, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "Preimenovanje %s v %s je bilo neuspe¹no: %m"
-#: build.c:236
+#: build.c:237
#, fuzzy, c-format
msgid "failed to stat %s: %m\n"
msgstr "status %s ni na voljo: %s"
-#: build.c:241
+#: build.c:242
#, fuzzy, c-format
msgid "File %s is not a regular file.\n"
msgstr "Datoteka ni obièajna datoteka: %s\n"
-#: build.c:250
+#: build.c:251
#, fuzzy, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr "Ne ka¾e, da je %s datoteka s specifikacijami."
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Izgradnja za ciljna strojna okolja: %s\n"
-#: build.c:320
+#: build.c:321
#, c-format
msgid "Building for target %s\n"
msgstr "Izgradnja za ciljni sistem %s\n"
@@ -79,269 +79,269 @@ msgstr "napaka pri branju glave paketa\n"
msgid "cannot re-open payload: %s\n"
msgstr "ni mo¾no vnoviè odpreti (payload): %s\n"
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr "razlièica rpm, ki jo uporabljate"
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr "definirajte makro <ime> z vrednostjo <telo>"
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:121
#, fuzzy
msgid "print macro expansion of <expr>+"
msgstr "uporabljana razlièica rpm"
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr "standardni izhod preusmerjen na <ukaz>"
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr "uporabi <imenik> za korenski imenik"
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr "prika¾i konèni rpmrc in nastavitev makra"
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:180
+#: rpmqv.c:183
#, fuzzy
msgid "Signature options:"
msgstr "Dol¾. podpisa : %d\n"
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr ""
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "datoteka %s: %s\n"
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr "RPM razlièica %s\n"
-#: rpmqv.c:235
+#: rpmqv.c:238
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998 - Red Hat Software"
-#: rpmqv.c:236
+#: rpmqv.c:239
#, fuzzy
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Ta program je dovoljeno razpeèevati pod pogoji navedenimi v GNU GPL."
-#: rpmqv.c:248
+#: rpmqv.c:251
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "Uporaba: %s {--help}\n"
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:605
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Namesto njiju uporabite -e ali --erase.\n"
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Notranja napaka pri obdelavi argumentov (%d) :-\n"
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr "izbran sme biti le en glavni naèin"
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr "samo en tip poizvedbe/preverjanja je mo¾en naenkrat"
-#: rpmqv.c:682
+#: rpmqv.c:685
msgid "unexpected query flags"
msgstr "neprièakovane zastavice pri poizvedbi"
-#: rpmqv.c:685
+#: rpmqv.c:688
msgid "unexpected query format"
msgstr "neprièakovana oblika poizvedbe"
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr "neprièakovan izvor poizvedbe"
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath podan, vendar, èeprav nepotreben"
-#: rpmqv.c:735
+#: rpmqv.c:738
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"--force smemo podati samo pri --install --upgrade, --rmsource in --rmspec"
-#: rpmqv.c:737
+#: rpmqv.c:740
msgid "files may only be relocated during package installation"
msgstr "datoteke smemo premakniti samo med namestitvijo paketa"
-#: rpmqv.c:740
+#: rpmqv.c:743
msgid "only one of --prefix or --relocate may be used"
msgstr "izbiri --prefix in --relocate se medsebojno izkljuèujeta"
-#: rpmqv.c:743
+#: rpmqv.c:746
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "izbiri --relocate in --excludepath se lahko uporabi le pri namestitvi"
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix se sme uporabiti le pri namestitvi"
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr "argumenti izbire --prefix se morajo zaèeti z /"
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr "--percent sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs sme biti podatn le ob namestitvi paketa"
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "izbiri --excludedocs in --includedocs se medsebojno izkljuèujeta"
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos sme podan le ob namestitvi paketa"
-#: rpmqv.c:790
+#: rpmqv.c:793
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches sme biti podan le ob odstranitvi paketa"
-#: rpmqv.c:798
+#: rpmqv.c:801
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles sme biti podati le ob namestitvi paketa"
-#: rpmqv.c:803
+#: rpmqv.c:806
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
-#: rpmqv.c:808
+#: rpmqv.c:811
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
-#: rpmqv.c:813
+#: rpmqv.c:816
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
-#: rpmqv.c:817
+#: rpmqv.c:820
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -349,14 +349,14 @@ msgstr ""
"--nodeps sme biti podan le ob izgradnji, vnovièni izgradnji, prevajanju, "
"namestitvi, odstranitvi ali preverjanju paketa"
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test sme biti podan le ob namestitvi, odstranitvi ali izgradnji paketa"
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -364,87 +364,87 @@ msgstr ""
"--root (-r) sme biti podan le ob namestitvi, odstranitvi poizvedbi ali "
"vnovièni izgradnji paketa"
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenti izbire --root (-r) se morajo zaèeti z /"
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr "ni datotek, ki bi jih lahko podpisal\n"
-#: rpmqv.c:868
+#: rpmqv.c:871
#, c-format
msgid "cannot access file %s\n"
msgstr "dostop do datoteke %s ni mo¾en\n"
-#: rpmqv.c:887
+#: rpmqv.c:890
msgid "pgp not found: "
msgstr "pgp manjka: "
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr "Vnesite pristopno geslo: "
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr "Preverjanje pristopnega gesla neuspe¹no\n"
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr "Pristopno geslo je pravo.\n"
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Neveljaven %%_signature v makro-datoteki.\n"
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr "--sign sme biti podan le ob izgradnji paketa"
-#: rpmqv.c:927
+#: rpmqv.c:930
msgid "exec failed\n"
msgstr "izvajanje je bilo neuspe¹no\n"
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr "paketi za vnovièno izgradnjo niso navedeni"
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr "datoteka spec za izgradnjo manjka"
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr "arhiv tar za izgradnjo manjka"
-#: rpmqv.c:1051
+#: rpmqv.c:1055
#, fuzzy
msgid "no packages given for erase"
msgstr "paketi katere bi bilo potrebno podpisati niso navedeni"
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr "argumenti za poizvedbo niso podani"
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr "argumenti za preverjanje niso podani"
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr "neprièakovani argumenti za --querytags "
-#: rpmqv.c:1145
+#: rpmqv.c:1149
#, fuzzy
msgid "no arguments given"
msgstr "argumenti za poizvedbo niso podani"
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
#, fuzzy
msgid "Unable to open temp file.\n"
msgstr "Zaèasne datoteke ni mo¾no odpreti"
@@ -664,7 +664,7 @@ msgstr "Datoteke ni mo¾no najti z raz¹iritvijo metaznakov v imenu: %s"
msgid "Could not open %%files file %s: %s\n"
msgstr "Datoteke %s iz %%files ni mo¾no odpreti: %s"
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, fuzzy, c-format
msgid "line: %s\n"
msgstr "vrstica: %s"
@@ -739,157 +739,157 @@ msgstr ""
msgid "Could not canonicalize hostname: %s\n"
msgstr "Iskanje kanoniènega imena gostitelja je bilo neuspe¹no: %s\n"
-#: build/pack.c:83
+#: build/pack.c:85
#, fuzzy, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "ustvarjanje arhiva je bilo za datoteko %s neuspe¹no: %s"
-#: build/pack.c:86
+#: build/pack.c:88
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "ustvarjanje arhiva je bilo za datoteko %s neuspe¹no: %s"
-#: build/pack.c:108
+#: build/pack.c:110
#, fuzzy, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "pisanje cpio_copy neuspe¹no: %s"
-#: build/pack.c:115
+#: build/pack.c:117
#, fuzzy, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "branje cpio_copy neuspe¹no: %s"
-#: build/pack.c:218
+#: build/pack.c:220
#, fuzzy, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "Datoteke PreIn ni mo¾no odpreti: %s"
-#: build/pack.c:225
+#: build/pack.c:227
#, fuzzy, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "Datoteke PreUn ni mo¾no odpreti: %s"
-#: build/pack.c:232
+#: build/pack.c:234
#, fuzzy, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "Datoteke PostIn ni mo¾no odpreti: %s"
-#: build/pack.c:239
+#: build/pack.c:241
#, fuzzy, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "Datoteke PostUn ni mo¾no odpreti: %s"
-#: build/pack.c:247
+#: build/pack.c:249
#, fuzzy, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "Datoteke VerifyScript ni mo¾no odpreti: %s"
-#: build/pack.c:262
+#: build/pack.c:264
#, fuzzy, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "Skriptne datoteke Trigger ni mo¾no odpreti: %s"
-#: build/pack.c:290
+#: build/pack.c:292
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr "readRPM: odpiranje %s: %s\n"
-#: build/pack.c:300
+#: build/pack.c:302
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr "readRPM: branje %s: %s\n"
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
-#: build/pack.c:337
+#: build/pack.c:339
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s ni paket tipa RPM\n"
-#: build/pack.c:346
+#: build/pack.c:348
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: branje glave %s\n"
-#: build/pack.c:475
+#: build/pack.c:477
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "Ikone %s ni mo¾no prebrati: %s"
-#: build/pack.c:494
+#: build/pack.c:496
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "Ni mo¾no zapisati paketa %s: %s"
-#: build/pack.c:504
+#: build/pack.c:506
#, fuzzy
msgid "Bad CSA data\n"
msgstr "Po¹kodovani podatki CSA"
-#: build/pack.c:540
+#: build/pack.c:542
#, fuzzy
msgid "Unable to write final header\n"
msgstr "Ni mo¾no zapisati paketa %s: %s"
-#: build/pack.c:560
+#: build/pack.c:562
#, c-format
msgid "Generating signature: %d\n"
msgstr "Izdelujemo podpis: %d\n"
-#: build/pack.c:578
+#: build/pack.c:580
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "Ikone %s ni mo¾no prebrati: %s"
-#: build/pack.c:586
+#: build/pack.c:588
#, c-format
msgid "Could not open %s: %s\n"
msgstr "Ni mo¾no odpreti %s: %s\n"
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Ni mo¾no zapisati paketa: %s"
-#: build/pack.c:637
+#: build/pack.c:639
#, fuzzy, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Ciljnega podpisa %s ni mo¾no odpreti: %s"
-#: build/pack.c:648
+#: build/pack.c:650
#, fuzzy, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "Ikone %s ni mo¾no prebrati: %s"
-#: build/pack.c:662
+#: build/pack.c:664
#, fuzzy, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Ni mo¾no zapisati paketa %s: %s"
-#: build/pack.c:672
+#: build/pack.c:674
#, fuzzy, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Ikone %s ni mo¾no prebrati: %s"
-#: build/pack.c:678
+#: build/pack.c:680
#, fuzzy, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Ni mo¾no zapisati paketa %s: %s"
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr "Zapisano: %s\n"
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Neuspe¹no ustvarjanje izhodne datoteke za paket %s: %s\n"
-#: build/pack.c:787
+#: build/pack.c:789
#, c-format
msgid "cannot create %s: %s\n"
msgstr "ni mo¾no ustvariti %s: %s\n"
@@ -1471,77 +1471,77 @@ msgstr " neuspe¹no - "
msgid "package %s was already added, replacing with %s\n"
msgstr "paket %s-%s-%s je ¾e name¹èen"
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s DA (rpmrc ponudbe)\n"
-#: lib/depends.c:423
+#: lib/depends.c:425
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s DA (rpmlib ponudbe)\n"
-#: lib/depends.c:444
+#: lib/depends.c:446
#, fuzzy
msgid "(db files)"
msgstr "po¹kodovana zbirka podatkov %s"
-#: lib/depends.c:456
+#: lib/depends.c:458
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s DA (db ponudbe)\n"
-#: lib/depends.c:469
+#: lib/depends.c:471
#, fuzzy
msgid "(db package)"
msgstr "ni paketov\n"
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:927
+#: lib/depends.c:931
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "odstranjujemo seznam skupin\n"
#. Record all relations.
-#: lib/depends.c:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr "(ni ¹tevilo)"
@@ -1633,48 +1633,43 @@ msgstr "opozorilo: %s ustvarjen kot %s"
msgid "error creating temporary file %s\n"
msgstr "napaka pri ustvarjanju zaèasne datoteke %s"
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead je bil neuspe¹en\n"
-#: lib/package.c:174
-#, fuzzy, c-format
-msgid "%s: bad magic\n"
-msgstr "Napaèno magièno ¹tevilo"
-
-#: lib/package.c:182
+#: lib/package.c:181
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <= 3"
-#: lib/package.c:190
+#: lib/package.c:189
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <=4"
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature je bil neuspe¹en\n"
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Podpis ni na voljo\n"
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead je bil neuspe¹en\n"
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
@@ -2130,88 +2125,88 @@ msgid "generate signature"
msgstr "izdelava podpisa PGP/GPG"
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, fuzzy, c-format
msgid "package %s is intended for a %s architecture"
msgstr "paket %s-%s-%s je za drug tip arhitekture"
-#: lib/problems.c:224
+#: lib/problems.c:226
#, fuzzy, c-format
msgid "package %s is intended for a %s operating system"
msgstr "paket %s-%s-%s je za drug operacijski sistem"
-#: lib/problems.c:229
+#: lib/problems.c:231
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "paket %s-%s-%s je ¾e name¹èen"
-#: lib/problems.c:234
+#: lib/problems.c:236
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "paketa %s ni mo¾no prestaviti\n"
-#: lib/problems.c:239
+#: lib/problems.c:241
#, fuzzy, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr "datoteka %s je v sporu med poskusom namestitve %s in %s"
-#: lib/problems.c:244
+#: lib/problems.c:246
#, fuzzy, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
"datoteka %s name¹èena z %s-%s-%s je v sporu z datoteko iz paketa %s-%s-%s"
-#: lib/problems.c:249
+#: lib/problems.c:251
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "paket %s-%s-%s (ki je novej¹i kot %s-%s-%s) je ¾e name¹èen"
-#: lib/problems.c:254
+#: lib/problems.c:256
#, fuzzy, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr "namestitev paketa %s-%s-%s zahteva %ld%cb na datoteènem sistemu %s"
-#: lib/problems.c:264
+#: lib/problems.c:266
#, fuzzy, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr "paket %s pred-prenosljivih sistemskih klicov: %s ni uspelo: %s"
-#: lib/problems.c:269
+#: lib/problems.c:271
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:273
+#: lib/problems.c:275
#, fuzzy, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
-#: lib/problems.c:277
+#: lib/problems.c:279
#, fuzzy, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
-#: lib/problems.c:282
+#: lib/problems.c:284
#, fuzzy, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "conflicts with"
msgstr " je v sporu z %s-%s-%s\n"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "is needed by"
msgstr " potrebuje %s-%s-%s\n"
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr "Tip podatkov %d ni podprt\n"
@@ -2226,27 +2221,27 @@ msgstr "ni mo¾no ustvariti %s: %s\n"
msgid "cannot write to %%%s %s\n"
msgstr "pisanje na %s ni mo¾no"
-#: lib/psm.c:487
+#: lib/psm.c:485
#, fuzzy
msgid "source package expected, binary found\n"
msgstr "prièakovan je bil izvorni paket, najden binarni"
-#: lib/psm.c:603
+#: lib/psm.c:601
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "izvorni paket ne vsebuje datoteke .spec"
-#: lib/psm.c:722
+#: lib/psm.c:720
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n"
-#: lib/psm.c:888
+#: lib/psm.c:890
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "skript se ni uspe¹no izvedel"
-#: lib/psm.c:895
+#: lib/psm.c:897
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "skript se ni uspe¹no izvedel"
@@ -2290,215 +2285,215 @@ msgstr "neuspe¹no odpiranje %s: %s\n"
msgid "%s failed: %s\n"
msgstr "%s neuspe¹en"
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "napaka v obliki: %s\n"
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr "(ne vsebuje datotek)"
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr "normalno "
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr "nadome¹èeno "
-#: lib/query.c:290
+#: lib/query.c:289
msgid "not installed "
msgstr "ni name¹èeno "
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr "omre¾ni "
-#: lib/query.c:296
+#: lib/query.c:295
#, c-format
msgid "(unknown %3d) "
msgstr "(neznano %3d) "
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr "(brez stanja) "
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id"
-#: lib/query.c:466
+#: lib/query.c:465
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "ni mo¾no poizvedeti o %s: %s\n"
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, c-format
msgid "open of %s failed: %s\n"
msgstr "odpiranje %s je bilo neuspe¹no: %s\n"
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr "poizvedba po %s je bila neuspe¹na\n"
-#: lib/query.c:642
+#: lib/query.c:637
msgid "old format source packages cannot be queried\n"
msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n"
-#: lib/query.c:668 lib/rpminstall.c:507
+#: lib/query.c:663 lib/rpminstall.c:514
#, fuzzy, c-format
-msgid "%s: read manifest failed: %s\n"
-msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
+msgid "%s: not a package manifest: %s\n"
+msgstr "noben paket ne pro¾i %s\n"
-#: lib/query.c:712
+#: lib/query.c:707
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "poizvedba po datoteki spec. %s je bila neuspe¹na, razèlemba ni mo¾na\n"
-#: lib/query.c:733
+#: lib/query.c:728
#, fuzzy
msgid "no packages\n"
msgstr "ni paketov\n"
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "skupina %s ne vsebuje nobenega paketa\n"
-#: lib/query.c:763
+#: lib/query.c:758
#, c-format
msgid "no package triggers %s\n"
msgstr "noben paket ne pro¾i %s\n"
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "Neuspe¹no branje %s: %s."
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "noben paket ne pro¾i %s\n"
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr "noben paket ne potrebuje %s\n"
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr "noben paket ne nudi %s\n"
-#: lib/query.c:916
+#: lib/query.c:911
#, c-format
msgid "file %s: %s\n"
msgstr "datoteka %s: %s\n"
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "datoteka %s ni del nobenega paketa\n"
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr "neveljavna ¹tevilka paketa: %s\n"
-#: lib/query.c:950
+#: lib/query.c:945
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "¹tevilka zapisa paketa: %d\n"
-#: lib/query.c:955
+#: lib/query.c:950
#, fuzzy, c-format
msgid "record %u could not be read\n"
msgstr "zapisa %d ni mo¾no prebrati\n"
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s ni name¹èen\n"
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
#, fuzzy
msgid "(added files)"
msgstr "po¹kodovana zbirka podatkov %s"
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
#, fuzzy
msgid "(added provide)"
msgstr "%s: %-45s DA (db ponudbe)\n"
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: odpiranje je bilo neuspe¹no: %s\n"
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
msgid "makeTempFile failed\n"
msgstr "makeTempFile je bil neuspe¹en\n"
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: pisanje Fwrite je bilo neuspe¹no: %s\n"
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: Podpis RPM v1.0 ni mo¾en\n"
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: Sprememba podpisa RPM v2.0 ni mo¾na\n"
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead je bil neuspe¹en: %s\n"
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature je bilo neuspe¹no: %s\n"
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead je bil neuspe¹en\n"
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Podpis ni na voljo (RPM v1.0)\n"
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr "NI DOBRO"
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
msgid " (MISSING KEYS:"
msgstr " (MANJKAJOÈI KLJUÈI:"
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr " (NEPREVERJENI KLJUÈI:"
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr "V REDU"
@@ -2532,95 +2527,95 @@ msgstr " %s A %s\tB %s\n"
msgid "package %s has unsatisfied %s: %s\n"
msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "paketi za namestitev niso navedeni"
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, 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:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr " ... kot %s\n"
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "preskoèeno - %s - prenos neuspe¹en - %s\n"
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, c-format
msgid "package %s is not relocateable\n"
msgstr "paketa %s ni mo¾no premakniti\n"
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, c-format
msgid "error reading from file %s\n"
msgstr "napaka pri branju iz datoteke %s\n"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, 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:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ni mo¾no namestiti\n"
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "najdeno %d izvornih in %d binarnih paketov\n"
-#: lib/rpminstall.c:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "neuspe¹ne soodvisnosti:\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
msgid "installing binary packages\n"
msgstr "name¹èanje binarnih paketov\n"
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "ni mo¾no odpreti datoteke %s: %s\n"
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" doloèa veè paketov\n"
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
msgid "removing these packages would break dependencies:\n"
msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ni mo¾no odpreti %s: %s\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr "Name¹èanje %s\n"
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2725,7 +2720,7 @@ 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:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n"
@@ -2874,36 +2869,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Dol¾. polnila : %d\n"
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n"
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, c-format
msgid "excluding directory %s\n"
msgstr "izkljuèevanje imenika %s\n"
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr "zbiranje seznama priklopljenih datoteènih sistemov.\n"
-#: lib/verify.c:330
+#: lib/verify.c:283
#, fuzzy, c-format
msgid "missing %s"
msgstr "manjka %s\n"
-#: lib/verify.c:426
+#: lib/verify.c:379
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: "
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr ""
-
#: rpmdb/db3.c:85
#, fuzzy, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -2962,22 +2952,22 @@ msgstr "skupno"
msgid "locked db index %s/%s\n"
msgstr "zaklenjeno db kazalo %s/%s\n"
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, fuzzy, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr "dbiSetConfig: neprepoznana izbira db: \"%s\" prezrto\n"
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr "%s ima neveljavno ¹tevilèno vrednost, prezrto\n"
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr "%s ima preveliko ali premajhno dolgo (long) vrednost, prezrto\n"
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
@@ -2986,78 +2976,78 @@ msgstr ""
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
#, fuzzy
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr "¹tevec grabData() RPM_STRING_TYPE mora biti 1.\n"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr "manjkajoèi { za %"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr "manjkajoèi } za %{"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr "oblika znaèke manjka"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr "ime znaèke manjka"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr "neznana znaèka"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr "na koncu polja je prièakovan ]"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
msgid "unexpected ]"
msgstr "neprièakovan ]"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
msgid "unexpected }"
msgstr "neprièakovan }"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr "v izrazu je prièakovan ?"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
msgid "{ expected after ? in expression"
msgstr "v izrazu je za { prièakovan ?"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr "v izrazu je prièakovan }"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr "za podizrazom ? je prièakovano :"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
msgid "{ expected after : in expression"
msgstr "v izrazu je za : prièakovan {"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr "na koncu izraza je prièakovan |"
@@ -3080,240 +3070,250 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: neprepoznano ime znaèke: \"%s\" prezrto\n"
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "ni mo¾no odpreti kazala %s z uporabo db%d - %s (%d)"
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "ni mo¾no odpreti kazala %s:"
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
#, fuzzy
msgid "no dbpath has been set\n"
msgstr "dbpath ni nastavljena"
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, fuzzy, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "napaka(%d) pri pisanju zapisa %s v %s"
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: ni mo¾no prebrati glave pri 0x%x"
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstranjevanje \"%s\" iz kazala %s.\n"
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "odstranjevanje %d vnosov iz kazala %s\n"
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
-msgid "error(%d) storing record %s into %s\n"
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "napaka(%d) pri pisanju zapisa %s v %s"
-#: rpmdb/rpmdb.c:2416
+#: rpmdb/rpmdb.c:2450
#, fuzzy, c-format
-msgid "error(%d) removing record %s from %s\n"
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "napaka(%d) pri brisanju zapisa %s iz %s"
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "napaka(%d) pri iskanju paketa %s\n"
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "dodajanje \"%s\" v kazalo %s.\n"
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "dodajanje %d vnosov v kazalo %s.\n"
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, fuzzy, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr "napaka(%d) pri pisanju zapisa %s v %s"
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr "dbpath ni nastavljena"
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n"
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "zaèasna podatkovna zbirka %s ¾e obstaja"
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "ustvarjanje imenika: %s\n"
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "ustvarjanje imenika: %s\n"
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "odpiranje stare podatkovne zbirke\n"
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n"
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "zapis ¹t. %d v zbirki je po¹kodovan -- preskoèeno."
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "zapisa ni mo¾no dodati na %d"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
#, fuzzy
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"ponovna izgradnja podatkovne zbirke je bila neuspe¹na; stara ostaja na\n"
"istem mestu\n"
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspe¹na!\n"
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "poskus povrnitve z nadomestitvijo datotek v %s z datotekami v %s"
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "odstranjevanje imenika: %s\n"
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "neuspe¹na odstranitev imenika %s: %s\n"
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== aktivni %d prazni %d\n"
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr "%3d>%*s(prazni)"
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr "%3d<%*s(prazni)\n"
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, fuzzy, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr "Makro %%%s vsebuje nezakljuèeno telo"
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, fuzzy, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr "Makro %%%s vsebuje nedovoljeno ime (%%define)"
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, fuzzy, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr "Makro %%%s vsebuje nezakljuèene izbire"
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, fuzzy, c-format
msgid "Macro %%%s has empty body\n"
msgstr "Makro %%%s vsebuje prazno telo"
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, fuzzy, c-format
msgid "Macro %%%s failed to expand\n"
msgstr "Makro %%%s se ne raz¹iri"
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, fuzzy, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr "Makro %%%s vsebuje nedovoljeno ime (%%undefine)"
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, fuzzy, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr "Makro %%%s (%s) ni bil uporabljen pod ravnijo %d"
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, fuzzy, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr "Neznana izbira %c v %s(%s)"
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, fuzzy, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr "Globina rekurzije (%d) veèja od maksimalne (%d)"
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, fuzzy, c-format
msgid "Unterminated %c: %s\n"
msgstr "Nezakljuèeni %c: %s"
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, fuzzy, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr "Oznaki %% sledi nerazèlenljiv makro"
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, fuzzy, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr "Makro %%%.*s ni najden - preskoèeno"
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
#, fuzzy
msgid "Target buffer overflow\n"
msgstr "Ciljni medpomnilnik je bil prekoraèen"
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, fuzzy, c-format
msgid "File %s: %s\n"
msgstr "Datoteka %s: %s"
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, fuzzy, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr "Datoteka %s je kraj¹a od %d bajtov"
@@ -3437,6 +3437,14 @@ msgstr "vrata URL morajo biti ¹tevilka\n"
msgid "failed to create %s: %s\n"
msgstr "neuspe¹no ustvarjanje %s: %s\n"
+#, fuzzy
+#~ msgid "%s: bad magic\n"
+#~ msgstr "Napaèno magièno ¹tevilo"
+
+#, fuzzy
+#~ msgid "%s: read manifest failed: %s\n"
+#~ msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
+
#~ msgid "closed db file %s\n"
#~ msgstr "zaprta datoteka db %s\n"
diff --git a/po/sr.po b/po/sr.po
index 381c4fdb7..6511ed641 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,58 +1,58 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-05-02 21:41:47-0400\n"
-#: build.c:38
+#: build.c:39
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "lo¹e meðuzavisnosti:\n"
-#: build.c:69
+#: build.c:70
#, fuzzy, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "Ne mogu da otvorim %s za èitanje: %s"
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, fuzzy, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "neuspelo otvaranje %s\n"
#. Give up
-#: build.c:168
+#: build.c:169
#, fuzzy, c-format
msgid "Failed to read spec file from %s\n"
msgstr "Neuspelo èitanje %s: %s."
-#: build.c:196
+#: build.c:197
#, fuzzy, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "Neuspelo èitanje %s: %s."
-#: build.c:236
+#: build.c:237
#, fuzzy, c-format
msgid "failed to stat %s: %m\n"
msgstr "neuspelo otvaranje %s: %s"
-#: build.c:241
+#: build.c:242
#, fuzzy, c-format
msgid "File %s is not a regular file.\n"
msgstr "%s ne lièi na RPM paket\n"
-#: build.c:250
+#: build.c:251
#, fuzzy, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr "%s ne lièi na RPM paket\n"
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:320
+#: build.c:321
#, fuzzy, c-format
msgid "Building for target %s\n"
msgstr "gre¹ka potrage za paketom %s\n"
@@ -71,271 +71,271 @@ msgstr "gre¹ka potrage za paketom %s\n"
msgid "cannot re-open payload: %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr "napi¹i verziju rpm-a koja se koristi"
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:121
#, fuzzy
msgid "print macro expansion of <expr>+"
msgstr "napi¹i verziju rpm-a koja se koristi"
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr "po¹alji standardni izlaz u <komandu>"
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr "koristi <dir> kao direktorijum najvi¹eg nivoa"
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:180
+#: rpmqv.c:183
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr ""
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verzija %s\n"
-#: rpmqv.c:235
+#: rpmqv.c:238
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:236
+#: rpmqv.c:239
#, fuzzy
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Mo¾ete slobodno distribuirati dalje pod odredbama GNU GPL"
-#: rpmqv.c:248
+#: rpmqv.c:251
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "kori¹æenje: {rpm --help}"
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:605
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Koristite -e ili --erase.\n"
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr "samo jedan glavni re¾im mo¾e biti naveden"
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr "samo jedan tip upita/provere mo¾e biti uraðen odjednom"
-#: rpmqv.c:682
+#: rpmqv.c:685
#, fuzzy
msgid "unexpected query flags"
msgstr "neoèekivan izvor upita"
-#: rpmqv.c:685
+#: rpmqv.c:688
#, fuzzy
msgid "unexpected query format"
msgstr "neoèekivan izvor upita"
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr "neoèekivan izvor upita"
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath je naveden za operaciju koja ne koristi bazu podataka"
-#: rpmqv.c:735
+#: rpmqv.c:738
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "samo instalacija i a¾uriranje mogu biti forsirane"
-#: rpmqv.c:737
+#: rpmqv.c:740
msgid "files may only be relocated during package installation"
msgstr "datoteke mogu biti preme¹tene samo tokom instalacije paketa"
-#: rpmqv.c:740
+#: rpmqv.c:743
msgid "only one of --prefix or --relocate may be used"
msgstr "samo jedno mo¾ete koristiti: --prefix ili --relocate"
-#: rpmqv.c:743
+#: rpmqv.c:746
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate mo¾ete koristiti samo kad instalirate novi paket"
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix mo¾ete koristiti samo kod instalacije novog paketa"
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr "argumenti za --prefix moraju poèeti znakom /"
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr "--percent mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludecocs mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr "--includecocs mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "samo jedno mo¾ete da navedete: --excludedocs ili --includedocs"
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:790
+#: rpmqv.c:793
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches mo¾ete koristiti samo kod brisanja paketa"
-#: rpmqv.c:798
+#: rpmqv.c:801
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:803
+#: rpmqv.c:806
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb mo¾ete koristiti samo kod instalacije i brisanja paketa"
-#: rpmqv.c:808
+#: rpmqv.c:811
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb mo¾ete koristiti samo kod instalacije i brisanja paketa"
-#: rpmqv.c:813
+#: rpmqv.c:816
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb mo¾ete koristiti samo kod instalacije i brisanja paketa"
-#: rpmqv.c:817
+#: rpmqv.c:820
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -343,14 +343,14 @@ msgid ""
msgstr ""
"--nodeps mo¾ete koristiti samo kod instalacije, uklanjanja ili provere paketa"
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test mo¾ete koristiti samo kod instalacije, uklanjanja ili kreiranja paketa"
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -358,89 +358,89 @@ msgstr ""
"--root (-r) mo¾ete navesti samo kod instalacije, uklanjanja, upita ili "
"rekreiranja baze podataka"
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenti za --root (-r) moraju poèeti znakom /"
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:868
+#: rpmqv.c:871
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: rpmqv.c:887
+#: rpmqv.c:890
#, fuzzy
msgid "pgp not found: "
msgstr "Datoteka nije pronaðena na serveru"
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr "Neuspela provera lozinke\n"
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr "Lozinka je dobra.\n"
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr "--sign se mo¾e koristiti samo kod kreiranja paketa"
-#: rpmqv.c:927
+#: rpmqv.c:930
#, fuzzy
msgid "exec failed\n"
msgstr "%s: Neuspelo otvaranje\n"
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr "nedosataje paket za rekreiranje"
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr "nedostaje specifikacije za kreiranje"
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr "nedostaju 'tar' datoteke za kreiranje"
-#: rpmqv.c:1051
+#: rpmqv.c:1055
#, fuzzy
msgid "no packages given for erase"
msgstr "nedostaje paket za potpisivanje"
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr "nedostaje paket za instalaciju"
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr "nedostaju argumenti za upit"
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr "nedostaju argumenti za proveru"
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr "neoèekivani argumenti za --querytags"
-#: rpmqv.c:1145
+#: rpmqv.c:1149
#, fuzzy
msgid "no arguments given"
msgstr "nedostaju argumenti za upit"
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
#, fuzzy
msgid "Unable to open temp file.\n"
msgstr "Ne mogu da otvorim %s za èitanje: %s"
@@ -653,7 +653,7 @@ msgstr "Datoteka nije pronaðena na serveru"
msgid "Could not open %%files file %s: %s\n"
msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, fuzzy, c-format
msgid "line: %s\n"
msgstr "neuspelo otvaranje %s: %s"
@@ -728,156 +728,156 @@ msgstr ""
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
-#: build/pack.c:83
+#: build/pack.c:85
#, fuzzy, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: build/pack.c:86
+#: build/pack.c:88
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: build/pack.c:108
+#: build/pack.c:110
#, fuzzy, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "neuspelo èitanje: %s (%d)"
-#: build/pack.c:115
+#: build/pack.c:117
#, fuzzy, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "neuspelo èitanje: %s (%d)"
-#: build/pack.c:218
+#: build/pack.c:220
#, fuzzy, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
-#: build/pack.c:225
+#: build/pack.c:227
#, fuzzy, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
-#: build/pack.c:232
+#: build/pack.c:234
#, fuzzy, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
-#: build/pack.c:239
+#: build/pack.c:241
#, fuzzy, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
-#: build/pack.c:247
+#: build/pack.c:249
#, fuzzy, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
-#: build/pack.c:262
+#: build/pack.c:264
#, fuzzy, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
-#: build/pack.c:290
+#: build/pack.c:292
#, fuzzy, c-format
msgid "readRPM: open %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: build/pack.c:300
+#: build/pack.c:302
#, fuzzy, c-format
msgid "readRPM: read %s: %s\n"
msgstr "Neuspelo èitanje %s: %s."
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: build/pack.c:337
+#: build/pack.c:339
#, fuzzy, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "gre¹ka: èini se da %s nije RPM paket\n"
-#: build/pack.c:346
+#: build/pack.c:348
#, fuzzy, c-format
msgid "readRPM: reading header from %s\n"
msgstr "gre¹ka kod uzimanja sloga %s iz %s"
-#: build/pack.c:475
+#: build/pack.c:477
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:494
+#: build/pack.c:496
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:504
+#: build/pack.c:506
msgid "Bad CSA data\n"
msgstr ""
-#: build/pack.c:540
+#: build/pack.c:542
#, fuzzy
msgid "Unable to write final header\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:560
+#: build/pack.c:562
#, fuzzy, c-format
msgid "Generating signature: %d\n"
msgstr "napravi PGP potpis"
-#: build/pack.c:578
+#: build/pack.c:580
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:586
+#: build/pack.c:588
#, fuzzy, c-format
msgid "Could not open %s: %s\n"
msgstr "neuspelo otvaranje %s\n"
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:637
+#: build/pack.c:639
#, fuzzy, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:648
+#: build/pack.c:650
#, fuzzy, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:662
+#: build/pack.c:664
#, fuzzy, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:672
+#: build/pack.c:674
#, fuzzy, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:678
+#: build/pack.c:680
#, fuzzy, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr ""
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:787
+#: build/pack.c:789
#, fuzzy, c-format
msgid "cannot create %s: %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
@@ -1458,77 +1458,77 @@ msgstr "PGP omanuo"
msgid "package %s was already added, replacing with %s\n"
msgstr "paket %s nije instaliran\n"
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
#, fuzzy
msgid "(rpmrc provides)"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/depends.c:423
+#: lib/depends.c:425
#, fuzzy
msgid "(rpmlib provides)"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/depends.c:444
+#: lib/depends.c:446
#, fuzzy
msgid "(db files)"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/depends.c:456
+#: lib/depends.c:458
#, fuzzy
msgid "(db provides)"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/depends.c:469
+#: lib/depends.c:471
#, fuzzy
msgid "(db package)"
msgstr "upit nad svim paketima"
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:927
+#: lib/depends.c:931
#, 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:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr "(nije broj)"
@@ -1620,48 +1620,43 @@ msgstr "Ne mogu da otvorim datoteku %s: "
msgid "error creating temporary file %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/package.c:174
-#, c-format
-msgid "%s: bad magic\n"
-msgstr ""
-
-#: lib/package.c:182
+#: lib/package.c:181
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a"
-#: lib/package.c:190
+#: lib/package.c:189
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a"
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: Neuspelo 'rpmReadSignature'\n"
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Potpis nije na raspolaganju\n"
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
@@ -2125,87 +2120,87 @@ msgid "generate signature"
msgstr "napravi PGP potpis"
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, fuzzy, c-format
msgid "package %s is intended for a %s architecture"
msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
-#: lib/problems.c:224
+#: lib/problems.c:226
#, fuzzy, c-format
msgid "package %s is intended for a %s operating system"
msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
-#: lib/problems.c:229
+#: lib/problems.c:231
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "paket %s nije instaliran\n"
-#: lib/problems.c:234
+#: lib/problems.c:236
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "paket %s nije instaliran\n"
-#: lib/problems.c:239
+#: lib/problems.c:241
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:244
+#: lib/problems.c:246
#, fuzzy, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr " se sudara sa %s-%s-%s\n"
-#: lib/problems.c:249
+#: lib/problems.c:251
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
-#: lib/problems.c:254
+#: lib/problems.c:256
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:264
+#: lib/problems.c:266
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:269
+#: lib/problems.c:271
#, fuzzy, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
-#: lib/problems.c:273
+#: lib/problems.c:275
#, fuzzy, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr "paket %s nije naveden u %s"
-#: lib/problems.c:277
+#: lib/problems.c:279
#, fuzzy, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr "paket %s nije naveden u %s"
-#: lib/problems.c:282
+#: lib/problems.c:284
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "conflicts with"
msgstr " se sudara sa %s-%s-%s\n"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "is needed by"
msgstr " je potreban paketu %s-%s-%s\n"
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
@@ -2220,26 +2215,26 @@ msgstr "Ne mogu da otvorim datoteku %s: "
msgid "cannot write to %%%s %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: lib/psm.c:487
+#: lib/psm.c:485
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:603
+#: lib/psm.c:601
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "upit nad paketom koji ima <datoteku>"
-#: lib/psm.c:722
+#: lib/psm.c:720
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "nemoj izvr¹iti nijednu fazu"
-#: lib/psm.c:888
+#: lib/psm.c:890
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "neuspelo izvr¹avanje skripta"
-#: lib/psm.c:895
+#: lib/psm.c:897
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "neuspelo izvr¹avanje skripta"
@@ -2283,218 +2278,218 @@ msgstr "neuspelo otvaranje %s: %s"
msgid "%s failed: %s\n"
msgstr "PGP omanuo"
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "gre¹ka u formatu: %s\n"
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr "(nema datoteka)"
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr ""
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr ""
-#: lib/query.c:290
+#: lib/query.c:289
#, fuzzy
msgid "not installed "
msgstr "paket %s nije instaliran\n"
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr ""
-#: lib/query.c:296
+#: lib/query.c:295
#, fuzzy, c-format
msgid "(unknown %3d) "
msgstr "(nepoznat tip)"
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr ""
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "paket nema imena"
-#: lib/query.c:466
+#: lib/query.c:465
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "gre¹ka: ne mogu da otvorim %s\n"
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "neuspelo otvaranje %s: %s\n"
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr "upit nad %s neuspeo\n"
-#: lib/query.c:642
+#: lib/query.c:637
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:668 lib/rpminstall.c:507
+#: lib/query.c:663 lib/rpminstall.c:514
#, fuzzy, c-format
-msgid "%s: read manifest failed: %s\n"
-msgstr "%s: Neuspeo 'readLead'\n"
+msgid "%s: not a package manifest: %s\n"
+msgstr "nijedan paket ne aktivira %s\n"
-#: lib/query.c:712
+#: lib/query.c:707
#, fuzzy, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "upit nad %s neuspeo\n"
-#: lib/query.c:733
+#: lib/query.c:728
#, fuzzy
msgid "no packages\n"
msgstr "upit nad svim paketima"
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "grupa %s ne sadr¾i nijedan paket\n"
-#: lib/query.c:763
+#: lib/query.c:758
#, c-format
msgid "no package triggers %s\n"
msgstr "nijedan paket ne aktivira %s\n"
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "Neuspelo èitanje %s: %s."
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "nijedan paket ne aktivira %s\n"
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr "nijedan paket ne zahteva %s\n"
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr "nijedan paket ne obezbeðuje %s\n"
-#: lib/query.c:916
+#: lib/query.c:911
#, fuzzy, c-format
msgid "file %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr "pogre¹an broj paketa: %s\n"
-#: lib/query.c:950
+#: lib/query.c:945
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "pogre¹an broj paketa: %s\n"
-#: lib/query.c:955
+#: lib/query.c:950
#, fuzzy, c-format
msgid "record %u could not be read\n"
msgstr "ne mogu da proèitam slog %d\n"
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s nije instaliran\n"
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
#, fuzzy
msgid "(added files)"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
#, fuzzy
msgid "(added provide)"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: Neuspelo otvaranje\n"
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "%s: Neuspelo otvaranje\n"
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: Ne mogu da potpi¹em v1.0 RPM\n"
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: Ne mogu da ponovo potpi¹em v2.0 RPM\n"
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, fuzzy, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: Neuspelo 'rpmReadSignature'\n"
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n"
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
#, fuzzy
msgid " (MISSING KEYS:"
msgstr " (NEDOSTAJUÆI KLJUÈEVI)"
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr ""
@@ -2525,96 +2520,96 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr "paket %s nije naveden u %s"
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "nedostaje paket za instalaciju"
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, c-format
msgid "Retrieving %s\n"
msgstr "Pribavljam %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n"
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "paket %s nije instaliran\n"
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "gre¹ka: %s se ne mo¾e instalirati\n"
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "grupa %s ne sadr¾i nijedan paket\n"
-#: lib/rpminstall.c:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "lo¹e meðuzavisnosti:\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
#, fuzzy
msgid "installing binary packages\n"
msgstr "instaliraj paket"
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" odreðuje vi¹e paketa\n"
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
msgid "removing these packages would break dependencies:\n"
msgstr "uklanjanje oviha paketa æe naru¹iti zavisnosti:\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "gre¹ka: ne mogu da otvorim %s\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr "Instaliram %s\n"
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "neodstaje paket za deinstalaciju"
@@ -2719,7 +2714,7 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Ne mogu da otvorim %s za èitanje: %s"
-#: lib/rpmts.c:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n"
@@ -2869,36 +2864,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, fuzzy, c-format
msgid "excluding directory %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr ""
-#: lib/verify.c:330
+#: lib/verify.c:283
#, fuzzy, c-format
msgid "missing %s"
msgstr "nedostaje { posle %"
-#: lib/verify.c:426
+#: lib/verify.c:379
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "Nezadovoljene meðuzavisnosti za %s-%s-%s: "
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr ""
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -2957,101 +2947,101 @@ msgstr "deljeno"
msgid "locked db index %s/%s\n"
msgstr "rekreiraj bazu podataka iz postojeæe baze"
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr ""
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr ""
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr "nedostaje { posle %"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr "nedostaje } posle %"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr "prazan 'tag' format'"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr "prazno ime tag-a"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr "nepoznat tag"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr "] oèekivano na kraju niza"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
msgid "unexpected ]"
msgstr "neoèekivano ]"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
msgid "unexpected }"
msgstr "neoèekivano }"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr "oèekivan znak ? u izrazu"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
#, fuzzy
msgid "{ expected after ? in expression"
msgstr "{ oèekivano posle ? u izrazu"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr "} oèekivano u izrazu"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr "oèekivano : praæeno ? podizrazom"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
#, fuzzy
msgid "{ expected after : in expression"
msgstr "{ oèekivano posle : u izrazu"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr "| oèekivano na kraju izraza"
@@ -3074,236 +3064,246 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "gre¹ka: ne mogu da otvorim %s\n"
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
#, fuzzy
msgid "no dbpath has been set\n"
msgstr "dbpath nije odreðen"
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "gre¹ka kod uzimanja sloga %s iz %s"
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, fuzzy, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "gre¹ka zapisivanja sloga %s u %s"
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "ne mogu da proèitam zaglavlje na %d za proveru"
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "gre¹ka uklanjanja sloga %s u %s"
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "gre¹ka uklanjanja sloga %s u %s"
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
-msgid "error(%d) storing record %s into %s\n"
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "gre¹ka zapisivanja sloga %s u %s"
-#: rpmdb/rpmdb.c:2416
+#: rpmdb/rpmdb.c:2450
#, fuzzy, c-format
-msgid "error(%d) removing record %s from %s\n"
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "gre¹ka uklanjanja sloga %s u %s"
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "gre¹ka kod potrage za paketom %s\n"
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "gre¹ka uklanjanja sloga %s u %s"
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, fuzzy, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr "gre¹ka zapisivanja sloga %s u %s"
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr "dbpath nije odreðen"
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "rekreiraj bazu podataka iz postojeæe baze"
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "privremena baza podataka %s veæ postoji"
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "rekreiraj bazu podataka iz postojeæe baze"
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "rekreiraj bazu podataka iz postojeæe baze"
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "slog broj %d u bazi podataka je neispravan -- preskaèem ga"
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "ne mogu da dodam slog originalno na %d"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr ""
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr ""
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr ""
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, c-format
msgid "Macro %%%s has empty body\n"
msgstr ""
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, c-format
msgid "Macro %%%s failed to expand\n"
msgstr ""
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr ""
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr ""
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, fuzzy, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr "(nepoznat tip)"
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr ""
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, fuzzy, c-format
msgid "Unterminated %c: %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr ""
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, fuzzy, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr "paket %s nije naðen u %s"
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
msgid "Target buffer overflow\n"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, fuzzy, c-format
msgid "File %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr ""
@@ -3436,6 +3436,10 @@ msgid "failed to create %s: %s\n"
msgstr "neuspelo kreiranje %s\n"
#, fuzzy
+#~ msgid "%s: read manifest failed: %s\n"
+#~ msgstr "%s: Neuspeo 'readLead'\n"
+
+#, fuzzy
#~ msgid "bad db file %s\n"
#~ msgstr "neuspelo otvaranje %s: %s"
diff --git a/po/sv.po b/po/sv.po
index 65a01c689..84bcec057 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-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\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"
@@ -9,54 +9,54 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: build.c:38
+#: build.c:39
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "ouppfyllda byggberoenden:\n"
-#: build.c:69
+#: build.c:70
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "Kan inte öppna specfilen %s: %s\n"
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "Kunde inte öppna \"tar\"-rör: %m\n"
#. Give up
-#: build.c:168
+#: build.c:169
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr "Kunde inte läsa specfil från %s\n"
-#: build.c:196
+#: build.c:197
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "Kunde inte byta namn på %s till %s: %m\n"
-#: build.c:236
+#: build.c:237
#, c-format
msgid "failed to stat %s: %m\n"
msgstr "kunde inte ta status på %s: %m\n"
-#: build.c:241
+#: build.c:242
#, c-format
msgid "File %s is not a regular file.\n"
msgstr "Filen %s är inte en vanlig fil.\n"
-#: build.c:250
+#: build.c:251
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr "Filen %s tycks inte vara en specfil.\n"
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Bygger målplattformar: %s\n"
-#: build.c:320
+#: build.c:321
#, c-format
msgid "Building for target %s\n"
msgstr "Bygger för målet %s\n"
@@ -74,252 +74,252 @@ msgstr "fel vid läsning av pakethuvud\n"
msgid "cannot re-open payload: %s\n"
msgstr "kan inte återöppna lasten: %s\n"
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr "visa vilken version av rpm som används"
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr "visa mindre detaljerad utdata"
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr "visa mer detaljerad utdata"
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr "definiera makrot <namn> som <kropp>"
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr "'<namn> <kropp>'"
-#: rpmqv.c:118
+#: rpmqv.c:121
msgid "print macro expansion of <expr>+"
msgstr "skriv ut makroexpansion av <uttr>+"
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr "<uttr>+"
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr "skicka standard ut till <kommando>"
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr "<kommando>"
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr "använd <kat> som toppkatalog"
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr "<kat>"
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr "läs <fil:...> istället för standardmakrofil(er)"
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr "<fil:...>"
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "läs <fil:...> istället för standard rpmrc-fil(er)"
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr "visa slutliga rpmrc- och makrokonfigurationer"
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr "deaktivera användningen av libio(3)-API:et"
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr "felsök protokolldataström"
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr "felsök rpmio I/O"
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr "felsök cache-hanteringen av URL:ar"
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr "Frågeflaggor (med -q eller --query):"
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr "Verifieringsflaggor (med -V eller --verify):"
-#: rpmqv.c:180
+#: rpmqv.c:183
msgid "Signature options:"
msgstr "Signaturflaggor:"
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr "Databasflaggor:"
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr "Byggflaggor med [ <specfil> | <tar-arkiv> | <källpaket> ]:"
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr "Installera-/Uppdatera-/Raderaflaggor"
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr "Gemensamma flaggor för alla rpm-lägen:"
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr "RPM version %s\n"
-#: rpmqv.c:235
+#: rpmqv.c:238
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright © 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:236
+#: rpmqv.c:239
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Det här programmet kan distribueras fritt enligt villkoren i GNU GPL"
-#: rpmqv.c:248
+#: rpmqv.c:251
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Användning: %s {--help}\n"
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr "Flaggan --rcfile har tagits bort.\n"
-#: rpmqv.c:602
+#: rpmqv.c:605
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Använd \"--macros <fil:...>\" istället.\n"
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Internt fel i argumenthantering (%d) :-(\n"
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr "enbart ett huvudläge kan anges"
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr "endast en typ av fråga/verifiering kan utföras åt gången"
-#: rpmqv.c:682
+#: rpmqv.c:685
msgid "unexpected query flags"
msgstr "oväntade frågeflaggor"
-#: rpmqv.c:685
+#: rpmqv.c:688
msgid "unexpected query format"
msgstr "oväntat frågeformat"
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr "oväntad frågekälla"
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath angivet för en operation som inte använder någon databas"
-#: rpmqv.c:735
+#: rpmqv.c:738
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"enbart installation, uppgradering, rmsource och rmspec kan tvingas fram"
-#: rpmqv.c:737
+#: rpmqv.c:740
msgid "files may only be relocated during package installation"
msgstr "filer kan relokeras endast under paketinstallation"
-#: rpmqv.c:740
+#: rpmqv.c:743
msgid "only one of --prefix or --relocate may be used"
msgstr "enbart en av --prefix eller --relocate kan användas"
-#: rpmqv.c:743
+#: rpmqv.c:746
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate och --excludepath kan endast användas när nya paket installeras"
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix kan endast användas när nya paket installeras"
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr "argument till --prefix måste börja med /"
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) kan enbart användas vid paketinstallation"
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr "--percent kan enbart användas vid paketinstallation"
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles kan enbart användas vid paketinstallation"
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs kan enbart användas vid paketinstallation"
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs kan enbart användas vid paketinstallation"
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs kan enbart användas vid paketinstallation"
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "enbart en av --excludedocs och --includedocs kan användas"
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch kan enbart användas vid paketinstallation"
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos kan enbart användas vid paketinstallation"
-#: rpmqv.c:790
+#: rpmqv.c:793
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize kan enbart användas vid paketinstallation"
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches kan enbart användas när paket raderas"
-#: rpmqv.c:798
+#: rpmqv.c:801
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles kan enbart användas vid paketinstallation"
-#: rpmqv.c:803
+#: rpmqv.c:806
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb kan enbart användas när paket installeras eller raderas"
-#: rpmqv.c:808
+#: rpmqv.c:811
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -327,7 +327,7 @@ msgstr ""
"skriptdeaktiveringsflaggor kan enbart användas när paket installeras eller "
"raderas"
-#: rpmqv.c:813
+#: rpmqv.c:816
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -335,7 +335,7 @@ msgstr ""
"utlösardeaktiveringsflaggor kan enbart användas när paket installeras eller "
"raderas"
-#: rpmqv.c:817
+#: rpmqv.c:820
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -343,13 +343,13 @@ msgstr ""
"--nodeps kan enbart användas när paket byggs, byggs om, kompileras om, "
"installeras, raderas eller verifieras"
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test kan enbart användas när paket installeras, raderas eller byggs"
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -357,87 +357,87 @@ msgstr ""
"--root (-r) kan enbart användas när paket installeras, raderas, frågas eller "
"databasen byggs om"
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr "argument till --root (-r) måste börja med /"
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr "inga filer att signera\n"
-#: rpmqv.c:868
+#: rpmqv.c:871
#, c-format
msgid "cannot access file %s\n"
msgstr "kan inte komma åt filen %s\n"
-#: rpmqv.c:887
+#: rpmqv.c:890
msgid "pgp not found: "
msgstr "pgp hittades inte: "
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr "Ange lösenfras: "
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr "Kontrollen av lösenfrasen misslyckades\n"
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr "Lösenfrasen är ok.\n"
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Felaktig %%_signature-spec i makrofil.\n"
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr "--sign kan enbart användas vid pakettillverkning"
-#: rpmqv.c:927
+#: rpmqv.c:930
msgid "exec failed\n"
msgstr "exec misslyckades\n"
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr "inga paketfiler angivna för omtillverkning"
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr "inga specfiler angivna för tillverkning"
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr "inga tar-filer angivna för tillverkning"
-#: rpmqv.c:1051
+#: rpmqv.c:1055
#, fuzzy
msgid "no packages given for erase"
msgstr "inga paket angivna för signering"
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr "inga paket angivna för installation"
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr "inga parametrar angivna för fråga"
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr "inga parametrar angivna för verifiering"
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr "oväntade argument till --querytags "
-#: rpmqv.c:1145
+#: rpmqv.c:1149
#, fuzzy
msgid "no arguments given"
msgstr "inga parametrar angivna för fråga"
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
msgid "Unable to open temp file.\n"
msgstr "Kan inte öppna temporär fil.\n"
@@ -647,7 +647,7 @@ msgstr "Hittade ingen fil vid matchningen: %s\n"
msgid "Could not open %%files file %s: %s\n"
msgstr "Kunde inte öppna %%files-fil %s: %s\n"
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, c-format
msgid "line: %s\n"
msgstr "rad: %s\n"
@@ -722,152 +722,152 @@ msgstr "getGidS: för många gid\n"
msgid "Could not canonicalize hostname: %s\n"
msgstr "Kunde inte kanonisera värdnamn: %s\n"
-#: build/pack.c:83
+#: build/pack.c:85
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "skapande av arkiv misslyckades vid fil %s: %s\n"
-#: build/pack.c:86
+#: build/pack.c:88
#, c-format
msgid "create archive failed: %s\n"
msgstr "skapande av arkiv misslyckades: %s\n"
-#: build/pack.c:108
+#: build/pack.c:110
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "cpio_copy kunde inte skriva: %s\n"
-#: build/pack.c:115
+#: build/pack.c:117
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "cpio_copy kunde inte läsa: %s\n"
-#: build/pack.c:218
+#: build/pack.c:220
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "Kunde inte öppna PreIn-fil: %s\n"
-#: build/pack.c:225
+#: build/pack.c:227
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "Kunde inte öppna PreUn-fil: %s\n"
-#: build/pack.c:232
+#: build/pack.c:234
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "Kunde inte öppna PostIn-fil: %s\n"
-#: build/pack.c:239
+#: build/pack.c:241
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "Kunde inte öppna PostUn-fil: %s\n"
-#: build/pack.c:247
+#: build/pack.c:249
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "Kunde inte öppna VerifyScript-fil: %s\n"
-#: build/pack.c:262
+#: build/pack.c:264
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "Kunde inte öppna Trigger-skriptfil: %s\n"
-#: build/pack.c:290
+#: build/pack.c:292
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr "readRPM: öppna %s: %s\n"
-#: build/pack.c:300
+#: build/pack.c:302
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr "readRPM: läs %s: %s\n"
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: Fseek misslyckades: %s\n"
-#: build/pack.c:337
+#: build/pack.c:339
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s är inte ett RPM-paket\n"
-#: build/pack.c:346
+#: build/pack.c:348
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: läser huvud från %s\n"
-#: build/pack.c:475
+#: build/pack.c:477
msgid "Unable to create immutable header region.\n"
msgstr "Kan inte skapa oföränderlig huvudregion.\n"
-#: build/pack.c:494
+#: build/pack.c:496
msgid "Unable to write temp header\n"
msgstr "Kan inte skriva temporärhuvud\n"
-#: build/pack.c:504
+#: build/pack.c:506
msgid "Bad CSA data\n"
msgstr "Felaktig CSA-data\n"
-#: build/pack.c:540
+#: build/pack.c:542
msgid "Unable to write final header\n"
msgstr "Kan inte skriva slutligt huvud\n"
-#: build/pack.c:560
+#: build/pack.c:562
#, c-format
msgid "Generating signature: %d\n"
msgstr "Genererar signatur: %d\n"
-#: build/pack.c:578
+#: build/pack.c:580
msgid "Unable to reload signature header.\n"
msgstr "Kan inte läsa om signaturhuvud.\n"
-#: build/pack.c:586
+#: build/pack.c:588
#, c-format
msgid "Could not open %s: %s\n"
msgstr "Kunde inte öppna %s: %s\n"
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Kunde inte skriva paket: %s\n"
-#: build/pack.c:637
+#: build/pack.c:639
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Kan inte läsa signaturen %s: %s\n"
-#: build/pack.c:648
+#: build/pack.c:650
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "Kan inte läsa huvud från %s: %s\n"
-#: build/pack.c:662
+#: build/pack.c:664
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Kan inte skriva huvud till %s: %s\n"
-#: build/pack.c:672
+#: build/pack.c:674
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Kan inte läsa last från %s: %s\n"
-#: build/pack.c:678
+#: build/pack.c:680
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Kan inte skriva last till %s: %s\n"
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr "Skrev: %s\n"
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Kunde inte generera utfilnamn för paketet %s: %s\n"
-#: build/pack.c:787
+#: build/pack.c:789
#, c-format
msgid "cannot create %s: %s\n"
msgstr "kan inte skapa %s: %s\n"
@@ -1433,52 +1433,52 @@ msgstr " misslyckades - "
msgid "package %s was already added, replacing with %s\n"
msgstr "paket %s är redan installerat"
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n"
-#: lib/depends.c:423
+#: lib/depends.c:425
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n"
-#: lib/depends.c:444
+#: lib/depends.c:446
#, fuzzy
msgid "(db files)"
msgstr "felaktig db-fil %s\n"
-#: lib/depends.c:456
+#: lib/depends.c:458
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s JA (db-tillhandahållande)\n"
-#: lib/depends.c:469
+#: lib/depends.c:471
#, fuzzy
msgid "(db package)"
msgstr "inga paket\n"
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:927
+#: lib/depends.c:931
#, 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:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr "========== noterar alla relationer\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1486,26 +1486,26 @@ msgid ""
msgstr ""
"========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n"
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr "========== endast efterföljare (presentationsordning)\n"
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr "LOOP:\n"
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr "========== fortsätter med tsort ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr "(inte ett tal)"
@@ -1598,46 +1598,41 @@ msgstr "%s skapades som %s\n"
msgid "error creating temporary file %s\n"
msgstr "fel när tämporärfil %s skapades\n"
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead misslyckades\n"
-#: lib/package.c:174
-#, fuzzy, c-format
-msgid "%s: bad magic\n"
-msgstr "Felaktigt magiskt tal"
-
-#: lib/package.c:182
+#: lib/package.c:181
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "paket med versionsnummer 1 stöds inte av denna version av RPM\n"
-#: lib/package.c:190
+#: lib/package.c:189
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "endast paket med huvudnummer <= 4 stöds av denna version av RPM\n"
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature misslyckades\n"
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen signatur tillgänglig\n"
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead misslyckades\n"
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread misslyckades: %s\n"
@@ -2069,87 +2064,87 @@ msgid "generate signature"
msgstr "generera signatur"
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, fuzzy, c-format
msgid "package %s is intended for a %s architecture"
msgstr "paket %s är för en annan arkitektur"
-#: lib/problems.c:224
+#: lib/problems.c:226
#, fuzzy, c-format
msgid "package %s is intended for a %s operating system"
msgstr "paket %s är för ett annat operativsystem"
-#: lib/problems.c:229
+#: lib/problems.c:231
#, c-format
msgid "package %s is already installed"
msgstr "paket %s är redan installerat"
-#: lib/problems.c:234
+#: lib/problems.c:236
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr "sökväg %s i paket %s är inte relokerbar"
-#: lib/problems.c:239
+#: lib/problems.c:241
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr "fil %s är en konflikt mellan installationsförsök av %s och %s"
-#: lib/problems.c:244
+#: lib/problems.c:246
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr "fil %s från installation av %s står i konflikt med filen från paket %s"
-#: lib/problems.c:249
+#: lib/problems.c:251
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "paket %s (som är nyare än %s) är redan installerat"
-#: lib/problems.c:254
+#: lib/problems.c:256
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr "installation av paket %s kräver %ld%cB på filsystem %s"
-#: lib/problems.c:264
+#: lib/problems.c:266
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr "installation av paket %s kräver %ld inoder på filsystem %s"
-#: lib/problems.c:269
+#: lib/problems.c:271
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr "paket %s systemanrop före transaktion: %s misslyckades: %s"
-#: lib/problems.c:273
+#: lib/problems.c:275
#, fuzzy, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n"
-#: lib/problems.c:277
+#: lib/problems.c:279
#, fuzzy, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n"
-#: lib/problems.c:282
+#: lib/problems.c:284
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "okänt fel %d uppträdde under behandling av paket %s"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "conflicts with"
msgstr " står i konflikt med %s-%s-%s\n"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "is needed by"
msgstr " behövs av %s-%s-%s\n"
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr "Datatyp %d stöds inte\n"
@@ -2164,26 +2159,26 @@ msgstr "kan inte skapa %%%s %s\n"
msgid "cannot write to %%%s %s\n"
msgstr "kan inte skriva till %%%s %s\n"
-#: lib/psm.c:487
+#: lib/psm.c:485
msgid "source package expected, binary found\n"
msgstr "källpaket förväntades, fann binärpaket\n"
-#: lib/psm.c:603
+#: lib/psm.c:601
msgid "source package contains no .spec file\n"
msgstr "källpaket innehåller ingen .spec-fil\n"
-#: lib/psm.c:722
+#: lib/psm.c:720
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "%s: kör (eventuellt) %s-skript\n"
-#: lib/psm.c:888
+#: lib/psm.c:890
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
"körning av %s-skript från %s-%s-%s misslyckades, waitpid returnerade %s\n"
-#: lib/psm.c:895
+#: lib/psm.c:897
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "körning av %s-skript från %s-%s-%s misslyckades, slutstatus %d\n"
@@ -2227,213 +2222,213 @@ msgstr "%s misslyckades på fil %s: %s\n"
msgid "%s failed: %s\n"
msgstr "%s misslyckades: %s\n"
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, c-format
msgid "incorrect format: %s\n"
msgstr "fel format: %s\n"
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr "(innehåller inga filer)"
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr "normal "
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr "ersatt "
-#: lib/query.c:290
+#: lib/query.c:289
msgid "not installed "
msgstr "oinstallerat "
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr "nätdelad "
-#: lib/query.c:296
+#: lib/query.c:295
#, c-format
msgid "(unknown %3d) "
msgstr "(okänd %3d) "
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr "(ej tillstnd) "
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
msgid "package has neither file owner or id lists\n"
msgstr "paketet har varken filägare eller id-listor\n"
-#: lib/query.c:466
+#: lib/query.c:465
#, c-format
msgid "can't query %s: %s\n"
msgstr "kan inte fråga %s: %s\n"
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, c-format
msgid "open of %s failed: %s\n"
msgstr "misslyckades med att öppna %s: %s\n"
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr "fråga av %s misslyckades\n"
-#: lib/query.c:642
+#: lib/query.c:637
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:668 lib/rpminstall.c:507
-#, c-format
-msgid "%s: read manifest failed: %s\n"
-msgstr "%s: läsning av paketlista misslyckades: %s\n"
+#: lib/query.c:663 lib/rpminstall.c:514
+#, fuzzy, c-format
+msgid "%s: not a package manifest: %s\n"
+msgstr "inga paketutlösare %s\n"
-#: lib/query.c:712
+#: lib/query.c:707
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "fråga av specfil %s misslyckades, kan inte tolka\n"
-#: lib/query.c:733
+#: lib/query.c:728
msgid "no packages\n"
msgstr "inga paket\n"
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "grupp %s innehåller inga paket\n"
-#: lib/query.c:763
+#: lib/query.c:758
#, c-format
msgid "no package triggers %s\n"
msgstr "inga paketutlösare %s\n"
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "Misslyckades med att läsa %s: %s.\n"
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "inga paketutlösare %s\n"
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr "inget paket behöver %s\n"
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr "inget paket tillhandahåller %s\n"
-#: lib/query.c:916
+#: lib/query.c:911
#, c-format
msgid "file %s: %s\n"
msgstr "fil %s: %s\n"
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "filen %s tillhör inget paket\n"
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr "felaktigt paketnummer: %s\n"
-#: lib/query.c:950
+#: lib/query.c:945
#, c-format
msgid "package record number: %u\n"
msgstr "paketpost nummer: %u\n"
-#: lib/query.c:955
+#: lib/query.c:950
#, c-format
msgid "record %u could not be read\n"
msgstr "post %u kunde inte läsas\n"
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s är inte installerat\n"
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
#, fuzzy
msgid "(added files)"
msgstr "felaktig db-fil %s\n"
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
#, fuzzy
msgid "(added provide)"
msgstr "%s: %-45s JA (db-tillhandahållande)\n"
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: open misslyckades: %s\n"
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
msgid "makeTempFile failed\n"
msgstr "makeTempFile misslyckades\n"
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite misslyckades: %s\n"
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: Kan inte signera v1.0 RPM\n"
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: Kan inte signera om v2.0 RPM\n"
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead misslyckades: %s\n"
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature misslyckades: %s\n"
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead misslyckades\n"
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ingen signatur tillgänglig (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr "EJ OK"
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
msgid " (MISSING KEYS:"
msgstr " (SAKNADE NYCKLAR:"
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr " (EJ BETRODDA NYCKLAR:"
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr "OK"
@@ -2466,94 +2461,94 @@ msgstr " %s A %s\tB %s\n"
msgid "package %s has unsatisfied %s: %s\n"
msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n"
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr "Förbereder..."
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr "Förbereder paket för installation ..."
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, 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:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "hoppar över %s - överföring misslyckades - %s\n"
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, c-format
msgid "package %s is not relocateable\n"
msgstr "paket %s är inte relokerbart\n"
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, c-format
msgid "error reading from file %s\n"
msgstr "fel vid läsning från fil %s\n"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, 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:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kan inte installeras\n"
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "hittade %d käll- och %d binärpaket\n"
-#: lib/rpminstall.c:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "ouppfyllda beroenden:\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
msgid "installing binary packages\n"
msgstr "installerar binärpaket\n"
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "kan inte öppna filen %s: %s\n"
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" anger flera paket\n"
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
msgid "removing these packages would break dependencies:\n"
msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:733
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan inte öppna %s: %s\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr "Installerar %s\n"
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2658,7 +2653,7 @@ 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:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "kan inte öppna paketdatabas i %s\n"
@@ -2803,36 +2798,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n"
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s överhoppad på grund av missingok-flagga\n"
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, c-format
msgid "excluding directory %s\n"
msgstr "hoppar över katalogen %s\n"
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr "hämtar lista över monterade filsystem\n"
-#: lib/verify.c:330
+#: lib/verify.c:283
#, c-format
msgid "missing %s"
msgstr "saknas %s"
-#: lib/verify.c:426
+#: lib/verify.c:379
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "Ouppfyllda beroenden för %s-%s-%s: "
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr "%s-%s-%s: kontrollsumma för oföränderlig huvudregion misslyckades\n"
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -2891,99 +2881,99 @@ msgstr "delat"
msgid "locked db index %s/%s\n"
msgstr "låste db-index %s/%s\n"
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr "okänd db-flagga: \"%s\" ignorerad\n"
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr "%s har ogiltigt ogiltigt numeriskt värde, hoppar över\n"
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr "%s har för stort eller för litet \"long\"-värde, hoppar över\n"
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr "%s har för stort eller för litet heltalsvärde, hoppar över\n"
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr "dataLength() RPM_STRING_TYPE antal måste vara 1.\n"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr "{ fattas efter %"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr "} fattas efter %{"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr "tomt taggformat"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr "tomt taggnamn"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr "okänd tagg"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr "] förväntades vid slutet på vektor"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
msgid "unexpected ]"
msgstr "oväntad ]"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
msgid "unexpected }"
msgstr "oväntad }"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr "? förväntades i uttryck"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
msgid "{ expected after ? in expression"
msgstr "{ förväntades efter ? i uttryck"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr "} förväntades i uttryck"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr ": förväntades efter ? i deluttryck"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
msgid "{ expected after : in expression"
msgstr "{ förväntades efter : i uttryck"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr "| förväntades vid slutet på uttryck"
@@ -3004,235 +2994,245 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr "generera huvuden kompatibla med (äldre) rpm[23]-paketering"
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: okänt taggnamn: \"%s\" ignorerat\n"
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "kan inte öppna %s-indexet med db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "cannot open %s index\n"
msgstr "kan inte öppna %s-indexet\n"
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
msgid "no dbpath has been set\n"
msgstr "ingen dbpath har satts\n"
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "fel(%d) när \"%s\"-poster hämtades från %s-indexet\n"
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, fuzzy, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "fel(%d) när post %s sparades i %s\n"
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr "rpmdb: skadad huvudinstans #%u hämtad, hoppar över.\n"
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: kan inte läsa huvud vid 0x%x\n"
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "tar bort \"%s\" från %s-indexet.\n"
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "tar bort %d poster från %s-indexet.\n"
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
-#, c-format
-msgid "error(%d) storing record %s into %s\n"
+#: rpmdb/rpmdb.c:2440
+#, fuzzy, c-format
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "fel(%d) när post %s sparades i %s\n"
-#: rpmdb/rpmdb.c:2416
-#, c-format
-msgid "error(%d) removing record %s from %s\n"
+#: rpmdb/rpmdb.c:2450
+#, fuzzy, c-format
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "fel(%d) när post %s togs bort ur %s\n"
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "fel(%d) vid allokering av ny paketinstans\n"
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "lägger till \"%s\" till %s-indexet.\n"
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "lägger till %d poster till %s-indexet.\n"
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr "fel(%d) när post %s sparades i %s\n"
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "tar bort %s efter lyckad db3-ombyggnad.\n"
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr "ingen dbpath har satts"
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "bygger om databas %s till %s\n"
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, c-format
msgid "temporary database %s already exists\n"
msgstr "tillfällig databas %s existerar redan\n"
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, c-format
msgid "creating directory %s\n"
msgstr "skapar katalog %s\n"
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, c-format
msgid "creating directory %s: %s\n"
msgstr "skapar katalog %s: %s\n"
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "öppnar gammal databas med dbapi %d\n"
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "öppnar ny databas med dbapi %d\n"
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "post nummer %u i databasen är felaktig -- hoppar över.\n"
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "kan inte lägga till post ursprungligen vid %u\n"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
msgid "failed to rebuild database: original database remains in place\n"
msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n"
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr "kunde inte ersätta gammal databas med ny databas!\n"
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "byt ut filer i %s med filer från %s för att återställa"
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, c-format
msgid "removing directory %s\n"
msgstr "tar bort katalog %s\n"
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "kunde inte ta bort katalogen %s: %s\n"
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== aktiva %d tomma %d\n"
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr "%3d>%*s(tom)"
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr "%3d<%*s(tom)\n"
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr "Makro %%%s har oavslutad kropp\n"
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr "Makro %%%s har otillåtet namn (%%define)\n"
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr "Makro %%%s har oavslutade flaggor\n"
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, c-format
msgid "Macro %%%s has empty body\n"
msgstr "makro %%%s har tom kropp\n"
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, c-format
msgid "Macro %%%s failed to expand\n"
msgstr "Makro %%%s misslyckades att expandera\n"
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr "Makro %%%s har otillåtet namn (%%undefine)\n"
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr "Makro %%%s (%s) användes inte under nivå %d\n"
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr "Okänd flagga %c i %s(%s)\n"
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr "Rekursionsdjup(%d) större än max(%d)\n"
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, c-format
msgid "Unterminated %c: %s\n"
msgstr "Oavslutad %c: %s\n"
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr "Ett %% följs av ett makro som inte kan tolkas\n"
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr "Inget makro %%%.*s hittat, hoppar över\n"
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
msgid "Target buffer overflow\n"
msgstr "Målbuffert översvämmad\n"
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, c-format
msgid "File %s: %s\n"
msgstr "Fil %s: %s\n"
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr "Filen %s är mindre än %u byte\n"
@@ -3353,6 +3353,16 @@ msgstr "url-port måste vara ett tal\n"
msgid "failed to create %s: %s\n"
msgstr "kunde inte skapa %s: %s\n"
+#, fuzzy
+#~ msgid "%s: bad magic\n"
+#~ msgstr "Felaktigt magiskt tal"
+
+#~ msgid "%s: read manifest failed: %s\n"
+#~ msgstr "%s: läsning av paketlista misslyckades: %s\n"
+
+#~ msgid "%s-%s-%s: immutable header region digest check failed\n"
+#~ msgstr "%s-%s-%s: kontrollsumma för oföränderlig huvudregion misslyckades\n"
+
#~ msgid ""
#~ "Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n"
#~ msgstr "Trasig paketkedja vid %d(0x%08x), försöker återansluta ...\n"
diff --git a/po/tr.po b/po/tr.po
index b4abeb45c..90a55b3d5 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-05-06 21:08-0400\n"
+"POT-Creation-Date: 2002-05-16 12:53-0400\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"
@@ -10,54 +10,54 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.2alpha\n"
-#: build.c:38
+#: build.c:39
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "iþlem durdu, önce baðýmlý paketler kurulmalý:\n"
-#: build.c:69
+#: build.c:70
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "%s spec dosyasý açýlamadý: %s\n"
-#: build.c:149 build.c:161
+#: build.c:150 build.c:162
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "tar veriyolu açýlamadý: %m\n"
#. Give up
-#: build.c:168
+#: build.c:169
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr "%s paketinden spec dosyasý okunamadý\n"
-#: build.c:196
+#: build.c:197
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "%s %s olarak deðiþtirilemedi: %m\n"
-#: build.c:236
+#: build.c:237
#, c-format
msgid "failed to stat %s: %m\n"
msgstr "%s durum bilgileri alýnamadý: %m\n"
-#: build.c:241
+#: build.c:242
#, c-format
msgid "File %s is not a regular file.\n"
msgstr "%s bir normal bir dosya deðil.\n"
-#: build.c:250
+#: build.c:251
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr "%s bir spec dosyasý gibi görünmüyor.\n"
#. parse up the build operators
-#: build.c:305
+#: build.c:306
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Hedef platformlar derleniyor: %s\n"
-#: build.c:320
+#: build.c:321
#, c-format
msgid "Building for target %s\n"
msgstr "%s için derleniyor\n"
@@ -75,256 +75,256 @@ msgstr "paketten baþlýk okunmasý sýrasýnda hata oluþtu\n"
msgid "cannot re-open payload: %s\n"
msgstr "payload %s tekrar açýlamýyor\n"
-#: rpmqv.c:108
+#: rpmqv.c:111
msgid "print the version of rpm being used"
msgstr "Kullanýlan RPM sürümünü verir"
-#: rpmqv.c:111
+#: rpmqv.c:114
msgid "provide less detailed output"
msgstr "daha az ayrýntýlý çýktý saðlar"
-#: rpmqv.c:113
+#: rpmqv.c:116
msgid "provide more detailed output"
msgstr "daha ayrýntýlý çýktý saðlar"
-#: rpmqv.c:115
+#: rpmqv.c:118
msgid "define macro <name> with value <body>"
msgstr "<isim> makrosunu <gövde> deðeriyle tanýmlar"
-#: rpmqv.c:116
+#: rpmqv.c:119
msgid "'<name> <body>'"
msgstr "'<isim> <gövde>'"
-#: rpmqv.c:118
+#: rpmqv.c:121
msgid "print macro expansion of <expr>+"
msgstr "<ifade>+ için makro açýlýmýný gösterir"
-#: rpmqv.c:119
+#: rpmqv.c:122
msgid "<expr>+"
msgstr "<ifade>+"
-#: rpmqv.c:121
+#: rpmqv.c:124
msgid "send stdout to <cmd>"
msgstr "standart çýktýyý <KOMUT>'a gönderir"
-#: rpmqv.c:122
+#: rpmqv.c:125
msgid "<cmd>"
msgstr "<kmt>"
-#: rpmqv.c:124
+#: rpmqv.c:127
msgid "use <dir> as the top level directory"
msgstr "Üst düzey dizin olarak <dizin> kullanýlýr"
-#: rpmqv.c:125 lib/poptI.c:215
+#: rpmqv.c:128 lib/poptI.c:215
msgid "<dir>"
msgstr "<dizin>"
-#: rpmqv.c:127
+#: rpmqv.c:130
msgid "read <file:...> instead of default macro file(s)"
msgstr "öntanýmlý makro dosyasý yerine <dosya:...> okunur"
-#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136
+#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
msgid "<file:...>"
msgstr "<dosya:...>"
-#: rpmqv.c:131 rpmqv.c:135
+#: rpmqv.c:134 rpmqv.c:138
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "öntanýmlý rpmrc dosyasý yerine <dosya:...> okunur"
-#: rpmqv.c:139
+#: rpmqv.c:142
msgid "display final rpmrc and macro configuration"
msgstr "son rpmrc ve makro yapýlandýrmasýný gösterir"
-#: rpmqv.c:144
+#: rpmqv.c:147
msgid "disable use of libio(3) API"
msgstr "libio(3) API kullanýmýný iptal eder"
-#: rpmqv.c:147
+#: rpmqv.c:150
msgid "debug protocol data stream"
msgstr "protokol veri akýþýnda hata kontrolu"
-#: rpmqv.c:149
+#: rpmqv.c:152
msgid "debug rpmio I/O"
msgstr "rpmio G/Ç hata kontrolu"
-#: rpmqv.c:151
+#: rpmqv.c:154
msgid "debug URL cache handling"
msgstr "URL arabellek kullanýmý hata kontrolu"
-#: rpmqv.c:171
+#: rpmqv.c:174
msgid "Query options (with -q or --query):"
msgstr "Sorgulama seçenekleri (-q ya da --query ile)"
-#: rpmqv.c:174
+#: rpmqv.c:177
msgid "Verify options (with -V or --verify):"
msgstr "Denetleme seçenekleri (-V ya da --verify ile)"
-#: rpmqv.c:180
+#: rpmqv.c:183
msgid "Signature options:"
msgstr "Ýmza seçenekleri:"
-#: rpmqv.c:186
+#: rpmqv.c:189
msgid "Database options:"
msgstr "Veritabaný seçenekleri:"
-#: rpmqv.c:192
+#: rpmqv.c:195
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"[ <specDosyasý> | <tarPaketi> | <kaynakPaketi> ] ile paketleme seçenekleri:"
-#: rpmqv.c:198
+#: rpmqv.c:201
msgid "Install/Upgrade/Erase options:"
msgstr "Kurma/Güncelleme/Kaldýrma seçenekleri:"
-#: rpmqv.c:203
+#: rpmqv.c:206
msgid "Common options for all rpm modes:"
msgstr "Tüm rpm kipleri için ortak seçenekler:"
#. @-modfilesys -globs @
-#: rpmqv.c:220 lib/poptI.c:27
+#: rpmqv.c:223 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr "dosya %s: %s\n"
-#: rpmqv.c:228
+#: rpmqv.c:231
#, c-format
msgid "RPM version %s\n"
msgstr "RPM Sürüm %s\n"
-#: rpmqv.c:235
+#: rpmqv.c:238
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998 - 2000 - Red Hat, Inc."
-#: rpmqv.c:236
+#: rpmqv.c:239
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Bu program GNU GPL koþullarýna uygun olarak serbestçe daðýtýlabilir."
-#: rpmqv.c:248
+#: rpmqv.c:251
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Kullanýmý: %s {--help}\n"
-#: rpmqv.c:601
+#: rpmqv.c:604
msgid "The --rcfile option has been eliminated.\n"
msgstr "--rcfile seçeneði kaldýrýlmýþtý.\n"
-#: rpmqv.c:602
+#: rpmqv.c:605
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Yerine \"--macros <dosya:...>\" kullanýn.\n"
-#: rpmqv.c:608
+#: rpmqv.c:611
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "(%d) argümaný iþlenirken iç hata oluþtu :-(\n"
-#: rpmqv.c:649 rpmqv.c:655 rpmqv.c:661 rpmqv.c:699
+#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
msgid "only one major mode may be specified"
msgstr "sadece bir ana kip belirtilebilir"
-#: rpmqv.c:678
+#: rpmqv.c:681
msgid "one type of query/verify may be performed at a time"
msgstr "bir anda sadece bir tarz sorgulama/denetleme yapýlabilir"
-#: rpmqv.c:682
+#: rpmqv.c:685
msgid "unexpected query flags"
msgstr "beklenmeyen sorgulama bayraklarý"
-#: rpmqv.c:685
+#: rpmqv.c:688
msgid "unexpected query format"
msgstr "beklenmeyen sorgulama biçemi"
-#: rpmqv.c:688
+#: rpmqv.c:691
msgid "unexpected query source"
msgstr "beklenmeyen sorgulama kaynaðý"
-#: rpmqv.c:729
+#: rpmqv.c:732
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath bir veritabaný kullanmayan iþlemler için verilmiþ"
-#: rpmqv.c:735
+#: rpmqv.c:738
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"sadece kaynak ve spec silme iþlemleri, kurma, güncelleme iþlemleri için "
"zorlanabilir"
-#: rpmqv.c:737
+#: rpmqv.c:740
msgid "files may only be relocated during package installation"
msgstr ""
"dosyalar sadece paket kurulumu sýrasýnda yeni yerlerine yerleþtirilebilir"
-#: rpmqv.c:740
+#: rpmqv.c:743
msgid "only one of --prefix or --relocate may be used"
msgstr "--prefix ve --relocate seçeneklerinden sadece biri kullanýlabilir"
-#: rpmqv.c:743
+#: rpmqv.c:746
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate ve --excludepath sadece yeni paket kurulumunda kullanýlabilir"
-#: rpmqv.c:746
+#: rpmqv.c:749
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix sadece yeni paketlerin kurulmasý sýrasýnda kullanýlabilir"
-#: rpmqv.c:749
+#: rpmqv.c:752
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix ile belirtilenler '/' ile baþlamalý"
-#: rpmqv.c:752
+#: rpmqv.c:755
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:756
+#: rpmqv.c:759
msgid "--percent may only be specified during package installation"
msgstr "--percent sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:761
+#: rpmqv.c:764
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:765
+#: rpmqv.c:768
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:769
+#: rpmqv.c:772
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:773
+#: rpmqv.c:776
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:777
+#: rpmqv.c:780
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "--excludedocs ve --includedocs bir arada kullanýlamaz"
-#: rpmqv.c:781
+#: rpmqv.c:784
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:785
+#: rpmqv.c:788
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:790
+#: rpmqv.c:793
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:794
+#: rpmqv.c:797
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:798
+#: rpmqv.c:801
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:803
+#: rpmqv.c:806
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb sadece paket kurulumu ve kaldýrýlmasý sýrasýnda kullanýlabilir"
-#: rpmqv.c:808
+#: rpmqv.c:811
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -332,7 +332,7 @@ msgstr ""
"betik iptal etme seçenekleri sadece paketin kurulmasý ve silinmesi sýrasýnda "
"kullanýlabilir"
-#: rpmqv.c:813
+#: rpmqv.c:816
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -340,7 +340,7 @@ msgstr ""
"tetikleme iptal seçenekleri sadece paketin kurulmasý ve silinmesi sýrasýnda "
"kullanýlabilir"
-#: rpmqv.c:817
+#: rpmqv.c:820
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -348,7 +348,7 @@ msgstr ""
"--nodeps sadece paket oluþturma, yeniden oluþturma, yeniden derleme, "
"kurulum, kaldýrma ve denetleme iþlemlerinde kullanýlabilir"
-#: rpmqv.c:822
+#: rpmqv.c:825
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -356,7 +356,7 @@ msgstr ""
"--test sadece paket kurulumu, kaldýrýlmasý ve oluþturulmasý iþlemlerinde "
"kullanýlabilir"
-#: rpmqv.c:827
+#: rpmqv.c:830
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -364,87 +364,87 @@ msgstr ""
"--root (-r) sadece kurulum, kaldýrma, sorgulama ve yeniden veritabaný "
"oluþturma iþlemlerinde kullanýlabilir"
-#: rpmqv.c:839
+#: rpmqv.c:842
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) ile verilenler '/' ile baþlamalý"
-#: rpmqv.c:863
+#: rpmqv.c:866
msgid "no files to sign\n"
msgstr "imzalanacak dosya yok\n"
-#: rpmqv.c:868
+#: rpmqv.c:871
#, c-format
msgid "cannot access file %s\n"
msgstr "%s dosyasý bulunamýyor\n"
-#: rpmqv.c:887
+#: rpmqv.c:890
msgid "pgp not found: "
msgstr "pgp bulunamadý: "
-#: rpmqv.c:892
+#: rpmqv.c:895
msgid "Enter pass phrase: "
msgstr "Anahtar parolasýný girin: "
-#: rpmqv.c:894
+#: rpmqv.c:897
msgid "Pass phrase check failed\n"
msgstr "Anahtar parolasý kontrolü baþarýsýz\n"
-#: rpmqv.c:898
+#: rpmqv.c:901
msgid "Pass phrase is good.\n"
msgstr "Anahtar parolasý doðru.\n"
-#: rpmqv.c:903
+#: rpmqv.c:906
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Makro dosyasýndaki %%_signature spec geçersiz.\n"
-#: rpmqv.c:910
+#: rpmqv.c:913
msgid "--sign may only be used during package building"
msgstr "--sign sadece paket oluþturulurken kullanýlabilir"
-#: rpmqv.c:927
+#: rpmqv.c:930
msgid "exec failed\n"
msgstr "icra baþarýsýz\n"
-#: rpmqv.c:959
+#: rpmqv.c:963
msgid "no packages files given for rebuild"
msgstr "yeniden oluþturmak için paket dosyalarý belirtilmemiþ"
-#: rpmqv.c:1027
+#: rpmqv.c:1031
msgid "no spec files given for build"
msgstr "oluþturma için gerekli spec dosyasý belirtilmemiþ"
-#: rpmqv.c:1029
+#: rpmqv.c:1033
msgid "no tar files given for build"
msgstr "oluþturma için gereken tar dosyalarý belirtilmemiþ"
-#: rpmqv.c:1051
+#: rpmqv.c:1055
#, fuzzy
msgid "no packages given for erase"
msgstr "imzalanacak paket(ler) belirtilmedi"
-#: rpmqv.c:1092
+#: rpmqv.c:1096
msgid "no packages given for install"
msgstr "yüklenecek paket(ler) belirtilmedi"
-#: rpmqv.c:1108
+#: rpmqv.c:1112
msgid "no arguments given for query"
msgstr "sorgulama için hiç argüman belirtilmedi"
-#: rpmqv.c:1121
+#: rpmqv.c:1125
msgid "no arguments given for verify"
msgstr "denetleme için hiç argüman belirtilmedi"
-#: rpmqv.c:1129
+#: rpmqv.c:1133
msgid "unexpected arguments to --querytags "
msgstr "--querytags ile beklenmeyen girdiler"
-#: rpmqv.c:1145
+#: rpmqv.c:1149
#, fuzzy
msgid "no arguments given"
msgstr "sorgulama için hiç argüman belirtilmedi"
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:489
msgid "Unable to open temp file.\n"
msgstr "Geçici dosya açýlamadý.\n"
@@ -654,7 +654,7 @@ msgstr "Dosya glob tarafýndan bulunamadý: %s\n"
msgid "Could not open %%files file %s: %s\n"
msgstr "%%files dosya %s dosyasýnda açýlamadý: %s\n"
-#: build/files.c:1826 build/pack.c:150
+#: build/files.c:1826 build/pack.c:152
#, c-format
msgid "line: %s\n"
msgstr "satýr: %s\n"
@@ -729,156 +729,156 @@ msgstr "getGidS: çok fazla grup-kimliði\n"
msgid "Could not canonicalize hostname: %s\n"
msgstr "Böyle bir makina yok: %s\n"
-#: build/pack.c:83
+#: build/pack.c:85
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "%s dosyasýnda arþiv oluþturulamadý: %s\n"
-#: build/pack.c:86
+#: build/pack.c:88
#, c-format
msgid "create archive failed: %s\n"
msgstr "arþiv oluþturulamadý: %s\n"
-#: build/pack.c:108
+#: build/pack.c:110
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "cpio_copy yazma hatasý:%s\n"
-#: build/pack.c:115
+#: build/pack.c:117
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "cpio_copy okuma hatasý: %s\n"
-#: build/pack.c:218
+#: build/pack.c:220
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "PreIn dosyasý açýlamadý: %s\n"
-#: build/pack.c:225
+#: build/pack.c:227
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "PreUn dosyasý açýlamadý: %s\n"
-#: build/pack.c:232
+#: build/pack.c:234
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "PostIn dosyasý açýlamadý: %s\n"
-#: build/pack.c:239
+#: build/pack.c:241
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "PostUn dosyasý açýlamadý: %s\n"
-#: build/pack.c:247
+#: build/pack.c:249
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "VerifyScript dosyasý açýlamadý: %s\n"
-#: build/pack.c:262
+#: build/pack.c:264
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "Trigger betik dosyasý açýlamadý: %s\n"
-#: build/pack.c:290
+#: build/pack.c:292
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr "readRPM: %s açýlýrken: %s\n"
-#: build/pack.c:300
+#: build/pack.c:302
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr "readRPM: %s okunurken: %s\n"
-#: build/pack.c:309 build/pack.c:533
+#: build/pack.c:311 build/pack.c:535
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: Fseek baþarýsýz: %s\n"
-#: build/pack.c:337
+#: build/pack.c:339
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s bir RPM paketi deðil\n"
-#: build/pack.c:346
+#: build/pack.c:348
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: %s baþlýðý okunuyor\n"
-#: build/pack.c:475
+#: build/pack.c:477
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "%s'den baþlýk okunamadý: %s\n"
-#: build/pack.c:494
+#: build/pack.c:496
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "%s'e baþlýk yazýlamadý: %s\n"
-#: build/pack.c:504
+#: build/pack.c:506
msgid "Bad CSA data\n"
msgstr "CSA verisi geçersiz\n"
-#: build/pack.c:540
+#: build/pack.c:542
#, fuzzy
msgid "Unable to write final header\n"
msgstr "%s'e baþlýk yazýlamadý: %s\n"
-#: build/pack.c:560
+#: build/pack.c:562
#, c-format
msgid "Generating signature: %d\n"
msgstr "Ýmza üretiliyor: %d\n"
-#: build/pack.c:578
+#: build/pack.c:580
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "%s'den baþlýk okunamadý: %s\n"
-#: build/pack.c:586
+#: build/pack.c:588
#, c-format
msgid "Could not open %s: %s\n"
msgstr "%s açýlamadý: %s\n"
-#: build/pack.c:622 lib/psm.c:1450
+#: build/pack.c:624 lib/psm.c:1450
#, c-format
msgid "Unable to write package: %s\n"
msgstr "paket yazýlamadý: %s\n"
-#: build/pack.c:637
+#: build/pack.c:639
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "sigtarget %s açýlamadý: %s\n"
-#: build/pack.c:648
+#: build/pack.c:650
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "%s'den baþlýk okunamadý: %s\n"
-#: build/pack.c:662
+#: build/pack.c:664
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "%s'e baþlýk yazýlamadý: %s\n"
-#: build/pack.c:672
+#: build/pack.c:674
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "%s'den payload okunamadý: %s\n"
-#: build/pack.c:678
+#: build/pack.c:680
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "%s'e payload yazýlamadý: %s\n"
-#: build/pack.c:703 lib/psm.c:1738
+#: build/pack.c:705 lib/psm.c:1738
#, c-format
msgid "Wrote: %s\n"
msgstr "Yazýldý: %s\n"
-#: build/pack.c:770
+#: build/pack.c:772
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "%s paket dosyasý için çýktý dosya adý üretilemedi: %s\n"
-#: build/pack.c:787
+#: build/pack.c:789
#, c-format
msgid "cannot create %s: %s\n"
msgstr "%s dosyasý oluþturulamýyor: %s\n"
@@ -1453,52 +1453,52 @@ msgstr " baþarýsýz - "
msgid "package %s was already added, replacing with %s\n"
msgstr "%s zaten kurulu"
-#: lib/depends.c:382
+#: lib/depends.c:384
msgid "(cached)"
msgstr ""
-#: lib/depends.c:407
+#: lib/depends.c:409
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s EVET (rpmrc saðlar)\n"
-#: lib/depends.c:423
+#: lib/depends.c:425
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s EVET (rpmlib saðlar)\n"
-#: lib/depends.c:444
+#: lib/depends.c:446
#, fuzzy
msgid "(db files)"
msgstr "db dosyasý %s hatalý\n"
-#: lib/depends.c:456
+#: lib/depends.c:458
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s EVET (db saðlar)\n"
-#: lib/depends.c:469
+#: lib/depends.c:471
#, fuzzy
msgid "(db package)"
msgstr "paket yok\n"
-#: lib/depends.c:807
+#: lib/depends.c:811
#, c-format
msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
msgstr ""
-#: lib/depends.c:927
+#: lib/depends.c:931
#, 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:1195
+#: lib/depends.c:1199
msgid "========== recording tsort relations\n"
msgstr "========== tsort baðýntýlarý kaydediliyor\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1301
+#: lib/depends.c:1305
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1506,26 +1506,26 @@ msgid ""
msgstr ""
"========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n"
-#: lib/depends.c:1394
+#: lib/depends.c:1398
msgid "========== successors only (presentation order)\n"
msgstr "========== sadece ardýllar (sunum sýrasý)\n"
-#: lib/depends.c:1464
+#: lib/depends.c:1468
msgid "LOOP:\n"
msgstr "ÇEVRÝM:\n"
-#: lib/depends.c:1499
+#: lib/depends.c:1503
msgid "========== continuing tsort ...\n"
msgstr "========== tsort sürüyor ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1504
+#: lib/depends.c:1508
#, c-format
-msgid "rpmdepOrder failed, %d elements remain\n"
+msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
#: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281
-#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028
+#: rpmdb/header.c:2990 rpmdb/header.c:3011 rpmdb/header.c:3033
msgid "(not a number)"
msgstr "(bir sayý deðil)"
@@ -1618,48 +1618,43 @@ msgstr "%s %s olarak oluþturuldu\n"
msgid "error creating temporary file %s\n"
msgstr "%s geçici dosyasý oluþturulurken hata\n"
-#: lib/package.c:168 lib/rpmchecksig.c:165 lib/rpmchecksig.c:573
+#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead baþarýsýz\n"
-#: lib/package.c:174
-#, fuzzy, c-format
-msgid "%s: bad magic\n"
-msgstr "Magic hatalý"
-
-#: lib/package.c:182
+#: lib/package.c:181
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "RPM'nin bu sürümünde paket sürümü 1 desteklenmiyor\n"
-#: lib/package.c:190
+#: lib/package.c:189
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"RPM'nin bu sürümünde sadece ilk sürüm rakamý <= 4 olan paketler "
"destekleniyor\n"
-#: lib/package.c:199 lib/rpmchecksig.c:183 lib/rpmchecksig.c:589
+#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature baþarýsýz\n"
-#: lib/package.c:203 lib/rpmchecksig.c:187 lib/rpmchecksig.c:594
+#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ýmza bulundurmuyor\n"
-#: lib/package.c:249 lib/rpmchecksig.c:494
+#: lib/package.c:248 lib/rpmchecksig.c:495
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead baþarýsýz\n"
-#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:665
+#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:351 lib/rpmchecksig.c:113 lib/rpmchecksig.c:523
+#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread baþarýsýz: %s\n"
@@ -2093,87 +2088,87 @@ msgid "generate signature"
msgstr "imza üretir"
#. @observer@
-#: lib/problems.c:211
+#: lib/problems.c:213
msgid "different"
msgstr ""
-#: lib/problems.c:219
+#: lib/problems.c:221
#, fuzzy, c-format
msgid "package %s is intended for a %s architecture"
msgstr "%s farklý bir mimari için"
-#: lib/problems.c:224
+#: lib/problems.c:226
#, fuzzy, c-format
msgid "package %s is intended for a %s operating system"
msgstr "%s farklý bir iþletim sistemi için"
-#: lib/problems.c:229
+#: lib/problems.c:231
#, c-format
msgid "package %s is already installed"
msgstr "%s zaten kurulu"
-#: lib/problems.c:234
+#: lib/problems.c:236
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr "%s dosya yolu %s paketinde yeniden konumlandýrýlamaz"
-#: lib/problems.c:239
+#: lib/problems.c:241
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr "%s dosyasý kalkýþýlan %s ve %s kurulumlarý arasýnda çeliþiyor"
-#: lib/problems.c:244
+#: lib/problems.c:246
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr "%s dosyasýnýn %s kurulumu %s kurulumundaki dosya ile çeliþiyor"
-#: lib/problems.c:249
+#: lib/problems.c:251
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "%s paketi zaten yüklü (%s sürümünden daha yeni)"
-#: lib/problems.c:254
+#: lib/problems.c:256
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr "%s kurulumu %ld%cb gerektiriyor (%s dosya sisteminde)"
-#: lib/problems.c:264
+#: lib/problems.c:266
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr "%s kurulumu %ld i-düðüm gerektiriyor (%s dosya sisteminde)"
-#: lib/problems.c:269
+#: lib/problems.c:271
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr "%s iþlem öncesi sistem çaðrý(sý/larý): %s baþarýsýz: %s"
-#: lib/problems.c:273
+#: lib/problems.c:275
#, fuzzy, c-format
msgid "package %s has unsatisfied Requires: %s\n"
msgstr "paket %s-%s-%s gereksinimi tatmin edici deðil: %s\n"
-#: lib/problems.c:277
+#: lib/problems.c:279
#, fuzzy, c-format
msgid "package %s has unsatisfied Conflicts: %s\n"
msgstr "paket %s-%s-%s gereksinimi tatmin edici deðil: %s\n"
-#: lib/problems.c:282
+#: lib/problems.c:284
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "anlaþýlamayan %d hatasý, %s paketi iþlenirken saptandý"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "conflicts with"
msgstr " %s-%s-%s ile çeliþiyor\n"
-#: lib/problems.c:363
+#: lib/problems.c:365
#, fuzzy
msgid "is needed by"
msgstr " %s-%s-%s için gerekli\n"
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:383 rpmdb/header_internal.c:161
+#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr "%d veri türü desteklenmiyor\n"
@@ -2188,25 +2183,25 @@ msgstr "%%%s dosyasý oluþturulamýyor: %s\n"
msgid "cannot write to %%%s %s\n"
msgstr "%%%s dosyasýna yazýlamaz %s\n"
-#: lib/psm.c:487
+#: lib/psm.c:485
msgid "source package expected, binary found\n"
msgstr "kaynak paketi gerekirken çalýþtýrýlabilir paketi bulundu\n"
-#: lib/psm.c:603
+#: lib/psm.c:601
msgid "source package contains no .spec file\n"
msgstr "kaynak paketi .spec dosyasý içermiyor\n"
-#: lib/psm.c:722
+#: lib/psm.c:720
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "%s: %s betiði çalýþtýrýlýyor (varsa)\n"
-#: lib/psm.c:888
+#: lib/psm.c:890
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "%s betiðinin %s-%s-%s'den icrasý baþarýsýz, waitpid sonucu %s\n"
-#: lib/psm.c:895
+#: lib/psm.c:897
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "%s betiðinin %s-%s-%s'den icrasý baþarýsýz, çýkýþta durum %d\n"
@@ -2250,213 +2245,213 @@ msgstr "%s açýlamadý: %s\n"
msgid "%s failed: %s\n"
msgstr "%s baþarýsýz\n"
-#: lib/query.c:127 lib/rpmts.c:226
+#: lib/query.c:126 lib/rpmts.c:227
#, c-format
msgid "incorrect format: %s\n"
msgstr "biçem yanlýþ: %s\n"
-#: lib/query.c:223
+#: lib/query.c:222
msgid "(contains no files)"
msgstr "(hiç dosya içermiyor)"
-#: lib/query.c:284
+#: lib/query.c:283
msgid "normal "
msgstr "normal "
-#: lib/query.c:287
+#: lib/query.c:286
msgid "replaced "
msgstr "yerine "
-#: lib/query.c:290
+#: lib/query.c:289
msgid "not installed "
msgstr "yüklenmedi "
-#: lib/query.c:293
+#: lib/query.c:292
msgid "net shared "
msgstr "að paylaþýmlý "
-#: lib/query.c:296
+#: lib/query.c:295
#, c-format
msgid "(unknown %3d) "
msgstr "(bilinmeyen %3d)"
-#: lib/query.c:301
+#: lib/query.c:300
msgid "(no state) "
msgstr "(durumsuz) "
-#: lib/query.c:320 lib/query.c:376
+#: lib/query.c:319 lib/query.c:375
msgid "package has neither file owner or id lists\n"
msgstr "paket ne dosya sahibi ne de kimlik listesi içeriyor\n"
-#: lib/query.c:466
+#: lib/query.c:465
#, c-format
msgid "can't query %s: %s\n"
msgstr "%s sorgulanamýyor: %s\n"
-#: lib/query.c:620 lib/query.c:658 lib/rpminstall.c:352 lib/rpminstall.c:494
-#: lib/rpminstall.c:887
+#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
+#: lib/rpminstall.c:890
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s açýlamadý: %s\n"
-#: lib/query.c:636
+#: lib/query.c:631
#, c-format
msgid "query of %s failed\n"
msgstr "%s 'nin sorgulamasý baþarýsýzlýkla sonuçlandý\n"
-#: lib/query.c:642
+#: lib/query.c:637
msgid "old format source packages cannot be queried\n"
msgstr "eski biçem kaynak paketleri sorgulanamaz\n"
-#: lib/query.c:668 lib/rpminstall.c:507
+#: lib/query.c:663 lib/rpminstall.c:514
#, fuzzy, c-format
-msgid "%s: read manifest failed: %s\n"
-msgstr "%s: bildirge okuma baþarýsýz: %s\n"
+msgid "%s: not a package manifest: %s\n"
+msgstr "%s tetikleyen paket yok\n"
-#: lib/query.c:712
+#: lib/query.c:707
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "%s spec dosyasýnýn sorgulanmasý baþarýsýz, çözümlenemiyor\n"
-#: lib/query.c:733
+#: lib/query.c:728
msgid "no packages\n"
msgstr "paket yok\n"
-#: lib/query.c:753
+#: lib/query.c:748
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "%s grubu hiç paket içermiyor\n"
-#: lib/query.c:763
+#: lib/query.c:758
#, c-format
msgid "no package triggers %s\n"
msgstr "%s tetikleyen paket yok\n"
-#: lib/query.c:777 lib/query.c:799 lib/query.c:820 lib/query.c:855
+#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "%s okunamadý: %s.\n"
-#: lib/query.c:787 lib/query.c:805 lib/query.c:830 lib/query.c:860
+#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "%s tetikleyen paket yok\n"
-#: lib/query.c:871
+#: lib/query.c:866
#, c-format
msgid "no package requires %s\n"
msgstr "%s gerektiren paket yok\n"
-#: lib/query.c:882
+#: lib/query.c:877
#, c-format
msgid "no package provides %s\n"
msgstr "%s saðlayan paket yok\n"
-#: lib/query.c:916
+#: lib/query.c:911
#, c-format
msgid "file %s: %s\n"
msgstr "dosya %s: %s\n"
-#: lib/query.c:920
+#: lib/query.c:915
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "%s dosyasý, hiç bir pakete ait deðil\n"
-#: lib/query.c:947
+#: lib/query.c:942
#, c-format
msgid "invalid package number: %s\n"
msgstr "geçersiz paket numarasý: %s\n"
-#: lib/query.c:950
+#: lib/query.c:945
#, c-format
msgid "package record number: %u\n"
msgstr "paket kayýt numarasý: %u\n"
-#: lib/query.c:955
+#: lib/query.c:950
#, c-format
msgid "record %u could not be read\n"
msgstr "%u. kayýt okunamadý\n"
-#: lib/query.c:966 lib/rpminstall.c:675
+#: lib/query.c:961 lib/rpminstall.c:678
#, c-format
msgid "package %s is not installed\n"
msgstr "%s paketi kurulu deðil\n"
-#: lib/rpmal.c:684
+#: lib/rpmal.c:686
#, fuzzy
msgid "(added files)"
msgstr "db dosyasý %s hatalý\n"
-#: lib/rpmal.c:761
+#: lib/rpmal.c:763
#, fuzzy
msgid "(added provide)"
msgstr "%s: %-45s EVET (db saðlar)\n"
-#: lib/rpmchecksig.c:54
+#: lib/rpmchecksig.c:55
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: açýlamadý: %s\n"
-#: lib/rpmchecksig.c:66
+#: lib/rpmchecksig.c:67
msgid "makeTempFile failed\n"
msgstr "makeTempFile baþarýsýz\n"
-#: lib/rpmchecksig.c:107
+#: lib/rpmchecksig.c:108
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite baþarýsýz: %s\n"
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:171
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: v1.0 RPM (eski sürüm) imzalanamaz\n"
-#: lib/rpmchecksig.c:174
+#: lib/rpmchecksig.c:175
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: v2.0 RPM (eski sürüm) yeniden imzalanamaz\n"
-#: lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:274
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead baþarýsýz: %s\n"
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:280
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature baþarýsýz: %s\n"
-#: lib/rpmchecksig.c:508
+#: lib/rpmchecksig.c:509
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead baþarýsýz\n"
-#: lib/rpmchecksig.c:579
+#: lib/rpmchecksig.c:580
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ýmza bulundurmuyor (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:825
msgid "NOT OK"
msgstr "TAMAM DEÐÝL"
-#: lib/rpmchecksig.c:825 lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
msgid " (MISSING KEYS:"
msgstr " (EKSÝK ANAHTARLAR:"
-#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
+#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid " (UNTRUSTED KEYS:"
msgstr " (GÜVENCESÝZ ANAHTARLAR:"
-#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
+#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:838
+#: lib/rpmchecksig.c:839
msgid "OK"
msgstr "Tamam"
@@ -2489,94 +2484,94 @@ msgstr " %s A %s\tB %s\n"
msgid "package %s has unsatisfied %s: %s\n"
msgstr "paket %s-%s-%s gereksinimi tatmin edici deðil: %s\n"
-#: lib/rpminstall.c:161
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr "Hazýrlanýyor..."
-#: lib/rpminstall.c:163
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr "Kurulacak paketler hazýrlanýyor..."
-#: lib/rpminstall.c:300
+#: lib/rpminstall.c:307
#, 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:312
+#: lib/rpminstall.c:319
#, c-format
msgid " ... as %s\n"
msgstr "... %s olarak\n"
-#: lib/rpminstall.c:316
+#: lib/rpminstall.c:323
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s atlanýyor - aktarým baþarýsýz - %s\n"
-#: lib/rpminstall.c:414
+#: lib/rpminstall.c:421
#, c-format
msgid "package %s is not relocateable\n"
msgstr "%s paketi yeniden konumlandýrýlamaz\n"
-#: lib/rpminstall.c:468
+#: lib/rpminstall.c:475
#, c-format
msgid "error reading from file %s\n"
msgstr "%s dosyasýndan okuma hatalý\n"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:481
#, 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:486 lib/rpminstall.c:743
+#: lib/rpminstall.c:493 lib/rpminstall.c:746
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s yüklenemedi\n"
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:529
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n"
-#: lib/rpminstall.c:538 lib/rpminstall.c:1076
+#: lib/rpminstall.c:545 lib/rpminstall.c:1077
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "baðýmlýlýklarda hata; gerekli paketler:\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:552
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:584
msgid "installing binary packages\n"
msgstr "icra edilebilir paketleri kuruluyor\n"
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:606
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "%s dosyasý açýlamadý: %s\n"
-#: lib/rpminstall.c:678
+#: lib/rpminstall.c:681
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" birden fazla paketi tanýmlýyor\n"
-#: lib/rpminstall.c:703
+#: lib/rpminstall.c:706
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:730
+#: lib/rpminstall.c:733
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s açýlamadý: %s\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:739
#, c-format
msgid "Installing %s\n"
msgstr "%s kuruluyor\n"
-#: lib/rpminstall.c:1070
+#: lib/rpminstall.c:1071
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2681,7 +2676,7 @@ 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:95 lib/rpmts.c:137
+#: lib/rpmts.c:96 lib/rpmts.c:138
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "%s de Paket veritabaný açýlamadý\n"
@@ -2824,36 +2819,31 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Ýmza: boyut(%d)+iz(%d)\n"
-#: lib/transaction.c:178
+#: lib/transaction.c:180
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "missingok flamasýndan dolayý %s atlandý\n"
#. @innercontinue@
-#: lib/transaction.c:1002
+#: lib/transaction.c:1004
#, c-format
msgid "excluding directory %s\n"
msgstr "%s dizini dýþlanýyor\n"
-#: lib/transaction.c:1092
+#: lib/transaction.c:1093
msgid "getting list of mounted filesystems\n"
msgstr "baðlý dosya sistemlerinin listesi alýnýyor\n"
-#: lib/verify.c:330
+#: lib/verify.c:283
#, c-format
msgid "missing %s"
msgstr "eksik %s"
-#: lib/verify.c:426
+#: lib/verify.c:379
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "%s-%s-%s için tatmin edici olmayan baðýmlýlýklar: "
-#: lib/verify.c:466
-#, c-format
-msgid "%s-%s-%s: immutable header region digest check failed\n"
-msgstr "%s-%s-%s: deðiþmez baþlýk alaný özet denetimi baþarýsýz\n"
-
#: rpmdb/db3.c:85
#, c-format
msgid "db%d error(%d) from %s: %s\n"
@@ -2912,99 +2902,99 @@ msgstr "paylaþýmlý"
msgid "locked db index %s/%s\n"
msgstr "kilitli db endeks %s/%s\n"
-#: rpmdb/dbconfig.c:389
+#: rpmdb/dbconfig.c:390
#, c-format
msgid "unrecognized db option: \"%s\" ignored.\n"
msgstr "tanýnmayan db seçeneði: \"%s\" yoksayýldý\n"
-#: rpmdb/dbconfig.c:427
+#: rpmdb/dbconfig.c:428
#, c-format
msgid "%s has invalid numeric value, skipped\n"
msgstr "%s geçersiz sayýsal deðer içeriyor, atlandý\n"
-#: rpmdb/dbconfig.c:436
+#: rpmdb/dbconfig.c:437
#, c-format
msgid "%s has too large or too small long value, skipped\n"
msgstr "%s ya çok büyük ya da çok küçük 'long' deðer içeriyor, atlandý\n"
-#: rpmdb/dbconfig.c:445
+#: rpmdb/dbconfig.c:446
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
msgstr "%s ya çok büyük ya da çok küçük 'integer' deðer içeriyor, atlandý\n"
#. This should not be allowed
#. @-modfilesys@
-#: rpmdb/header.c:346
+#: rpmdb/header.c:351
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr "dataLength() RPM_STRING_TYPE sayýsý 1 olmalý.\n"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2210
+#: rpmdb/header.c:2215
msgid "missing { after %"
msgstr "%% den sonraki { yok"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2240
+#: rpmdb/header.c:2245
msgid "missing } after %{"
msgstr "%%{ den sonraki } yok"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2254
+#: rpmdb/header.c:2259
msgid "empty tag format"
msgstr "etiket biçemi boþ"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2268
+#: rpmdb/header.c:2273
msgid "empty tag name"
msgstr "etiket ismi boþ"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2285
+#: rpmdb/header.c:2290
msgid "unknown tag"
msgstr "bilinmeyen etiket"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2317
msgid "] expected at end of array"
msgstr "dizinin sonunda ] gerekli"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2330
+#: rpmdb/header.c:2335
msgid "unexpected ]"
msgstr "beklenmeyen ]"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2334
+#: rpmdb/header.c:2339
msgid "unexpected }"
msgstr "beklenmeyen }"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2401
+#: rpmdb/header.c:2406
msgid "? expected in expression"
msgstr "ifade içerisinde ? gerekli"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2410
+#: rpmdb/header.c:2415
msgid "{ expected after ? in expression"
msgstr "ifade içerisinde ? dan sonra { gerekli"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2423 rpmdb/header.c:2468
+#: rpmdb/header.c:2428 rpmdb/header.c:2473
msgid "} expected in expression"
msgstr "ifade içinde } gerekli"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2433
+#: rpmdb/header.c:2438
msgid ": expected following ? subexpression"
msgstr "? alt ifadesinden sonra : gerekli"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2453
+#: rpmdb/header.c:2458
msgid "{ expected after : in expression"
msgstr "ifade içersinde : den sonra { gerekli"
#. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2478
+#: rpmdb/header.c:2483
msgid "| expected at end of expression"
msgstr "ifadenin sonunda | gerekli"
@@ -3025,237 +3015,247 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr "(eski) rpm[23] paketleme ile uyumlu baþlýklarý üretir"
#. @-modfilesys@
-#: rpmdb/rpmdb.c:162
+#: rpmdb/rpmdb.c:164
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: tanýmlanmamýþ etiket adý: \"%s\" yoksayýldý\n"
-#: rpmdb/rpmdb.c:234
+#: rpmdb/rpmdb.c:236
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "%s indeksi db%d - %s (%d) kullanarak açýlamadý\n"
-#: rpmdb/rpmdb.c:256
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "cannot open %s index\n"
msgstr "%s indeksi açýlamadý\n"
-#: rpmdb/rpmdb.c:695
+#: rpmdb/rpmdb.c:701
msgid "no dbpath has been set\n"
msgstr "belirtilmiþ bir dbpath deðeri yok\n"
-#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007
-#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787
+#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034
+#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n"
-#: rpmdb/rpmdb.c:1930
+#: rpmdb/rpmdb.c:1384
+#, fuzzy, c-format
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n"
+
+#: rpmdb/rpmdb.c:1956
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr "rpmdb: bozuk baþlýk örneði #%u alýndý, atlanýyor.\n"
-#: rpmdb/rpmdb.c:2189
+#: rpmdb/rpmdb.c:2222
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: 0x%x de baþlýk okunamadý\n"
-#: rpmdb/rpmdb.c:2354
+#: rpmdb/rpmdb.c:2388
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "\"%s\" %s indeksinden siliniyor.\n"
-#: rpmdb/rpmdb.c:2358
+#: rpmdb/rpmdb.c:2392
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "%d girdi %s indeksinden siliniyor.\n"
-#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803
-#, c-format
-msgid "error(%d) storing record %s into %s\n"
+#: rpmdb/rpmdb.c:2440
+#, fuzzy, c-format
+msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n"
-#: rpmdb/rpmdb.c:2416
-#, c-format
-msgid "error(%d) removing record %s from %s\n"
+#: rpmdb/rpmdb.c:2450
+#, fuzzy, c-format
+msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "hata(%d) %s kaydýn %s dosyasýndan silinmesi\n"
-#: rpmdb/rpmdb.c:2557
+#: rpmdb/rpmdb.c:2592
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "yeni paket örneðini tutma hatasý(%d)\n"
-#: rpmdb/rpmdb.c:2763
+#: rpmdb/rpmdb.c:2796
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "\"%s\" %s indeksine ekleniyor.\n"
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2800
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "%d girdi %s indeksine ekleniyor.\n"
-#: rpmdb/rpmdb.c:3137
+#: rpmdb/rpmdb.c:2836
+#, c-format
+msgid "error(%d) storing record %s into %s\n"
+msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n"
+
+#: rpmdb/rpmdb.c:3175
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "baþarýlý db3 yeniden oluþturma ertesinde %s kaldýrýlýyor\n"
-#: rpmdb/rpmdb.c:3172
+#: rpmdb/rpmdb.c:3210
msgid "no dbpath has been set"
msgstr "belirtilmiþ bir dbpath yok"
-#: rpmdb/rpmdb.c:3199
+#: rpmdb/rpmdb.c:3237
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "%s veritabaný %s içinde yeniden oluþturuluyor\n"
-#: rpmdb/rpmdb.c:3203
+#: rpmdb/rpmdb.c:3241
#, c-format
msgid "temporary database %s already exists\n"
msgstr "geçici veritabaný %s zaten mevcut\n"
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3247
#, c-format
msgid "creating directory %s\n"
msgstr "%s dizini oluþturuluyor\n"
-#: rpmdb/rpmdb.c:3211
+#: rpmdb/rpmdb.c:3249
#, c-format
msgid "creating directory %s: %s\n"
msgstr "%s dizini oluþturuluyor: %s\n"
-#: rpmdb/rpmdb.c:3218
+#: rpmdb/rpmdb.c:3256
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "eski veritabaný dbapi %d ile açýlýyor\n"
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3267
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "yeni veritabaný dbapi %d ile açýlýyor\n"
-#: rpmdb/rpmdb.c:3253
+#: rpmdb/rpmdb.c:3291
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "veritabanýndaki %u. kayýt hatalý -- atlanýyor\n"
-#: rpmdb/rpmdb.c:3293
+#: rpmdb/rpmdb.c:3331
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "kayýt özgün olarak %u e eklenemedi\n"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3349
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"veritabaný yeniden oluþturulamadý: mevcut veritabaný deðiþmeden\n"
"yerinde býrakýldý\n"
-#: rpmdb/rpmdb.c:3319
+#: rpmdb/rpmdb.c:3357
msgid "failed to replace old database with new database!\n"
msgstr "eski veritabanýnýn yenisiyle deðiþtirilirmesi baþarýsýz!\n"
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3359
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "kurtarmak için %s içindeki dosyalar %s deki dosyalarla deðiþtiriliyor"
-#: rpmdb/rpmdb.c:3331
+#: rpmdb/rpmdb.c:3369
#, c-format
msgid "removing directory %s\n"
msgstr "%s dizini siliniyor\n"
-#: rpmdb/rpmdb.c:3333
+#: rpmdb/rpmdb.c:3371
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "%s dizininin silinmesi baþarýsýz: %s\n"
-#: rpmio/macro.c:226
+#: rpmio/macro.c:225
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== %d etkin %d boþ\n"
#. XXX just in case
-#: rpmio/macro.c:353
+#: rpmio/macro.c:354
#, c-format
msgid "%3d>%*s(empty)"
msgstr "%3d>%*s(boþ)"
-#: rpmio/macro.c:396
+#: rpmio/macro.c:397
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr "%3d<%*s(boþ)\n"
-#: rpmio/macro.c:631
+#: rpmio/macro.c:632
#, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr "%%%s makrosunun gövdesi sonlandýrýlmamýþ\n"
-#: rpmio/macro.c:660
+#: rpmio/macro.c:661
#, c-format
msgid "Macro %%%s has illegal name (%%define)\n"
msgstr "%%%s makrosunun ismi kuraldýþý (%%define)\n"
-#: rpmio/macro.c:666
+#: rpmio/macro.c:667
#, c-format
msgid "Macro %%%s has unterminated opts\n"
msgstr "%%%s makrosunu seçenekleri sonlandýrýlmamýþ\n"
-#: rpmio/macro.c:671
+#: rpmio/macro.c:672
#, c-format
msgid "Macro %%%s has empty body\n"
msgstr "%%%s makrosu boþ\n"
-#: rpmio/macro.c:677
+#: rpmio/macro.c:678
#, c-format
msgid "Macro %%%s failed to expand\n"
msgstr "%%%s makrosu geniþletmede baþarýsýz\n"
-#: rpmio/macro.c:714
+#: rpmio/macro.c:715
#, c-format
msgid "Macro %%%s has illegal name (%%undefine)\n"
msgstr "%%%s makrosunun ismi kuraldýþý (%%define)\n"
-#: rpmio/macro.c:826
+#: rpmio/macro.c:831
#, c-format
msgid "Macro %%%s (%s) was not used below level %d\n"
msgstr "%%%s (%s) makrosu %d seviyenin altýnda kullanýlmadý\n"
-#: rpmio/macro.c:946
+#: rpmio/macro.c:951
#, c-format
msgid "Unknown option %c in %s(%s)\n"
msgstr "%c seçeneði %s(%s) de anlaþýlamadý\n"
-#: rpmio/macro.c:1147
+#: rpmio/macro.c:1154
#, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
msgstr "Yineleme derinliði(%d) mümkün miktardan(%d) büyük\n"
-#: rpmio/macro.c:1216 rpmio/macro.c:1233
+#: rpmio/macro.c:1224 rpmio/macro.c:1241
#, c-format
msgid "Unterminated %c: %s\n"
msgstr "%c sonlandýrýlmamýþ: %s\n"
-#: rpmio/macro.c:1274
+#: rpmio/macro.c:1282
#, c-format
msgid "A %% is followed by an unparseable macro\n"
msgstr "Bir ayrýþtýrýlamayan makro tarafýndan bir %% izlendi\n"
-#: rpmio/macro.c:1403
+#: rpmio/macro.c:1411
#, c-format
msgid "Macro %%%.*s not found, skipping\n"
msgstr "%%%.*s makrosu bulunamadý, atlanýyor\n"
-#: rpmio/macro.c:1479
+#: rpmio/macro.c:1488
msgid "Target buffer overflow\n"
msgstr "Hedef tampon bellek taþtý\n"
#. XXX Fstrerror
-#: rpmio/macro.c:1678 rpmio/macro.c:1684
+#: rpmio/macro.c:1687 rpmio/macro.c:1693
#, c-format
msgid "File %s: %s\n"
msgstr "%s dosyasý: %s\n"
-#: rpmio/macro.c:1687
+#: rpmio/macro.c:1696
#, c-format
msgid "File %s is smaller than %u bytes\n"
msgstr "%s dosyasý %u bayttan küçük\n"
@@ -3376,6 +3376,17 @@ msgstr "url portu bir sayý olmalý\n"
msgid "failed to create %s: %s\n"
msgstr "%s oluþturulamadý: %s\n"
+#, fuzzy
+#~ msgid "%s: bad magic\n"
+#~ msgstr "Magic hatalý"
+
+#, fuzzy
+#~ msgid "%s: read manifest failed: %s\n"
+#~ msgstr "%s: bildirge okuma baþarýsýz: %s\n"
+
+#~ msgid "%s-%s-%s: immutable header region digest check failed\n"
+#~ msgstr "%s-%s-%s: deðiþmez baþlýk alaný özet denetimi baþarýsýz\n"
+
#~ msgid ""
#~ "Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n"
#~ msgstr ""
diff --git a/popt/Makefile.am b/popt/Makefile.am
index 8ffe16408..af8113acb 100644
--- a/popt/Makefile.am
+++ b/popt/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST = autogen.sh CHANGES $(man_MANS) popt.spec \
SUBDIRS = intl po
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I. -I$(top_srcdir)
noinst_HEADERS = findme.h poptint.h system.h
diff --git a/python/Makefile.am b/python/Makefile.am
index 59f68b166..461fe6930 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -4,8 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
PYVER= @WITH_PYTHON_VERSION@
-INCLUDES = \
- -I$(top_srcdir) \
+INCLUDES = -I. \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
@@ -14,7 +13,8 @@ INCLUDES = \
-I/usr/include/python${PYVER} \
@INCPATH@
-EXTRA_DIST = hash.h upgrade.h
+EXTRA_DIST = db-py.h hash.h header-py.h upgrade.h
+
mylibs= \
$(top_builddir)/lib/librpm.la \
$(top_builddir)/rpmdb/librpmdb.la \
@@ -28,11 +28,12 @@ python_PROGRAMS = rpmmodule.so poptmodule.so
rpmmodule_so_SOURCES =
rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so
+
poptmodule_so_SOURCES = poptmodule.c
poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so
noinst_LTLIBRARIES = librpmmodule.la
-librpmmodule_la_SOURCES = rpmmodule.c hash.c upgrade.c
+librpmmodule_la_SOURCES = rpmmodule.c hash.c upgrade.c header-py.c db-py.c
rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS)
$(LINK) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS)
diff --git a/python/Makefile.in b/python/Makefile.in
index cf4fc6808..6e4b9b79c 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -198,8 +198,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
PYVER = @WITH_PYTHON_VERSION@
-INCLUDES = \
- -I$(top_srcdir) \
+INCLUDES = -I. \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
diff --git a/python/db-py.c b/python/db-py.c
index eebe166d8..3c7c1a8cf 100644
--- a/python/db-py.c
+++ b/python/db-py.c
@@ -7,8 +7,12 @@
#include <unistd.h>
#include "Python.h"
+
#include "rpmio_internal.h"
#include "rpmcli.h" /* XXX for rpmCheckSig */
+
+#include "rpmdb.h"
+
#include "misc.h"
#include "header_internal.h"
#include "upgrade.h"
diff --git a/python/header-py.c b/python/header-py.c
index 93a6af817..9126789d7 100644
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -183,7 +183,7 @@ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) {
TFI_t fi;
int rc;
- ts = rpmtransCreateSet(NULL, NULL);
+ ts = rpmtsCreate();
fi = fiNew(ts, NULL, s->h, RPMTAG_BASENAMES, scareMem);
fi = tfiInit(fi, fileNumber);
if (fi != NULL && tfiNext(fi) >= 0) {
@@ -193,7 +193,7 @@ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) {
rc = 1;
fi = fiFree(fi, 1);
- rpmtransFree(ts);
+ rpmtsFree(ts);
if (rc) {
Py_INCREF(Py_None);
@@ -782,9 +782,9 @@ PyObject * rpmHeaderFromPackage(PyObject * self, PyObject * args) {
fd = fdDup(rawFd);
{ rpmTransactionSet ts;
- ts = rpmtransCreateSet(NULL, NULL);
+ ts = rpmtsCreate();
rc = rpmReadPackageFile(ts, fd, "rpmHeaderFromPackage", &header);
- rpmtransFree(ts);
+ rpmtsFree(ts);
}
Fclose(fd);
@@ -890,12 +890,6 @@ PyObject * rhnLoad(PyObject * self, PyObject * args) {
return NULL;
}
- if (rpmVerifyDigest(hdr)) {
- PyErr_SetString(pyrpmError, "bad header, digest check failed");
- headerFree(hdr, "rhnLoad hdr #3");
- return NULL;
- }
-
/* Retrofit a RHNPlatform: tag. */
if (!headerIsEntry(hdr, RPMTAG_RHNPLATFORM)) {
const char * arch;
diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index ccb3f9de7..dedc4afc3 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -17,7 +17,10 @@
#include "Python.h"
#include "rpmio_internal.h"
#include "rpmcli.h" /* XXX for rpmCheckSig */
+
+#include "rpmdb.h"
#include "rpmts.h" /* XXX for ts->rpmdb */
+
#include "legacy.h"
#include "misc.h"
#include "header_internal.h"
@@ -46,7 +49,7 @@ int rpmvercmp(const char * one, const char * two);
/** \ingroup python
*/
-typedef struct rpmtransObject_s rpmtransObject;
+typedef struct rpmtsObject_s rpmtsObject;
/** \ingroup python
* \name Class: rpmtrans
@@ -153,7 +156,7 @@ typedef struct rpmtransObject_s rpmtransObject;
/** \ingroup python
*/
-struct rpmtransObject_s {
+struct rpmtsObject_s {
PyObject_HEAD;
rpmdbObject * dbo;
rpmTransactionSet ts;
@@ -163,7 +166,7 @@ struct rpmtransObject_s {
/** \ingroup python
*/
-static PyObject * rpmtransAdd(rpmtransObject * s, PyObject * args) {
+static PyObject * py_rpmtsAdd(rpmtsObject * s, PyObject * args) {
hdrObject * h;
PyObject * key;
char * how = NULL;
@@ -185,9 +188,9 @@ static PyObject * rpmtransAdd(rpmtransObject * s, PyObject * args) {
isUpgrade = 1;
if (how && !strcmp(how, "a"))
- rpmtransAvailablePackage(s->ts, hdrGetHeader(h), key);
+ rpmtsAvailablePackage(s->ts, hdrGetHeader(h), key);
else
- rpmtransAddPackage(s->ts, hdrGetHeader(h), key, isUpgrade, NULL);
+ rpmtsAddPackage(s->ts, hdrGetHeader(h), key, isUpgrade, NULL);
/* This should increment the usage count for me */
if (key) {
@@ -200,7 +203,7 @@ static PyObject * rpmtransAdd(rpmtransObject * s, PyObject * args) {
/** \ingroup python
*/
-static PyObject * rpmtransRemove(rpmtransObject * s, PyObject * args) {
+static PyObject * py_rpmtsRemove(rpmtsObject * s, PyObject * args) {
char * name;
int count;
rpmdbMatchIterator mi;
@@ -219,7 +222,7 @@ static PyObject * rpmtransRemove(rpmtransObject * s, PyObject * args) {
while ((h = rpmdbNextIterator(mi)) != NULL) {
unsigned int recOffset = rpmdbGetIteratorOffset(mi);
if (recOffset) {
- rpmtransRemovePackage(s->ts, h, recOffset);
+ rpmtsRemovePackage(s->ts, h, recOffset);
}
}
}
@@ -231,16 +234,17 @@ static PyObject * rpmtransRemove(rpmtransObject * s, PyObject * args) {
/** \ingroup python
*/
-static PyObject * rpmtransDepCheck(rpmtransObject * s, PyObject * args) {
+static PyObject * py_rpmtsDepCheck(rpmtsObject * s, PyObject * args) {
rpmProblemSet ps;
rpmProblem p;
PyObject * list, * cf;
int i;
int allSuggestions = 0;
+ int xx;
if (!PyArg_ParseTuple(args, "|i", &allSuggestions)) return NULL;
- rpmdepCheck(s->ts);
+ xx = rpmtsCheck(s->ts);
ps = rpmtsGetProblems(s->ts);
if (ps) {
list = PyList_New(0);
@@ -313,10 +317,12 @@ static PyObject * rpmtransDepCheck(rpmtransObject * s, PyObject * args) {
/** \ingroup python
*/
-static PyObject * rpmtransOrder(rpmtransObject * s, PyObject * args) {
+static PyObject * py_rpmtsOrder(rpmtsObject * s, PyObject * args) {
+ int xx;
+
if (!PyArg_ParseTuple(args, "")) return NULL;
- rpmdepOrder(s->ts);
+ xx = rpmtsOrder(s->ts);
Py_INCREF(Py_None);
return Py_None;
@@ -324,12 +330,12 @@ static PyObject * rpmtransOrder(rpmtransObject * s, PyObject * args) {
/** \ingroup python
*/
-static PyObject * py_rpmtransGetKeys(rpmtransObject * s, PyObject * args) {
+static PyObject * py_rpmtsGetKeys(rpmtsObject * s, PyObject * args) {
const void **data = NULL;
int num, i;
PyObject *tuple;
- rpmtransGetKeys(s->ts, &data, &num);
+ rpmtsGetKeys(s->ts, &data, &num);
if (data == NULL) {
Py_INCREF(Py_None);
return Py_None;
@@ -409,7 +415,7 @@ static void * tsCallback(const void * hd, const rpmCallbackType what,
/** \ingroup python
*/
-static PyObject * rpmtransRun(rpmtransObject * s, PyObject * args)
+static PyObject * py_rpmtsRun(rpmtsObject * s, PyObject * args)
{
int flags, ignoreSet;
int rc, i;
@@ -426,7 +432,7 @@ static PyObject * rpmtransRun(rpmtransObject * s, PyObject * args)
(void) rpmtsSetNotifyCallback(s->ts, tsCallback, (void *) &cbInfo);
(void) rpmtsSetFlags(s->ts, flags);
- rc = rpmRunTransactions(s->ts, NULL, ignoreSet);
+ rc = rpmtsRun(s->ts, NULL, ignoreSet);
ps = rpmtsGetProblems(s->ts);
if (cbInfo.pythonError) {
@@ -460,29 +466,29 @@ static PyObject * rpmtransRun(rpmtransObject * s, PyObject * args)
/** \ingroup python
*/
-static struct PyMethodDef rpmtransMethods[] = {
- {"add", (PyCFunction) rpmtransAdd, 1 },
- {"remove", (PyCFunction) rpmtransRemove, 1 },
- {"depcheck", (PyCFunction) rpmtransDepCheck, 1 },
- {"order", (PyCFunction) rpmtransOrder, 1 },
- {"getKeys", (PyCFunction) py_rpmtransGetKeys, 1 },
- {"run", (PyCFunction) rpmtransRun, 1 },
+static struct PyMethodDef rpmtsMethods[] = {
+ {"add", (PyCFunction) py_rpmtsAdd, 1 },
+ {"remove", (PyCFunction) py_rpmtsRemove, 1 },
+ {"depcheck", (PyCFunction) py_rpmtsDepCheck, 1 },
+ {"order", (PyCFunction) py_rpmtsOrder, 1 },
+ {"getKeys", (PyCFunction) py_rpmtsGetKeys, 1 },
+ {"run", (PyCFunction) py_rpmtsRun, 1 },
{NULL, NULL} /* sentinel */
};
/** \ingroup python
*/
-static PyObject * rpmtransGetAttr(rpmtransObject * o, char * name) {
- return Py_FindMethod(rpmtransMethods, (PyObject *) o, name);
+static PyObject * py_rpmtsGetAttr(rpmtsObject * o, char * name) {
+ return Py_FindMethod(rpmtsMethods, (PyObject *) o, name);
}
/** \ingroup python
*/
-static void rpmtransDealloc(PyObject * o) {
- rpmtransObject * trans = (void *) o;
+static void py_rpmtsDealloc(PyObject * o) {
+ rpmtsObject * trans = (void *) o;
trans->ts->rpmdb = NULL; /* XXX HACK: avoid rpmdb close/free */
- rpmtransFree(trans->ts);
+ rpmtsFree(trans->ts);
if (trans->dbo) {
Py_DECREF(trans->dbo);
}
@@ -495,7 +501,7 @@ static void rpmtransDealloc(PyObject * o) {
/** \ingroup python
*/
-static int rpmtransSetAttr(rpmtransObject * o, char * name,
+static int py_rpmtsSetAttr(rpmtsObject * o, char * name,
PyObject * val) {
int i;
@@ -506,7 +512,7 @@ static int rpmtransSetAttr(rpmtransObject * o, char * name,
return -1;
} else {
o->scriptFd = fdDup(i);
- rpmtransSetScriptFd(o->ts, o->scriptFd);
+ rpmtsSetScriptFd(o->ts, o->scriptFd);
}
} else {
PyErr_SetString(PyExc_AttributeError, name);
@@ -518,16 +524,16 @@ static int rpmtransSetAttr(rpmtransObject * o, char * name,
/** \ingroup python
*/
-static PyTypeObject rpmtransType = {
+static PyTypeObject rpmtsType = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"rpmtrans", /* tp_name */
- sizeof(rpmtransObject), /* tp_size */
+ sizeof(rpmtsObject), /* tp_size */
0, /* tp_itemsize */
- (destructor) rpmtransDealloc, /* tp_dealloc */
+ (destructor) py_rpmtsDealloc, /* tp_dealloc */
0, /* tp_print */
- (getattrfunc) rpmtransGetAttr, /* tp_getattr */
- (setattrfunc) rpmtransSetAttr, /* tp_setattr */
+ (getattrfunc) py_rpmtsGetAttr, /* tp_getattr */
+ (setattrfunc) py_rpmtsSetAttr, /* tp_setattr */
0, /* tp_compare */
0, /* tp_repr */
0, /* tp_as_number */
@@ -544,23 +550,25 @@ static PyTypeObject rpmtransType = {
/**
*/
-static PyObject * rpmtransCreate(PyObject * self, PyObject * args) {
- rpmtransObject * o;
+static PyObject * py_rpmtsCreate(PyObject * self, PyObject * args) {
+ rpmtsObject * o;
rpmdbObject * db = NULL;
- char * rootPath = "/";
+ char * rootDir = "/";
- if (!PyArg_ParseTuple(args, "|sO", &rootPath, &db)) return NULL;
+ if (!PyArg_ParseTuple(args, "|sO", &rootDir, &db)) return NULL;
if (db && ((PyObject *) db)->ob_type != &rpmdbType) {
PyErr_SetString(PyExc_TypeError, "bad type for database argument");
return NULL;
}
- o = (void *) PyObject_NEW(rpmtransObject, &rpmtransType);
+ o = (void *) PyObject_NEW(rpmtsObject, &rpmtsType);
Py_XINCREF(db);
o->dbo = db;
o->scriptFd = NULL;
- o->ts = rpmtransCreateSet(NULL, rootPath);
+ o->ts = rpmtsCreate();
+ (void) rpmtsSetRootDir(o->ts, rootDir);
+ /* XXX this will be fun to fix */
o->ts->rpmdb = (db ? dbFromDb(db) : NULL);
o->keyList = PyList_New(0);
@@ -839,9 +847,9 @@ static PyObject * checkSig (PyObject * self, PyObject * args) {
ka->qva_flags = (VERIFY_DIGEST|VERIFY_SIGNATURE);
ka->sign = 0;
ka->passPhrase = NULL;
- ts = rpmtransCreateSet(NULL, NULL);
+ ts = rpmtsCreate();
rc = rpmcliSign(ts, ka, av);
- rpmtransFree(ts);
+ rpmtsFree(ts);
}
return Py_BuildValue("i", rc);
}
@@ -978,7 +986,7 @@ static PyObject * doFopen(PyObject * self, PyObject * args) {
/**
*/
static PyMethodDef rpmModuleMethods[] = {
- { "TransactionSet", (PyCFunction) rpmtransCreate, METH_VARARGS, NULL },
+ { "TransactionSet", (PyCFunction) py_rpmtsCreate, METH_VARARGS, NULL },
{ "addMacro", (PyCFunction) doAddMacro, METH_VARARGS, NULL },
{ "delMacro", (PyCFunction) doDelMacro, METH_VARARGS, NULL },
{ "archscore", (PyCFunction) archScore, METH_VARARGS, NULL },
@@ -1015,7 +1023,7 @@ void initrpm(void) {
hdrType.ob_type = &PyType_Type;
rpmdbMIType.ob_type = &PyType_Type;
rpmdbType.ob_type = &PyType_Type;
- rpmtransType.ob_type = &PyType_Type;
+ rpmtsType.ob_type = &PyType_Type;
if(!m)
return;
diff --git a/python/upgrade.c b/python/upgrade.c
index d8488bc0a..0fd54eceb 100644
--- a/python/upgrade.c
+++ b/python/upgrade.c
@@ -12,6 +12,7 @@
#include <dirent.h> /* XXX rpmio.h */
#include <rpmlib.h>
+#include "rpmdb.h"
#include "hash.h"
#include "upgrade.h"
diff --git a/rpm.c b/rpm.c
index b6ed542ea..f7f36ff0e 100755
--- a/rpm.c
+++ b/rpm.c
@@ -583,7 +583,7 @@ int main(int argc, const char ** argv)
enum modes bigMode = MODE_UNKNOWN;
QVA_t qva = &rpmQVArgs;
int arg;
- rpmtransFlags transFlags = RPMTRANS_FLAG_NONE;
+ rpmtsFlags transFlags = RPMTRANS_FLAG_NONE;
rpmInstallInterfaceFlags installInterfaceFlags = INSTALL_NONE;
rpmEraseInterfaceFlags eraseInterfaceFlags = UNINSTALL_NONE;
int verifyFlags;
diff --git a/rpm.spec.in b/rpm.spec.in
index 0228a05dd..54483dc14 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -20,7 +20,7 @@ Name: rpm
%define version @VERSION@
Version: %{version}
%{expand: %%define rpm_version %{version}}
-Release: 0.13
+Release: 0.14
Group: System Environment/Base
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
Copyright: GPL
@@ -521,7 +521,10 @@ fi
%{__prefix}/include/popt.h
%changelog
-* Mon May 6 2002 Jeff Johnson <jbj@redhat.com>
+* Thu May 16 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.14
+- opaque (well mostly) rpmTransactionSet using methods.
+
+* Mon May 6 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.13
- rework most of rpmdb.c prepatory to implementing duplicates.
- fix: 2 memory leaks in headerSprintf.
- fix: db mire's access out-of-bounds memory.
diff --git a/rpm2cpio.c b/rpm2cpio.c
index 397303c66..2767f4db9 100644
--- a/rpm2cpio.c
+++ b/rpm2cpio.c
@@ -30,13 +30,13 @@ int main(int argc, char **argv)
}
fdo = fdDup(STDOUT_FILENO);
- { rpmTransactionSet ts = rpmtransCreateSet(NULL, NULL);
+ { rpmTransactionSet ts = rpmtsCreate();
/*@-mustmod@*/ /* LCL: segfault */
rc = rpmReadPackageFile(ts, fdi, "rpm2cpio", &h);
/*@=mustmod@*/
- ts = rpmtransFree(ts);
+ ts = rpmtsFree(ts);
}
switch (rc) {
diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am
index d7d9dcf31..2ee5fd0ac 100644
--- a/rpmdb/Makefile.am
+++ b/rpmdb/Makefile.am
@@ -2,8 +2,7 @@
AUTOMAKE_OPTIONS = 1.4 foreign
-INCLUDES = \
- -I$(top_srcdir) \
+INCLUDES = -I. \
-I$(top_srcdir)/build \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/rpmio \
diff --git a/rpmdb/dbconfig.c b/rpmdb/dbconfig.c
index 31bf44d82..55d5a1a04 100644
--- a/rpmdb/dbconfig.c
+++ b/rpmdb/dbconfig.c
@@ -305,6 +305,7 @@ dbiIndex db3Free(dbiIndex dbi)
dbi->dbi_home = _free(dbi->dbi_home);
dbi->dbi_file = _free(dbi->dbi_file);
dbi->dbi_subfile = _free(dbi->dbi_subfile);
+ dbi->dbi_tmpdir = _free(dbi->dbi_tmpdir);
dbi->dbi_host = _free(dbi->dbi_host);
dbi->dbi_errpfx = _free(dbi->dbi_errpfx);
dbi->dbi_re_source = _free(dbi->dbi_re_source);
diff --git a/rpmdb/header.c b/rpmdb/header.c
index 15712cb0a..e73ff12fa 100644
--- a/rpmdb/header.c
+++ b/rpmdb/header.c
@@ -102,14 +102,18 @@ Header XheaderLink(Header h, /*@null@*/ const char * msg,
const char * fn, unsigned ln)
/*@modifies h @*/
{
- if (h != NULL) h->nrefs++;
+/*@-nullret@*/
+ if (h == NULL) return NULL;
+/*@=nullret@*/
+
+ h->nrefs++;
/*@-modfilesystem@*/
if ((_h_debug > 0 || (h->flags & HEADERFLAG_DEBUG)) && msg != NULL)
-fprintf(stderr, "--> h %p ++ %d blob %p flags %x %s at %s:%u\n", h, (h != NULL ? h->nrefs : 0), (h != NULL ? h->blob : NULL), (h != NULL ? h->flags : 0), msg, fn, ln);
+fprintf(stderr, "--> h %p ++ %d blob %p flags %x %s at %s:%u\n", h, h->nrefs, h->blob, h->flags, msg, fn, ln);
/*@=modfilesystem@*/
- /*@-refcounttrans -nullret @*/
+ /*@-refcounttrans @*/
return h;
- /*@=refcounttrans =nullret @*/
+ /*@=refcounttrans @*/
}
/** \ingroup header
@@ -122,11 +126,12 @@ Header XheaderUnlink(/*@killref@*/ /*@null@*/ Header h,
/*@null@*/ const char * msg, const char * fn, unsigned ln)
/*@modifies h @*/
{
+ if (h == NULL) return NULL;
/*@-modfilesystem@*/
if ((_h_debug > 0 || (h->flags & HEADERFLAG_DEBUG)) && msg != NULL)
-fprintf(stderr, "--> h %p -- %d blob %p flags %x %s at %s:%u\n", h, (h != NULL ? h->nrefs : 0), (h != NULL ? h->blob : NULL), (h != NULL ? h->flags : 0), msg, fn, ln);
+fprintf(stderr, "--> h %p -- %d blob %p flags %x %s at %s:%u\n", h, h->nrefs, h->blob, h->flags, msg, fn, ln);
/*@=modfilesystem@*/
- if (h != NULL) h->nrefs--;
+ h->nrefs--;
return NULL;
}
@@ -185,7 +190,7 @@ Header headerNew(void)
h->blob = NULL;
h->indexAlloced = INDEX_MALLOC_SIZE;
h->indexUsed = 0;
- h->flags = HEADERFLAG_SORTED;
+ h->flags |= HEADERFLAG_SORTED;
h->index = (h->indexAlloced
? xcalloc(h->indexAlloced, sizeof(*h->index))
@@ -912,7 +917,7 @@ Header headerLoad(/*@kept@*/ void * uh)
h->indexAlloced = il + 1;
h->indexUsed = il;
h->index = xcalloc(h->indexAlloced, sizeof(*h->index));
- h->flags = HEADERFLAG_SORTED;
+ h->flags |= HEADERFLAG_SORTED;
h->nrefs = 0;
h = headerLink(h, "headerLoad");
diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index 74f350cf6..dfbbcc5bc 100644
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -32,8 +32,10 @@ extern void regfree (/*@only@*/ regex_t *preg)
/*@=declundef =exportheader @*/
#endif
-#include <rpmcli.h>
+#include <rpmio.h>
#include <rpmpgp.h>
+#include <rpmmacro.h>
+#include <rpmurl.h>
#include "rpmdb.h"
#include "fprint.h"
@@ -323,7 +325,7 @@ union _dbswap {
* @retval setp (malloc'ed) index set
* @return 0 on success
*/
-static int dbt2set(dbiIndex dbi, DBT * data, dbiIndexSet * setp)
+static int dbt2set(dbiIndex dbi, DBT * data, /*@out@*/ dbiIndexSet * setp)
/*@modifies *setp @*/
{
int _dbbyteswapped = dbiByteSwapped(dbi);
@@ -380,7 +382,9 @@ static int dbt2set(dbiIndex dbi, DBT * data, dbiIndexSet * setp)
break;
}
*setp = set;
+/*@-compdef@*/
return 0;
+/*@=compdef@*/
}
/**
@@ -401,7 +405,7 @@ static int set2dbt(dbiIndex dbi, DBT * data, dbiIndexSet set)
return -1;
data->size = set->count * (dbi->dbi_jlen);
- if (data->size <= 0) {
+ if (data->size == 0) {
data->data = NULL;
return 0;
}
@@ -442,7 +446,9 @@ static int set2dbt(dbiIndex dbi, DBT * data, dbiIndexSet set)
break;
}
+/*@-compdef@*/
return 0;
+/*@=compdef@*/
}
/* XXX assumes hdrNum is first int in dbiIndexItem */
@@ -926,7 +932,7 @@ int rpmdbVerify(const char * prefix)
static int rpmdbFindByFile(rpmdb db, /*@null@*/ const char * filespec,
DBT * key, DBT * data, /*@out@*/ dbiIndexSet * matches)
/*@globals fileSystem @*/
- /*@modifies db, *matches, fileSystem @*/
+ /*@modifies db, *key, *data, *matches, fileSystem @*/
{
HGE_t hge = (HGE_t)headerGetEntryMinMemory;
HFD_t hfd = headerFreeData;
@@ -973,7 +979,9 @@ static int rpmdbFindByFile(rpmdb db, /*@null@*/ const char * filespec,
dbcursor = NULL;
xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, 0);
+/*@-temptrans@*/
key->data = (void *) baseName;
+/*@=temptrans@*/
key->size = strlen(baseName);
if (key->size == 0) key->size++; /* XXX "/" fixup. */
@@ -1084,7 +1092,9 @@ memset(data, 0, sizeof(*data));
if (dbi == NULL)
return 0;
+/*@-temptrans@*/
key->data = (void *) name;
+/*@=temptrans@*/
key->size = strlen(name);
xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, 0);
@@ -1140,7 +1150,9 @@ static rpmRC dbiFindMatches(dbiIndex dbi, DBC * dbcursor,
int rc;
int i;
+/*@-temptrans@*/
key->data = (void *) name;
+/*@=temptrans@*/
key->size = strlen(name);
rc = dbiGet(dbi, dbcursor, key, data, DB_SET);
@@ -1202,8 +1214,10 @@ key->size = strlen(name);
rc = RPMRC_NOTFOUND;
exit:
+/*@-unqualifiedtrans@*/
if (rc && matches && *matches)
*matches = dbiFreeIndexSet(*matches);
+/*@=unqualifiedtrans@*/
return rc;
}
@@ -1222,7 +1236,7 @@ exit:
static rpmRC dbiFindByLabel(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
/*@null@*/ const char * arg, /*@out@*/ dbiIndexSet * matches)
/*@globals fileSystem @*/
- /*@modifies dbi, *dbcursor, *matches, fileSystem @*/
+ /*@modifies dbi, *dbcursor, *key, *data, *matches, fileSystem @*/
{
const char * release;
char * localarg;
@@ -1311,16 +1325,19 @@ typedef struct miRE_s {
} * miRE;
struct _rpmdbMatchIterator {
-/*@only@*/ const void * mi_keyp;
+/*@only@*/
+ const void * mi_keyp;
size_t mi_keylen;
-/*@refcounted@*/ rpmdb mi_db;
+/*@refcounted@*/
+ rpmdb mi_db;
rpmTag mi_rpmtag;
dbiIndexSet mi_set;
DBC * mi_dbc;
DBT mi_key;
DBT mi_data;
int mi_setx;
-/*@null@*/ Header mi_h;
+/*@refcounted@*/ /*@null@*/
+ Header mi_h;
int mi_sorted;
int mi_cflags;
int mi_modified;
@@ -1328,7 +1345,8 @@ struct _rpmdbMatchIterator {
unsigned int mi_offset;
unsigned int mi_filenum;
int mi_nre;
-/*@only@*//*@null@*/ miRE mi_re;
+/*@only@*/ /*@null@*/
+ miRE mi_re;
};
/**
@@ -1336,55 +1354,69 @@ struct _rpmdbMatchIterator {
* Note: this is called from a markReplacedFiles iteration, and *must*
* preserve the "join key" (i.e. offset) for the header.
* @param mi database iterator
- * @param dbi index database handle (always RPMDBI_PACKAGES)
+ * @param dbi index database handle
* @return 0 on success
*/
static int miFreeHeader(rpmdbMatchIterator mi, dbiIndex dbi)
/*@globals fileSystem @*/
- /*@modifies mi, dbi, fileSystem @*/
+ /*@modifies mi, fileSystem @*/
{
- sigset_t signalMask;
- DBT * key;
- DBT * data;
int rc = 0;
- int xx;
- if (mi == NULL || dbi == NULL || mi->mi_h == NULL)
+ if (mi == NULL || mi->mi_h == NULL)
return 0;
- key = &mi->mi_key;
- data = &mi->mi_data;
if (mi->mi_modified && mi->mi_prevoffset) {
- key->data = (void *) &mi->mi_prevoffset;
+ DBT * key = &mi->mi_key;
+ DBT * data = &mi->mi_data;
+ sigset_t signalMask;
+ int xx;
+
+/*@i@*/ key->data = (void *) &mi->mi_prevoffset;
key->size = sizeof(mi->mi_prevoffset);
data->data = headerUnload(mi->mi_h);
data->size = headerSizeof(mi->mi_h, HEADER_MAGIC_NO);
if (data->data != NULL) {
(void) blockSignals(dbi->dbi_rpmdb, &signalMask);
rc = dbiPut(dbi, mi->mi_dbc, key, data, 0);
+ if (rc) {
+ rpmError(RPMERR_DBPUTINDEX,
+ _("error(%d) storing record #%d into %s\n"),
+ rc, mi->mi_prevoffset, tagName(dbi->dbi_rpmtag));
+ }
xx = dbiSync(dbi, 0);
(void) unblockSignals(dbi->dbi_rpmdb, &signalMask);
}
data->data = _free(data->data);
data->size = 0;
}
+
mi->mi_h = headerFree(mi->mi_h, "mi->mi_h");
- return 0;
+
+/*@-nullstate@*/
+ return rc;
+/*@=nullstate@*/
}
rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi)
{
- dbiIndex dbi = NULL;
+ dbiIndex dbi;
int xx;
int i;
if (mi == NULL)
- return mi;
+ return NULL;
- /* Rewrite header (if necessary) and unlink. */
dbi = dbiOpen(mi->mi_db, RPMDBI_PACKAGES, 0);
+ if (dbi == NULL) /* XXX can't happen */
+ return NULL;
+
xx = miFreeHeader(mi, dbi);
+ if (mi->mi_dbc)
+ xx = dbiCclose(dbi, mi->mi_dbc, 0);
+ mi->mi_dbc = NULL;
+
if (mi->mi_re != NULL)
for (i = 0; i < mi->mi_nre; i++) {
miRE mire = mi->mi_re + i;
@@ -1398,11 +1430,6 @@ rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi)
}
mi->mi_re = _free(mi->mi_re);
- /*@-branchstate@*/
- if (dbi && mi->mi_dbc)
- xx = dbiCclose(dbi, mi->mi_dbc, 0);
- /*@=branchstate@*/
- mi->mi_dbc = NULL;
mi->mi_set = dbiFreeIndexSet(mi->mi_set);
mi->mi_keyp = _free(mi->mi_keyp);
mi->mi_db = rpmdbUnlink(mi->mi_db, "matchIterator");
@@ -1809,12 +1836,7 @@ int rpmdbSetIteratorModified(rpmdbMatchIterator mi, int modified) {
return rc;
}
-Header XrpmdbNextIterator(rpmdbMatchIterator mi,
- /*@unused@*/ const char * f, /*@unused@*/ unsigned int l)
-{
- return rpmdbNextIterator(mi);
-}
-
+/*@-nullstate@*/
Header rpmdbNextIterator(rpmdbMatchIterator mi)
{
dbiIndex dbi;
@@ -1884,7 +1906,7 @@ top:
* largest header instance in the database, and should be
* skipped.
*/
- if (rc == 0 && keyp && mi->mi_setx)
+ if (keyp && mi->mi_setx && rc == 0)
memcpy(&mi->mi_offset, keyp, sizeof(mi->mi_offset));
/* Terminate on error or end of keys */
@@ -1896,8 +1918,10 @@ top:
} while (mi->mi_offset == 0);
/* If next header is identical, return it now. */
+/*@-compdef -refcounttrans -retalias -retexpose -usereleased @*/
if (mi->mi_prevoffset && mi->mi_offset == mi->mi_prevoffset)
return mi->mi_h;
+/*@=compdef =refcounttrans =retalias =retexpose =usereleased @*/
/* Retrieve next header blob for index iterator. */
/*@-branchstate -immediatetrans @*/
@@ -1924,7 +1948,9 @@ top:
return NULL;
/* Did the header blob load correctly? */
+/*@-onlytrans@*/
mi->mi_h = headerLoad(uh);
+/*@=onlytrans@*/
if (mi->mi_h == NULL || !headerIsEntry(mi->mi_h, RPMTAG_NAME)) {
rpmError(RPMERR_BADHEADER,
_("rpmdb: damaged header instance #%u retrieved, skipping.\n"),
@@ -1946,10 +1972,11 @@ top:
mi->mi_prevoffset = mi->mi_offset;
mi->mi_modified = 0;
- /*@-retexpose -retalias@*/
+/*@-compdef -retalias -retexpose -usereleased @*/
return mi->mi_h;
- /*@=retexpose =retalias@*/
+/*@=compdef =retalias =retexpose =usereleased @*/
}
+/*@=nullstate@*/
static void rpmdbSortIterator(/*@null@*/ rpmdbMatchIterator mi)
/*@modifies mi @*/
@@ -2014,6 +2041,7 @@ static int rpmdbGrowIterator(/*@null@*/ rpmdbMatchIterator mi, int fpNum)
for (i = 0; i < set->count; i++)
set->recs[i].fpNum = fpNum;
+/*@-branchstate@*/
if (mi->mi_set == NULL) {
mi->mi_set = set;
} else {
@@ -2024,6 +2052,7 @@ static int rpmdbGrowIterator(/*@null@*/ rpmdbMatchIterator mi, int fpNum)
mi->mi_set->count += set->count;
set = dbiFreeIndexSet(set);
}
+/*@=branchstate@*/
return rc;
}
@@ -2078,6 +2107,7 @@ rpmdbMatchIterator rpmdbInitIterator(rpmdb db, rpmTag rpmtag,
key = &mi->mi_key;
data = &mi->mi_data;
+/*@-branchstate@*/
if (rpmtag != RPMDBI_PACKAGES && keyp) {
DBC * dbcursor = NULL;
int rc;
@@ -2101,11 +2131,13 @@ key->size = keylen;
if (key->data && key->size == 0) key->size = strlen((char *)key->data);
if (key->data && key->size == 0) key->size++; /* XXX "/" fixup. */
+/*@-nullstate@*/
rc = dbiGet(dbi, dbcursor, key, data, DB_SET);
+/*@=nullstate@*/
if (rc > 0) {
rpmError(RPMERR_DBGETINDEX,
_("error(%d) getting \"%s\" records from %s index\n"),
- rc, key->data, tagName(dbi->dbi_rpmtag));
+ rc, (key->data ? key->data : "???"), tagName(dbi->dbi_rpmtag));
}
if (rc == 0)
@@ -2120,6 +2152,7 @@ if (rc == 0)
return NULL;
}
}
+/*@=branchstate@*/
if (keyp) {
char * k;
@@ -2270,6 +2303,7 @@ memset(data, 0, sizeof(*data));
printed = 0;
xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, DB_WRITECURSOR);
+/*@-branchstate@*/
for (i = 0; i < rpmcnt; i++) {
dbiIndexSet set;
int stringvalued;
@@ -2342,7 +2376,7 @@ memset(data, 0, sizeof(*data));
}
/*@fallthrough@*/
default:
- key->data = (void *) rpmvals[i];
+/*@i@*/ key->data = (void *) rpmvals[i];
key->size = strlen(rpmvals[i]);
stringvalued = 1;
/*@switchbreak@*/ break;
@@ -2379,13 +2413,13 @@ if (key->size == 0) key->size++; /* XXX "/" fixup. */
if (rc == 0) { /* success */
(void) dbt2set(dbi, data, &set);
} else if (rc == DB_NOTFOUND) { /* not found */
- continue;
+ /*@innercontinue@*/ continue;
} else { /* error */
rpmError(RPMERR_DBGETINDEX,
_("error(%d) getting \"%s\" records from %s index\n"),
rc, key->data, tagName(dbi->dbi_rpmtag));
ret += 1;
- continue;
+ /*@innercontinue@*/ continue;
}
/*@-mods@*/ /* a single rec is not modified */
@@ -2395,7 +2429,7 @@ if (key->size == 0) key->size++; /* XXX "/" fixup. */
/* If nothing was pruned, then don't bother updating. */
if (rc) {
set = dbiFreeIndexSet(set);
- continue;
+ /*@innercontinue@*/ continue;
}
if (set->count > 0) {
@@ -2403,7 +2437,7 @@ if (key->size == 0) key->size++; /* XXX "/" fixup. */
rc = dbiPut(dbi, dbcursor, key, data, 0);
if (rc) {
rpmError(RPMERR_DBPUTINDEX,
- _("error(%d) storing record %s into %s\n"),
+ _("error(%d) storing record \"%s\" into %s\n"),
rc, key->data, tagName(dbi->dbi_rpmtag));
ret += 1;
}
@@ -2413,13 +2447,14 @@ if (key->size == 0) key->size++; /* XXX "/" fixup. */
rc = dbiDel(dbi, dbcursor, key, data, 0);
if (rc) {
rpmError(RPMERR_DBPUTINDEX,
- _("error(%d) removing record %s from %s\n"),
+ _("error(%d) removing record \"%s\" from %s\n"),
rc, key->data, tagName(dbi->dbi_rpmtag));
ret += 1;
}
}
set = dbiFreeIndexSet(set);
}
+/*@=branchstate@*/
xx = dbiCclose(dbi, dbcursor, DB_WRITECURSOR);
dbcursor = NULL;
@@ -2563,7 +2598,6 @@ memset(data, 0, sizeof(*data));
if (hdrNum)
{ dbiIndexItem rec = dbiIndexNewItem(hdrNum, 0);
- /*@-nullpass -nullptrarith -nullderef @*/ /* FIX: rpmvals heartburn */
if (dbiTags != NULL)
for (dbix = 0; dbix < dbiTagsMax; dbix++) {
const char *av[1];
@@ -2595,11 +2629,8 @@ key->size = sizeof(hdrNum);
data->data = headerUnload(h);
data->size = headerSizeof(h, HEADER_MAGIC_NO);
if (data->data != NULL) {
- sigset_t signalMask;
- (void) blockSignals(dbi->dbi_rpmdb, &signalMask);
xx = dbiPut(dbi, dbcursor, key, data, 0);
xx = dbiSync(dbi, 0);
- (void) unblockSignals(dbi->dbi_rpmdb, &signalMask);
}
data->data = _free(data->data);
data->size = 0;
@@ -2696,23 +2727,24 @@ data->size = 0;
/* Identify value pointer and length. */
stringvalued = 0;
+/*@-branchstate@*/
switch (rpmtype) {
case RPM_CHAR_TYPE:
case RPM_INT8_TYPE:
key->size = sizeof(int_8);
- key->data = rpmvals + i;
+/*@i@*/ key->data = rpmvals + i;
/*@switchbreak@*/ break;
case RPM_INT16_TYPE:
key->size = sizeof(int_16);
- key->data = rpmvals + i;
+/*@i@*/ key->data = rpmvals + i;
/*@switchbreak@*/ break;
case RPM_INT32_TYPE:
key->size = sizeof(int_32);
- key->data = rpmvals + i;
+/*@i@*/ key->data = rpmvals + i;
/*@switchbreak@*/ break;
case RPM_BIN_TYPE:
key->size = rpmcnt;
- key->data = rpmvals;
+/*@i@*/ key->data = rpmvals;
rpmcnt = 1; /* XXX break out of loop. */
/*@switchbreak@*/ break;
case RPM_STRING_TYPE:
@@ -2751,11 +2783,12 @@ data->size = 0;
}
/*@fallthrough@*/
default:
- key->data = (void *) rpmvals[i];
+/*@i@*/ key->data = (void *) rpmvals[i];
key->size = strlen(rpmvals[i]);
stringvalued = 1;
/*@switchbreak@*/ break;
}
+/*@=branchstate@*/
if (!printed) {
if (rpmcnt == 1 && stringvalued) {
@@ -2787,7 +2820,7 @@ if (key->size == 0) key->size++; /* XXX "/" fixup. */
_("error(%d) getting \"%s\" records from %s index\n"),
rc, key->data, tagName(dbi->dbi_rpmtag));
ret += 1;
- continue;
+ /*@innercontinue@*/ continue;
}
if (set == NULL) /* not found or duplicate */
@@ -2804,7 +2837,9 @@ if (key->size == 0) key->size++; /* XXX "/" fixup. */
rc, key->data, tagName(dbi->dbi_rpmtag));
ret += 1;
}
+/*@-unqualifiedtrans@*/
data->data = _free(data->data);
+/*@=unqualifiedtrans@*/
data->size = 0;
set = dbiFreeIndexSet(set);
}
@@ -2850,6 +2885,9 @@ DBT * data;
if (db == NULL) return 0;
mi = rpmdbInitIterator(db, RPMTAG_BASENAMES, NULL, 0);
+ if (mi == NULL) /* XXX should never happen */
+ return 0;
+
key = &mi->mi_key;
data = &mi->mi_data;
@@ -2920,7 +2958,7 @@ if (key->size == 0) key->size++; /* XXX "/" fixup. */
for (i = 0; i < num; i++, im++) {
/*@-nullpass@*/
if (!FP_EQUAL(fps[i], fpList[im->fpNum]))
- continue;
+ /*@innercontinue@*/ continue;
/*@=nullpass@*/
/*@-usedef@*/
xx = dbiAppendSet(matchList[im->fpNum], im, 1, sizeof(*im), 0);
diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h
index 4bbd57fab..5a43f7e98 100644
--- a/rpmdb/rpmdb.h
+++ b/rpmdb/rpmdb.h
@@ -10,10 +10,37 @@
#include <rpmlib.h>
#include <db.h>
+#ifdef NOTYET
+/** \ingroup rpmdb
+ * Database of headers and tag value indices.
+ */
+typedef /*@abstract@*/ /*@refcounted@*/ struct rpmdb_s * rpmdb;
+
+/** \ingroup rpmdb
+ * Database iterator.
+ */
+typedef /*@abstract@*/ struct _rpmdbMatchIterator * rpmdbMatchIterator;
+#endif
+
+/**
+ * Tag value pattern match mode.
+ */
+typedef enum rpmMireMode_e {
+ RPMMIRE_DEFAULT = 0, /*!< regex with \., .* and ^...$ added */
+ RPMMIRE_STRCMP = 1, /*!< strcmp on strings */
+ RPMMIRE_REGEX = 2, /*!< regex patterns */
+ RPMMIRE_GLOB = 3 /*!< glob patterns through fnmatch(3) */
+} rpmMireMode;
+
/**
*/
typedef /*@abstract@*/ struct _dbiIndexItem * dbiIndexItem;
+/** \ingroup rpmdb
+ * A single element (i.e. inverted list from tag values) of a database.
+ */
+typedef /*@abstract@*/ struct _dbiIndexSet * dbiIndexSet;
+
/**
*/
typedef /*@abstract@*/ struct _dbiIndex * dbiIndex;
@@ -731,6 +758,259 @@ unsigned int dbiIndexRecordOffset(dbiIndexSet set, int recno)
unsigned int dbiIndexRecordFileNumber(dbiIndexSet set, int recno)
/*@*/;
+/** \ingroup rpmdb
+ * Tags for which rpmdb indices will be built.
+ */
+/*@-exportlocal@*/
+/*@unchecked@*/
+/*@only@*/ /*@null@*/ extern int * dbiTags;
+/*@unchecked@*/
+extern int dbiTagsMax;
+/*@=exportlocal@*/
+
+/** \ingroup rpmdb
+ * Unreference a database instance.
+ * @param db rpm database
+ * @param msg
+ * @return NULL always
+ */
+/*@unused@*/ /*@null@*/
+rpmdb rpmdbUnlink (/*@killref@*/ /*@only@*/ rpmdb db, const char * msg)
+ /*@modifies db @*/;
+
+/** @todo Remove debugging entry from the ABI. */
+/*@-exportlocal@*/
+/*@null@*/
+rpmdb XrpmdbUnlink (/*@killref@*/ /*@only@*/ rpmdb db, const char * msg,
+ const char * fn, unsigned ln)
+ /*@modifies db @*/;
+/*@=exportlocal@*/
+#define rpmdbUnlink(_db, _msg) XrpmdbUnlink(_db, _msg, __FILE__, __LINE__)
+
+/** \ingroup rpmdb
+ * Reference a database instance.
+ * @param db rpm database
+ * @param msg
+ * @return new rpm database reference
+ */
+/*@unused@*/
+rpmdb rpmdbLink (rpmdb db, const char * msg)
+ /*@modifies db @*/;
+
+/** @todo Remove debugging entry from the ABI. */
+/*@-exportlocal@*/
+rpmdb XrpmdbLink (rpmdb db, const char * msg,
+ const char * fn, unsigned ln)
+ /*@modifies db @*/;
+/*@=exportlocal@*/
+#define rpmdbLink(_db, _msg) XrpmdbLink(_db, _msg, __FILE__, __LINE__)
+
+/** \ingroup rpmdb
+ * Open rpm database.
+ * @param prefix path to top of install tree
+ * @retval dbp address of rpm database
+ * @param mode open(2) flags: O_RDWR or O_RDONLY (O_CREAT also)
+ * @param perms database permissions
+ * @return 0 on success
+ */
+int rpmdbOpen (/*@null@*/ const char * prefix, /*@null@*/ /*@out@*/ rpmdb * dbp,
+ int mode, int perms)
+ /*@globals fileSystem @*/
+ /*@modifies *dbp, fileSystem @*/;
+
+/** \ingroup rpmdb
+ * Initialize database.
+ * @param prefix path to top of install tree
+ * @param perms database permissions
+ * @return 0 on success
+ */
+int rpmdbInit(/*@null@*/ const char * prefix, int perms)
+ /*@globals fileSystem @*/
+ /*@modifies fileSystem @*/;
+
+/** \ingroup rpmdb
+ * Verify database components.
+ * @param prefix path to top of install tree
+ * @return 0 on success
+ */
+int rpmdbVerify(/*@null@*/ const char * prefix)
+ /*@globals fileSystem @*/
+ /*@modifies fileSystem @*/;
+
+/** \ingroup rpmdb
+ * Close all database indices and free rpmdb.
+ * @param db rpm database
+ * @return 0 on success
+ */
+int rpmdbClose (/*@killref@*/ /*@only@*/ /*@null@*/ rpmdb db)
+ /*@globals fileSystem @*/
+ /*@modifies db, fileSystem @*/;
+
+/** \ingroup rpmdb
+ * Sync all database indices.
+ * @param db rpm database
+ * @return 0 on success
+ */
+int rpmdbSync (/*@null@*/ rpmdb db)
+ /*@globals fileSystem @*/
+ /*@modifies fileSystem @*/;
+
+/** \ingroup rpmdb
+ * Open all database indices.
+ * @param db rpm database
+ * @return 0 on success
+ */
+/*@-exportlocal@*/
+int rpmdbOpenAll (/*@null@*/ rpmdb db)
+ /*@modifies db @*/;
+/*@=exportlocal@*/
+
+/** \ingroup rpmdb
+ * Return number of instances of package in rpm database.
+ * @param db rpm database
+ * @param name rpm package name
+ * @return number of instances
+ */
+int rpmdbCountPackages(/*@null@*/ rpmdb db, const char * name)
+ /*@globals fileSystem @*/
+ /*@modifies db, fileSystem @*/;
+
+/** \ingroup rpmdb
+ * Return header join key for current position of rpm database iterator.
+ * @param mi rpm database iterator
+ * @return current header join key
+ */
+unsigned int rpmdbGetIteratorOffset(/*@null@*/ rpmdbMatchIterator mi)
+ /*@*/;
+
+/** \ingroup rpmdb
+ * Return number of elements in rpm database iterator.
+ * @param mi rpm database iterator
+ * @return number of elements
+ */
+int rpmdbGetIteratorCount(/*@null@*/ rpmdbMatchIterator mi)
+ /*@*/;
+
+/** \ingroup rpmdb
+ * Append items to set of package instances to iterate.
+ * @param mi rpm database iterator
+ * @param hdrNums array of package instances
+ * @param nHdrNums number of elements in array
+ * @return 0 on success, 1 on failure (bad args)
+ */
+int rpmdbAppendIterator(/*@null@*/ rpmdbMatchIterator mi,
+ /*@null@*/ const int * hdrNums, int nHdrNums)
+ /*@modifies mi @*/;
+
+/** \ingroup rpmdb
+ * Remove items from set of package instances to iterate.
+ * @note Sorted hdrNums are always passed in rpmlib.
+ * @param mi rpm database iterator
+ * @param hdrNums array of package instances
+ * @param nHdrNums number of elements in array
+ * @param sorted is the array sorted? (array will be sorted on return)
+ * @return 0 on success, 1 on failure (bad args)
+ */
+int rpmdbPruneIterator(/*@null@*/ rpmdbMatchIterator mi,
+ /*@null@*/ int * hdrNums, int nHdrNums, int sorted)
+ /*@modifies mi, hdrNums @*/;
+
+/** \ingroup rpmdb
+ * Add pattern to iterator selector.
+ * @param mi rpm database iterator
+ * @param tag rpm tag
+ * @param mode type of pattern match
+ * @param pattern pattern to match
+ * @return 0 on success
+ */
+int rpmdbSetIteratorRE(/*@null@*/ rpmdbMatchIterator mi, rpmTag tag,
+ rpmMireMode mode, /*@null@*/ const char * pattern)
+ /*@modifies mi @*/;
+
+/** \ingroup rpmdb
+ * Prepare iterator for lazy writes.
+ * @note Must be called before rpmdbNextIterator() with CDB model database.
+ * @param mi rpm database iterator
+ * @param rewrite new value of rewrite
+ * @return previous value
+ */
+int rpmdbSetIteratorRewrite(/*@null@*/ rpmdbMatchIterator mi, int rewrite)
+ /*@modifies mi @*/;
+
+/** \ingroup rpmdb
+ * Modify iterator to mark header for lazy write.
+ * @param mi rpm database iterator
+ * @param modified new value of modified
+ * @return previous value
+ */
+int rpmdbSetIteratorModified(/*@null@*/ rpmdbMatchIterator mi, int modified)
+ /*@modifies mi @*/;
+
+/** \ingroup rpmdb
+ * Return database iterator.
+ * @param db rpm database
+ * @param rpmtag rpm tag
+ * @param keyp key data (NULL for sequential access)
+ * @param keylen key data length (0 will use strlen(keyp))
+ * @return NULL on failure
+ */
+/*@only@*/ /*@null@*/
+rpmdbMatchIterator rpmdbInitIterator(/*@null@*/ rpmdb db, rpmTag rpmtag,
+ /*@null@*/ const void * keyp, size_t keylen)
+ /*@globals fileSystem @*/
+ /*@modifies db, fileSystem @*/;
+
+/** \ingroup rpmdb
+ * Return next package header from iteration.
+ * @param mi rpm database iterator
+ * @return NULL on end of iteration.
+ */
+/*@null@*/
+Header rpmdbNextIterator(/*@null@*/ rpmdbMatchIterator mi)
+ /*@globals fileSystem @*/
+ /*@modifies mi, fileSystem @*/;
+
+/** \ingroup rpmdb
+ * Destroy rpm database iterator.
+ * @param mi rpm database iterator
+ * @return NULL always
+ */
+/*@null@*/
+rpmdbMatchIterator rpmdbFreeIterator(/*@only@*/ /*@null@*/rpmdbMatchIterator mi)
+ /*@globals fileSystem @*/
+ /*@modifies mi, fileSystem @*/;
+
+/** \ingroup rpmdb
+ * Add package header to rpm database and indices.
+ * @param db rpm database
+ * @param iid install transaction id (iid = 0 or -1 to skip)
+ * @param h header
+ * @return 0 on success
+ */
+int rpmdbAdd(/*@null@*/ rpmdb db, int iid, Header h)
+ /*@globals fileSystem @*/
+ /*@modifies db, h, fileSystem @*/;
+
+/** \ingroup rpmdb
+ * Remove package header from rpm database and indices.
+ * @param db rpm database
+ * @param rid remove transaction id (rid = 0 or -1 to skip)
+ * @param hdrNum package instance number in database
+ * @return 0 on success
+ */
+int rpmdbRemove(/*@null@*/ rpmdb db, /*@unused@*/ int rid, unsigned int hdrNum)
+ /*@globals fileSystem @*/
+ /*@modifies db, fileSystem @*/;
+
+/** \ingroup rpmdb
+ * Rebuild database indices from package headers.
+ * @param prefix path to top of install tree
+ * @return 0 on success
+ */
+int rpmdbRebuild(/*@null@*/ const char * prefix)
+ /*@globals rpmGlobalMacroContext, fileSystem @*/
+ /*@modifies rpmGlobalMacroContext, fileSystem @*/;
+
/**
* Mergesort, same arguments as qsort(2).
*/
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index f08144311..68bac6c10 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -6,8 +6,7 @@ EXTRA_DIST = tdigest.c tdir.c tficl.c tfts.c tglob.c tinv.c tkey.c trpmio.c
EXTRA_PROGRAMS = tdigest tdir tfts tglob tinv tkey tring trpmio dumpasn1
-INCLUDES = \
- -I$(top_srcdir) \
+INCLUDES = -I. \
-I$(top_srcdir)/beecrypt \
-I$(top_srcdir)/popt \
@INCPATH@
diff --git a/rpmio/macro.c b/rpmio/macro.c
index 03cf51b31..b7d8d9c3a 100644
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -1,4 +1,3 @@
-/*@-branchstate@*/
/** \ingroup rpmrc rpmio
* \file rpmio/macro.c
*/
@@ -248,11 +247,13 @@ findEntry(MacroContext mc, const char * name, size_t namelen)
if (mc->macroTable == NULL || mc->firstFree == 0)
return NULL;
+/*@-branchstate@*/
if (namelen > 0) {
strncpy(namebuf, name, namelen);
namebuf[namelen] = '\0';
name = namebuf;
}
+/*@=branchstate@*/
key = &keybuf;
memset(key, 0, sizeof(*key));
@@ -763,10 +764,12 @@ pushMacro(/*@out@*/ MacroEntry * mep,
me->body = xstrdup(b ? b : "");
me->used = 0;
me->level = level;
+/*@-branchstate@*/
if (mep)
*mep = me;
else
me = _free(me);
+/*@=branchstate@*/
}
/**
@@ -779,6 +782,7 @@ popMacro(MacroEntry * mep)
{
MacroEntry me = (*mep ? *mep : NULL);
+/*@-branchstate@*/
if (me) {
/* XXX cast to workaround const */
/*@-onlytrans@*/
@@ -789,6 +793,7 @@ popMacro(MacroEntry * mep)
me = _free(me);
/*@=onlytrans@*/
}
+/*@=branchstate@*/
}
/**
@@ -1059,7 +1064,9 @@ doFoo(MacroBuf mb, int negate, const char * f, size_t fn,
b = (rpmIsVerbose() ? buf : NULL);
} else if (STREQ("url2path", f, fn) || STREQ("u2p", f, fn)) {
(void)urlPath(buf, (const char **)&b);
+/*@-branchstate@*/
if (*b == '\0') b = "/";
+/*@=branchstate@*/
} else if (STREQ("uncompress", f, fn)) {
rpmCompressedMagic compressed = COMPRESSED_OTHER;
/*@-globs@*/
@@ -1151,6 +1158,7 @@ expandMacro(MacroBuf mb)
return 1;
}
+/*@-branchstate@*/
while (rc == 0 && mb->nb > 0 && (c = *s) != '\0') {
s++;
/* Copy text until next macro */
@@ -1434,6 +1442,7 @@ expandMacro(MacroBuf mb)
s = se;
}
+/*@=branchstate@*/
*mb->t = '\0';
mb->s = s;
@@ -1930,12 +1939,14 @@ if (_debug) fprintf(stderr, "*** RGP ut %d file %s nurl %d\n", ut, file, nurl);
#endif
}
+/*@-branchstate@*/
if (url && nurl > 0) {
char *t = strncpy(alloca(nurl+1), url, nurl);
t[nurl] = '\0';
url = t;
} else
url = "";
+/*@=branchstate@*/
result = rpmGetPath(url, root, "/", mdir, "/", file, NULL);
@@ -2029,4 +2040,3 @@ main(int argc, char *argv[])
}
#endif /* EVAL_MACROS */
#endif /* DEBUG_MACROS */
-/*@=branchstate@*/
diff --git a/rpmqv.c b/rpmqv.c
index 3a2e516c8..48a19be29 100755
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -13,6 +13,9 @@
#include <rpmcli.h>
#include <rpmbuild.h>
+#include "rpmdb.h"
+#include "rpmts.h"
+
#define POPT_NODEPS 1025
#define POPT_FORCE 1026
#define POPT_NOMD5 1027
@@ -932,7 +935,8 @@ int main(int argc, const char ** argv)
(void) close(p[1]);
}
- ts = rpmtransCreateSet(NULL, rootdir);
+ ts = rpmtsCreate();
+ (void) rpmtsSetRootDir(ts, rootdir);
switch (bigMode) {
#ifdef IAM_RPMDB
case MODE_INITDB:
@@ -1183,7 +1187,7 @@ ia->probFilter |= RPMPROB_FILTER_OLDPACKAGE;
exit:
#endif /* IAM_RPMBT || IAM_RPMK */
- ts = rpmtransFree(ts);
+ ts = rpmtsFree(ts);
optCon = poptFreeContext(optCon);
rpmFreeMacros(NULL);
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 99554ca41..3b25d453d 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,8 +2,7 @@
AUTOMAKE_OPTIONS = 1.4 foreign
-INCLUDES = \
- -I$(top_srcdir) \
+INCLUDES = -I. \
-I$(top_srcdir)/build \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/rpmdb \
diff --git a/tools/dumpdb.c b/tools/dumpdb.c
index 66fdd642e..745c81ba3 100644
--- a/tools/dumpdb.c
+++ b/tools/dumpdb.c
@@ -2,6 +2,9 @@
#include <rpmlib.h>
#include "header_internal.h"
+
+#include "rpmdb.h"
+
#include "debug.h"
int main(int argc, char ** argv)
diff --git a/tools/rpmsort.c b/tools/rpmsort.c
index 04052f141..5b8acea5a 100644
--- a/tools/rpmsort.c
+++ b/tools/rpmsort.c
@@ -4,6 +4,7 @@
#include <rpmmacro.h>
#include <rpmurl.h>
+#include "rpmdb.h"
#include "rpmte.h"
#include "rpmts.h"
@@ -64,7 +65,7 @@ do_tsort(const char *fileArgv[])
if (fileArgv == NULL)
return 0;
- ts = rpmtransCreateSet(NULL, NULL);
+ ts = rpmtsCreate();
if (!noChainsaw)
ts->transFlags = RPMTRANS_FLAG_CHAINSAW;
@@ -89,7 +90,7 @@ do_tsort(const char *fileArgv[])
}
mi = rpmdbInitIterator(avdb, RPMDBI_PACKAGES, NULL, 0);
while ((h = rpmdbNextIterator(mi)) != NULL) {
- rpmtransAvailablePackage(ts, h, NULL);
+ rpmtsAvailablePackage(ts, h, NULL);
}
endavail:
@@ -168,7 +169,7 @@ restart:
}
if (rc == 0) {
- rc = rpmtransAddPackage(ts, h, (fnpyKey)fileName, 0, NULL);
+ rc = rpmtsAddPackage(ts, h, (fnpyKey)fileName, 0, NULL);
headerFree(h, "do_tsort");
continue;
}
@@ -211,7 +212,7 @@ restart:
if (!noDeps) {
rpmProblemSet ps;
- rc = rpmdepCheck(ts);
+ rc = rpmtsCheck(ts);
ps = rpmtsGetProblems(ts);
if (ps) {
@@ -224,7 +225,7 @@ restart:
ps = rpmProblemSetFree(ps);
}
- rc = rpmdepOrder(ts);
+ rc = rpmtsOrder(ts);
if (rc)
goto exit;
@@ -373,7 +374,7 @@ exit:
pkgURL = _free(pkgURL);
argv = _free(argv);
- ts = rpmtransFree(ts);
+ ts = rpmtsFree(ts);
return rc;
}
diff --git a/tools/tpkgid.c b/tools/tpkgid.c
index ad1c68692..246a569fc 100644
--- a/tools/tpkgid.c
+++ b/tools/tpkgid.c
@@ -419,7 +419,6 @@ main(int argc, const char *argv[])
{
poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
const char * rootDir = "";
- rpmdb db = NULL;
rpmTransactionSet ts = NULL;
FTS * ftsp;
FTSENT * fts;
@@ -445,7 +444,8 @@ main(int argc, const char *argv[])
rpmIncreaseVerbosity();
}
- ts = rpmtransCreateSet(db, rootDir);
+ ts = rpmtsCreate();
+ (void) rpmtsSetRootDir(rootDir);
(void) rpmtsOpenDB(ts, O_RDONLY);
if (verify_legacy) {
ts->dig = pgpNewDig();
@@ -467,7 +467,7 @@ main(int argc, const char *argv[])
ftsPrintPaths(stdout);
freeItems();
- ts = rpmtransFree(ts);
+ ts = rpmtsFree(ts);
return ec;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 04:01:26 +0000