summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES3
-rw-r--r--Doxyfile.in3
-rw-r--r--build.c13
-rw-r--r--build.h2
-rw-r--r--build/buildio.h2
-rw-r--r--build/files.c18
-rw-r--r--build/pack.c12
-rw-r--r--build/rpmspec.h4
-rw-r--r--build/spec.c10
-rw-r--r--lib/Makefile.am10
-rw-r--r--lib/depends.c562
-rw-r--r--lib/fsm.c60
-rw-r--r--lib/fsm.h12
-rw-r--r--lib/package.c5
-rw-r--r--lib/psm.c116
-rw-r--r--lib/psm.h8
-rw-r--r--lib/query.c9
-rw-r--r--lib/rpmal.c90
-rw-r--r--lib/rpmal.h10
-rw-r--r--lib/rpmchecksig.c11
-rw-r--r--lib/rpmcli.h32
-rw-r--r--lib/rpmds.c92
-rw-r--r--lib/rpmds.h57
-rw-r--r--lib/rpmfi.c90
-rw-r--r--lib/rpmfi.h68
-rw-r--r--lib/rpminstall.c43
-rw-r--r--lib/rpmlib.h198
-rw-r--r--lib/rpmlibprov.c11
-rw-r--r--lib/rpmps.c (renamed from lib/problems.c)23
-rw-r--r--lib/rpmps.h193
-rw-r--r--lib/rpmte.c160
-rw-r--r--lib/rpmte.h133
-rw-r--r--lib/rpmts.c298
-rw-r--r--lib/rpmts.h146
-rw-r--r--lib/signature.c17
-rw-r--r--lib/transaction.c562
-rw-r--r--lib/ts.c8
-rw-r--r--lib/verify.c61
-rw-r--r--po/POTFILES.in2
-rw-r--r--po/cs.po725
-rw-r--r--po/da.po727
-rw-r--r--po/de.po733
-rw-r--r--po/fi.po725
-rw-r--r--po/fr.po721
-rw-r--r--po/gl.po721
-rw-r--r--po/is.po721
-rw-r--r--po/ja.po743
-rw-r--r--po/ko.po737
-rw-r--r--po/no.po725
-rw-r--r--po/pl.po729
-rw-r--r--po/pt_BR.po721
-rw-r--r--po/ro.po721
-rw-r--r--po/rpm.pot721
-rw-r--r--po/ru.po725
-rw-r--r--po/sk.po725
-rw-r--r--po/sl.po729
-rw-r--r--po/sr.po725
-rw-r--r--po/sv.po725
-rw-r--r--po/tr.po725
-rw-r--r--python/header-py.c15
-rw-r--r--python/rpmmodule.c15
-rw-r--r--rpm.spec.in5
-rw-r--r--rpm2cpio.c2
-rw-r--r--rpmdb/header.h2
-rwxr-xr-xrpmqv.c3
-rw-r--r--tools/rpmsort.c85
-rw-r--r--tools/tpkgid.c22
67 files changed, 8978 insertions, 8849 deletions
diff --git a/CHANGES b/CHANGES
index 5f89751ac..8cf45083a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -111,8 +111,9 @@
- rework most of rpmdb.c prepatory to implementing duplicates.
- fix: 2 memory leaks in headerSprintf.
- fix: db mire's access out-of-bounds memory.
- - plug most install mode leaks.
+ - plug install mode leaks.
- opaque (well mostly) rpmTransactionSet using methods.
+ - Grand Renaming of rpm data types.
4.0.3 -> 4.0.4:
- solaris: translate i86pc to i386 (#57182).
diff --git a/Doxyfile.in b/Doxyfile.in
index 6b747ecba..9f55bdd79 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -371,7 +371,6 @@ INPUT = \
@top_srcdir@/lib/package.c \
@top_srcdir@/lib/poptI.c \
@top_srcdir@/lib/poptQV.c \
- @top_srcdir@/lib/problems.c \
@top_srcdir@/lib/psm.c \
@top_srcdir@/lib/psm.h \
@top_srcdir@/lib/query.c \
@@ -386,6 +385,8 @@ INPUT = \
@top_srcdir@/lib/rpmlead.h \
@top_srcdir@/lib/rpmlib.h \
@top_srcdir@/lib/rpmlibprov.c \
+ @top_srcdir@/lib/rpmps.c \
+ @top_srcdir@/lib/rpmps.h \
@top_srcdir@/lib/rpmrc.c \
@top_srcdir@/lib/rpmte.c \
@top_srcdir@/lib/rpmte.h \
diff --git a/build.c b/build.c
index cb25adfbd..5e2e1d888 100644
--- a/build.c
+++ b/build.c
@@ -7,23 +7,24 @@
#include <rpmcli.h>
#include <rpmbuild.h>
+#include "rpmps.h"
#include "rpmte.h"
#include "rpmts.h"
#include "build.h"
#include "debug.h"
-/*@access rpmTransactionSet @*/ /* XXX compared with NULL @*/
+/*@access rpmts @*/ /* XXX compared with NULL @*/
/*@access rpmdb @*/ /* XXX compared with NULL @*/
/*@access FD_t @*/ /* XXX compared with NULL @*/
/**
*/
-static int checkSpec(rpmTransactionSet ts, Header h)
+static int checkSpec(rpmts ts, Header h)
/*@globals fileSystem, internalState @*/
/*@modifies ts, h, fileSystem, internalState @*/
{
- rpmProblemSet ps;
+ rpmps ps;
int rc;
if (!headerIsEntry(h, RPMTAG_REQUIRENAME)
@@ -40,7 +41,7 @@ static int checkSpec(rpmTransactionSet ts, Header h)
printDepProblems(stderr, ps);
rc = 1;
}
- ps = rpmProblemSetFree(ps);
+ ps = rpmpsFree(ps);
/* XXX nuke the added package. */
rpmtsClean(ts);
@@ -94,7 +95,7 @@ static int isSpecFile(const char * specfile)
/**
*/
-static int buildForTarget(rpmTransactionSet ts, const char * arg, BTA_t ba)
+static int buildForTarget(rpmts ts, const char * arg, BTA_t ba)
/*@globals rpmGlobalMacroContext,
fileSystem, internalState @*/
/*@modifies ts, rpmGlobalMacroContext,
@@ -288,7 +289,7 @@ exit:
return rc;
}
-int build(rpmTransactionSet ts, const char * arg, BTA_t ba, const char * rcfile)
+int build(rpmts ts, const char * arg, BTA_t ba, const char * rcfile)
{
char *t, *te;
int rc = 0;
diff --git a/build.h b/build.h
index c80a2c7ed..7100c8b97 100644
--- a/build.h
+++ b/build.h
@@ -5,7 +5,7 @@
extern "C" {
#endif
-int build(rpmTransactionSet ts, const char * arg, BTA_t ba,
+int build(rpmts ts, const char * arg, BTA_t ba,
/*@null@*/ const char * rcfile)
/*@globals rpmGlobalMacroContext, rpmCLIMacroContext,
fileSystem, internalState @*/
diff --git a/build/buildio.h b/build/buildio.h
index dc3800b04..06eb6914e 100644
--- a/build/buildio.h
+++ b/build/buildio.h
@@ -15,7 +15,7 @@
typedef /*@abstract@*/ struct cpioSourceArchive_s {
unsigned int cpioArchiveSize;
FD_t cpioFdIn;
- TFI_t cpioList;
+ rpmfi cpioList;
/*@only@*/ struct rpmlead * lead; /* XXX FIXME: exorcize lead/arch/os */
} * CSA_t;
diff --git a/build/files.c b/build/files.c
index 67fd8e723..30345a9c6 100644
--- a/build/files.c
+++ b/build/files.c
@@ -25,7 +25,7 @@
#include "debug.h"
/*@access Header @*/
-/*@access TFI_t @*/
+/*@access rpmfi @*/
/*@access FD_t @*/
/*@access StringBuf @*/ /* compared with NULL */
@@ -1097,7 +1097,7 @@ static int checkHardLinks(FileList fl)
* @param isSrc
*/
static void genCpioListAndHeader(/*@partial@*/ FileList fl,
- TFI_t * cpioList, Header h, int isSrc)
+ rpmfi * cpioList, Header h, int isSrc)
/*@globals rpmGlobalMacroContext,
fileSystem @*/
/*@modifies h, *cpioList, fl->processingFailed, fl->fileList,
@@ -1331,15 +1331,15 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl,
(void) rpmlibNeedsFeature(h, "CompressedFileNames", "3.0.4-1");
}
- { TFI_t fi = xcalloc(1, sizeof(*fi));
+ { rpmfi fi = xcalloc(1, sizeof(*fi));
int scareMem = 1;
char * a, * d;
- /* XXX FIXME drill rpmTransactionSet ts all the way down here */
+ /* XXX FIXME drill rpmts ts all the way down here */
/*@i@*/ fi->te = xcalloc(1, sizeof(*fi->te));
/*@i@*/ fi->te->type = TR_ADDED;
- fi = fiNew(NULL, fi, h, RPMTAG_BASENAMES, scareMem);
+ fi = rpmfiNew(NULL, fi, h, RPMTAG_BASENAMES, scareMem);
if (fi == NULL) return; /* XXX can't happen */
fi->dnl = _free(fi->dnl);
@@ -2006,7 +2006,7 @@ static int processPackageFiles(Spec spec, Package pkg,
(void) rpmlibNeedsFeature(pkg->header,
"PartialHardlinkSets", "4.0.4-1");
- genCpioListAndHeader(&fl, (TFI_t *)&pkg->cpioList, pkg->header, 0);
+ genCpioListAndHeader(&fl, (rpmfi *)&pkg->cpioList, pkg->header, 0);
if (spec->timeCheck)
timeCheck(spec->timeCheck, pkg->header);
@@ -2222,7 +2222,7 @@ int processSourceFiles(Spec spec)
if (! fl.processingFailed) {
if (spec->sourceHeader != NULL)
- genCpioListAndHeader(&fl, (TFI_t *)&spec->sourceCpioList,
+ genCpioListAndHeader(&fl, (rpmfi *)&spec->sourceCpioList,
spec->sourceHeader, 1);
}
@@ -2430,13 +2430,13 @@ DepMsg_t depMsgs[] = {
/**
*/
-static int generateDepends(Spec spec, Package pkg, TFI_t cpioList, int multiLib)
+static int generateDepends(Spec spec, Package pkg, rpmfi cpioList, int multiLib)
/*@globals rpmGlobalMacroContext,
fileSystem, internalState @*/
/*@modifies cpioList, rpmGlobalMacroContext,
fileSystem, internalState @*/
{
- TFI_t fi = cpioList;
+ rpmfi fi = cpioList;
StringBuf writeBuf;
int writeBytes;
StringBuf readBuf;
diff --git a/build/pack.c b/build/pack.c
index 9a711e395..7362974ac 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -8,6 +8,8 @@
#include <rpmio_internal.h>
#include <rpmbuild.h>
+#include "rpmps.h"
+
#include "cpio.h"
#include "fsm.h"
#include "psm.h"
@@ -22,8 +24,8 @@
#include "rpmlead.h"
#include "debug.h"
-/*@access rpmTransactionSet @*/
-/*@access TFI_t @*/ /* compared with NULL */
+/*@access rpmts @*/
+/*@access rpmfi @*/ /* compared with NULL */
/*@access Header @*/ /* compared with NULL */
/*@access FD_t @*/ /* compared with NULL */
/*@access StringBuf @*/ /* compared with NULL */
@@ -56,8 +58,8 @@ static int cpio_doio(FD_t fdo, /*@unused@*/ Header h, CSA_t csa,
fileSystem@*/
/*@modifies fdo, csa, rpmGlobalMacroContext, fileSystem @*/
{
- rpmTransactionSet ts = rpmtsCreate();
- TFI_t fi = csa->cpioList;
+ rpmts ts = rpmtsCreate();
+ rpmfi fi = csa->cpioList;
const char *failedFile = NULL;
FD_t cfd;
int rc, ec;
@@ -321,7 +323,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 = rpmtsCreate();
+ { rpmts ts = rpmtsCreate();
/* XXX W2DO? pass fileName? */
/*@-mustmod@*/ /* LCL: segfault */
diff --git a/build/rpmspec.h b/build/rpmspec.h
index 517e2fa02..fa2877562 100644
--- a/build/rpmspec.h
+++ b/build/rpmspec.h
@@ -129,7 +129,7 @@ struct SpecStruct {
/*@refcounted@*/
Header sourceHeader;
- TFI_t sourceCpioList;
+ rpmfi sourceCpioList;
/*@dependent@*/ /*@null@*/ MacroContext macros;
@@ -147,7 +147,7 @@ struct SpecStruct {
struct PackageStruct {
/*@refcounted@*/
Header header;
- TFI_t cpioList;
+ rpmfi cpioList;
/*@owned@*/ struct Source * icon;
diff --git a/build/spec.c b/build/spec.c
index 684a61068..3c4f405f8 100644
--- a/build/spec.c
+++ b/build/spec.c
@@ -18,7 +18,7 @@ extern int specedit;
#define SKIPNONWHITE(_x){while(*(_x) &&!(xisspace(*_x) || *(_x) == ',')) (_x)++;}
/*@access Header @*/ /* compared with NULL */
-/*@access TFI_t @*/ /* compared with NULL */
+/*@access rpmfi @*/ /* compared with NULL */
/**
* @param p trigger entry chain
@@ -163,9 +163,9 @@ Package freePackage(Package pkg)
pkg->fileList = freeStringBuf(pkg->fileList);
pkg->fileFile = _free(pkg->fileFile);
if (pkg->cpioList) {
- TFI_t fi = pkg->cpioList;
+ rpmfi fi = pkg->cpioList;
pkg->cpioList = NULL;
- fi = fiFree(fi, 1);
+ fi = rpmfiFree(fi, 1);
#ifdef DYING
/*@-refcounttrans@*/ /* FIX: fi needs to be only */
fi = _free(fi);
@@ -513,9 +513,9 @@ Spec freeSpec(Spec spec)
spec->sourceHeader = headerFree(spec->sourceHeader, "spec->sourceHeader");
if (spec->sourceCpioList) {
- TFI_t fi = spec->sourceCpioList;
+ rpmfi fi = spec->sourceCpioList;
spec->sourceCpioList = NULL;
- fi = fiFree(fi, 1);
+ fi = rpmfiFree(fi, 1);
#ifdef DYING
/*@-refcounttrans@*/ /* FIX: fi needs to be only */
fi = _free(fi);
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 748978182..e7e0ad354 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -14,10 +14,10 @@ EXTRA_DIST = getdate.y
pkgincdir = $(pkgincludedir)
pkginc_HEADERS = \
- misc.h rpmcli.h rpmlib.h stringbuf.h
+ misc.h rpmcli.h rpmlib.h \
+ rpmds.h rpmfi.h rpmps.h rpmte.h rpmts.h stringbuf.h
noinst_HEADERS = \
- cpio.h fsm.h manifest.h psm.h \
- rpmal.h rpmds.h rpmfi.h rpmlead.h rpmte.h rpmts.h signature.h
+ cpio.h fsm.h manifest.h psm.h rpmal.h rpmlead.h signature.h
mylibpaths = \
-L$(top_builddir)/lib \
@@ -32,9 +32,9 @@ lib_LTLIBRARIES = librpm.la
librpm_la_SOURCES = \
cpio.c depends.c formats.c fs.c fsm.c getdate.c \
manifest.c misc.c package.c \
- problems.c poptI.c poptQV.c psm.c query.c \
+ poptI.c poptQV.c psm.c query.c \
rpmal.c rpmchecksig.c rpmds.c rpmfi.c rpminstall.c \
- rpmlead.c rpmlibprov.c rpmrc.c rpmte.c rpmts.c rpmvercmp.c \
+ rpmlead.c rpmlibprov.c rpmps.c rpmrc.c rpmte.c rpmts.c rpmvercmp.c \
signature.c stringbuf.c transaction.c \
verify.c
librpm_la_LDFLAGS = -release @VERSION@
diff --git a/lib/depends.c b/lib/depends.c
index 003774b3e..c8815b823 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -9,6 +9,7 @@
#include <rpmmacro.h> /* XXX rpmExpand("%{_dependency_whiteout}" */
#include "rpmdb.h" /* XXX response cache needs dbiOpen et al. */
+#include "rpmps.h"
#include "rpmal.h"
#include "rpmds.h"
@@ -19,7 +20,7 @@
#include "debug.h"
/*@access tsortInfo @*/
-/*@access rpmTransactionSet @*/
+/*@access rpmts @*/
/*@access dbiIndex @*/ /* XXX for dbi->dbi_txnid */
@@ -75,11 +76,11 @@ static int intcmp(const void * a, const void * b) /*@*/
* @param depends installed package of pair (or RPMAL_NOMATCH on erase)
* @return 0 on success
*/
-static int removePackage(rpmTransactionSet ts, Header h, int dboffset,
+static int removePackage(rpmts ts, Header h, int dboffset,
/*@exposed@*/ /*@dependent@*/ /*@null@*/ alKey depends)
/*@modifies ts, h @*/
{
- transactionElement p;
+ rpmte p;
/* Filter out duplicate erasures. */
if (ts->numRemovedPackages > 0 && ts->removedPackages != NULL) {
@@ -109,22 +110,22 @@ static int removePackage(rpmTransactionSet ts, Header h, int dboffset,
/*@=type =voidabstract @*/
}
- p = teNew(ts, h, TR_REMOVED, NULL, NULL, dboffset, depends);
+ p = rpmteNew(ts, h, TR_REMOVED, NULL, NULL, dboffset, depends);
ts->order[ts->orderCount] = p;
ts->orderCount++;
return 0;
}
-int rpmtsAddPackage(rpmTransactionSet ts, Header h,
+int rpmtsAddPackage(rpmts ts, Header h,
fnpyKey key, int upgrade, rpmRelocation * relocs)
{
HGE_t hge = (HGE_t)headerGetEntryMinMemory;
int isSource;
int duplicate = 0;
- teIterator pi; transactionElement p;
- rpmDepSet add;
- rpmDepSet obsoletes;
+ rpmtei pi; rpmte p;
+ rpmds add;
+ rpmds obsoletes;
alKey pkgKey; /* addedPackages key */
int xx;
int ec = 0;
@@ -135,40 +136,40 @@ int rpmtsAddPackage(rpmTransactionSet ts, Header h,
* Check for previously added versions with the same name.
* FIXME: only catches previously added, older packages.
*/
- add = dsThis(h, RPMTAG_REQUIRENAME, (RPMSENSE_EQUAL|RPMSENSE_LESS));
+ add = rpmdsThis(h, RPMTAG_REQUIRENAME, (RPMSENSE_EQUAL|RPMSENSE_LESS));
pkgKey = RPMAL_NOMATCH;
- for (pi = teInitIterator(ts), oc = 0; (p = teNextIterator(pi)) != NULL; oc++) {
- rpmDepSet this;
+ for (pi = rpmteiInit(ts), oc = 0; (p = rpmteiNext(pi, 0)) != NULL; oc++) {
+ rpmds this;
/* XXX Only added packages need be checked for dupes. */
- if (teGetType(p) == TR_REMOVED)
+ if (rpmteType(p) == TR_REMOVED)
continue;
- if ((this = teGetDS(p, RPMTAG_NAME)) == NULL)
+ if ((this = rpmteDS(p, RPMTAG_NAME)) == NULL)
continue; /* XXX can't happen */
- rc = dsCompare(add, this);
+ rc = rpmdsCompare(add, this);
if (rc != 0) {
- const char * pkgNEVR = dsiGetDNEVR(this);
- const char * addNEVR = dsiGetDNEVR(add);
+ const char * pkgNEVR = rpmdsDNEVR(this);
+ const char * addNEVR = rpmdsDNEVR(add);
rpmMessage(RPMMESS_WARNING,
_("package %s was already added, replacing with %s\n"),
(pkgNEVR ? pkgNEVR + 2 : "?pkgNEVR?"),
(addNEVR ? addNEVR + 2 : "?addNEVR?"));
duplicate = 1;
- pkgKey = teGetAddedKey(p);
+ pkgKey = rpmteAddedKey(p);
break;
}
}
- pi = teFreeIterator(pi);
- add = dsFree(add);
+ pi = rpmteiFree(pi);
+ add = rpmdsFree(add);
isSource = headerIsEntry(h, RPMTAG_SOURCEPACKAGE);
if (p != NULL && duplicate && oc < ts->orderCount) {
/* XXX FIXME removed transaction element side effects need to be weeded */
/*@-type -unqualifiedtrans@*/
- ts->order[oc] = teFree(ts->order[oc]);
+ ts->order[oc] = rpmteFree(ts->order[oc]);
/*@=type =unqualifiedtrans@*/
}
@@ -179,20 +180,20 @@ int rpmtsAddPackage(rpmTransactionSet ts, Header h,
/*@=type =voidabstract @*/
}
- p = teNew(ts, h, TR_ADDED, key, relocs, -1, pkgKey);
+ p = rpmteNew(ts, h, TR_ADDED, key, relocs, -1, pkgKey);
ts->order[oc] = p;
if (!duplicate)
ts->orderCount++;
- pkgKey = alAddPackage(&ts->addedPackages, pkgKey, teGetKey(p),
- teGetDS(p, RPMTAG_PROVIDENAME),
- teGetFI(p, RPMTAG_BASENAMES));
+ pkgKey = alAddPackage(&ts->addedPackages, pkgKey, rpmteKey(p),
+ rpmteDS(p, RPMTAG_PROVIDENAME),
+ rpmteFI(p, RPMTAG_BASENAMES));
if (pkgKey == RPMAL_NOMATCH) {
- ts->order[oc] = teFree(ts->order[oc]);
+ ts->order[oc] = rpmteFree(ts->order[oc]);
ec = 1;
goto exit;
}
- (void) teSetAddedKey(p, pkgKey);
+ (void) rpmteSetAddedKey(p, pkgKey);
#ifdef NOYET
/* XXX this needs a search over ts->order, not ts->addedPackages */
@@ -207,12 +208,12 @@ int rpmtsAddPackage(rpmTransactionSet ts, Header h,
if (multiLibMask) {
for (i = 0; i < pkgNum - 1; i++) {
- if (!strcmp (teGetN(p), al->list[i].name)
+ if (!strcmp (rpmteN(p), al->list[i].name)
&& hge(al->list[i].h, RPMTAG_MULTILIBS, NULL,
(void **) &pp, NULL)
&& !rpmVersionCompare(p->h, al->list[i].h)
&& *pp && !(*pp & multiLibMask))
- (void) teSetMultiLib(p, multiLibMask);
+ (void) rpmteSetMultiLib(p, multiLibMask);
}
}
}
@@ -238,7 +239,7 @@ int rpmtsAddPackage(rpmTransactionSet ts, Header h,
{ rpmdbMatchIterator mi;
Header h2;
- mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, teGetN(p), 0);
+ mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, rpmteN(p), 0);
while((h2 = rpmdbNextIterator(mi)) != NULL) {
if (rpmVersionCompare(h, h2))
xx = removePackage(ts, h2, rpmdbGetIteratorOffset(mi), pkgKey);
@@ -252,24 +253,24 @@ int rpmtsAddPackage(rpmTransactionSet ts, Header h,
if (oldmultiLibMask && multiLibMask
&& !(oldmultiLibMask & multiLibMask))
{
- (void) teSetMultiLib(p, multiLibMask);
+ (void) rpmteSetMultiLib(p, multiLibMask);
}
}
}
mi = rpmdbFreeIterator(mi);
}
- obsoletes = rpmdsLink(teGetDS(p, RPMTAG_OBSOLETENAME), "Obsoletes");
- obsoletes = dsiInit(obsoletes);
+ obsoletes = rpmdsLink(rpmteDS(p, RPMTAG_OBSOLETENAME), "Obsoletes");
+ obsoletes = rpmdsInit(obsoletes);
if (obsoletes != NULL)
- while (dsiNext(obsoletes) >= 0) {
+ while (rpmdsNext(obsoletes) >= 0) {
const char * Name;
- if ((Name = dsiGetN(obsoletes)) == NULL)
+ if ((Name = rpmdsN(obsoletes)) == NULL)
continue; /* XXX can't happen */
/* XXX avoid self-obsoleting packages. */
- if (!strcmp(teGetN(p), Name))
+ if (!strcmp(rpmteN(p), Name))
continue;
{ rpmdbMatchIterator mi;
@@ -285,36 +286,36 @@ int rpmtsAddPackage(rpmTransactionSet ts, Header h,
* Rpm prior to 3.0.3 does not have versioned obsoletes.
* If no obsoletes version info is available, match all names.
*/
- if (dsiGetEVR(obsoletes) == NULL
+ if (rpmdsEVR(obsoletes) == NULL
|| headerMatchesDepFlags(h2, obsoletes))
xx = removePackage(ts, h2, rpmdbGetIteratorOffset(mi), pkgKey);
}
mi = rpmdbFreeIterator(mi);
}
}
- obsoletes = dsFree(obsoletes);
+ obsoletes = rpmdsFree(obsoletes);
ec = 0;
exit:
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
return ec;
}
-void rpmtsAvailablePackage(rpmTransactionSet ts, Header h, fnpyKey key)
+void rpmtsAvailablePackage(rpmts ts, Header h, fnpyKey key)
{
int scareMem = 0;
- rpmDepSet provides = dsNew(h, RPMTAG_PROVIDENAME, scareMem);
- TFI_t fi = fiNew(ts, NULL, h, RPMTAG_BASENAMES, scareMem);
+ rpmds provides = rpmdsNew(h, RPMTAG_PROVIDENAME, scareMem);
+ rpmfi fi = rpmfiNew(ts, NULL, h, RPMTAG_BASENAMES, scareMem);
/* XXX FIXME: return code RPMAL_NOMATCH is error */
(void) alAddPackage(&ts->availablePackages, RPMAL_NOMATCH, key,
provides, fi);
- fi = fiFree(fi, 1);
- provides = dsFree(provides);
+ fi = rpmfiFree(fi, 1);
+ provides = rpmdsFree(provides);
}
-int rpmtsRemovePackage(rpmTransactionSet ts, Header h, int dboffset)
+int rpmtsRemovePackage(rpmts ts, Header h, int dboffset)
{
return removePackage(ts, h, dboffset, RPMAL_NOMATCH);
}
@@ -326,7 +327,7 @@ int rpmtsRemovePackage(rpmTransactionSet ts, Header h, int dboffset)
* @param dep dependency
* @return 0 if satisfied, 1 if not satisfied, 2 if error
*/
-static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet dep)
+static int unsatisfiedDepend(rpmts ts, rpmds dep)
/*@globals _cacheDependsRC, fileSystem @*/
/*@modifies ts, _cacheDependsRC, fileSystem @*/
{
@@ -338,7 +339,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet dep)
int rc;
int xx;
- if ((Name = dsiGetN(dep)) == NULL)
+ if ((Name = rpmdsN(dep)) == NULL)
return 0; /* XXX can't happen */
/*
@@ -354,7 +355,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet dep)
rc = -1;
/*@-branchstate@*/
- if ((DNEVR = dsiGetDNEVR(dep)) != NULL) {
+ if ((DNEVR = rpmdsDNEVR(dep)) != NULL) {
DBC * dbcursor = NULL;
void * datap = NULL;
size_t datalen = 0;
@@ -381,7 +382,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet dep)
/*@=branchstate@*/
if (rc >= 0) {
- dsiNotify(dep, _("(cached)"), rc);
+ rpmdsNotify(dep, _("(cached)"), rc);
return rc;
}
}
@@ -392,7 +393,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet dep)
#if defined(DYING) || defined(__LCLINT__)
{ static /*@observer@*/ const char noProvidesString[] = "nada";
static /*@observer@*/ const char * rcProvidesString = noProvidesString;
- int_32 Flags = dsiGetFlags(dep);
+ int_32 Flags = rpmdsFlags(dep);
const char * start;
int i;
@@ -406,7 +407,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet dep)
while ((start = strstr(rcProvidesString, Name))) {
/*@=observertrans =mayaliasunique@*/
if (xisspace(start[i]) || start[i] == '\0' || start[i] == ',') {
- dsiNotify(dep, _("(rpmrc provides)"), rc);
+ rpmdsNotify(dep, _("(rpmrc provides)"), rc);
goto exit;
}
rcProvidesString = start + 1;
@@ -422,7 +423,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet dep)
*/
if (!strncmp(Name, "rpmlib(", sizeof("rpmlib(")-1)) {
if (rpmCheckRpmlibProvides(dep)) {
- dsiNotify(dep, _("(rpmlib provides)"), rc);
+ rpmdsNotify(dep, _("(rpmlib provides)"), rc);
goto exit;
}
goto unsatisfied;
@@ -443,7 +444,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet dep)
ts->removedPackages, ts->numRemovedPackages, 1);
while ((h = rpmdbNextIterator(mi)) != NULL) {
- dsiNotify(dep, _("(db files)"), rc);
+ rpmdsNotify(dep, _("(db files)"), rc);
mi = rpmdbFreeIterator(mi);
goto exit;
}
@@ -455,7 +456,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet dep)
ts->removedPackages, ts->numRemovedPackages, 1);
while ((h = rpmdbNextIterator(mi)) != NULL) {
if (rangeMatchesDepFlags(h, dep)) {
- dsiNotify(dep, _("(db provides)"), rc);
+ rpmdsNotify(dep, _("(db provides)"), rc);
mi = rpmdbFreeIterator(mi);
goto exit;
}
@@ -468,7 +469,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet dep)
ts->removedPackages, ts->numRemovedPackages, 1);
while ((h = rpmdbNextIterator(mi)) != NULL) {
if (rangeMatchesDepFlags(h, dep)) {
- dsiNotify(dep, _("(db package)"), rc);
+ rpmdsNotify(dep, _("(db package)"), rc);
mi = rpmdbFreeIterator(mi);
goto exit;
}
@@ -486,7 +487,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet dep)
unsatisfied:
rc = 1; /* dependency is unsatisfied */
- dsiNotify(dep, NULL, rc);
+ rpmdsNotify(dep, NULL, rc);
exit:
/*
@@ -501,7 +502,7 @@ exit:
const char * DNEVR;
xx = 0;
/*@-branchstate@*/
- if ((DNEVR = dsiGetDNEVR(dep)) != NULL) {
+ if ((DNEVR = rpmdsDNEVR(dep)) != NULL) {
DBC * dbcursor = NULL;
size_t DNEVRlen = strlen(DNEVR);
@@ -537,8 +538,8 @@ exit:
* @param multiLib skip multilib colored dependencies?
* @return 0 no problems found
*/
-static int checkPackageDeps(rpmTransactionSet ts, const char * pkgNEVR,
- /*@null@*/ rpmDepSet requires, /*@null@*/ rpmDepSet conflicts,
+static int checkPackageDeps(rpmts ts, const char * pkgNEVR,
+ /*@null@*/ rpmds requires, /*@null@*/ rpmds conflicts,
/*@null@*/ const char * depName, uint_32 multiLib)
/*@globals fileSystem @*/
/*@modifies ts, requires, conflicts, fileSystem */
@@ -548,18 +549,18 @@ static int checkPackageDeps(rpmTransactionSet ts, const char * pkgNEVR,
int rc;
int ourrc = 0;
- requires = dsiInit(requires);
+ requires = rpmdsInit(requires);
if (requires != NULL)
- while (!ourrc && dsiNext(requires) >= 0) {
+ while (!ourrc && rpmdsNext(requires) >= 0) {
- if ((Name = dsiGetN(requires)) == NULL)
+ if ((Name = rpmdsN(requires)) == NULL)
continue; /* XXX can't happen */
/* Filter out requires that came along for the ride. */
if (depName != NULL && strcmp(depName, Name))
continue;
- Flags = dsiGetFlags(requires);
+ Flags = rpmdsFlags(requires);
/* If this requirement comes from the core package only, not libraries,
then if we're installing the libraries only, don't count it in. */
@@ -581,7 +582,7 @@ static int checkPackageDeps(rpmTransactionSet ts, const char * pkgNEVR,
}
/*@=branchstate@*/
- dsProblem(ts->probs, pkgNEVR, requires, suggestedKeys);
+ rpmdsProblem(ts->probs, pkgNEVR, requires, suggestedKeys);
}
/*@switchbreak@*/ break;
@@ -592,18 +593,18 @@ static int checkPackageDeps(rpmTransactionSet ts, const char * pkgNEVR,
}
}
- conflicts = dsiInit(conflicts);
+ conflicts = rpmdsInit(conflicts);
if (conflicts != NULL)
- while (!ourrc && dsiNext(conflicts) >= 0) {
+ while (!ourrc && rpmdsNext(conflicts) >= 0) {
- if ((Name = dsiGetN(conflicts)) == NULL)
+ if ((Name = rpmdsN(conflicts)) == NULL)
continue; /* XXX can't happen */
/* Filter out conflicts that came along for the ride. */
if (depName != NULL && strcmp(depName, Name))
continue;
- Flags = dsiGetFlags(conflicts);
+ Flags = rpmdsFlags(conflicts);
/* If this requirement comes from the core package only, not libraries,
then if we're installing the libraries only, don't count it in. */
@@ -615,7 +616,7 @@ static int checkPackageDeps(rpmTransactionSet ts, const char * pkgNEVR,
/* 1 == unsatisfied, 0 == satsisfied */
switch (rc) {
case 0: /* conflicts exist. */
- dsProblem(ts->probs, pkgNEVR, conflicts, NULL);
+ rpmdsProblem(ts->probs, pkgNEVR, conflicts, NULL);
/*@switchbreak@*/ break;
case 1: /* conflicts don't exist. */
/*@switchbreak@*/ break;
@@ -638,7 +639,7 @@ static int checkPackageDeps(rpmTransactionSet ts, const char * pkgNEVR,
* @param mi rpm database iterator
* @return 0 no problems found
*/
-static int checkPackageSet(rpmTransactionSet ts,
+static int checkPackageSet(rpmts ts,
const char * dep, /*@only@*/ /*@null@*/ rpmdbMatchIterator mi)
/*@globals fileSystem @*/
/*@modifies ts, mi, fileSystem @*/
@@ -651,15 +652,15 @@ static int checkPackageSet(rpmTransactionSet ts,
ts->removedPackages, ts->numRemovedPackages, 1);
while ((h = rpmdbNextIterator(mi)) != NULL) {
const char * pkgNEVR;
- rpmDepSet requires, conflicts;
+ rpmds requires, conflicts;
int rc;
pkgNEVR = hGetNEVR(h, NULL);
- requires = dsNew(h, RPMTAG_REQUIRENAME, scareMem);
- conflicts = dsNew(h, RPMTAG_CONFLICTNAME, scareMem);
+ requires = rpmdsNew(h, RPMTAG_REQUIRENAME, scareMem);
+ conflicts = rpmdsNew(h, RPMTAG_CONFLICTNAME, scareMem);
rc = checkPackageDeps(ts, pkgNEVR, requires, conflicts, dep, 0);
- conflicts = dsFree(conflicts);
- requires = dsFree(requires);
+ conflicts = rpmdsFree(conflicts);
+ requires = rpmdsFree(requires);
pkgNEVR = _free(pkgNEVR);
if (rc) {
@@ -678,7 +679,7 @@ static int checkPackageSet(rpmTransactionSet ts,
* @param dep requires name
* @return 0 no problems found
*/
-static int checkDependentPackages(rpmTransactionSet ts, const char * dep)
+static int checkDependentPackages(rpmts ts, const char * dep)
/*@globals fileSystem @*/
/*@modifies ts, fileSystem @*/
{
@@ -693,7 +694,7 @@ static int checkDependentPackages(rpmTransactionSet ts, const char * dep)
* @param dep conflicts name
* @return 0 no problems found
*/
-static int checkDependentConflicts(rpmTransactionSet ts, const char * dep)
+static int checkDependentConflicts(rpmts ts, const char * dep)
/*@globals fileSystem @*/
/*@modifies ts, fileSystem @*/
{
@@ -776,8 +777,7 @@ static void freeBadDeps(void)
* @param q predecessor element (i.e. with Provides: )
* @return 1 if dependency is to be ignored.
*/
-static int ignoreDep(const transactionElement p,
- const transactionElement q)
+static int ignoreDep(const rpmte p, const rpmte q)
/*@globals badDeps, badDepsInitialized @*/
/*@modifies badDeps, badDepsInitialized @*/
{
@@ -823,7 +823,7 @@ static int ignoreDep(const transactionElement p,
/*@-compdef@*/
if (badDeps != NULL)
for (bdp = badDeps; bdp->pname != NULL && bdp->qname != NULL; bdp++) {
- if (!strcmp(teGetN(p), bdp->pname) && !strcmp(teGetN(q), bdp->qname))
+ if (!strcmp(rpmteN(p), bdp->pname) && !strcmp(rpmteN(q), bdp->qname))
return 1;
}
return 0;
@@ -835,23 +835,23 @@ static int ignoreDep(const transactionElement p,
* @param tsi successor chain
* @param q predecessor
*/
-static void markLoop(/*@special@*/ tsortInfo tsi, transactionElement q)
+static void markLoop(/*@special@*/ tsortInfo tsi, rpmte q)
/*@globals internalState @*/
/*@uses tsi @*/
/*@modifies internalState @*/
{
- transactionElement p;
+ rpmte p;
/*@-branchstate@*/ /* FIX: q is kept */
while (tsi != NULL && (p = tsi->tsi_suc) != NULL) {
tsi = tsi->tsi_next;
- if (teGetTSI(p)->tsi_chain != NULL)
+ if (rpmteTSI(p)->tsi_chain != NULL)
continue;
/*@-assignexpose -temptrans@*/
- teGetTSI(p)->tsi_chain = q;
+ rpmteTSI(p)->tsi_chain = q;
/*@=assignexpose =temptrans@*/
- if (teGetTSI(p)->tsi_next != NULL)
- markLoop(teGetTSI(p)->tsi_next, p);
+ if (rpmteTSI(p)->tsi_next != NULL)
+ markLoop(rpmteTSI(p)->tsi_next, p);
}
/*@=branchstate@*/
}
@@ -891,8 +891,8 @@ static inline /*@observer@*/ const char * const identifyDepend(int_32 f)
*/
/*@-mustmod@*/ /* FIX: hack modifies, but -type disables */
static /*@owned@*/ /*@null@*/ const char *
-zapRelation(transactionElement q, transactionElement p,
- /*@null@*/ rpmDepSet requires,
+zapRelation(rpmte q, rpmte p,
+ /*@null@*/ rpmds requires,
int zap, /*@in@*/ /*@out@*/ int * nzaps)
/*@modifies q, p, requires, *nzaps @*/
{
@@ -900,7 +900,7 @@ zapRelation(transactionElement q, transactionElement p,
tsortInfo tsi;
const char *dp = NULL;
- for (tsi_prev = teGetTSI(q), tsi = teGetTSI(q)->tsi_next;
+ for (tsi_prev = rpmteTSI(q), tsi = rpmteTSI(q)->tsi_next;
tsi != NULL;
/* XXX Note: the loop traverses "not found", break on "found". */
/*@-nullderef@*/
@@ -916,11 +916,11 @@ zapRelation(transactionElement q, transactionElement p,
if (requires == NULL) continue; /* XXX can't happen */
- (void) dsiSetIx(requires, tsi->tsi_reqx);
+ (void) rpmdsSetIx(requires, tsi->tsi_reqx);
- Flags = dsiGetFlags(requires);
+ Flags = rpmdsFlags(requires);
- dp = dsDNEVR( identifyDepend(Flags), requires);
+ dp = rpmdsNewDNEVR( identifyDepend(Flags), requires);
/*
* Attempt to unravel a dependency loop by eliminating Requires's.
@@ -929,8 +929,8 @@ zapRelation(transactionElement q, transactionElement p,
if (zap && !(Flags & RPMSENSE_PREREQ)) {
rpmMessage(RPMMESS_DEBUG,
_("removing %s \"%s\" from tsort relations.\n"),
- (teGetNEVR(p) ? teGetNEVR(p) : "???"), dp);
- teGetTSI(p)->tsi_count--;
+ (rpmteNEVR(p) ? rpmteNEVR(p) : "???"), dp);
+ rpmteTSI(p)->tsi_count--;
if (tsi_prev) tsi_prev->tsi_next = tsi->tsi_next;
tsi->tsi_next = NULL;
tsi->tsi_suc = NULL;
@@ -969,21 +969,21 @@ if (_tso_debug) {
* @return 0 always
*/
/*@-mustmod@*/
-static inline int addRelation(rpmTransactionSet ts,
- /*@dependent@*/ transactionElement p,
+static inline int addRelation(rpmts ts,
+ /*@dependent@*/ rpmte p,
unsigned char * selected,
- rpmDepSet requires)
+ rpmds requires)
/*@globals fileSystem @*/
/*@modifies ts, p, *selected, fileSystem @*/
{
- teIterator qi; transactionElement q;
+ rpmtei qi; rpmte q;
tsortInfo tsi;
const char * Name;
fnpyKey key;
alKey pkgKey;
int i = 0;
- if ((Name = dsiGetN(requires)) == NULL)
+ if ((Name = rpmdsN(requires)) == NULL)
return 0; /* XXX can't happen */
/* Avoid rpmlib feature dependencies. */
@@ -1002,14 +1002,16 @@ fprintf(stderr, "addRelation: pkgKey %ld\n", (long)pkgKey);
/* XXX Set q to the added package that has pkgKey == q->u.addedKey */
/* XXX FIXME: bsearch is possible/needed here */
- for (qi = teInitIterator(ts), i = 0; (q = teNextIterator(qi)) != NULL; i++) {
+ for (qi = rpmteiInit(ts), i = 0; (q = rpmteiNext(qi, 0)) != NULL; i++) {
+
/* XXX Only added packages need be checked for matches. */
- if (teGetType(q) == TR_REMOVED)
+ if (rpmteType(q) == TR_REMOVED)
continue;
- if (pkgKey == teGetAddedKey(q))
+
+ if (pkgKey == rpmteAddedKey(q))
break;
}
- qi = teFreeIterator(qi);
+ qi = rpmteiFree(qi);
if (q == NULL || i == ts->orderCount)
return 0;
@@ -1019,7 +1021,7 @@ fprintf(stderr, "addRelation: pkgKey %ld\n", (long)pkgKey);
/*@-nullpass -nullderef -formattype@*/
if (_tso_debug)
-fprintf(stderr, "addRelation: q %p(%s) from %p[%d:%d]\n", q, teGetN(q), ts->order, i, ts->orderCount);
+fprintf(stderr, "addRelation: q %p(%s) from %p[%d:%d]\n", q, rpmteN(q), ts->order, i, ts->orderCount);
/*@=nullpass =nullderef =formattype@*/
/* Avoid redundant relations. */
@@ -1033,37 +1035,37 @@ fprintf(stderr, "addRelation: selected[%d] = 1\n", i);
/*@=nullpass@*/
/* T3. Record next "q <- p" relation (i.e. "p" requires "q"). */
- teGetTSI(p)->tsi_count++; /* bump p predecessor count */
+ rpmteTSI(p)->tsi_count++; /* bump p predecessor count */
- if (teGetDepth(p) <= teGetDepth(q)) /* Save max. depth in dependency tree */
- (void) teSetDepth(p, (teGetDepth(q) + 1));
+ if (rpmteDepth(p) <= rpmteDepth(q)) /* Save max. depth in dependency tree */
+ (void) rpmteSetDepth(p, (rpmteDepth(q) + 1));
/*@-nullpass@*/
if (_tso_debug)
-/*@i@*/ fprintf(stderr, "addRelation: p %p(%s) depth %d", p, teGetN(p), teGetDepth(p));
-prtTSI(NULL, teGetTSI(p));
+/*@i@*/ fprintf(stderr, "addRelation: p %p(%s) depth %d", p, rpmteN(p), rpmteDepth(p));
+prtTSI(NULL, rpmteTSI(p));
/*@=nullpass@*/
tsi = xcalloc(1, sizeof(*tsi));
tsi->tsi_suc = p;
- tsi->tsi_reqx = dsiGetIx(requires);
+ tsi->tsi_reqx = rpmdsIx(requires);
- tsi->tsi_next = teGetTSI(q)->tsi_next;
+ tsi->tsi_next = rpmteTSI(q)->tsi_next;
/*@-nullpass -compmempass@*/
prtTSI("addRelation: new", tsi);
if (_tso_debug)
-/*@i@*/ fprintf(stderr, "addRelation: BEFORE q %p(%s)", q, teGetN(q));
-prtTSI(NULL, teGetTSI(q));
+/*@i@*/ fprintf(stderr, "addRelation: BEFORE q %p(%s)", q, rpmteN(q));
+prtTSI(NULL, rpmteTSI(q));
/*@=nullpass =compmempass@*/
/*@-mods@*/
- teGetTSI(q)->tsi_next = tsi;
- teGetTSI(q)->tsi_qcnt++; /* bump q successor count */
+ rpmteTSI(q)->tsi_next = tsi;
+ rpmteTSI(q)->tsi_qcnt++; /* bump q successor count */
/*@=mods@*/
/*@-nullpass -compmempass@*/
if (_tso_debug)
-/*@i@*/ fprintf(stderr, "addRelation: AFTER q %p(%s)", q, teGetN(q));
-prtTSI(NULL, teGetTSI(q));
+/*@i@*/ fprintf(stderr, "addRelation: AFTER q %p(%s)", q, rpmteN(q));
+prtTSI(NULL, rpmteTSI(q));
/*@=nullpass =compmempass@*/
return 0;
}
@@ -1091,15 +1093,15 @@ static int orderListIndexCmp(const void * one, const void * two) /*@*/
* @retval rp address of last element
*/
/*@-mustmod@*/
-static void addQ(/*@dependent@*/ transactionElement p,
- /*@in@*/ /*@out@*/ transactionElement * qp,
- /*@in@*/ /*@out@*/ transactionElement * rp)
+static void addQ(/*@dependent@*/ rpmte p,
+ /*@in@*/ /*@out@*/ rpmte * qp,
+ /*@in@*/ /*@out@*/ rpmte * rp)
/*@modifies p, *qp, *rp @*/
{
- transactionElement q, qprev;
+ rpmte q, qprev;
/* Mark the package as queued. */
- teGetTSI(p)->tsi_reqx = 1;
+ rpmteTSI(p)->tsi_reqx = 1;
if ((*rp) == NULL) { /* 1st element */
/*@-dependenttrans@*/ /* FIX: double indirection */
@@ -1111,32 +1113,32 @@ static void addQ(/*@dependent@*/ transactionElement p,
/* Find location in queue using metric tsi_qcnt. */
for (qprev = NULL, q = (*qp);
q != NULL;
- qprev = q, q = teGetTSI(q)->tsi_suc)
+ qprev = q, q = rpmteTSI(q)->tsi_suc)
{
- if (teGetTSI(q)->tsi_qcnt <= teGetTSI(p)->tsi_qcnt)
+ if (rpmteTSI(q)->tsi_qcnt <= rpmteTSI(p)->tsi_qcnt)
break;
}
if (qprev == NULL) { /* insert at beginning of list */
- teGetTSI(p)->tsi_suc = q;
+ rpmteTSI(p)->tsi_suc = q;
/*@-dependenttrans@*/
(*qp) = p; /* new head */
/*@=dependenttrans@*/
} else if (q == NULL) { /* insert at end of list */
- teGetTSI(qprev)->tsi_suc = p;
+ rpmteTSI(qprev)->tsi_suc = p;
/*@-dependenttrans@*/
(*rp) = p; /* new tail */
/*@=dependenttrans@*/
} else { /* insert between qprev and q */
- teGetTSI(p)->tsi_suc = q;
- teGetTSI(qprev)->tsi_suc = p;
+ rpmteTSI(p)->tsi_suc = q;
+ rpmteTSI(qprev)->tsi_suc = p;
}
}
/*@=mustmod@*/
-int rpmtsOrder(rpmTransactionSet ts)
+int rpmtsOrder(rpmts ts)
{
- rpmDepSet requires;
+ rpmds requires;
int_32 Flags;
#ifdef DYING
@@ -1144,16 +1146,16 @@ int rpmtsOrder(rpmTransactionSet ts)
#else
int chainsaw = 1;
#endif
- teIterator pi; transactionElement p;
- teIterator qi; transactionElement q;
- teIterator ri; transactionElement r;
+ rpmtei pi; rpmte p;
+ rpmtei qi; rpmte q;
+ rpmtei ri; rpmte r;
tsortInfo tsi;
tsortInfo tsi_next;
alKey * ordering;
int orderingCount = 0;
unsigned char * selected = alloca(sizeof(*selected) * (ts->orderCount + 1));
int loopcheck;
- transactionElement * newOrder;
+ rpmte * newOrder;
int newOrderCount = 0;
orderListIndex orderList;
int numOrderList;
@@ -1190,35 +1192,35 @@ fprintf(stderr, "*** rpmtsOrder(%p) order %p[%d]\n", ts, ts->order, ts->orderCou
ordering = alloca(sizeof(*ordering) * (numOrderList + 1));
loopcheck = numOrderList;
- pi = teInitIterator(ts);
- while ((p = teNext(pi, oType)) != NULL)
- teNewTSI(p);
- pi = teFreeIterator(pi);
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, oType)) != NULL)
+ rpmteNewTSI(p);
+ pi = rpmteiFree(pi);
/* Record all relations. */
rpmMessage(RPMMESS_DEBUG, _("========== recording tsort relations\n"));
- pi = teInitIterator(ts);
+ pi = rpmteiInit(ts);
/* XXX Only added packages are ordered (for now). */
- while ((p = teNext(pi, oType)) != NULL) {
+ while ((p = rpmteiNext(pi, oType)) != NULL) {
- if ((requires = teGetDS(p, RPMTAG_REQUIRENAME)) == NULL)
+ if ((requires = rpmteDS(p, RPMTAG_REQUIRENAME)) == NULL)
continue;
memset(selected, 0, sizeof(*selected) * ts->orderCount);
/* Avoid narcisstic relations. */
- selected[teiGetOc(pi)] = 1;
+ selected[rpmteiGetOc(pi)] = 1;
/* T2. Next "q <- p" relation. */
/* First, do pre-requisites. */
- requires = dsiInit(requires);
+ requires = rpmdsInit(requires);
if (requires != NULL)
- while (dsiNext(requires) >= 0) {
+ while (rpmdsNext(requires) >= 0) {
- Flags = dsiGetFlags(requires);
+ Flags = rpmdsFlags(requires);
- switch (teGetType(p)) {
+ switch (rpmteType(p)) {
case TR_REMOVED:
/* Skip if not %preun/%postun requires or legacy prereq. */
if (isInstallPreReq(Flags)
@@ -1243,13 +1245,13 @@ fprintf(stderr, "*** rpmtsOrder(%p) order %p[%d]\n", ts, ts->order, ts->orderCou
}
/* Then do co-requisites. */
- requires = dsiInit(requires);
+ requires = rpmdsInit(requires);
if (requires != NULL)
- while (dsiNext(requires) >= 0) {
+ while (rpmdsNext(requires) >= 0) {
- Flags = dsiGetFlags(requires);
+ Flags = rpmdsFlags(requires);
- switch (teGetType(p)) {
+ switch (rpmteType(p)) {
case TR_REMOVED:
/* Skip if %preun/%postun requires or legacy prereq. */
if (isInstallPreReq(Flags)
@@ -1273,69 +1275,69 @@ fprintf(stderr, "*** rpmtsOrder(%p) order %p[%d]\n", ts, ts->order, ts->orderCou
}
}
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
/* Save predecessor count and mark tree roots. */
treex = 0;
- pi = teInitIterator(ts);
- while ((p = teNext(pi, oType)) != NULL) {
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, oType)) != NULL) {
int npreds;
- npreds = teGetTSI(p)->tsi_count;
+ npreds = rpmteTSI(p)->tsi_count;
- (void) teSetNpreds(p, npreds);
+ (void) rpmteSetNpreds(p, npreds);
if (npreds == 0)
- (void) teSetTree(p, treex++);
+ (void) rpmteSetTree(p, treex++);
else
- (void) teSetTree(p, -1);
+ (void) rpmteSetTree(p, -1);
#ifdef UNNECESSARY
- (void) teSetParent(p, NULL);
+ (void) rpmteSetParent(p, NULL);
#endif
/*@-modfilesystem -nullpass @*/
if (_tso_debug)
-/*@i@*/ fprintf(stderr, "\t+++ %p[%d] %s npreds %d\n", p, teiGetOc(pi), teGetNEVR(p), teGetNpreds(p));
+/*@i@*/ fprintf(stderr, "\t+++ %p[%d] %s npreds %d\n", p, rpmteiGetOc(pi), rpmteNEVR(p), rpmteNpreds(p));
/*@=modfilesystem =nullpass @*/
}
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
/* T4. Scan for zeroes. */
rpmMessage(RPMMESS_DEBUG, _("========== tsorting packages (order, #predecessors, #succesors, tree, depth)\n"));
rescan:
- if (pi != NULL) pi = teFreeIterator(pi);
+ if (pi != NULL) pi = rpmteiFree(pi);
q = r = NULL;
qlen = 0;
- pi = teInitIterator(ts);
- while ((p = teNext(pi, oType)) != NULL) {
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, oType)) != NULL) {
/* Prefer packages in chainsaw or presentation order. */
if (!chainsaw)
- teGetTSI(p)->tsi_qcnt = (ts->orderCount - teiGetOc(pi));
+ rpmteTSI(p)->tsi_qcnt = (ts->orderCount - rpmteiGetOc(pi));
- if (teGetTSI(p)->tsi_count != 0)
+ if (rpmteTSI(p)->tsi_count != 0)
continue;
- teGetTSI(p)->tsi_suc = NULL;
+ rpmteTSI(p)->tsi_suc = NULL;
addQ(p, &q, &r);
qlen++;
/*@-modfilesystem -nullpass @*/
if (_tso_debug)
-/*@i@*/ fprintf(stderr, "\t+++ addQ ++ qlen %d p %p(%s)", qlen, p, teGetNEVR(p));
-prtTSI(" p", teGetTSI(p));
+/*@i@*/ fprintf(stderr, "\t+++ addQ ++ qlen %d p %p(%s)", qlen, p, rpmteNEVR(p));
+prtTSI(" p", rpmteTSI(p));
/*@=modfilesystem =nullpass @*/
}
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
/* T5. Output front of queue (T7. Remove from queue.) */
- for (; q != NULL; q = teGetTSI(q)->tsi_suc) {
+ for (; q != NULL; q = rpmteTSI(q)->tsi_suc) {
/* Mark the package as unqueued. */
- teGetTSI(q)->tsi_reqx = 0;
+ rpmteTSI(q)->tsi_reqx = 0;
if (oType != 0)
- switch (teGetType(q)) {
+ switch (rpmteType(q)) {
case TR_ADDED:
if (!(oType & TR_ADDED))
continue;
@@ -1348,66 +1350,66 @@ prtTSI(" p", teGetTSI(p));
continue;
/*@notreached@*/ /*@switchbreak@*/ break;
}
- deptypechar = (teGetType(q) == TR_REMOVED ? '-' : '+');
+ deptypechar = (rpmteType(q) == TR_REMOVED ? '-' : '+');
rpmMessage(RPMMESS_DEBUG, "%5d%5d%5d%5d%5d %*s%c%s\n",
- orderingCount, teGetNpreds(q),
- teGetTSI(q)->tsi_qcnt, teGetTree(q), teGetDepth(q),
- (2 * teGetDepth(q)), "",
+ orderingCount, rpmteNpreds(q),
+ rpmteTSI(q)->tsi_qcnt, rpmteTree(q), rpmteDepth(q),
+ (2 * rpmteDepth(q)), "",
deptypechar,
- (teGetNEVR(q) ? teGetNEVR(q) : "???"));
+ (rpmteNEVR(q) ? rpmteNEVR(q) : "???"));
- treex = teGetTree(q);
- depth = teGetDepth(q);
- (void) teSetDegree(q, 0);
+ treex = rpmteTree(q);
+ depth = rpmteDepth(q);
+ (void) rpmteSetDegree(q, 0);
- ordering[orderingCount] = teGetAddedKey(q);
+ ordering[orderingCount] = rpmteAddedKey(q);
orderingCount++;
qlen--;
loopcheck--;
/* T6. Erase relations. */
- tsi_next = teGetTSI(q)->tsi_next;
- teGetTSI(q)->tsi_next = NULL;
+ tsi_next = rpmteTSI(q)->tsi_next;
+ rpmteTSI(q)->tsi_next = NULL;
while ((tsi = tsi_next) != NULL) {
tsi_next = tsi->tsi_next;
tsi->tsi_next = NULL;
p = tsi->tsi_suc;
- if (p && (--teGetTSI(p)->tsi_count) <= 0) {
+ if (p && (--rpmteTSI(p)->tsi_count) <= 0) {
- (void) teSetTree(p, treex);
- (void) teSetDepth(p, depth+1);
- (void) teSetParent(p, q);
- (void) teSetDegree(q, teGetDegree(q)+1);
+ (void) rpmteSetTree(p, treex);
+ (void) rpmteSetDepth(p, depth+1);
+ (void) rpmteSetParent(p, q);
+ (void) rpmteSetDegree(q, rpmteDegree(q)+1);
/* XXX TODO: add control bit. */
- teGetTSI(p)->tsi_suc = NULL;
- addQ(p, &teGetTSI(q)->tsi_suc, &r);
+ rpmteTSI(p)->tsi_suc = NULL;
+ addQ(p, &rpmteTSI(q)->tsi_suc, &r);
qlen++;
/*@-modfilesystem -nullpass @*/
if (_tso_debug)
-/*@i@*/ fprintf(stderr, "\t+++ addQ ++ qlen %d p %p(%s)", qlen, p, teGetNEVR(p));
-prtTSI(" p", teGetTSI(p));
+/*@i@*/ fprintf(stderr, "\t+++ addQ ++ qlen %d p %p(%s)", qlen, p, rpmteNEVR(p));
+prtTSI(" p", rpmteTSI(p));
/*@=modfilesystem =nullpass @*/
}
tsi = _free(tsi);
}
- if (!_printed && loopcheck == qlen && teGetTSI(q)->tsi_suc != NULL) {
+ if (!_printed && loopcheck == qlen && rpmteTSI(q)->tsi_suc != NULL) {
_printed++;
rpmMessage(RPMMESS_DEBUG,
_("========== successors only (presentation order)\n"));
/* Relink the queue in presentation order. */
- tsi = teGetTSI(q);
- pi = teInitIterator(ts);
- while ((p = teNext(pi, oType)) != NULL) {
+ tsi = rpmteTSI(q);
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, oType)) != NULL) {
/* Is this element in the queue? */
- if (teGetTSI(p)->tsi_reqx == 0)
+ if (rpmteTSI(p)->tsi_reqx == 0)
/*@innercontinue@*/ continue;
tsi->tsi_suc = p;
- tsi = teGetTSI(p);
+ tsi = rpmteTSI(p);
}
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
tsi->tsi_suc = NULL;
}
}
@@ -1418,51 +1420,51 @@ prtTSI(" p", teGetTSI(p));
/* T9. Initialize predecessor chain. */
nzaps = 0;
- qi = teInitIterator(ts);
- while ((q = teNext(qi, oType)) != NULL) {
- teGetTSI(q)->tsi_chain = NULL;
- teGetTSI(q)->tsi_reqx = 0;
+ qi = rpmteiInit(ts);
+ while ((q = rpmteiNext(qi, oType)) != NULL) {
+ rpmteTSI(q)->tsi_chain = NULL;
+ rpmteTSI(q)->tsi_reqx = 0;
/* Mark packages already sorted. */
- if (teGetTSI(q)->tsi_count == 0)
- teGetTSI(q)->tsi_count = -1;
+ if (rpmteTSI(q)->tsi_count == 0)
+ rpmteTSI(q)->tsi_count = -1;
}
- qi = teFreeIterator(qi);
+ qi = rpmteiFree(qi);
/* T10. Mark all packages with their predecessors. */
- qi = teInitIterator(ts);
- while ((q = teNext(qi, oType)) != NULL) {
- if ((tsi = teGetTSI(q)->tsi_next) == NULL)
+ qi = rpmteiInit(ts);
+ while ((q = rpmteiNext(qi, oType)) != NULL) {
+ if ((tsi = rpmteTSI(q)->tsi_next) == NULL)
continue;
- teGetTSI(q)->tsi_next = NULL;
+ rpmteTSI(q)->tsi_next = NULL;
markLoop(tsi, q);
- teGetTSI(q)->tsi_next = tsi;
+ rpmteTSI(q)->tsi_next = tsi;
}
- qi = teFreeIterator(qi);
+ qi = rpmteiFree(qi);
/* T11. Print all dependency loops. */
- ri = teInitIterator(ts);
- while ((r = teNext(ri, oType)) != NULL)
+ ri = rpmteiInit(ts);
+ while ((r = rpmteiNext(ri, oType)) != NULL)
{
int printed;
printed = 0;
/* T12. Mark predecessor chain, looking for start of loop. */
- for (q = teGetTSI(r)->tsi_chain; q != NULL;
- q = teGetTSI(q)->tsi_chain)
+ for (q = rpmteTSI(r)->tsi_chain; q != NULL;
+ q = rpmteTSI(q)->tsi_chain)
{
- if (teGetTSI(q)->tsi_reqx)
+ if (rpmteTSI(q)->tsi_reqx)
/*@innerbreak@*/ break;
- teGetTSI(q)->tsi_reqx = 1;
+ rpmteTSI(q)->tsi_reqx = 1;
}
/* T13. Print predecessor chain from start of loop. */
- while ((p = q) != NULL && (q = teGetTSI(p)->tsi_chain) != NULL) {
+ while ((p = q) != NULL && (q = rpmteTSI(p)->tsi_chain) != NULL) {
const char * dp;
char buf[4096];
/* Unchain predecessor loop. */
- teGetTSI(p)->tsi_chain = NULL;
+ rpmteTSI(p)->tsi_chain = NULL;
if (!printed) {
rpmMessage(RPMMESS_DEBUG, _("LOOP:\n"));
@@ -1470,16 +1472,16 @@ prtTSI(" p", teGetTSI(p));
}
/* Find (and destroy if co-requisite) "q <- p" relation. */
- requires = teGetDS(p, RPMTAG_REQUIRENAME);
- requires = dsiInit(requires);
+ requires = rpmteDS(p, RPMTAG_REQUIRENAME);
+ requires = rpmdsInit(requires);
if (requires == NULL)
/*@innercontinue@*/ continue; /* XXX can't happen */
dp = zapRelation(q, p, requires, 1, &nzaps);
/* Print next member of loop. */
buf[0] = '\0';
- if (teGetNEVR(p) != NULL)
- (void) stpcpy(buf, teGetNEVR(p));
+ if (rpmteNEVR(p) != NULL)
+ (void) stpcpy(buf, rpmteNEVR(p));
rpmMessage(RPMMESS_DEBUG, " %-40s %s\n", buf,
(dp ? dp : "not found!?!"));
@@ -1487,15 +1489,15 @@ prtTSI(" p", teGetTSI(p));
}
/* Walk (and erase) linear part of predecessor chain as well. */
- for (p = r, q = teGetTSI(r)->tsi_chain; q != NULL;
- p = q, q = teGetTSI(q)->tsi_chain)
+ for (p = r, q = rpmteTSI(r)->tsi_chain; q != NULL;
+ p = q, q = rpmteTSI(q)->tsi_chain)
{
/* Unchain linear part of predecessor loop. */
- teGetTSI(p)->tsi_chain = NULL;
- teGetTSI(p)->tsi_reqx = 0;
+ rpmteTSI(p)->tsi_chain = NULL;
+ rpmteTSI(p)->tsi_reqx = 0;
}
}
- ri = teFreeIterator(ri);
+ ri = rpmteiFree(ri);
/* If a relation was eliminated, then continue sorting. */
/* XXX TODO: add control bit. */
@@ -1511,10 +1513,10 @@ prtTSI(" p", teGetTSI(p));
}
/* Clean up tsort remnants (if any). */
- pi = teInitIterator(ts);
- while ((p = teNextIterator(pi)) != NULL)
- teFreeTSI(p);
- pi = teFreeIterator(pi);
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, 0)) != NULL)
+ rpmteFreeTSI(p);
+ pi = rpmteiFree(pi);
/*
* The order ends up as installed packages followed by removed packages,
@@ -1524,21 +1526,21 @@ prtTSI(" p", teGetTSI(p));
*/
orderList = xcalloc(numOrderList, sizeof(*orderList));
j = 0;
- pi = teInitIterator(ts);
- while ((p = teNext(pi, oType)) != NULL) {
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, oType)) != NULL) {
/* Prepare added package ordering permutation. */
- switch (teGetType(p)) {
+ switch (rpmteType(p)) {
case TR_ADDED:
- orderList[j].pkgKey = teGetAddedKey(p);
+ orderList[j].pkgKey = rpmteAddedKey(p);
/*@switchbreak@*/ break;
case TR_REMOVED:
orderList[j].pkgKey = RPMAL_NOMATCH;
/*@switchbreak@*/ break;
}
- orderList[j].orIndex = teiGetOc(pi);
+ orderList[j].orIndex = rpmteiGetOc(pi);
j++;
}
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
qsort(orderList, numOrderList, sizeof(*orderList), orderListIndexCmp);
@@ -1568,8 +1570,8 @@ prtTSI(" p", teGetTSI(p));
for (j = needle->orIndex + 1; j < ts->orderCount; j++) {
if ((q = ts->order[j]) == NULL)
/*@innerbreak@*/ break;
- if (teGetType(q) == TR_REMOVED
- && teGetDependsOnKey(q) == needle->pkgKey)
+ if (rpmteType(q) == TR_REMOVED
+ && rpmteDependsOnKey(q) == needle->pkgKey)
{
newOrder[newOrderCount++] = q;
ts->order[j] = NULL;
@@ -1596,11 +1598,11 @@ assert(newOrderCount == ts->orderCount);
#ifdef DYING
/* Clean up after dependency checks */
- pi = teInitIterator(ts);
- while ((p = teNextIterator(pi)) != NULL) {
- teCleanDS(p);
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, 0)) != NULL) {
+ rpmteCleanDS(p);
}
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
ts->addedPackages = alFree(ts->addedPackages);
ts->numAddedPackages = 0;
@@ -1646,10 +1648,10 @@ static int rpmdbCloseDBI(/*@null@*/ rpmdb db, int rpmtag)
}
/*@=mustmod =type@*/
-int rpmtsCheck(rpmTransactionSet ts)
+int rpmtsCheck(rpmts ts)
{
rpmdbMatchIterator mi = NULL;
- teIterator pi = NULL; transactionElement p;
+ rpmtei pi = NULL; rpmte p;
int closeatexit = 0;
int xx;
int rc;
@@ -1661,8 +1663,8 @@ int rpmtsCheck(rpmTransactionSet ts)
closeatexit = 1;
}
- ts->probs = rpmProblemSetFree(ts->probs);
- ts->probs = rpmProblemSetCreate();
+ ts->probs = rpmpsFree(ts->probs);
+ ts->probs = rpmpsCreate();
alMakeIndex(ts->addedPackages);
alMakeIndex(ts->availablePackages);
@@ -1671,36 +1673,36 @@ int rpmtsCheck(rpmTransactionSet ts)
* Look at all of the added packages and make sure their dependencies
* are satisfied.
*/
- pi = teInitIterator(ts);
- while ((p = teNext(pi, TR_ADDED)) != NULL) {
- rpmDepSet provides;
-
- rpmMessage(RPMMESS_DEBUG, "========== +++ %s\n" , teGetNEVR(p));
- rc = checkPackageDeps(ts, teGetNEVR(p),
- teGetDS(p, RPMTAG_REQUIRENAME),
- teGetDS(p, RPMTAG_CONFLICTNAME),
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, TR_ADDED)) != NULL) {
+ rpmds provides;
+
+ rpmMessage(RPMMESS_DEBUG, "========== +++ %s\n" , rpmteNEVR(p));
+ rc = checkPackageDeps(ts, rpmteNEVR(p),
+ rpmteDS(p, RPMTAG_REQUIRENAME),
+ rpmteDS(p, RPMTAG_CONFLICTNAME),
NULL,
- teGetMultiLib(p));
+ rpmteMultiLib(p));
if (rc)
goto exit;
#if defined(DYING) || defined(__LCLINT__)
/* XXX all packages now have Provides: name = version-release */
/* Adding: check name against conflicts matches. */
- rc = checkDependentConflicts(ts, teGetN(p));
+ rc = checkDependentConflicts(ts, rpmteN(p));
if (rc)
goto exit;
#endif
rc = 0;
- provides = teGetDS(p, RPMTAG_PROVIDENAME);
- provides = dsiInit(provides);
- if (provides == NULL || dsiGetN(provides) == NULL)
+ provides = rpmteDS(p, RPMTAG_PROVIDENAME);
+ provides = rpmdsInit(provides);
+ if (provides == NULL || rpmdsN(provides) == NULL)
continue;
- while (dsiNext(provides) >= 0) {
+ while (rpmdsNext(provides) >= 0) {
const char * Name;
- if ((Name = dsiGetN(provides)) == NULL)
+ if ((Name = rpmdsN(provides)) == NULL)
/*@innercontinue@*/ continue; /* XXX can't happen */
/* Adding: check provides key against conflicts matches. */
@@ -1712,34 +1714,34 @@ int rpmtsCheck(rpmTransactionSet ts)
if (rc)
goto exit;
}
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
/*
* Look at the removed packages and make sure they aren't critical.
*/
- pi = teInitIterator(ts);
- while ((p = teNext(pi, TR_REMOVED)) != NULL) {
- rpmDepSet provides;
- TFI_t fi;
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, TR_REMOVED)) != NULL) {
+ rpmds provides;
+ rpmfi fi;
- rpmMessage(RPMMESS_DEBUG, "========== --- %s\n" , teGetNEVR(p));
+ rpmMessage(RPMMESS_DEBUG, "========== --- %s\n" , rpmteNEVR(p));
#if defined(DYING) || defined(__LCLINT__)
/* XXX all packages now have Provides: name = version-release */
/* Erasing: check name against requiredby matches. */
- rc = checkDependentPackages(ts, teGetN(p));
+ rc = checkDependentPackages(ts, rpmteN(p));
if (rc)
goto exit;
#endif
rc = 0;
- provides = teGetDS(p, RPMTAG_PROVIDENAME);
- provides = dsiInit(provides);
+ provides = rpmteDS(p, RPMTAG_PROVIDENAME);
+ provides = rpmdsInit(provides);
if (provides != NULL)
- while (dsiNext(provides) >= 0) {
+ while (rpmdsNext(provides) >= 0) {
const char * Name;
- if ((Name = dsiGetN(provides)) == NULL)
+ if ((Name = rpmdsN(provides)) == NULL)
/*@innercontinue@*/ continue; /* XXX can't happen */
/* Erasing: check provides against requiredby matches. */
@@ -1752,10 +1754,10 @@ int rpmtsCheck(rpmTransactionSet ts)
goto exit;
rc = 0;
- fi = teGetFI(p, RPMTAG_BASENAMES);
- fi = tfiInit(fi, 0);
- while (tfiNext(fi) >= 0) {
- const char * fn = tfiGetFN(fi);
+ fi = rpmteFI(p, RPMTAG_BASENAMES);
+ fi = rpmfiInit(fi, 0);
+ while (rpmfiNext(fi) >= 0) {
+ const char * fn = rpmfiFN(fi);
/* Erasing: check filename against requiredby matches. */
if (!checkDependentPackages(ts, fn))
@@ -1766,13 +1768,13 @@ int rpmtsCheck(rpmTransactionSet ts)
if (rc)
goto exit;
}
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
rc = 0;
exit:
mi = rpmdbFreeIterator(mi);
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
/*@-branchstate@*/
if (closeatexit)
xx = rpmtsCloseDB(ts);
diff --git a/lib/fsm.c b/lib/fsm.c
index 5eef745b8..0dc3e28fe 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -8,6 +8,8 @@
#include <rpmio_internal.h>
#include <rpmlib.h>
+#include "rpmps.h"
+
#include "cpio.h"
#include "fsm.h"
#include "psm.h" /* XXX fiTypeString */
@@ -23,9 +25,9 @@
/*@access FSMI_t @*/
/*@access FSM_t @*/
-/*@access TFI_t @*/
-/*@access transactionElement @*/
-/*@access rpmTransactionSet @*/
+/*@access rpmfi @*/
+/*@access rpmte @*/
+/*@access rpmts @*/
#define alloca_strdup(_s) strcpy(alloca(strlen(_s)+1), (_s))
@@ -38,14 +40,14 @@ int _fsm_debug = 0;
int strict_erasures = 0;
/*@=exportlocal =exportheadervar@*/
-rpmTransactionSet fsmGetTs(const FSM_t fsm) {
+rpmts fsmGetTs(const FSM_t fsm) {
const FSMI_t iter = fsm->iter;
/*@-compdef -refcounttrans -retexpose -usereleased @*/
return (iter ? iter->ts : NULL);
/*@=compdef =refcounttrans =retexpose =usereleased @*/
}
-TFI_t fsmGetFi(const FSM_t fsm)
+rpmfi fsmGetFi(const FSM_t fsm)
{
const FSMI_t iter = fsm->iter;
/*@-compdef -refcounttrans -retexpose -usereleased @*/
@@ -116,7 +118,7 @@ static /*@null@*/ void * mapFreeIterator(/*@only@*//*@null@*/ void * p)
* @return file info iterator
*/
static void *
-mapInitIterator(rpmTransactionSet ts, TFI_t fi)
+mapInitIterator(rpmts ts, rpmfi fi)
/*@modifies ts, fi @*/
{
FSMI_t iter = NULL;
@@ -142,7 +144,7 @@ static int mapNextIterator(/*@null@*/ void * a)
int i = -1;
if (iter) {
- const TFI_t fi = iter->fi;
+ const rpmfi fi = iter->fi;
if (iter->reverse) {
if (iter->i >= 0) i = iter->i--;
} else {
@@ -184,7 +186,7 @@ static int mapFind(/*@null@*/ FSMI_t iter, const char * fsmPath)
int ix = -1;
if (iter) {
- const TFI_t fi = iter->fi;
+ const rpmfi fi = iter->fi;
if (fi && fi->fc > 0 && fi->apath && fsmPath && *fsmPath) {
const char ** p = NULL;
@@ -204,7 +206,7 @@ static int mapFind(/*@null@*/ FSMI_t iter, const char * fsmPath)
* Directory name iterator.
*/
typedef struct dnli_s {
- TFI_t fi;
+ rpmfi fi;
/*@only@*/ /*@null@*/ char * active;
int reverse;
int isave;
@@ -254,7 +256,7 @@ static /*@only@*/ void * dnlInitIterator(/*@special@*/ const FSM_t fsm,
/*@uses fsm->iter @*/
/*@*/
{
- TFI_t fi = fsmGetFi(fsm);
+ rpmfi fi = fsmGetFi(fsm);
DNLI_t dnli;
int i, j;
@@ -338,7 +340,7 @@ static /*@observer@*/ const char * dnlNextIterator(/*@null@*/ DNLI_t dnli)
const char * dn = NULL;
if (dnli) {
- TFI_t fi = dnli->fi;
+ rpmfi fi = dnli->fi;
int i = -1;
if (dnli->active)
@@ -423,7 +425,7 @@ static int saveHardLink(/*@special@*/ /*@partial@*/ FSM_t fsm)
return 1;
/* Here come the bits, time to choose a non-skipped file name. */
- { TFI_t fi = fsmGetFi(fsm);
+ { rpmfi fi = fsmGetFi(fsm);
for (j = fsm->li->linksLeft - 1; j >= 0; j--) {
ix = fsm->li->filex[j];
@@ -484,7 +486,7 @@ FSM_t freeFSM(FSM_t fsm)
}
int fsmSetup(FSM_t fsm, fileStage goal,
- const rpmTransactionSet ts, const TFI_t fi, FD_t cfd,
+ const rpmts ts, const rpmfi fi, FD_t cfd,
unsigned int * archiveSize, const char ** failedFile)
{
size_t pos = 0;
@@ -505,7 +507,7 @@ int fsmSetup(FSM_t fsm, fileStage goal,
/*@-type@*/ /* FIX: cast? */
/*@-noeffectuncon @*/ /* FIX: check rc */
(void)ts->notify(fi->h, RPMCALLBACK_INST_START, 0, fi->archiveSize,
- rpmfiGetKey(fi), ts->notifyData);
+ rpmfiKey(fi), ts->notifyData);
/*@=noeffectuncon @*/
/*@=type@*/
}
@@ -559,7 +561,7 @@ int fsmTeardown(FSM_t fsm)
int fsmMapPath(FSM_t fsm)
{
- TFI_t fi = fsmGetFi(fsm); /* XXX const except for fstates */
+ rpmfi fi = fsmGetFi(fsm); /* XXX const except for fstates */
int rc = 0;
int i;
@@ -653,7 +655,7 @@ assert(fi->te->type == TR_ADDED);
int fsmMapAttrs(FSM_t fsm)
{
struct stat * st = &fsm->sb;
- TFI_t fi = fsmGetFi(fsm);
+ rpmfi fi = fsmGetFi(fsm);
int i = fsm->ix;
if (fi && i >= 0 && i < fi->fc) {
@@ -685,7 +687,7 @@ int fsmMapAttrs(FSM_t fsm)
if (fsm->mapFlags & CPIO_MAP_GID)
st->st_gid = finalGid;
- { rpmTransactionSet ts = fsmGetTs(fsm);
+ { rpmts ts = fsmGetTs(fsm);
if (ts != NULL && !(ts->transFlags & RPMTRANS_FLAG_NOMD5)) {
fsm->fmd5sum = (fi->fmd5s ? fi->fmd5s[i] : NULL);
@@ -816,7 +818,7 @@ static int writeFile(/*@special@*/ FSM_t fsm, int writeData)
t = stpcpy( stpcpy(t, fsm->dirName), fsm->baseName);
/*@=compdef@*/
} else if (fsm->mapFlags & CPIO_MAP_PATH) {
- TFI_t fi = fsmGetFi(fsm);
+ rpmfi fi = fsmGetFi(fsm);
fsm->path =
(fi->apath ? fi->apath[fsm->ix] + fi->striplen : fi->bnl[fsm->ix]);
}
@@ -892,14 +894,14 @@ static int writeFile(/*@special@*/ FSM_t fsm, int writeData)
rc = fsmStage(fsm, FSM_PAD);
if (rc) goto exit;
- { const rpmTransactionSet ts = fsmGetTs(fsm);
- TFI_t fi = fsmGetFi(fsm);
+ { const rpmts ts = fsmGetTs(fsm);
+ rpmfi fi = fsmGetFi(fsm);
if (ts && ts->notify && fi) {
size_t size = (fdGetCpioPos(fsm->cfd) - pos);
/*@-type@*/ /* FIX: cast? */
/*@-noeffectuncon @*/ /* FIX: check rc */
(void)ts->notify(fi->h, RPMCALLBACK_INST_PROGRESS, size, size,
- rpmfiGetKey(fi), ts->notifyData);
+ rpmfiKey(fi), ts->notifyData);
/*@=noeffectuncon @*/
/*@=type@*/
}
@@ -1197,7 +1199,7 @@ static int fsmMkdirs(/*@special@*/ FSM_t fsm)
/* Move pre-existing path marker forward. */
fsm->dnlx[dc] = (te - dn);
} else if (rc == CPIOERR_LSTAT_FAILED) {
- TFI_t fi = fsmGetFi(fsm);
+ rpmfi fi = fsmGetFi(fsm);
*te = '\0';
st->st_mode = S_IFDIR | (fi->dperms & 07777);
rc = fsmStage(fsm, FSM_MKDIR);
@@ -1431,7 +1433,7 @@ int fsmStage(FSM_t fsm, fileStage stage)
break;
case FSM_CREATE:
- { rpmTransactionSet ts = fsmGetTs(fsm);
+ { rpmts ts = fsmGetTs(fsm);
#define _tsmask (RPMTRANS_FLAG_PKGCOMMIT | RPMTRANS_FLAG_COMMIT)
fsm->commit = ((ts && (ts->transFlags & _tsmask) &&
fsm->goal != FSM_PKGCOMMIT) ? 0 : 1);
@@ -1508,7 +1510,7 @@ int fsmStage(FSM_t fsm, fileStage stage)
/* On non-install, mode must be known so that dirs don't get suffix. */
if (fsm->goal != FSM_PKGINSTALL) {
- TFI_t fi = fsmGetFi(fsm);
+ rpmfi fi = fsmGetFi(fsm);
st->st_mode = fi->fmodes[fsm->ix];
}
@@ -1692,14 +1694,14 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
break;
case FSM_NOTIFY: /* XXX move from fsm to psm -> tsm */
if (fsm->goal == FSM_PKGINSTALL || fsm->goal == FSM_PKGBUILD) {
- rpmTransactionSet ts = fsmGetTs(fsm);
- TFI_t fi = fsmGetFi(fsm);
+ rpmts ts = fsmGetTs(fsm);
+ rpmfi fi = fsmGetFi(fsm);
if (ts && ts->notify && fi) {
/*@-type@*/ /* FIX: cast? */
/*@-noeffectuncon @*/ /* FIX: check rc */
(void)ts->notify(fi->h, RPMCALLBACK_INST_PROGRESS,
fdGetCpioPos(fsm->cfd), fi->archiveSize,
- rpmfiGetKey(fi), ts->notifyData);
+ rpmfiKey(fi), ts->notifyData);
/*@=noeffectuncon @*/
/*@=type@*/
}
@@ -1761,7 +1763,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
/* Remove erased files. */
if (fsm->goal == FSM_PKGERASE) {
if (fsm->action == FA_ERASE) {
- TFI_t fi = fsmGetFi(fsm);
+ rpmfi fi = fsmGetFi(fsm);
if (S_ISDIR(st->st_mode)) {
rc = fsmStage(fsm, FSM_RMDIR);
if (!rc) break;
@@ -1827,7 +1829,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
rc = fsmStage(fsm, FSM_CHMOD);
if (!rc) {
time_t mtime = st->st_mtime;
- TFI_t fi = fsmGetFi(fsm);
+ rpmfi fi = fsmGetFi(fsm);
if (fi->fmtimes)
st->st_mtime = fi->fmtimes[fsm->ix];
rc = fsmStage(fsm, FSM_UTIME);
diff --git a/lib/fsm.h b/lib/fsm.h
index 977f3f905..8caa70be5 100644
--- a/lib/fsm.h
+++ b/lib/fsm.h
@@ -107,8 +107,8 @@ struct hardLink_s {
* Iterator across package file info, forward on install, backward on erase.
*/
struct fsmIterator_s {
- rpmTransactionSet ts; /*!< transaction set. */
- TFI_t fi; /*!< transaction element file info. */
+ rpmts ts; /*!< transaction set. */
+ rpmfi fi; /*!< transaction element file info. */
int reverse; /*!< reversed traversal? */
int isave; /*!< last returned iterator index. */
int i; /*!< iterator index. */
@@ -239,8 +239,8 @@ extern "C" {
* @return 0 on success
*/
int fsmSetup(FSM_t fsm, fileStage goal,
- const rpmTransactionSet ts,
- const TFI_t fi,
+ const rpmts ts,
+ const rpmfi fi,
FD_t cfd,
/*@out@*/ unsigned int * archiveSize,
/*@out@*/ const char ** failedFile)
@@ -262,7 +262,7 @@ int fsmTeardown(FSM_t fsm)
* @param fsm file state machine data
* @return transaction set
*/
-rpmTransactionSet fsmGetTs(const FSM_t fsm)
+rpmts fsmGetTs(const FSM_t fsm)
/*@*/;
/**
@@ -270,7 +270,7 @@ rpmTransactionSet fsmGetTs(const FSM_t fsm)
* @param fsm file state machine data
* @return transaction element file info
*/
-TFI_t fsmGetFi(/*@partial@*/ const FSM_t fsm)
+rpmfi fsmGetFi(/*@partial@*/ const FSM_t fsm)
/*@*/;
/**
diff --git a/lib/package.c b/lib/package.c
index 90ce04374..4b286b87b 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -9,6 +9,7 @@
#include <rpmio_internal.h>
#include <rpmlib.h>
+#include "rpmps.h"
#include "rpmts.h"
#include "misc.h" /* XXX stripTrailingChar() */
@@ -20,7 +21,7 @@
#define alloca_strdup(_s) strcpy(alloca(strlen(_s)+1), (_s))
-/*@access rpmTransactionSet@*/
+/*@access rpmts @*/
/*@access Header @*/ /* XXX compared with NULL */
/*@access FD_t @*/ /* XXX stealing digests */
@@ -142,7 +143,7 @@ static unsigned char header_magic[8] = {
0x8e, 0xad, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00
};
-int rpmReadPackageFile(rpmTransactionSet ts, FD_t fd,
+int rpmReadPackageFile(rpmts ts, FD_t fd,
const char * fn, Header * hdrp)
{
byte buf[8*BUFSIZ];
diff --git a/lib/psm.c b/lib/psm.c
index da0824563..ec48d5f20 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -8,6 +8,8 @@
#include <rpmio_internal.h>
#include <rpmlib.h>
+#include "rpmps.h"
+
#include "cpio.h"
#include "fsm.h" /* XXX CPIO_FOO/FSM_FOO constants */
#include "psm.h"
@@ -28,19 +30,19 @@
#include "rpmdb.h" /* XXX for db_chrootDone */
#include "debug.h"
-/*@access Header@*/ /* compared with NULL */
-/*@access rpmdbMatchIterator@*/ /* compared with NULL */
-/*@access FD_t@*/ /* compared with NULL */
-/*@access rpmdb@*/ /* compared with NULL */
+/*@access Header @*/ /* compared with NULL */
+/*@access rpmdbMatchIterator @*//* compared with NULL */
+/*@access FD_t @*/ /* compared with NULL */
+/*@access rpmdb @*/ /* compared with NULL */
-/*@access FSM_t@*/ /* compared with NULL */
-/*@access PSM_t@*/
+/*@access FSM_t @*/ /* compared with NULL */
+/*@access PSM_t @*/
-/*@access TFI_t@*/
-/*@access transactionElement@*/ /* XXX rpmInstallSourcePackage */
+/*@access rpmfi @*/
+/*@access rpmte @*/ /* XXX rpmInstallSourcePackage */
-/*@access alKey@*/
-/*@access rpmDepSet@*/
+/*@access alKey @*/
+/*@access rpmds @*/
int rpmVersionCompare(Header first, Header second)
{
@@ -78,9 +80,9 @@ int rpmVersionCompare(Header first, Header second)
return rpmvercmp(one, two);
}
-/*@observer@*/ const char *const fiTypeString(TFI_t fi)
+/*@observer@*/ const char *const fiTypeString(rpmfi fi)
{
- switch(teGetType(fi->te)) {
+ switch(rpmteType(fi->te)) {
case TR_ADDED: return " install";
case TR_REMOVED: return " erase";
default: return "???";
@@ -110,7 +112,7 @@ static struct tagMacro {
* @param h header
* @return 0 always
*/
-static int rpmInstallLoadMacros(TFI_t fi, Header h)
+static int rpmInstallLoadMacros(rpmfi fi, Header h)
/*@globals rpmGlobalMacroContext @*/
/*@modifies rpmGlobalMacroContext @*/
{
@@ -157,7 +159,7 @@ static int rpmInstallLoadMacros(TFI_t fi, Header h)
* @param newH header to
* @return 0 on success, 1 on failure
*/
-static int mergeFiles(TFI_t fi, Header h, Header newH)
+static int mergeFiles(rpmfi fi, Header h, Header newH)
/*@modifies h @*/
{
HGE_t hge = (HGE_t)fi->hge;
@@ -344,8 +346,8 @@ static int markReplacedFiles(const PSM_t psm)
/*@globals fileSystem@*/
/*@modifies psm, fileSystem @*/
{
- const rpmTransactionSet ts = psm->ts;
- TFI_t fi = psm->fi;
+ const rpmts ts = psm->ts;
+ rpmfi fi = psm->fi;
HGE_t hge = (HGE_t)fi->hge;
sharedFileInfo replaced = fi->replaced;
sharedFileInfo sfi;
@@ -355,7 +357,7 @@ static int markReplacedFiles(const PSM_t psm)
unsigned int prev;
int num, xx;
- if (!(tfiGetFC(fi) > 0 && fi->replaced))
+ if (!(rpmfiFC(fi) > 0 && fi->replaced))
return 0;
num = prev = 0;
@@ -456,11 +458,11 @@ static rpmRC chkdir (const char * dpath, const char * dname)
return RPMRC_OK;
}
-rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, FD_t fd,
+rpmRC rpmInstallSourcePackage(rpmts ts, FD_t fd,
const char ** specFilePtr, const char ** cookie)
{
int scareMem = 1;
- TFI_t fi = NULL;
+ rpmfi fi = NULL;
const char * _sourcedir = NULL;
const char * _specdir = NULL;
const char * specFile = NULL;
@@ -488,7 +490,7 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, FD_t fd,
(void) rpmtsAddPackage(ts, h, NULL, 0, NULL);
- fi = fiNew(ts, fi, h, RPMTAG_BASENAMES, scareMem);
+ fi = rpmfiNew(ts, fi, h, RPMTAG_BASENAMES, scareMem);
h = headerFree(h, "InstallSourcePackage");
if (fi == NULL) { /* XXX can't happen */
@@ -629,7 +631,7 @@ exit:
(void) Fclose(fi->te->fd);
fi->te->fd = NULL;
fi->te = NULL;
- fi = fiFree(fi, 1);
+ fi = rpmfiFree(fi, 1);
}
/*@=branchstate@*/
@@ -690,8 +692,8 @@ static int runScript(PSM_t psm, Header h,
/*@globals rpmGlobalMacroContext, fileSystem, internalState@*/
/*@modifies rpmGlobalMacroContext, fileSystem, internalState @*/
{
- const rpmTransactionSet ts = psm->ts;
- TFI_t fi = psm->fi;
+ const rpmts ts = psm->ts;
+ rpmfi fi = psm->fi;
HGE_t hge = fi->hge;
HFD_t hfd = (fi->hfd ? fi->hfd : headerFreeData);
const char ** argv = NULL;
@@ -923,7 +925,7 @@ static rpmRC runInstScript(PSM_t psm)
/*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
/*@modifies rpmGlobalMacroContext, fileSystem, internalState @*/
{
- TFI_t fi = psm->fi;
+ rpmfi fi = psm->fi;
HGE_t hge = fi->hge;
HFD_t hfd = (fi->hfd ? fi->hfd : headerFreeData);
void ** progArgv;
@@ -978,11 +980,11 @@ static int handleOneTrigger(const PSM_t psm, Header sourceH, Header triggeredH,
fileSystem, internalState @*/
{
int scareMem = 1;
- const rpmTransactionSet ts = psm->ts;
- TFI_t fi = psm->fi;
+ const rpmts ts = psm->ts;
+ rpmfi fi = psm->fi;
HGE_t hge = fi->hge;
HFD_t hfd = (fi->hfd ? fi->hfd : headerFreeData);
- rpmDepSet trigger = NULL;
+ rpmds trigger = NULL;
const char ** triggerScripts;
const char ** triggerProgs;
int_32 * triggerIndices;
@@ -992,17 +994,17 @@ static int handleOneTrigger(const PSM_t psm, Header sourceH, Header triggeredH,
xx = headerNVR(sourceH, &sourceName, NULL, NULL);
- trigger = dsiInit(dsNew(triggeredH, RPMTAG_TRIGGERNAME, scareMem));
+ trigger = rpmdsInit(rpmdsNew(triggeredH, RPMTAG_TRIGGERNAME, scareMem));
if (trigger != NULL)
- while (dsiNext(trigger) >= 0) {
+ while (rpmdsNext(trigger) >= 0) {
rpmTagType tit, tst, tpt;
const char * Name;
- int_32 Flags = dsiGetFlags(trigger);
+ int_32 Flags = rpmdsFlags(trigger);
#ifdef LEGACY
int skip;
#endif
- if ((Name = dsiGetN(trigger)) == NULL)
+ if ((Name = rpmdsN(trigger)) == NULL)
continue; /* XXX can't happen */
if (strcmp(Name, sourceName))
@@ -1070,7 +1072,7 @@ static int handleOneTrigger(const PSM_t psm, Header sourceH, Header triggeredH,
break;
}
- trigger = dsFree(trigger);
+ trigger = rpmdsFree(trigger);
return rc;
}
@@ -1086,12 +1088,12 @@ static int runTriggers(PSM_t psm)
/*@modifies psm, rpmGlobalMacroContext,
fileSystem, internalState @*/
{
- const rpmTransactionSet ts = psm->ts;
- TFI_t fi = psm->fi;
+ const rpmts ts = psm->ts;
+ rpmfi fi = psm->fi;
int numPackage;
rpmRC rc = RPMRC_OK;
- numPackage = rpmdbCountPackages(rpmtsGetRdb(ts), teGetN(psm->te)) + psm->countCorrection;
+ numPackage = rpmdbCountPackages(rpmtsGetRdb(ts), rpmteN(psm->te)) + psm->countCorrection;
if (numPackage < 0)
return 1;
@@ -1101,7 +1103,7 @@ static int runTriggers(PSM_t psm)
int countCorrection = psm->countCorrection;
psm->countCorrection = 0;
- mi = rpmtsInitIterator(ts, RPMTAG_TRIGGERNAME, teGetN(psm->te), 0);
+ mi = rpmtsInitIterator(ts, RPMTAG_TRIGGERNAME, rpmteN(psm->te), 0);
while((triggeredH = rpmdbNextIterator(mi)) != NULL) {
rc |= handleOneTrigger(psm, fi->h, triggeredH, numPackage, NULL);
}
@@ -1124,8 +1126,8 @@ static int runImmedTriggers(PSM_t psm)
/*@modifies psm, rpmGlobalMacroContext,
fileSystem, internalState @*/
{
- const rpmTransactionSet ts = psm->ts;
- TFI_t fi = psm->fi;
+ const rpmts ts = psm->ts;
+ rpmfi fi = psm->fi;
HGE_t hge = fi->hge;
HFD_t hfd = (fi->hfd ? fi->hfd : headerFreeData);
const char ** triggerNames;
@@ -1219,8 +1221,8 @@ static int runImmedTriggers(PSM_t psm)
/*@-nullpass@*/ /* FIX: testing null annotation for fi->h */
int psmStage(PSM_t psm, pkgStage stage)
{
- const rpmTransactionSet ts = psm->ts;
- TFI_t fi = psm->fi;
+ const rpmts ts = psm->ts;
+ rpmfi fi = psm->fi;
HGE_t hge = fi->hge;
HME_t hme = fi->hme;
HFD_t hfd = (fi->hfd ? fi->hfd : headerFreeData);
@@ -1234,31 +1236,31 @@ int psmStage(PSM_t psm, pkgStage stage)
break;
case PSM_INIT:
rpmMessage(RPMMESS_DEBUG, _("%s: %s has %d files, test = %d\n"),
- psm->stepName, teGetNEVR(psm->te),
- tfiGetFC(fi), (rpmtsGetFlags(ts) & RPMTRANS_FLAG_TEST));
+ psm->stepName, rpmteNEVR(psm->te),
+ rpmfiFC(fi), (rpmtsGetFlags(ts) & RPMTRANS_FLAG_TEST));
/*
* When we run scripts, we pass an argument which is the number of
* versions of this package that will be installed when we are
* finished.
*/
- psm->npkgs_installed = rpmdbCountPackages(rpmtsGetRdb(ts), teGetN(psm->te));
+ psm->npkgs_installed = rpmdbCountPackages(rpmtsGetRdb(ts), rpmteN(psm->te));
if (psm->npkgs_installed < 0) {
rc = RPMRC_FAIL;
break;
}
if (psm->goal == PSM_PKGINSTALL) {
- int fc = tfiGetFC(fi);
+ int fc = rpmfiFC(fi);
psm->scriptArg = psm->npkgs_installed + 1;
assert(psm->mi == NULL);
- psm->mi = rpmtsInitIterator(ts, RPMTAG_NAME, teGetN(psm->te), 0);
+ psm->mi = rpmtsInitIterator(ts, RPMTAG_NAME, rpmteN(psm->te), 0);
xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_VERSION,
- RPMMIRE_DEFAULT, teGetV(psm->te));
+ RPMMIRE_DEFAULT, rpmteV(psm->te));
xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_RELEASE,
- RPMMIRE_DEFAULT, teGetR(psm->te));
+ RPMMIRE_DEFAULT, rpmteR(psm->te));
while ((psm->oh = rpmdbNextIterator(psm->mi))) {
fi->record = rpmdbGetIteratorOffset(psm->mi);
@@ -1355,7 +1357,7 @@ assert(psm->mi == NULL);
rpmError(RPMERR_SCRIPT,
_("%s: %s scriptlet failed (%d), skipping %s\n"),
psm->stepName, tag2sln(psm->scriptTag), rc,
- teGetNEVR(psm->te));
+ rpmteNEVR(psm->te));
break;
}
}
@@ -1442,7 +1444,7 @@ assert(psm->mi == NULL);
lead.osnum = osnum;
lead.signature_type = RPMSIGTYPE_HEADERSIG;
- strncpy(lead.name, teGetNEVR(psm->te), sizeof(lead.name));
+ strncpy(lead.name, rpmteNEVR(psm->te), sizeof(lead.name));
rc = writeLead(psm->fd, &lead);
if (rc) {
@@ -1483,9 +1485,9 @@ assert(psm->mi == NULL);
if (fi->fc <= 0) break;
for (i = 0; i < fi->fc; i++)
#else
- if (tfiGetFC(fi) <= 0) break;
- (void) tfiInit(fi, 0);
- while ((i = tfiNext(fi)) >= 0)
+ if (rpmfiFC(fi) <= 0) break;
+ (void) rpmfiInit(fi, 0);
+ while ((i = rpmfiNext(fi)) >= 0)
#endif
{
uid_t uid;
@@ -1517,13 +1519,13 @@ assert(psm->mi == NULL);
/* Retrieve type of payload compression. */
rc = psmStage(psm, PSM_RPMIO_FLAGS);
- if (teGetFd(fi->te) == NULL) { /* XXX can't happen */
+ if (rpmteFd(fi->te) == NULL) { /* XXX can't happen */
rc = RPMRC_FAIL;
break;
}
/*@-nullpass@*/ /* LCL: fi->fd != NULL here. */
- psm->cfd = Fdopen(fdDup(Fileno(teGetFd(fi->te))), psm->rpmio_flags);
+ psm->cfd = Fdopen(fdDup(Fileno(rpmteFd(fi->te))), psm->rpmio_flags);
/*@=nullpass@*/
if (psm->cfd == NULL) { /* XXX can't happen */
rc = RPMRC_FAIL;
@@ -1566,7 +1568,7 @@ assert(psm->mi == NULL);
xx = psmStage(psm, PSM_NOTIFY);
}
if (psm->goal == PSM_PKGERASE) {
- int fc = tfiGetFC(fi);
+ int fc = rpmfiFC(fi);
if (rpmtsGetFlags(ts) & RPMTRANS_FLAG_JUSTDB) break;
if (rpmtsGetFlags(ts) & RPMTRANS_FLAG_APPLYONLY) break;
@@ -1627,7 +1629,7 @@ assert(psm->mi == NULL);
if (psm->goal == PSM_PKGINSTALL) {
int_32 installTime = (int_32) time(NULL);
- int fc = tfiGetFC(fi);
+ int fc = rpmfiFC(fi);
if (fi->h == NULL) break; /* XXX can't happen */
if (fi->fstates != NULL && fc > 0)
@@ -1795,7 +1797,7 @@ assert(psm->mi == NULL);
if (ts && ts->notify) {
/*@-noeffectuncon @*/ /* FIX: check rc */
(void) ts->notify(fi->h, psm->what, psm->amount, psm->total,
- teGetKey(psm->te), ts->notifyData);
+ rpmteKey(psm->te), ts->notifyData);
/*@=noeffectuncon @*/
}
/*@=type@*/
diff --git a/lib/psm.h b/lib/psm.h
index efab8a2a6..02addd8ef 100644
--- a/lib/psm.h
+++ b/lib/psm.h
@@ -56,11 +56,11 @@ typedef enum pkgStage_e {
*/
struct psm_s {
/*@refcounted@*/
- rpmTransactionSet ts; /*!< transaction set */
+ rpmts ts; /*!< transaction set */
/*@dependent@*/
- transactionElement te; /*!< transaction element */
+ rpmte te; /*!< current transaction element */
/*@refcounted@*/
- TFI_t fi; /*!< transaction element file info */
+ rpmfi fi; /*!< transaction element file info */
FD_t cfd; /*!< Payload file handle. */
FD_t fd; /*!< Repackage file handle. */
Header oh; /*!< Repackage/multilib header. */
@@ -101,7 +101,7 @@ extern "C" {
* @param fi
* @return formatted string
*/
-/*@observer@*/ const char *const fiTypeString(/*@partial@*/TFI_t fi)
+/*@observer@*/ const char *const fiTypeString(/*@partial@*/rpmfi fi)
/*@*/;
/**
diff --git a/lib/query.c b/lib/query.c
index 1ab183b6b..aa25f23a8 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -16,6 +16,7 @@
#include <rpmbuild.h>
#include "rpmdb.h"
+#include "rpmps.h"
#include "rpmts.h"
#include "manifest.h"
@@ -154,7 +155,7 @@ static int countLinks(int_16 * fileRdevList, int_32 * fileInodeList, int nfiles,
return nlink;
}
-int showQueryPackage(QVA_t qva, /*@unused@*/ rpmTransactionSet ts, Header h)
+int showQueryPackage(QVA_t qva, /*@unused@*/ rpmts ts, Header h)
{
HGE_t hge = (HGE_t)headerGetEntryMinMemory;
HFD_t hfd = headerFreeData;
@@ -538,7 +539,7 @@ void rpmDisplayQueryTags(FILE * fp)
}
}
-int showMatches(QVA_t qva, rpmTransactionSet ts)
+int showMatches(QVA_t qva, rpmts ts)
{
Header h;
int ec = 0;
@@ -582,7 +583,7 @@ int (*parseSpecVec) (Spec *specp, const char *specFile, const char *rootdir,
/*@null@*/ Spec (*freeSpecVec) (Spec spec) = NULL;
/*@=redecl@*/
-int rpmQueryVerify(QVA_t qva, rpmTransactionSet ts, const char * arg)
+int rpmQueryVerify(QVA_t qva, rpmts ts, const char * arg)
{
const char ** av = NULL;
int res = 0;
@@ -970,7 +971,7 @@ restart:
return res;
}
-int rpmcliQuery(rpmTransactionSet ts, QVA_t qva, const char ** argv)
+int rpmcliQuery(rpmts ts, QVA_t qva, const char ** argv)
{
const char * arg;
int vsflags;
diff --git a/lib/rpmal.c b/lib/rpmal.c
index 5a4afb987..ed58a4bc2 100644
--- a/lib/rpmal.c
+++ b/lib/rpmal.c
@@ -6,6 +6,8 @@
#include <rpmlib.h>
+#include "rpmps.h"
+
#include "rpmal.h"
#include "rpmds.h"
#include "rpmfi.h"
@@ -29,9 +31,9 @@ static int _al_debug = 0;
*/
struct availablePackage_s {
/*@refcounted@*/ /*@null@*/
- rpmDepSet provides; /*!< Provides: dependencies. */
+ rpmds provides; /*!< Provides: dependencies. */
/*@refcounted@*/ /*@null@*/
- TFI_t fi; /*!< File info set. */
+ rpmfi fi; /*!< File info set. */
#ifdef DYING
uint_32 multiLib; /* MULTILIB */
@@ -214,8 +216,8 @@ availableList alFree(availableList al)
if ((alp = al->list) != NULL)
for (i = 0; i < al->size; i++, alp++) {
- alp->provides = dsFree(alp->provides);
- alp->fi = fiFree(alp->fi, 1);
+ alp->provides = rpmdsFree(alp->provides);
+ alp->fi = rpmfiFree(alp->fi, 1);
}
if ((die = al->dirs) != NULL)
@@ -287,7 +289,7 @@ void alDelPackage(availableList al, alKey pkgKey)
{
alNum pkgNum = alKey2Num(al, pkgKey);
availablePackage alp;
- TFI_t fi;
+ rpmfi fi;
if (al == NULL || al->list == NULL)
return; /* XXX can't happen */
@@ -301,7 +303,7 @@ fprintf(stderr, "*** del %p[%d]\n", al->list, pkgNum);
/* Delete directory/file info entries from added package list. */
if ((fi = alp->fi) != NULL)
- if (tfiGetFC(fi) > 0) {
+ if (rpmfiFC(fi) > 0) {
int origNumDirs = al->numDirs;
int dx;
dirInfo dieNeedle =
@@ -313,14 +315,14 @@ fprintf(stderr, "*** del %p[%d]\n", al->list, pkgNum);
/* XXX FIXME: We ought to relocate the directory list here */
if (al->dirs != NULL)
- for (dx = tfiGetDC(fi) - 1; dx >= 0; dx--)
+ for (dx = rpmfiDC(fi) - 1; dx >= 0; dx--)
{
fileIndexEntry fie;
- (void) tfiSetDX(fi, dx);
+ (void) rpmfiSetDX(fi, dx);
/*@-assignexpose -dependenttrans -observertrans@*/
- dieNeedle->dirName = (char *) tfiGetDN(fi);
+ dieNeedle->dirName = (char *) rpmfiDN(fi);
/*@=assignexpose =dependenttrans =observertrans@*/
dieNeedle->dirNameLen = (dieNeedle->dirName != NULL
? strlen(dieNeedle->dirName) : 0);
@@ -361,15 +363,15 @@ fprintf(stderr, "*** del %p[%d]\n", al->list, pkgNum);
}
}
- alp->provides = dsFree(alp->provides);
- alp->fi = fiFree(alp->fi, 1);
+ alp->provides = rpmdsFree(alp->provides);
+ alp->fi = rpmfiFree(alp->fi, 1);
memset(alp, 0, sizeof(*alp)); /* XXX trash and burn */
return;
}
alKey alAddPackage(availableList * alistp, alKey pkgKey, fnpyKey key,
- rpmDepSet provides, TFI_t fi)
+ rpmds provides, rpmfi fi)
{
alNum pkgNum;
availableList al;
@@ -407,8 +409,8 @@ fprintf(stderr, "*** add %p[%d]\n", al->list, pkgNum);
alp->fi = rpmfiLink(fi, "Files (alAddPackage)");
fi = rpmfiLink(alp->fi, "Files index (alAddPackage)");
- fi = tfiInit(fi, 0);
- if (tfiGetFC(fi) > 0) {
+ fi = rpmfiInit(fi, 0);
+ if (rpmfiFC(fi) > 0) {
int * dirMapping;
dirInfo dieNeedle =
memset(alloca(sizeof(*dieNeedle)), 0, sizeof(*dieNeedle));
@@ -418,7 +420,7 @@ fprintf(stderr, "*** add %p[%d]\n", al->list, pkgNum);
int dx;
int dc;
- dc = tfiGetDC(fi);
+ dc = rpmfiDC(fi);
/* XXX FIXME: We ought to relocate the directory list here */
@@ -433,10 +435,10 @@ fprintf(stderr, "*** add %p[%d]\n", al->list, pkgNum);
for (dx = 0; dx < dc; dx++) {
- (void) tfiSetDX(fi, dx);
+ (void) rpmfiSetDX(fi, dx);
/*@-assignexpose -dependenttrans -observertrans@*/
- dieNeedle->dirName = (char *) tfiGetDN(fi);
+ dieNeedle->dirName = (char *) rpmfiDN(fi);
/*@=assignexpose =dependenttrans =observertrans@*/
dieNeedle->dirNameLen = (dieNeedle->dirName != NULL
? strlen(dieNeedle->dirName) : 0);
@@ -461,17 +463,17 @@ fprintf(stderr, "+++ die[%3d] %p [%d] %s\n", al->numDirs, die, die->dirNameLen,
}
}
- for (first = tfiNext(fi); first >= 0;) {
+ for (first = rpmfiNext(fi); first >= 0;) {
fileIndexEntry fie;
int next;
/* Find the first file of the next directory. */
- dx = tfiGetDX(fi);
- while ((next = tfiNext(fi)) >= 0) {
- if (dx != tfiGetDX(fi))
+ dx = rpmfiDX(fi);
+ while ((next = rpmfiNext(fi)) >= 0) {
+ if (dx != rpmfiDX(fi))
/*@innerbreak@*/ break;
}
- if (next < 0) next = tfiGetFC(fi); /* XXX reset end-of-list */
+ if (next < 0) next = rpmfiFC(fi); /* XXX reset end-of-list */
die = al->dirs + dirMapping[dx];
die->files = xrealloc(die->files,
@@ -479,14 +481,14 @@ fprintf(stderr, "+++ die[%3d] %p [%d] %s\n", al->numDirs, die, die->dirNameLen,
fie = die->files + die->numFiles;
/* Rewind to first file, generate file index entry for each file. */
- fi = tfiInit(fi, first);
- while ((first = tfiNext(fi)) >= 0 && first < next) {
+ fi = rpmfiInit(fi, first);
+ while ((first = rpmfiNext(fi)) >= 0 && first < next) {
/*@-assignexpose -dependenttrans -observertrans @*/
- fie->baseName = tfiGetBN(fi);
+ fie->baseName = rpmfiBN(fi);
/*@=assignexpose =dependenttrans =observertrans @*/
fie->baseNameLen = (fie->baseName ? strlen(fie->baseName) : 0);
fie->pkgNum = pkgNum;
- fie->fileFlags = tfiGetFFlags(fi);
+ fie->fileFlags = rpmfiFFlags(fi);
die->numFiles++;
fie++;
}
@@ -528,7 +530,7 @@ static int indexcmp(const void * one, const void * two)
return strcmp(a->entry, b->entry);
}
-void alAddProvides(availableList al, alKey pkgKey, rpmDepSet provides)
+void alAddProvides(availableList al, alKey pkgKey, rpmds provides)
{
alNum pkgNum = alKey2Num(al, pkgKey);
availableIndex ai = &al->index;
@@ -540,12 +542,12 @@ void alAddProvides(availableList al, alKey pkgKey, rpmDepSet provides)
if (ai->index == NULL || ai->k < 0 || ai->k >= ai->size)
return;
- if (dsiInit(provides) != NULL)
- while (dsiNext(provides) >= 0) {
+ if (rpmdsInit(provides) != NULL)
+ while (rpmdsNext(provides) >= 0) {
const char * Name;
#ifdef DYING /* XXX FIXME: multilib colored dependency search */
- const int_32 Flags = dsiGetFlags(provides);
+ const int_32 Flags = rpmdsFlags(provides);
/* If multilib install, skip non-multilib provides. */
if (al->list[i].multiLib && !isDependsMULTILIB(Flags)) {
@@ -554,7 +556,7 @@ void alAddProvides(availableList al, alKey pkgKey, rpmDepSet provides)
}
#endif
- if ((Name = dsiGetN(provides)) == NULL)
+ if ((Name = rpmdsN(provides)) == NULL)
continue; /* XXX can't happen */
aie = ai->index + ai->k;
@@ -563,7 +565,7 @@ void alAddProvides(availableList al, alKey pkgKey, rpmDepSet provides)
aie->pkgKey = pkgKey;
aie->entry = Name;
aie->entryLen = strlen(Name);
- ix = dsiGetIx(provides);
+ ix = rpmdsIx(provides);
/* XXX make sure that element index fits in unsigned short */
assert(ix < 0x10000);
@@ -586,7 +588,7 @@ void alMakeIndex(availableList al)
for (i = 0; i < al->size; i++) {
alp = al->list + i;
if (alp->provides != NULL)
- ai->size += dsiGetCount(alp->provides);
+ ai->size += rpmdsCount(alp->provides);
}
if (ai->size) {
@@ -603,7 +605,7 @@ void alMakeIndex(availableList al)
}
fnpyKey *
-alAllFileSatisfiesDepend(const availableList al, const rpmDepSet ds, alKey * keyp)
+alAllFileSatisfiesDepend(const availableList al, const rpmds ds, alKey * keyp)
{
int found = 0;
const char * dirName;
@@ -619,7 +621,7 @@ alAllFileSatisfiesDepend(const availableList al, const rpmDepSet ds, alKey * key
const char * fileName;
if (keyp) *keyp = RPMAL_NOMATCH;
- if (al == NULL || (fileName = dsiGetN(ds)) == NULL || *fileName != '/')
+ if (al == NULL || (fileName = rpmdsN(ds)) == NULL || *fileName != '/')
return NULL;
/* Solaris 2.6 bsearch sucks down on this. */
@@ -683,7 +685,7 @@ fprintf(stderr, "==> fie %p %s\n", fie, (fie->baseName ? fie->baseName : "(nil)"
continue;
#endif
- dsiNotify(ds, _("(added files)"), 0);
+ rpmdsNotify(ds, _("(added files)"), 0);
alp = al->list + fie->pkgNum;
ret = xrealloc(ret, (found+2) * sizeof(*ret));
@@ -702,7 +704,7 @@ exit:
}
fnpyKey *
-alAllSatisfiesDepend(const availableList al, const rpmDepSet ds, alKey * keyp)
+alAllSatisfiesDepend(const availableList al, const rpmds ds, alKey * keyp)
{
availableIndex ai;
availableIndexEntry needle;
@@ -715,7 +717,7 @@ alAllSatisfiesDepend(const availableList al, const rpmDepSet ds, alKey * keyp)
if (keyp) *keyp = RPMAL_NOMATCH;
- if (al == NULL || ds == NULL || (KName = dsiGetN(ds)) == NULL)
+ if (al == NULL || ds == NULL || (KName = rpmdsN(ds)) == NULL)
return ret;
if (*KName == '/') {
@@ -754,13 +756,13 @@ alAllSatisfiesDepend(const availableList al, const rpmDepSet ds, alKey * keyp)
if (alp->provides != NULL) /* XXX can't happen */
switch (match->type) {
case IET_PROVIDES:
- /* XXX single step on dsiNext to regenerate DNEVR string */
- (void) dsiSetIx(alp->provides, match->entryIx - 1);
- if (dsiNext(alp->provides) >= 0)
- rc = dsCompare(alp->provides, ds);
+ /* XXX single step on rpmdsNext to regenerate DNEVR string */
+ (void) rpmdsSetIx(alp->provides, match->entryIx - 1);
+ if (rpmdsNext(alp->provides) >= 0)
+ rc = rpmdsCompare(alp->provides, ds);
if (rc)
- dsiNotify(ds, _("(added provide)"), 0);
+ rpmdsNotify(ds, _("(added provide)"), 0);
/*@switchbreak@*/ break;
}
@@ -783,7 +785,7 @@ alAllSatisfiesDepend(const availableList al, const rpmDepSet ds, alKey * keyp)
}
fnpyKey
-alSatisfiesDepend(const availableList al, const rpmDepSet ds, alKey * keyp)
+alSatisfiesDepend(const availableList al, const rpmds ds, alKey * keyp)
{
fnpyKey * tmp = alAllSatisfiesDepend(al, ds, keyp);
diff --git a/lib/rpmal.h b/lib/rpmal.h
index e39f45374..61192cf0f 100644
--- a/lib/rpmal.h
+++ b/lib/rpmal.h
@@ -50,7 +50,7 @@ void alDelPackage(/*@null@*/ availableList al, /*@null@*/ alKey pkgKey)
alKey alAddPackage(availableList * alistp,
/*@dependent@*/ /*@null@*/ alKey pkgKey,
/*@dependent@*/ /*@null@*/ fnpyKey key,
- /*@null@*/ rpmDepSet provides, /*@null@*/ TFI_t fi)
+ /*@null@*/ rpmds provides, /*@null@*/ rpmfi fi)
/*@modifies *alistp, provides, fi @*/;
/**
@@ -62,7 +62,7 @@ alKey alAddPackage(availableList * alistp,
/*@-exportlocal@*/
void alAddProvides(availableList al,
/*@dependent@*/ /*@null@*/ alKey pkgKey,
- /*@null@*/ rpmDepSet provides)
+ /*@null@*/ rpmds provides)
/*@modifies al, provides @*/;
/*@=exportlocal@*/
@@ -83,7 +83,7 @@ void alMakeIndex(/*@null@*/ availableList al)
/*@-exportlocal@*/
/*@only@*/ /*@null@*/
fnpyKey * alAllFileSatisfiesDepend(/*@null@*/ const availableList al,
- /*@null@*/ const rpmDepSet ds, /*@null@*/ alKey * keyp)
+ /*@null@*/ const rpmds ds, /*@null@*/ alKey * keyp)
/*@globals fileSystem @*/
/*@modifies al, *keyp, fileSystem @*/;
/*@=exportlocal@*/
@@ -96,7 +96,7 @@ fnpyKey * alAllFileSatisfiesDepend(/*@null@*/ const availableList al,
* @return associated package key(s), NULL if none
*/
/*@only@*/ /*@null@*/
-fnpyKey * alAllSatisfiesDepend(const availableList al, const rpmDepSet ds,
+fnpyKey * alAllSatisfiesDepend(const availableList al, const rpmds ds,
/*@null@*/ alKey * keyp)
/*@globals fileSystem @*/
/*@modifies al, *keyp, fileSystem @*/;
@@ -109,7 +109,7 @@ fnpyKey * alAllSatisfiesDepend(const availableList al, const rpmDepSet ds,
* @retval keyp added package key pointer (or NULL)
* @return associated package key, NULL if none
*/
-fnpyKey alSatisfiesDepend(const availableList al, const rpmDepSet ds,
+fnpyKey alSatisfiesDepend(const availableList al, const rpmds ds,
/*@null@*/ alKey * keyp)
/*@globals fileSystem @*/
/*@modifies al, *keyp, fileSystem @*/;
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index 5dc0f6ba0..d6b0872eb 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -10,6 +10,7 @@
#include "rpmpgp.h"
#include "rpmdb.h"
+#include "rpmps.h"
#include "rpmts.h"
#include "rpmlead.h"
@@ -17,7 +18,7 @@
#include "misc.h" /* XXX for makeTempFile() */
#include "debug.h"
-/*@access rpmTransactionSet @*/ /* ts->dig et al */
+/*@access rpmts @*/ /* ts->dig et al */
/*?access Header @*/ /* XXX compared with NULL */
/*@access FD_t @*/ /* XXX stealing digests */
/*@access pgpDig @*/
@@ -130,7 +131,7 @@ exit:
* @param argv array of package file names (NULL terminated)
* @return 0 on success
*/
-static int rpmReSign(/*@unused@*/ rpmTransactionSet ts,
+static int rpmReSign(/*@unused@*/ rpmts ts,
QVA_t qva, const char ** argv)
/*@globals rpmGlobalMacroContext,
fileSystem, internalState @*/
@@ -328,7 +329,7 @@ exit:
* @param argv array of pubkey file names (NULL terminated)
* @return 0 on success
*/
-static int rpmImportPubkey(const rpmTransactionSet ts,
+static int rpmImportPubkey(const rpmts ts,
/*@unused@*/ QVA_t qva,
/*@null@*/ const char ** argv)
/*@globals RPMVERSION, fileSystem, internalState @*/
@@ -550,7 +551,7 @@ exit:
return rc;
}
-int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
+int rpmVerifySignatures(QVA_t qva, rpmts ts, FD_t fd,
const char * fn)
{
int res2, res3;
@@ -853,7 +854,7 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
return res;
}
-int rpmcliSign(rpmTransactionSet ts, QVA_t qva, const char ** argv)
+int rpmcliSign(rpmts ts, QVA_t qva, const char ** argv)
{
const char * arg;
int dbmode = (qva->qva_mode != RPMSIGN_IMPORT_PUBKEY)
diff --git a/lib/rpmcli.h b/lib/rpmcli.h
index 647e9a504..81568c6ef 100644
--- a/lib/rpmcli.h
+++ b/lib/rpmcli.h
@@ -199,7 +199,7 @@ typedef struct rpmQVKArguments_s * QVA_t;
* @param ts transaction set
* @param h header to use for query/verify
*/
-typedef int (*QVF_t) (QVA_t qva, rpmTransactionSet ts, Header h)
+typedef int (*QVF_t) (QVA_t qva, rpmts ts, Header h)
/*@globals fileSystem@*/
/*@modifies qva, ts, fileSystem @*/;
@@ -273,7 +273,7 @@ extern struct poptOption rpmVerifyPoptTable[];
* @param ts transaction set
* @return result of last non-zero showPackage() return
*/
-int showMatches(QVA_t qva, rpmTransactionSet ts)
+int showMatches(QVA_t qva, rpmts ts)
/*@globals fileSystem@*/
/*@modifies qva, fileSystem @*/;
@@ -297,7 +297,7 @@ void rpmDisplayQueryTags(FILE * fp)
* @param arg name of source to query/verify
* @return showPackage() result, 1 if rpmdbInitIterator() is NULL
*/
-int rpmQueryVerify(QVA_t qva, rpmTransactionSet ts, const char * arg)
+int rpmQueryVerify(QVA_t qva, rpmts ts, const char * arg)
/*@globals rpmGlobalMacroContext,
fileSystem, internalState @*/
/*@modifies qva, ts, rpmGlobalMacroContext,
@@ -311,7 +311,7 @@ int rpmQueryVerify(QVA_t qva, rpmTransactionSet ts, const char * arg)
* @param h header to use for query
* @return 0 always
*/
-int showQueryPackage(QVA_t qva, rpmTransactionSet ts, Header h)
+int showQueryPackage(QVA_t qva, rpmts ts, Header h)
/*@modifies ts @*/;
/** \ingroup rpmcli
@@ -322,7 +322,7 @@ int showQueryPackage(QVA_t qva, rpmTransactionSet ts, Header h)
* @param argv query argument(s) (or NULL)
* @return 0 on success, else no. of failures
*/
-int rpmcliQuery(rpmTransactionSet ts, QVA_t qva, /*@null@*/ const char ** argv)
+int rpmcliQuery(rpmts ts, QVA_t qva, /*@null@*/ const char ** argv)
/*@globals rpmGlobalMacroContext,
fileSystem, internalState @*/
/*@modifies ts, qva, rpmGlobalMacroContext,
@@ -337,7 +337,7 @@ int rpmcliQuery(rpmTransactionSet ts, QVA_t qva, /*@null@*/ const char ** argv)
* @param omitMask bit(s) to disable verify checks
* @return 0 on success (or not installed), 1 on error
*/
-int rpmVerifyFile(const rpmTransactionSet ts, TFI_t fi,
+int rpmVerifyFile(const rpmts ts, rpmfi fi,
/*@out@*/ rpmVerifyAttrs * result, rpmVerifyAttrs omitMask)
/*@globals fileSystem @*/
/*@modifies fi, *result, fileSystem @*/;
@@ -349,7 +349,7 @@ int rpmVerifyFile(const rpmTransactionSet ts, TFI_t fi,
* @param h header to use for verify
* @return result of last non-zero verify return
*/
-int showVerifyPackage(QVA_t qva, rpmTransactionSet ts, Header h)
+int showVerifyPackage(QVA_t qva, rpmts ts, Header h)
/*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
/*@modifies ts, h, rpmGlobalMacroContext, fileSystem, internalState @*/;
@@ -361,7 +361,7 @@ int showVerifyPackage(QVA_t qva, rpmTransactionSet ts, Header h)
* @param fn package file name
* @return 0 on success, 1 on failure
*/
-int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
+int rpmVerifySignatures(QVA_t qva, rpmts ts, FD_t fd,
const char * fn)
/*@globals fileSystem, internalState @*/
/*@modifies qva, ts, fd,
@@ -375,7 +375,7 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
* @param argv verify argument(s) (or NULL)
* @return 0 on success, else no. of failures
*/
-int rpmcliVerify(rpmTransactionSet ts, QVA_t qva, /*@null@*/ const char ** argv)
+int rpmcliVerify(rpmts ts, QVA_t qva, /*@null@*/ const char ** argv)
/*@globals rpmGlobalMacroContext,
fileSystem, internalState @*/
/*@modifies ts, qva, rpmGlobalMacroContext,
@@ -420,7 +420,7 @@ extern int packagesTotal;
* @retval cookie
* @return 0 on success
*/
-int rpmInstallSource(rpmTransactionSet ts, const char * arg,
+int rpmInstallSource(rpmts ts, const char * arg,
/*@null@*/ /*@out@*/ const char ** specFilePtr,
/*@null@*/ /*@out@*/ const char ** cookie)
/*@globals rpmGlobalMacroContext,
@@ -456,7 +456,7 @@ struct rpmInstallArguments_s {
* @param fileArgv array of package file names (NULL terminated)
* @return 0 on success
*/
-int rpmInstall(rpmTransactionSet ts, struct rpmInstallArguments_s * ia,
+int rpmInstall(rpmts ts, struct rpmInstallArguments_s * ia,
/*@null@*/ const char ** fileArgv)
/*@globals packagesTotal, rpmGlobalMacroContext,
fileSystem, internalState@*/
@@ -470,7 +470,7 @@ int rpmInstall(rpmTransactionSet ts, struct rpmInstallArguments_s * ia,
* @param argv array of package file names (NULL terminated)
* @return 0 on success
*/
-int rpmErase(rpmTransactionSet ts, const struct rpmInstallArguments_s * ia,
+int rpmErase(rpmts ts, const struct rpmInstallArguments_s * ia,
/*@null@*/ const char ** argv)
/*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
/*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/;
@@ -540,7 +540,7 @@ typedef /*@abstract@*/ struct IDTindex_s {
* @param tag rpm tag
* @return id index
*/
-/*@only@*/ /*@null@*/ IDTX IDTXload(rpmTransactionSet ts, rpmTag tag)
+/*@only@*/ /*@null@*/ IDTX IDTXload(rpmts ts, rpmTag tag)
/*@globals fileSystem@*/
/*@modifies ts, fileSystem @*/;
@@ -551,7 +551,7 @@ typedef /*@abstract@*/ struct IDTindex_s {
* @param tag rpm tag
* @return id index
*/
-/*@only@*/ /*@null@*/ IDTX IDTXglob(rpmTransactionSet ts,
+/*@only@*/ /*@null@*/ IDTX IDTXglob(rpmts ts,
const char * globstr, rpmTag tag)
/*@globals fileSystem, internalState @*/
/*@modifies ts, fileSystem, internalState @*/;
@@ -563,7 +563,7 @@ typedef /*@abstract@*/ struct IDTindex_s {
* @param argv array of arguments (NULL terminated)
* @return 0 on success
*/
-int rpmRollback(rpmTransactionSet ts, struct rpmInstallArguments_s * ia,
+int rpmRollback(rpmts ts, struct rpmInstallArguments_s * ia,
/*@null@*/ const char ** argv)
/*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
/*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/;
@@ -633,7 +633,7 @@ extern struct poptOption rpmSignPoptTable[];
* @param argv array of arguments (NULL terminated)
* @return 0 on success
*/
-int rpmcliSign(rpmTransactionSet ts, QVA_t qva, /*@null@*/ const char ** argv)
+int rpmcliSign(rpmts ts, QVA_t qva, /*@null@*/ const char ** argv)
/*@globals RPMVERSION, rpmGlobalMacroContext,
fileSystem, internalState @*/
/*@modifies ts, qva, rpmGlobalMacroContext,
diff --git a/lib/rpmds.c b/lib/rpmds.c
index 4275640fc..eafe5a632 100644
--- a/lib/rpmds.c
+++ b/lib/rpmds.c
@@ -4,11 +4,12 @@
#include "system.h"
#include <rpmlib.h>
+#include "rpmps.h"
#include "rpmds.h"
#include "debug.h"
-/*@access rpmDepSet @*/
+/*@access rpmds @*/
/**
* Enable noisy range comparison debugging message?
@@ -19,7 +20,7 @@ static int _noisy_range_comparison_debug_message = 0;
/*@unchecked@*/
static int _ds_debug = 0;
-rpmDepSet XrpmdsUnlink(rpmDepSet ds, const char * msg, const char * fn, unsigned ln)
+rpmds XrpmdsUnlink(rpmds ds, const char * msg, const char * fn, unsigned ln)
{
if (ds == NULL) return NULL;
/*@-modfilesystem@*/
@@ -30,7 +31,7 @@ fprintf(stderr, "--> ds %p -- %d %s at %s:%u\n", ds, ds->nrefs, msg, fn, ln);
return NULL;
}
-rpmDepSet XrpmdsLink(rpmDepSet ds, const char * msg, const char * fn, unsigned ln)
+rpmds XrpmdsLink(rpmds ds, const char * msg, const char * fn, unsigned ln)
{
if (ds == NULL) return NULL;
ds->nrefs++;
@@ -43,7 +44,7 @@ fprintf(stderr, "--> ds %p ++ %d %s at %s:%u\n", ds, ds->nrefs, msg, fn, ln);
/*@-refcounttrans@*/ return ds; /*@=refcounttrans@*/
}
-rpmDepSet dsFree(rpmDepSet ds)
+rpmds rpmdsFree(rpmds ds)
{
HFD_t hfd = headerFreeData;
rpmTag tagEVR, tagF;
@@ -102,12 +103,12 @@ fprintf(stderr, "*** ds %p\t%s[%d]\n", ds, ds->Type, ds->Count);
return NULL;
}
-rpmDepSet dsNew(Header h, rpmTag tagN, int scareMem)
+rpmds rpmdsNew(Header h, rpmTag tagN, int scareMem)
{
HGE_t hge =
(scareMem ? (HGE_t) headerGetEntryMinMemory : (HGE_t) headerGetEntry);
rpmTag tagEVR, tagF;
- rpmDepSet ds = NULL;
+ rpmds ds = NULL;
const char * Type;
const char ** N;
rpmTagType Nt;
@@ -176,7 +177,7 @@ exit:
/*@=nullstate@*/
}
-char * dsDNEVR(const char * dspfx, const rpmDepSet ds)
+char * rpmdsNewDNEVR(const char * dspfx, const rpmds ds)
{
char * tbuf, * t;
size_t nb;
@@ -216,10 +217,10 @@ char * dsDNEVR(const char * dspfx, const rpmDepSet ds)
return tbuf;
}
-rpmDepSet dsThis(Header h, rpmTag tagN, int_32 Flags)
+rpmds rpmdsThis(Header h, rpmTag tagN, int_32 Flags)
{
HGE_t hge = (HGE_t) headerGetEntryMinMemory;
- rpmDepSet ds = NULL;
+ rpmds ds = NULL;
const char * Type;
const char * n, * v, * r;
int_32 * ep;
@@ -280,7 +281,7 @@ rpmDepSet dsThis(Header h, rpmTag tagN, int_32 Flags)
pre[0] = ds->Type[0];
pre[1] = '\0';
/*@-nullstate@*/ /* LCL: ds->Type may be NULL ??? */
- ds->DNEVR = dsDNEVR(pre, ds);
+ ds->DNEVR = rpmdsNewDNEVR(pre, ds);
/*@=nullstate@*/
}
@@ -288,9 +289,9 @@ exit:
return rpmdsLink(ds, (ds ? ds->Type : NULL));
}
-rpmDepSet dsSingle(rpmTag tagN, const char * N, const char * EVR, int_32 Flags)
+rpmds rpmdsSingle(rpmTag tagN, const char * N, const char * EVR, int_32 Flags)
{
- rpmDepSet ds = NULL;
+ rpmds ds = NULL;
const char * Type;
if (tagN == RPMTAG_PROVIDENAME) {
@@ -326,24 +327,24 @@ rpmDepSet dsSingle(rpmTag tagN, const char * N, const char * EVR, int_32 Flags)
{ char t[2];
t[0] = ds->Type[0];
t[1] = '\0';
- ds->DNEVR = dsDNEVR(t, ds);
+ ds->DNEVR = rpmdsNewDNEVR(t, ds);
}
exit:
return rpmdsLink(ds, (ds ? ds->Type : NULL));
}
-int dsiGetCount(const rpmDepSet ds)
+int rpmdsCount(const rpmds ds)
{
return (ds != NULL ? ds->Count : 0);
}
-int dsiGetIx(const rpmDepSet ds)
+int rpmdsIx(const rpmds ds)
{
return (ds != NULL ? ds->i : -1);
}
-int dsiSetIx(rpmDepSet ds, int ix)
+int rpmdsSetIx(rpmds ds, int ix)
{
int i = -1;
@@ -354,7 +355,7 @@ int dsiSetIx(rpmDepSet ds, int ix)
return i;
}
-const char * dsiGetDNEVR(const rpmDepSet ds)
+const char * rpmdsDNEVR(const rpmds ds)
{
const char * DNEVR = NULL;
@@ -365,7 +366,7 @@ const char * dsiGetDNEVR(const rpmDepSet ds)
return DNEVR;
}
-const char * dsiGetN(const rpmDepSet ds)
+const char * rpmdsN(const rpmds ds)
{
const char * N = NULL;
@@ -376,7 +377,7 @@ const char * dsiGetN(const rpmDepSet ds)
return N;
}
-const char * dsiGetEVR(const rpmDepSet ds)
+const char * rpmdsEVR(const rpmds ds)
{
const char * EVR = NULL;
@@ -387,7 +388,7 @@ const char * dsiGetEVR(const rpmDepSet ds)
return EVR;
}
-int_32 dsiGetFlags(const rpmDepSet ds)
+int_32 rpmdsFlags(const rpmds ds)
{
int_32 Flags = 0;
@@ -398,7 +399,7 @@ int_32 dsiGetFlags(const rpmDepSet ds)
return Flags;
}
-rpmTag dsiGetTagN(const rpmDepSet ds)
+rpmTag rpmdsTagN(const rpmds ds)
{
rpmTag tagN = 0;
@@ -408,7 +409,7 @@ rpmTag dsiGetTagN(const rpmDepSet ds)
return tagN;
}
-void dsiNotify(rpmDepSet ds, const char * where, int rc)
+void rpmdsNotify(rpmds ds, const char * where, int rc)
{
if (!(ds != NULL && ds->i >= 0 && ds->i < ds->Count))
return;
@@ -421,7 +422,7 @@ void dsiNotify(rpmDepSet ds, const char * where, int rc)
(where != NULL ? where : ""));
}
-int dsiNext(/*@null@*/ rpmDepSet ds)
+int rpmdsNext(/*@null@*/ rpmds ds)
/*@modifies ds @*/
{
int i = -1;
@@ -434,7 +435,7 @@ int dsiNext(/*@null@*/ rpmDepSet ds)
t[0] = ((ds->Type != NULL) ? ds->Type[0] : '\0');
t[1] = '\0';
/*@-nullstate@*/
- ds->DNEVR = dsDNEVR(t, ds);
+ ds->DNEVR = rpmdsNewDNEVR(t, ds);
/*@=nullstate@*/
} else
@@ -450,7 +451,7 @@ fprintf(stderr, "*** ds %p\t%s[%d]: %s\n", ds, (ds->Type ? ds->Type : "?Type?"),
return i;
}
-rpmDepSet dsiInit(/*@returned@*/ /*@null@*/ rpmDepSet ds)
+rpmds rpmdsInit(/*@returned@*/ /*@null@*/ rpmds ds)
/*@modifies ds @*/
{
if (ds != NULL)
@@ -506,7 +507,7 @@ void parseEVR(char * evr,
if (rp) *rp = release;
}
-int dsCompare(const rpmDepSet A, const rpmDepSet B)
+int rpmdsCompare(const rpmds A, const rpmds B)
{
const char *aDepend = (A->DNEVR != NULL ? xstrdup(A->DNEVR+2) : "");
const char *bDepend = (B->DNEVR != NULL ? xstrdup(B->DNEVR+2) : "");
@@ -582,16 +583,16 @@ exit:
return result;
}
-void dsProblem(rpmProblemSet tsprobs, const char * pkgNEVR, const rpmDepSet ds,
- const fnpyKey * suggestedKeys)
+void rpmdsProblem(rpmps ps, const char * pkgNEVR,
+ const rpmds ds, const fnpyKey * suggestedKeys)
{
- const char * Name = dsiGetN(ds);
- const char * DNEVR = dsiGetDNEVR(ds);
- const char * EVR = dsiGetEVR(ds);
+ const char * Name = rpmdsN(ds);
+ const char * DNEVR = rpmdsDNEVR(ds);
+ const char * EVR = rpmdsEVR(ds);
rpmProblemType type;
fnpyKey key;
- if (tsprobs == NULL) return;
+ if (ps == NULL) return;
/*@-branchstate@*/
if (Name == NULL) Name = "?N?";
@@ -605,21 +606,20 @@ void dsProblem(rpmProblemSet tsprobs, const char * pkgNEVR, const rpmDepSet ds,
type = (DNEVR[0] == 'C' && DNEVR[1] == ' ')
? RPMPROB_CONFLICT : RPMPROB_REQUIRES;
key = (suggestedKeys ? suggestedKeys[0] : NULL);
- rpmProblemSetAppend(tsprobs, type, pkgNEVR, key,
- NULL, NULL, DNEVR, 0);
+ rpmpsAppend(ps, type, pkgNEVR, key, NULL, NULL, DNEVR, 0);
}
-int rangeMatchesDepFlags (Header h, const rpmDepSet req)
+int rangeMatchesDepFlags (Header h, const rpmds req)
{
int scareMem = 1;
- rpmDepSet provides = NULL;
+ rpmds provides = NULL;
int result = 0;
if (!(req->Flags[req->i] & RPMSENSE_SENSEMASK) || !req->EVR[req->i] || *req->EVR[req->i] == '\0')
return 1;
/* Get provides information from header */
- provides = dsiInit(dsNew(h, RPMTAG_PROVIDENAME, scareMem));
+ provides = rpmdsInit(rpmdsNew(h, RPMTAG_PROVIDENAME, scareMem));
if (provides == NULL)
goto exit; /* XXX should never happen */
@@ -635,13 +635,13 @@ int rangeMatchesDepFlags (Header h, const rpmDepSet req)
result = 0;
if (provides != NULL)
- while (dsiNext(provides) >= 0) {
+ while (rpmdsNext(provides) >= 0) {
/* Filter out provides that came along for the ride. */
if (strcmp(provides->N[provides->i], req->N[req->i]))
continue;
- result = dsCompare(provides, req);
+ result = rpmdsCompare(provides, req);
/* If this provide matches the require, we're done. */
if (result)
@@ -649,12 +649,12 @@ int rangeMatchesDepFlags (Header h, const rpmDepSet req)
}
exit:
- provides = dsFree(provides);
+ provides = rpmdsFree(provides);
return result;
}
-int headerMatchesDepFlags(const Header h, const rpmDepSet req)
+int headerMatchesDepFlags(const Header h, const rpmds req)
{
HGE_t hge = (HGE_t)headerGetEntryMinMemory;
const char * pkgN, * v, * r;
@@ -662,8 +662,8 @@ int headerMatchesDepFlags(const Header h, const rpmDepSet req)
const char * pkgEVR;
char * t;
int_32 pkgFlags = RPMSENSE_EQUAL;
- rpmDepSet pkg;
- int rc = 1; /* XXX assume match as names should be the same already here */
+ rpmds pkg;
+ int rc = 1; /* XXX assume match, names already match here */
if (!((req->Flags[req->i] & RPMSENSE_SENSEMASK) && req->EVR[req->i] && *req->EVR[req->i]))
return rc;
@@ -681,9 +681,9 @@ int headerMatchesDepFlags(const Header h, const rpmDepSet req)
}
(void) stpcpy( stpcpy( stpcpy(t, v) , "-") , r);
- if ((pkg = dsSingle(RPMTAG_PROVIDENAME, pkgN, pkgEVR, pkgFlags)) != NULL) {
- rc = dsCompare(pkg, req);
- pkg = dsFree(pkg);
+ if ((pkg = rpmdsSingle(RPMTAG_PROVIDENAME, pkgN, pkgEVR, pkgFlags)) != NULL) {
+ rc = rpmdsCompare(pkg, req);
+ pkg = rpmdsFree(pkg);
}
return rc;
diff --git a/lib/rpmds.h b/lib/rpmds.h
index 55b90a56b..c9093b897 100644
--- a/lib/rpmds.h
+++ b/lib/rpmds.h
@@ -9,7 +9,7 @@
/**
* A package dependency set.
*/
-struct rpmDepSet_s {
+struct rpmds_s {
int i; /*!< Element index. */
/*@observer@*/
@@ -43,14 +43,14 @@ extern "C" {
* @return NULL always
*/
/*@unused@*/ /*@null@*/
-rpmDepSet rpmdsUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ rpmDepSet ds,
+rpmds rpmdsUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ rpmds ds,
/*@null@*/ const char * msg)
/*@modifies ds @*/;
/** @todo Remove debugging entry from the ABI. */
/*@-exportlocal@*/
/*@null@*/
-rpmDepSet XrpmdsUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ rpmDepSet ds,
+rpmds XrpmdsUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ rpmds ds,
/*@null@*/ const char * msg, const char * fn, unsigned ln)
/*@modifies ds @*/;
/*@=exportlocal@*/
@@ -63,11 +63,11 @@ rpmDepSet XrpmdsUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ rpmDepSet ds,
* @return new dependency set reference
*/
/*@unused@*/
-rpmDepSet rpmdsLink (/*@null@*/ rpmDepSet ds, /*@null@*/ const char * msg)
+rpmds rpmdsLink (/*@null@*/ rpmds ds, /*@null@*/ const char * msg)
/*@modifies ds @*/;
/** @todo Remove debugging entry from the ABI. */
-rpmDepSet XrpmdsLink (/*@null@*/ rpmDepSet ds, /*@null@*/ const char * msg,
+rpmds XrpmdsLink (/*@null@*/ rpmds ds, /*@null@*/ const char * msg,
const char * fn, unsigned ln)
/*@modifies ds @*/;
#define rpmdsLink(_ds, _msg) XrpmdsLink(_ds, _msg, __FILE__, __LINE__)
@@ -78,7 +78,7 @@ rpmDepSet XrpmdsLink (/*@null@*/ rpmDepSet ds, /*@null@*/ const char * msg,
* @return NULL always
*/
/*@null@*/
-rpmDepSet dsFree(/*@killref@*/ /*@only@*/ /*@null@*/ rpmDepSet ds)
+rpmds rpmdsFree(/*@killref@*/ /*@only@*/ /*@null@*/ rpmds ds)
/*@modifies ds@*/;
/**
* Create and load a dependency set.
@@ -88,7 +88,7 @@ rpmDepSet dsFree(/*@killref@*/ /*@only@*/ /*@null@*/ rpmDepSet ds)
* @return new dependency set
*/
/*@null@*/
-rpmDepSet dsNew(Header h, rpmTag tagN, int scareMem)
+rpmds rpmdsNew(Header h, rpmTag tagN, int scareMem)
/*@modifies h @*/;
/**
@@ -98,7 +98,7 @@ rpmDepSet dsNew(Header h, rpmTag tagN, int scareMem)
* @return new formatted dependency (malloc'ed)
*/
/*@only@*/
-char * dsDNEVR(const char * dspfx, const rpmDepSet ds)
+char * rpmdsNewDNEVR(const char * dspfx, const rpmds ds)
/*@*/;
/**
@@ -109,7 +109,7 @@ char * dsDNEVR(const char * dspfx, const rpmDepSet ds)
* @return new dependency set
*/
/*@null@*/
-rpmDepSet dsThis(Header h, rpmTag tagN, int_32 Flags)
+rpmds rpmdsThis(Header h, rpmTag tagN, int_32 Flags)
/*@*/;
/**
@@ -121,7 +121,7 @@ rpmDepSet dsThis(Header h, rpmTag tagN, int_32 Flags)
* @return new dependency set
*/
/*@null@*/
-rpmDepSet dsSingle(rpmTag tagN, const char * N, const char * EVR, int_32 Flags)
+rpmds rpmdsSingle(rpmTag tagN, const char * N, const char * EVR, int_32 Flags)
/*@*/;
/**
@@ -129,7 +129,7 @@ rpmDepSet dsSingle(rpmTag tagN, const char * N, const char * EVR, int_32 Flags)
* @param ds dependency set
* @return current count
*/
-int dsiGetCount(/*@null@*/ const rpmDepSet ds)
+int rpmdsCount(/*@null@*/ const rpmds ds)
/*@*/;
/**
@@ -137,7 +137,7 @@ int dsiGetCount(/*@null@*/ const rpmDepSet ds)
* @param ds dependency set
* @return current index
*/
-int dsiGetIx(/*@null@*/ const rpmDepSet ds)
+int rpmdsIx(/*@null@*/ const rpmds ds)
/*@*/;
/**
@@ -146,7 +146,7 @@ int dsiGetIx(/*@null@*/ const rpmDepSet ds)
* @param ix new index
* @return current index
*/
-int dsiSetIx(/*@null@*/ rpmDepSet ds, int ix)
+int rpmdsSetIx(/*@null@*/ rpmds ds, int ix)
/*@modifies ds @*/;
/**
@@ -155,7 +155,7 @@ int dsiSetIx(/*@null@*/ rpmDepSet ds, int ix)
* @return current dependency DNEVR, NULL on invalid
*/
/*@observer@*/ /*@null@*/
-const char * dsiGetDNEVR(/*@null@*/ const rpmDepSet ds)
+const char * rpmdsDNEVR(/*@null@*/ const rpmds ds)
/*@*/;
/**
@@ -164,7 +164,7 @@ const char * dsiGetDNEVR(/*@null@*/ const rpmDepSet ds)
* @return current dependency name, NULL on invalid
*/
/*@observer@*/ /*@null@*/
-const char * dsiGetN(/*@null@*/ const rpmDepSet ds)
+const char * rpmdsN(/*@null@*/ const rpmds ds)
/*@*/;
/**
@@ -173,7 +173,7 @@ const char * dsiGetN(/*@null@*/ const rpmDepSet ds)
* @return current dependency EVR, NULL on invalid
*/
/*@observer@*/ /*@null@*/
-const char * dsiGetEVR(/*@null@*/ const rpmDepSet ds)
+const char * rpmdsEVR(/*@null@*/ const rpmds ds)
/*@*/;
/**
@@ -181,7 +181,7 @@ const char * dsiGetEVR(/*@null@*/ const rpmDepSet ds)
* @param ds dependency set
* @return current dependency flags, 0 on invalid
*/
-int_32 dsiGetFlags(/*@null@*/ const rpmDepSet ds)
+int_32 rpmdsFlags(/*@null@*/ const rpmds ds)
/*@*/;
/**
@@ -189,7 +189,7 @@ int_32 dsiGetFlags(/*@null@*/ const rpmDepSet ds)
* @param ds dependency set
* @return current dependency type, 0 on invalid
*/
-rpmTag dsiGetTagN(/*@null@*/ const rpmDepSet ds)
+rpmTag rpmdsTagN(/*@null@*/ const rpmds ds)
/*@*/;
/**
@@ -199,7 +199,7 @@ rpmTag dsiGetTagN(/*@null@*/ const rpmDepSet ds)
* @param rc 0 == YES, otherwise NO
*/
/*@-globuse@*/ /* FIX: rpmMessage annotation is a lie */
-void dsiNotify(/*@null@*/ rpmDepSet ds, /*@null@*/ const char * where, int rc)
+void rpmdsNotify(/*@null@*/ rpmds ds, /*@null@*/ const char * where, int rc)
/*@globals fileSystem @*/
/*@modifies fileSystem @*/;
/*@=globuse@*/
@@ -209,7 +209,7 @@ void dsiNotify(/*@null@*/ rpmDepSet ds, /*@null@*/ const char * where, int rc)
* @param ds dependency set
* @return dependency set iterator index, -1 on termination
*/
-int dsiNext(/*@null@*/ rpmDepSet ds)
+int rpmdsNext(/*@null@*/ rpmds ds)
/*@modifies ds @*/;
/**
@@ -218,7 +218,7 @@ int dsiNext(/*@null@*/ rpmDepSet ds)
* @return dependency set
*/
/*@null@*/
-rpmDepSet dsiInit(/*@null@*/ rpmDepSet ds)
+rpmds rpmdsInit(/*@null@*/ rpmds ds)
/*@modifies ds @*/;
/**
@@ -227,23 +227,26 @@ rpmDepSet dsiInit(/*@null@*/ rpmDepSet ds)
* @param B 2nd dependency
* @return 1 if dependencies overlap, 0 otherwise
*/
-int dsCompare(const rpmDepSet A, const rpmDepSet B)
+int rpmdsCompare(const rpmds A, const rpmds B)
/*@*/;
/**
* Report a Requires: or Conflicts: dependency problem.
+ * @param ps transaction set problems
+ * @param pkgNEVR package name/epoch/version/release
+ * @param ds dependency set
+ * @param suggestedKeys
*/
-void dsProblem(/*@null@*/ rpmProblemSet tsprobs,
- const char * pkgNEVR, const rpmDepSet ds,
+void rpmdsProblem(/*@null@*/ rpmps ps, const char * pkgNEVR, const rpmds ds,
/*@only@*/ /*@null@*/ const fnpyKey * suggestedKeys)
- /*@modifies tsprobs @*/;
+ /*@modifies ps @*/;
/**
* Compare package provides dependencies from header with a single dependency.
* @param h header
* @param req dependency set
*/
-int rangeMatchesDepFlags (Header h, const rpmDepSet req)
+int rangeMatchesDepFlags (Header h, const rpmds req)
/*@modifies h @*/;
/**
@@ -253,7 +256,7 @@ int rangeMatchesDepFlags (Header h, const rpmDepSet req)
* @param req dependency
* @return 1 if dependency overlaps, 0 otherwise
*/
-int headerMatchesDepFlags(const Header h, const rpmDepSet req)
+int headerMatchesDepFlags(const Header h, const rpmds req)
/*@*/;
#ifdef __cplusplus
diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index 55429c937..88e9ba5b2 100644
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -8,6 +8,8 @@
#include <rpmio_internal.h>
#include <rpmlib.h>
+#include "rpmps.h"
+
#include "cpio.h" /* XXX CPIO_FOO */
#include "fsm.h" /* XXX newFSM() */
@@ -19,14 +21,14 @@
#include "debug.h"
-/*@access TFI_t @*/
-/*@access transactionElement @*/
-/*@access rpmTransactionSet @*/ /* XXX for ts->ignoreSet */
+/*@access rpmfi @*/
+/*@access rpmte @*/
+/*@access rpmts @*/ /* XXX for ts->ignoreSet */
/*@unchecked@*/
static int _fi_debug = 0;
-TFI_t XrpmfiUnlink(TFI_t fi, const char * msg, const char * fn, unsigned ln)
+rpmfi XrpmfiUnlink(rpmfi fi, const char * msg, const char * fn, unsigned ln)
{
if (fi == NULL) return NULL;
/*@-modfilesystem@*/
@@ -37,7 +39,7 @@ fprintf(stderr, "--> fi %p -- %d %s at %s:%u\n", fi, fi->nrefs, msg, fn, ln);
return NULL;
}
-TFI_t XrpmfiLink(TFI_t fi, const char * msg, const char * fn, unsigned ln)
+rpmfi XrpmfiLink(rpmfi fi, const char * msg, const char * fn, unsigned ln)
{
if (fi == NULL) return NULL;
fi->nrefs++;
@@ -48,33 +50,33 @@ fprintf(stderr, "--> fi %p ++ %d %s at %s:%u\n", fi, fi->nrefs, msg, fn, ln);
/*@-refcounttrans@*/ return fi; /*@=refcounttrans@*/
}
-fnpyKey rpmfiGetKey(TFI_t fi)
+fnpyKey rpmfiKey(rpmfi fi)
{
- return (fi != NULL ? teGetKey(fi->te) : NULL);
+ return (fi != NULL ? rpmteKey(fi->te) : NULL);
}
-int tfiGetFC(TFI_t fi)
+int rpmfiFC(rpmfi fi)
{
return (fi != NULL ? fi->fc : 0);
}
-int tfiGetDC(TFI_t fi)
+int rpmfiDC(rpmfi fi)
{
return (fi != NULL ? fi->dc : 0);
}
#ifdef NOTYET
-int tfiGetDI(TFI_t fi)
+int rpmfiDI(rpmfi fi)
{
}
#endif
-int tfiGetFX(TFI_t fi)
+int rpmfiFX(rpmfi fi)
{
return (fi != NULL ? fi->i : -1);
}
-int tfiSetFX(TFI_t fi, int fx)
+int rpmfiSetFX(rpmfi fi, int fx)
{
int i = -1;
@@ -86,12 +88,12 @@ int tfiSetFX(TFI_t fi, int fx)
return i;
}
-int tfiGetDX(TFI_t fi)
+int rpmfiDX(rpmfi fi)
{
return (fi != NULL ? fi->j : -1);
}
-int tfiSetDX(TFI_t fi, int dx)
+int rpmfiSetDX(rpmfi fi, int dx)
{
int j = -1;
@@ -102,7 +104,7 @@ int tfiSetDX(TFI_t fi, int dx)
return j;
}
-const char * tfiGetBN(TFI_t fi)
+const char * rpmfiBN(rpmfi fi)
{
const char * BN = NULL;
@@ -113,7 +115,7 @@ const char * tfiGetBN(TFI_t fi)
return BN;
}
-const char * tfiGetDN(TFI_t fi)
+const char * rpmfiDN(rpmfi fi)
{
const char * DN = NULL;
@@ -124,7 +126,7 @@ const char * tfiGetDN(TFI_t fi)
return DN;
}
-const char * tfiGetFN(TFI_t fi)
+const char * rpmfiFN(rpmfi fi)
{
const char * FN = "";
@@ -142,7 +144,7 @@ const char * tfiGetFN(TFI_t fi)
return FN;
}
-int_32 tfiGetFFlags(TFI_t fi)
+int_32 rpmfiFFlags(rpmfi fi)
{
int_32 FFlags = 0;
@@ -153,7 +155,7 @@ int_32 tfiGetFFlags(TFI_t fi)
return FFlags;
}
-int_32 tfiGetVFlags(TFI_t fi)
+int_32 rpmfiVFlags(rpmfi fi)
{
int_32 VFlags = 0;
@@ -164,7 +166,7 @@ int_32 tfiGetVFlags(TFI_t fi)
return VFlags;
}
-int_16 tfiGetFMode(TFI_t fi)
+int_16 rpmfiFMode(rpmfi fi)
{
int_16 fmode = 0;
@@ -175,7 +177,7 @@ int_16 tfiGetFMode(TFI_t fi)
return fmode;
}
-rpmfileState tfiGetFState(TFI_t fi)
+rpmfileState rpmfiFState(rpmfi fi)
{
char fstate = 0;
@@ -186,7 +188,7 @@ rpmfileState tfiGetFState(TFI_t fi)
return fstate;
}
-const unsigned char * tfiGetMD5(TFI_t fi)
+const unsigned char * rpmfiMD5(rpmfi fi)
{
unsigned char * md5 = NULL;
@@ -197,7 +199,7 @@ const unsigned char * tfiGetMD5(TFI_t fi)
return md5;
}
-const char * tfiGetFLink(TFI_t fi)
+const char * rpmfiFLink(rpmfi fi)
{
const char * flink = NULL;
@@ -208,7 +210,7 @@ const char * tfiGetFLink(TFI_t fi)
return flink;
}
-int_32 tfiGetFSize(TFI_t fi)
+int_32 rpmfiFSize(rpmfi fi)
{
int_32 fsize = 0;
@@ -219,7 +221,7 @@ int_32 tfiGetFSize(TFI_t fi)
return fsize;
}
-int_16 tfiGetFRdev(TFI_t fi)
+int_16 rpmfiFRdev(rpmfi fi)
{
int_16 frdev = 0;
@@ -230,7 +232,7 @@ int_16 tfiGetFRdev(TFI_t fi)
return frdev;
}
-int_32 tfiGetFMtime(TFI_t fi)
+int_32 rpmfiFMtime(rpmfi fi)
{
int_32 fmtime = 0;
@@ -241,7 +243,7 @@ int_32 tfiGetFMtime(TFI_t fi)
return fmtime;
}
-const char * tfiGetFUser(TFI_t fi)
+const char * rpmfiFUser(rpmfi fi)
{
const char * fuser = NULL;
@@ -252,7 +254,7 @@ const char * tfiGetFUser(TFI_t fi)
return fuser;
}
-const char * tfiGetFGroup(TFI_t fi)
+const char * rpmfiFGroup(rpmfi fi)
{
const char * fgroup = NULL;
@@ -263,7 +265,7 @@ const char * tfiGetFGroup(TFI_t fi)
return fgroup;
}
-int tfiNext(TFI_t fi)
+int rpmfiNext(rpmfi fi)
{
int i = -1;
@@ -285,7 +287,7 @@ fprintf(stderr, "*** fi %p\t%s[%d] %s%s\n", fi, (fi->Type ? fi->Type : "?Type?")
return i;
}
-TFI_t tfiInit(TFI_t fi, int fx)
+rpmfi rpmfiInit(rpmfi fi, int fx)
{
if (fi != NULL) {
if (fx >= 0 && fx < fi->fc) {
@@ -303,7 +305,7 @@ TFI_t tfiInit(TFI_t fi, int fx)
/*@=refcounttrans@*/
}
-int tdiNext(TFI_t fi)
+int rpmfiNextD(rpmfi fi)
{
int j = -1;
@@ -323,7 +325,7 @@ fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, (fi->Type ? fi->Type : "?Type?"), j);
return j;
}
-TFI_t tdiInit(TFI_t fi, int dx)
+rpmfi rpmfiInitD(rpmfi fi, int dx)
{
if (fi != NULL) {
if (dx >= 0 && dx < fi->fc)
@@ -382,11 +384,11 @@ fileTypes whatis(uint_16 mode)
* @return header with relocated files
*/
static
-Header relocateFileList(const rpmTransactionSet ts, TFI_t fi,
+Header relocateFileList(const rpmts ts, rpmfi fi,
Header origH, fileAction * actions)
/*@modifies ts, fi, origH, actions @*/
{
- transactionElement p = fi->te;
+ rpmte p = fi->te;
HGE_t hge = fi->hge;
HAE_t hae = fi->hae;
HME_t hme = fi->hme;
@@ -486,11 +488,11 @@ Header relocateFileList(const rpmTransactionSet ts, TFI_t fi,
/* XXX actions check prevents problem from being appended twice. */
if (j == numValid && !allowBadRelocate && actions) {
- rpmProblemSet ps = rpmtsGetProblems(ts);
- rpmProblemSetAppend(ps, RPMPROB_BADRELOCATE,
+ rpmps ps = rpmtsGetProblems(ts);
+ rpmpsAppend(ps, RPMPROB_BADRELOCATE,
p->NEVR, p->key,
relocations[i].oldPath, NULL, NULL, 0);
- ps = rpmProblemSetFree(ps);
+ ps = rpmpsFree(ps);
}
del =
strlen(relocations[i].newPath) - strlen(relocations[i].oldPath);
@@ -807,7 +809,7 @@ Header relocateFileList(const rpmTransactionSet ts, TFI_t fi,
return h;
}
-TFI_t fiFree(TFI_t fi, int freefimem)
+rpmfi rpmfiFree(rpmfi fi, int freefimem)
{
HFD_t hfd = headerFreeData;
@@ -902,7 +904,7 @@ static inline unsigned char nibble(char c)
(_fi)->_data = memcpy(xmalloc((_fi)->fc * sizeof(*(_fi)->_data)), \
(_fi)->_data, (_fi)->fc * sizeof(*(_fi)->_data))
-TFI_t fiNew(rpmTransactionSet ts, TFI_t fi,
+rpmfi rpmfiNew(rpmts ts, rpmfi fi,
Header h, rpmTag tagN, int scareMem)
{
HGE_t hge =
@@ -931,7 +933,7 @@ TFI_t fiNew(rpmTransactionSet ts, TFI_t fi,
}
/*@=branchstate@*/
- fi->magic = TFIMAGIC;
+ fi->magic = RPMFIMAGIC;
fi->Type = Type;
fi->i = -1;
fi->tagN = tagN;
@@ -1034,9 +1036,9 @@ if (fi->actions == NULL)
/*@-compdef@*/ /* FIX: fi-md5s undefined */
foo = relocateFileList(ts, fi, h, fi->actions);
/*@=compdef@*/
- fi->h = headerFree(fi->h, "fiNew fi->h");
- fi->h = headerLink(foo, "fiNew fi->h = foo");
- foo = headerFree(foo, "fiNew foo");
+ fi->h = headerFree(fi->h, "rpmfiNew fi->h");
+ fi->h = headerLink(foo, "rpmfiNew fi->h = foo");
+ foo = headerFree(foo, "rpmfiNew foo");
}
if (!scareMem) {
@@ -1072,7 +1074,7 @@ if (_fi_debug < 0)
fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, Type, (fi ? fi->fc : 0));
/*@=modfilesystem@*/
- /*@-compdef -nullstate@*/ /* FIX: TFI null annotations */
+ /*@-compdef -nullstate@*/ /* FIX: rpmfi null annotations */
return rpmfiLink(fi, (fi ? fi->Type : NULL));
/*@=compdef =nullstate@*/
}
diff --git a/lib/rpmfi.h b/lib/rpmfi.h
index 56b96492b..900c5f9d3 100644
--- a/lib/rpmfi.h
+++ b/lib/rpmfi.h
@@ -22,7 +22,7 @@ struct sharedFileInfo_s {
/**
* A package filename set.
*/
-struct TFI_s {
+struct rpmfi_s {
int i; /*!< Current file index. */
int j; /*!< Current directory index. */
@@ -78,7 +78,7 @@ struct TFI_s {
/*=============================*/
/*@dependent@*/
- transactionElement te;
+ rpmte te;
HGE_t hge; /*!< Vector to headerGetEntry() */
HAE_t hae; /*!< Vector to headerAddEntry() */
@@ -127,7 +127,7 @@ struct TFI_s {
uint_32 * replacedSizes; /*!< (TR_ADDED) */
unsigned int record; /*!< (TR_REMOVED) */
int magic;
-#define TFIMAGIC 0x09697923
+#define RPMFIMAGIC 0x09697923
/*=============================*/
/*@refs@*/ int nrefs; /*!< Reference count. */
@@ -143,14 +143,14 @@ extern "C" {
* @return NULL always
*/
/*@unused@*/ /*@null@*/
-TFI_t rpmfiUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ TFI_t fi,
+rpmfi rpmfiUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ rpmfi fi,
/*@null@*/ const char * msg)
/*@modifies fi @*/;
/** @todo Remove debugging entry from the ABI. */
/*@-exportlocal@*/
/*@null@*/
-TFI_t XrpmfiUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ TFI_t fi,
+rpmfi XrpmfiUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ rpmfi fi,
/*@null@*/ const char * msg, const char * fn, unsigned ln)
/*@modifies fi @*/;
/*@=exportlocal@*/
@@ -162,11 +162,11 @@ TFI_t XrpmfiUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ TFI_t fi,
* @return new file info set reference
*/
/*@unused@*/
-TFI_t rpmfiLink (/*@null@*/ TFI_t fi, /*@null@*/ const char * msg)
+rpmfi rpmfiLink (/*@null@*/ rpmfi fi, /*@null@*/ const char * msg)
/*@modifies fi @*/;
/** @todo Remove debugging entry from the ABI. */
-TFI_t XrpmfiLink (/*@null@*/ TFI_t fi, /*@null@*/ const char * msg,
+rpmfi XrpmfiLink (/*@null@*/ rpmfi fi, /*@null@*/ const char * msg,
const char * fn, unsigned ln)
/*@modifies fi @*/;
#define rpmfiLink(_fi, _msg) XrpmfiLink(_fi, _msg, __FILE__, __LINE__)
@@ -177,7 +177,7 @@ TFI_t XrpmfiLink (/*@null@*/ TFI_t fi, /*@null@*/ const char * msg,
* @return transaction element file info key
*/
/*@exposed@*/ /*@dependent@*/ /*@null@*/
-fnpyKey rpmfiGetKey(TFI_t fi)
+fnpyKey rpmfiKey(rpmfi fi)
/*@*/;
/**
@@ -185,7 +185,7 @@ fnpyKey rpmfiGetKey(TFI_t fi)
* @param fi file info set
* @return current file count
*/
-int tfiGetFC(/*@null@*/ TFI_t fi)
+int rpmfiFC(/*@null@*/ rpmfi fi)
/*@*/;
/**
@@ -194,7 +194,7 @@ int tfiGetFC(/*@null@*/ TFI_t fi)
* @return current file index
*/
/*@unused@*/
-int tfiGetFX(/*@null@*/ TFI_t fi)
+int rpmfiFX(/*@null@*/ rpmfi fi)
/*@*/;
/**
@@ -204,7 +204,7 @@ int tfiGetFX(/*@null@*/ TFI_t fi)
* @return current file index
*/
/*@unused@*/
-int tfiSetFX(/*@null@*/ TFI_t fi, int fx)
+int rpmfiSetFX(/*@null@*/ rpmfi fi, int fx)
/*@modifies fi @*/;
/**
@@ -212,7 +212,7 @@ int tfiSetFX(/*@null@*/ TFI_t fi, int fx)
* @param fi file info set
* @return current directory count
*/
-int tfiGetDC(/*@null@*/ TFI_t fi)
+int rpmfiDC(/*@null@*/ rpmfi fi)
/*@*/;
/**
@@ -220,7 +220,7 @@ int tfiGetDC(/*@null@*/ TFI_t fi)
* @param fi file info set
* @return current directory index
*/
-int tfiGetDX(/*@null@*/ TFI_t fi)
+int rpmfiDX(/*@null@*/ rpmfi fi)
/*@*/;
/**
@@ -229,7 +229,7 @@ int tfiGetDX(/*@null@*/ TFI_t fi)
* @param fx new directory index
* @return current directory index
*/
-int tfiSetDX(/*@null@*/ TFI_t fi, int dx)
+int rpmfiSetDX(/*@null@*/ rpmfi fi, int dx)
/*@modifies fi @*/;
/**
@@ -238,7 +238,7 @@ int tfiSetDX(/*@null@*/ TFI_t fi, int dx)
* @return current base name, NULL on invalid
*/
/*@observer@*/ /*@null@*/
-const char * tfiGetBN(/*@null@*/ TFI_t fi)
+const char * rpmfiBN(/*@null@*/ rpmfi fi)
/*@*/;
/**
@@ -247,7 +247,7 @@ const char * tfiGetBN(/*@null@*/ TFI_t fi)
* @return current directory, NULL on invalid
*/
/*@observer@*/ /*@null@*/
-const char * tfiGetDN(/*@null@*/ TFI_t fi)
+const char * rpmfiDN(/*@null@*/ rpmfi fi)
/*@*/;
/**
@@ -256,7 +256,7 @@ const char * tfiGetDN(/*@null@*/ TFI_t fi)
* @return current file name
*/
/*@observer@*/
-const char * tfiGetFN(/*@null@*/ TFI_t fi)
+const char * rpmfiFN(/*@null@*/ rpmfi fi)
/*@modifies fi @*/;
/**
@@ -264,7 +264,7 @@ const char * tfiGetFN(/*@null@*/ TFI_t fi)
* @param fi file info set
* @return current file flags, 0 on invalid
*/
-int_32 tfiGetFFlags(/*@null@*/ TFI_t fi)
+int_32 rpmfiFFlags(/*@null@*/ rpmfi fi)
/*@*/;
/**
@@ -272,7 +272,7 @@ int_32 tfiGetFFlags(/*@null@*/ TFI_t fi)
* @param fi file info set
* @return current file verify flags, 0 on invalid
*/
-int_32 tfiGetVFlags(/*@null@*/ TFI_t fi)
+int_32 rpmfiVFlags(/*@null@*/ rpmfi fi)
/*@*/;
/**
@@ -280,7 +280,7 @@ int_32 tfiGetVFlags(/*@null@*/ TFI_t fi)
* @param fi file info set
* @return current file mode, 0 on invalid
*/
-int_16 tfiGetFMode(/*@null@*/ TFI_t fi)
+int_16 rpmfiFMode(/*@null@*/ rpmfi fi)
/*@*/;
/**
@@ -288,7 +288,7 @@ int_16 tfiGetFMode(/*@null@*/ TFI_t fi)
* @param fi file info set
* @return current file state, 0 on invalid
*/
-rpmfileState tfiGetFState(/*@null@*/ TFI_t fi)
+rpmfileState rpmfiFState(/*@null@*/ rpmfi fi)
/*@*/;
/**
@@ -297,7 +297,7 @@ rpmfileState tfiGetFState(/*@null@*/ TFI_t fi)
* @return current file md5 digest, NULL on invalid
*/
/*@observer@*/ /*@null@*/
-const unsigned char * tfiGetMD5(/*@null@*/ TFI_t fi)
+const unsigned char * rpmfiMD5(/*@null@*/ rpmfi fi)
/*@*/;
/**
@@ -306,7 +306,7 @@ const unsigned char * tfiGetMD5(/*@null@*/ TFI_t fi)
* @return current file linkto, NULL on invalid
*/
/*@observer@*/ /*@null@*/
-const char * tfiGetFLink(/*@null@*/ TFI_t fi)
+const char * rpmfiFLink(/*@null@*/ rpmfi fi)
/*@*/;
/**
@@ -314,7 +314,7 @@ const char * tfiGetFLink(/*@null@*/ TFI_t fi)
* @param fi file info set
* @return current file size, 0 on invalid
*/
-int_32 tfiGetFSize(/*@null@*/ TFI_t fi)
+int_32 rpmfiFSize(/*@null@*/ rpmfi fi)
/*@*/;
/**
@@ -322,7 +322,7 @@ int_32 tfiGetFSize(/*@null@*/ TFI_t fi)
* @param fi file info set
* @return current file rdev, 0 on invalid
*/
-int_16 tfiGetFRdev(/*@null@*/ TFI_t fi)
+int_16 rpmfiFRdev(/*@null@*/ rpmfi fi)
/*@*/;
/**
@@ -330,7 +330,7 @@ int_16 tfiGetFRdev(/*@null@*/ TFI_t fi)
* @param fi file info set
* @return current file modify time, 0 on invalid
*/
-int_32 tfiGetFMtime(/*@null@*/ TFI_t fi)
+int_32 rpmfiFMtime(/*@null@*/ rpmfi fi)
/*@*/;
/**
@@ -339,7 +339,7 @@ int_32 tfiGetFMtime(/*@null@*/ TFI_t fi)
* @return current file owner, NULL on invalid
*/
/*@observer@*/ /*@null@*/
-const char * tfiGetFUser(/*@null@*/ TFI_t fi)
+const char * rpmfiFUser(/*@null@*/ rpmfi fi)
/*@*/;
/**
@@ -348,7 +348,7 @@ const char * tfiGetFUser(/*@null@*/ TFI_t fi)
* @return current file group, NULL on invalid
*/
/*@observer@*/ /*@null@*/
-const char * tfiGetFGroup(/*@null@*/ TFI_t fi)
+const char * rpmfiFGroup(/*@null@*/ rpmfi fi)
/*@*/;
/**
@@ -356,7 +356,7 @@ const char * tfiGetFGroup(/*@null@*/ TFI_t fi)
* @param fi file info set
* @return file iterator index, -1 on termination
*/
-int tfiNext(/*@null@*/ TFI_t fi)
+int rpmfiNext(/*@null@*/ rpmfi fi)
/*@modifies fi @*/;
/**
@@ -366,7 +366,7 @@ int tfiNext(/*@null@*/ TFI_t fi)
* @return file info set
*/
/*@null@*/
-TFI_t tfiInit(/*@null@*/ TFI_t fi, int fx)
+rpmfi rpmfiInit(/*@null@*/ rpmfi fi, int fx)
/*@modifies fi @*/;
/**
@@ -375,7 +375,7 @@ TFI_t tfiInit(/*@null@*/ TFI_t fi, int fx)
* @return directory iterator index, -1 on termination
*/
/*@unused@*/
-int tdiNext(/*@null@*/ TFI_t fi)
+int rpmfiNextD(/*@null@*/ rpmfi fi)
/*@modifies fi @*/;
/**
@@ -385,7 +385,7 @@ int tdiNext(/*@null@*/ TFI_t fi)
* @return file info set, NULL if dx is out of range
*/
/*@unused@*/ /*@null@*/
-TFI_t tdiInit(/*@null@*/ TFI_t fi, int dx)
+rpmfi rpmfiInitD(/*@null@*/ rpmfi fi, int dx)
/*@modifies fi @*/;
/**
@@ -395,7 +395,7 @@ TFI_t tdiInit(/*@null@*/ TFI_t fi, int dx)
* @return NULL always
*/
/*@null@*/
-TFI_t fiFree(/*@killref@*/ /*@only@*/ /*@null@*/ TFI_t fi, int freefimem)
+rpmfi rpmfiFree(/*@killref@*/ /*@only@*/ /*@null@*/ rpmfi fi, int freefimem)
/*@modifies fi@*/;
/**
@@ -408,7 +408,7 @@ TFI_t fiFree(/*@killref@*/ /*@only@*/ /*@null@*/ TFI_t fi, int freefimem)
* @return new file set
*/
/*@null@*/
-TFI_t fiNew(rpmTransactionSet ts, /*@null@*/ TFI_t fi,
+rpmfi rpmfiNew(rpmts ts, /*@null@*/ rpmfi fi,
Header h, rpmTag tagN, int scareMem)
/*@modifies ts, fi, h @*/;
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index a4eb6a673..3c721af3c 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -7,14 +7,15 @@
#include <rpmcli.h>
#include "rpmdb.h"
+#include "rpmps.h"
#include "rpmts.h"
#include "manifest.h"
#include "misc.h" /* XXX for rpmGlob() */
#include "debug.h"
-/*@access rpmTransactionSet @*/ /* XXX ts->goal, ts->dbmode */
-/*@access rpmProblemSet @*/ /* XXX compared with NULL */
+/*@access rpmts @*/ /* XXX ts->goal, ts->dbmode */
+/*@access rpmps @*/ /* XXX compared with NULL */
/*@access Header @*/ /* XXX compared with NULL */
/*@access rpmdb @*/ /* XXX compared with NULL */
/*@access FD_t @*/ /* XXX compared with NULL */
@@ -213,12 +214,12 @@ struct rpmEIU {
};
/** @todo Generalize --freshen policies. */
-int rpmInstall(rpmTransactionSet ts,
+int rpmInstall(rpmts ts,
struct rpmInstallArguments_s * ia,
const char ** fileArgv)
{
struct rpmEIU * eiu = memset(alloca(sizeof(*eiu)), 0, sizeof(*eiu));
- rpmProblemSet ps;
+ rpmps ps;
rpmprobFilterFlags probFilter;
rpmRelocation * relocations;
/*@only@*/ /*@null@*/ const char * fileURL = NULL;
@@ -559,7 +560,7 @@ restart:
}
/*@=branchstate@*/
}
- ps = rpmProblemSetFree(ps);
+ ps = rpmpsFree(ps);
}
if (eiu->numRPMS && !(ia->installInterfaceFlags & INSTALL_NOORDER)) {
@@ -582,9 +583,9 @@ restart:
eiu->numFailed += eiu->numRPMS;
} else if (rc > 0) {
eiu->numFailed += rc;
- rpmProblemSetPrint(stderr, ps);
+ rpmpsPrint(stderr, ps);
}
- ps = rpmProblemSetFree(ps);
+ ps = rpmpsFree(ps);
}
if (eiu->numSRPMS && !stopInstall) {
@@ -627,7 +628,7 @@ exit:
return eiu->numFailed;
}
-int rpmErase(rpmTransactionSet ts,
+int rpmErase(rpmts ts,
const struct rpmInstallArguments_s * ia,
const char ** argv)
{
@@ -636,7 +637,7 @@ int rpmErase(rpmTransactionSet ts,
int numFailed = 0;
int stopUninstall = 0;
int numPackages = 0;
- rpmProblemSet ps;
+ rpmps ps;
if (argv == NULL) return 0;
@@ -699,20 +700,20 @@ int rpmErase(rpmTransactionSet ts,
numFailed += numPackages;
stopUninstall = 1;
}
- ps = rpmProblemSetFree(ps);
+ ps = rpmpsFree(ps);
}
if (!stopUninstall) {
(void) rpmtsSetFlags(ts, (rpmtsGetFlags(ts) | RPMTRANS_FLAG_REVERSE));
numFailed += rpmtsRun(ts, NULL, 0);
ps = rpmtsGetProblems(ts);
- ps = rpmProblemSetFree(ps);
+ ps = rpmpsFree(ps);
}
return numFailed;
}
-int rpmInstallSource(rpmTransactionSet ts, const char * arg,
+int rpmInstallSource(rpmts ts, const char * arg,
const char ** specFilePtr, const char ** cookie)
{
FD_t fd;
@@ -808,7 +809,7 @@ IDTX IDTXsort(IDTX idtx)
return idtx;
}
-IDTX IDTXload(rpmTransactionSet ts, rpmTag tag)
+IDTX IDTXload(rpmts ts, rpmTag tag)
{
IDTX idtx = NULL;
rpmdbMatchIterator mi;
@@ -852,7 +853,7 @@ IDTX IDTXload(rpmTransactionSet ts, rpmTag tag)
return IDTXsort(idtx);
}
-IDTX IDTXglob(rpmTransactionSet ts, const char * globstr, rpmTag tag)
+IDTX IDTXglob(rpmts ts, const char * globstr, rpmTag tag)
{
IDTX idtx = NULL;
HGE_t hge = (HGE_t) headerGetEntry;
@@ -926,14 +927,14 @@ IDTX IDTXglob(rpmTransactionSet ts, const char * globstr, rpmTag tag)
}
/** @todo Transaction handling, more, needs work. */
-int rpmRollback(rpmTransactionSet ts,
+int rpmRollback(rpmts ts,
/*@unused@*/ struct rpmInstallArguments_s * ia,
const char ** argv)
{
#ifdef NOTYET
rpmdb db = NULL;
- rpmTransactionSet ts = NULL;
- rpmProblemSet ps;
+ rpmts ts = NULL;
+ rpmps ps;
int ifmask= (INSTALL_UPGRADE|INSTALL_FRESHEN|INSTALL_INSTALL|INSTALL_ERASE);
unsigned thistid = 0xffffffff;
unsigned prevtid;
@@ -1066,10 +1067,10 @@ int rpmRollback(rpmTransactionSet ts,
if (rc != 0 && ps) {
rpmMessage(RPMMESS_ERROR, _("Failed dependencies:\n"));
printDepProblems(stderr, ps);
- ps = rpmProblemSetFree(ps);
+ ps = rpmpsFree(ps);
goto exit;
}
- ps = rpmProblemSetFree(ps);
+ ps = rpmpsFree(ps);
rc = rpmtsOrder(ts);
if (rc != 0)
@@ -1078,8 +1079,8 @@ int rpmRollback(rpmTransactionSet ts,
rc = rpmtsRun(ts, NULL, (ia->probFilter|RPMPROB_FILTER_OLDPACKAGE));
ps = rpmtsGetProblems(ts);
if (rc > 0)
- rpmProblemSetPrint(stderr, ps);
- ps = rpmProblemSetFree(ps);
+ rpmpsPrint(stderr, ps);
+ ps = rpmpsFree(ps);
if (rc)
goto exit;
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index a5f8cc08d..e8651f123 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -66,7 +66,7 @@ void * _free(/*@only@*/ /*@null@*/ /*@out@*/ const void * p)
* strict removals, and prerequisite ordering is done on installs/upgrades.
*/
typedef /*@abstract@*/ /*@refcounted@*/
-struct rpmTransactionSet_s * rpmTransactionSet;
+struct rpmts_s * rpmts;
/** \ingroup rpmtrans
* An added/available package retrieval key.
@@ -84,17 +84,17 @@ typedef /*@abstract@*/ int alNum;
/** \ingroup rpmtrans
* Dependency tag sets from a header, so that a header can be discarded early.
*/
-typedef /*@abstract@*/ /*@refcounted@*/ struct rpmDepSet_s * rpmDepSet;
+typedef /*@abstract@*/ /*@refcounted@*/ struct rpmds_s * rpmds;
/** \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;
+typedef /*@abstract@*/ /*@refcounted@*/ struct rpmfi_s * rpmfi;
/** \ingroup rpmtrans
* An element of a transaction set, i.e. a TR_ADDED or TR_REMOVED package.
*/
-typedef /*@abstract@*/ struct transactionElement_s * transactionElement;
+typedef /*@abstract@*/ struct rpmte_s * rpmte;
/** \ingroup rpmdb
* Database of headers and tag value indices.
@@ -655,188 +655,6 @@ void rpmFreeRpmrc(void)
/*@}*/
/* ==================================================================== */
-/** \name RPMPROBS */
-/*@{*/
-
-/**
- * Raw data for an element of a problem set.
- */
-typedef /*@abstract@*/ struct rpmProblem_s * rpmProblem;
-
-/**
- * Transaction problems found by rpmtsRun().
- */
-typedef /*@abstract@*/ /*@refcounted@*/ struct rpmProblemSet_s * rpmProblemSet;
-
-/**
- * Enumerate transaction set problem types.
- */
-typedef enum rpmProblemType_e {
- RPMPROB_BADARCH, /*!< package ... is for a different architecture */
- RPMPROB_BADOS, /*!< package ... is for a different operating system */
- RPMPROB_PKG_INSTALLED, /*!< package ... is already installed */
- RPMPROB_BADRELOCATE,/*!< path ... is not relocateable for package ... */
- RPMPROB_REQUIRES, /*!< package ... has unsatisfied Requires: ... */
- RPMPROB_CONFLICT, /*!< package ... has unsatisfied Conflicts: ... */
- RPMPROB_NEW_FILE_CONFLICT, /*!< file ... conflicts between attemped installs of ... */
- RPMPROB_FILE_CONFLICT,/*!< file ... from install of ... conflicts with file from package ... */
- RPMPROB_OLDPACKAGE, /*!< package ... (which is newer than ...) is already installed */
- RPMPROB_DISKSPACE, /*!< installing package ... needs ... on the ... filesystem */
- RPMPROB_DISKNODES, /*!< installing package ... needs ... on the ... filesystem */
- RPMPROB_BADPRETRANS /*!< (unimplemented) */
- } rpmProblemType;
-
-/**
- */
-struct rpmProblem_s {
-/*@only@*/ /*@null@*/
- char * pkgNEVR;
-/*@only@*/ /*@null@*/
- char * altNEVR;
-/*@exposed@*/ /*@null@*/
- fnpyKey key;
- rpmProblemType type;
- int ignoreProblem;
-/*@only@*/ /*@null@*/
- char * str1;
- unsigned long ulong1;
-};
-
-/**
- */
-struct rpmProblemSet_s {
- int numProblems; /*!< Current probs array size. */
- int numProblemsAlloced; /*!< Allocated probs array size. */
- rpmProblem probs; /*!< Array of specific problems. */
-/*@refs@*/
- int nrefs; /*!< Reference count. */
-};
-
-/**
- */
-void printDepFlags(FILE *fp, const char *version, int flags)
- /*@globals fileSystem @*/
- /*@modifies *fp, fileSystem @*/;
-
-/**
- * Print a problem array.
- * @param fp output file
- * @param ps dependency problems
- */
-void printDepProblems(FILE * fp, /*@null@*/ const rpmProblemSet ps)
- /*@globals fileSystem @*/
- /*@modifies *fp, fileSystem @*/;
-
-/**
- * Return formatted string representation of a problem.
- * @param prob rpm problem
- * @return formatted string (malloc'd)
- */
-/*@-redecl@*/ /* LCL: is confused. */
-/*@only@*/ extern const char * rpmProblemString(const rpmProblem prob)
- /*@*/;
-/*@=redecl@*/
-
-/**
- * Unreference a problem set instance.
- * @param ps problem set
- * @param msg
- * @return problem set
- */
-/*@unused@*/
-rpmProblemSet rpmpsUnlink (/*@killref@*/ /*@returned@*/ rpmProblemSet ps,
- const char * msg)
- /*@modifies ps @*/;
-
-/** @todo Remove debugging entry from the ABI. */
-/*@null@*/
-rpmProblemSet XrpmpsUnlink (/*@killref@*/ /*@returned@*/ rpmProblemSet ps,
- const char * msg, const char * fn, unsigned ln)
- /*@modifies ps @*/;
-#define rpmpsUnlink(_ps, _msg) XrpmpsUnlink(_ps, _msg, __FILE__, __LINE__)
-
-/**
- * Reference a problem set instance.
- * @param ps transaction set
- * @param msg
- * @return new transaction set reference
- */
-/*@unused@*/
-rpmProblemSet rpmpsLink (rpmProblemSet ps, const char * msg)
- /*@modifies ps @*/;
-
-/** @todo Remove debugging entry from the ABI. */
-rpmProblemSet XrpmpsLink (rpmProblemSet ps,
- const char * msg, const char * fn, unsigned ln)
- /*@modifies ps @*/;
-#define rpmpsLink(_ps, _msg) XrpmpsLink(_ps, _msg, __FILE__, __LINE__)
-
-/**
- * Create a problem set.
- */
-rpmProblemSet rpmProblemSetCreate(void)
- /*@*/;
-
-/**
- * Destroy a problem array.
- * @param ps problem set
- * @return NULL always
- */
-/*@null@*/
-rpmProblemSet rpmProblemSetFree(/*@killref@*/ /*@only@*/ /*@null@*/ rpmProblemSet ps)
- /*@modifies ps @*/;
-
-/**
- * Output formatted string representation of a problem to file handle.
- * @deprecated API: prob used to be passed by value, now passed by reference.
- * @param fp file handle
- * @param prob rpm problem
- */
-void rpmProblemPrint(FILE *fp, rpmProblem prob)
- /*@globals fileSystem @*/
- /*@modifies prob, *fp, fileSystem @*/;
-
-/**
- * Print problems to file handle.
- * @param fp file handle
- * @param ps problem set
- */
-void rpmProblemSetPrint(FILE *fp, /*@null@*/ rpmProblemSet ps)
- /*@globals fileSystem @*/
- /*@modifies *fp, ps, fileSystem @*/;
-
-/**
- * Append a problem to set.
- */
-void rpmProblemSetAppend(/*@null@*/ rpmProblemSet ps, rpmProblemType type,
- /*@null@*/ const char * pkgNEVR,
- /*@exposed@*/ /*@null@*/ fnpyKey key,
- /*@null@*/ const char * dn, /*@null@*/ const char * bn,
- /*@null@*/ const char * altNEVR,
- unsigned long ulong1)
- /*@modifies ps @*/;
-
-/**
- * Filter a problem set.
- *
- * As the problem sets are generated in an order solely dependent
- * on the ordering of the packages in the transaction, and that
- * ordering can't be changed, the problem sets must be parallel to
- * one another. Additionally, the filter set must be a subset of the
- * target set, given the operations available on transaction set.
- * This is good, as it lets us perform this trim in linear time, rather
- * then logarithmic or quadratic.
- *
- * @param ps problem set
- * @param filter problem filter (or NULL)
- * @return 0 no problems, 1 if problems remain
- */
-int rpmProblemSetTrim(/*@null@*/ rpmProblemSet ps,
- /*@null@*/ rpmProblemSet filter)
- /*@modifies ps @*/;
-
-/*@}*/
-/* ==================================================================== */
/** \name RPMTS */
/*@{*/
/**
@@ -1013,7 +831,7 @@ typedef /*@abstract@*/ struct psm_s * PSM_t;
* @retval hdrp address of header (or NULL)
* @return 0 on success
*/
-int rpmReadPackageFile(rpmTransactionSet ts, FD_t fd,
+int rpmReadPackageFile(rpmts ts, FD_t fd,
const char * fn, /*@null@*/ /*@out@*/ Header * hdrp)
/*@globals fileSystem, internalState @*/
/*@modifies ts, fd, *hdrp, fileSystem, internalState @*/;
@@ -1026,7 +844,7 @@ int rpmReadPackageFile(rpmTransactionSet ts, FD_t fd,
* @retval cookie address of cookie pointer (or NULL)
* @return rpmRC return code
*/
-rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, FD_t fd,
+rpmRC rpmInstallSourcePackage(rpmts ts, FD_t fd,
/*@null@*/ /*@out@*/ const char ** specFilePtr,
/*@null@*/ /*@out@*/ const char ** cookie)
/*@globals rpmGlobalMacroContext,
@@ -1125,7 +943,7 @@ int rpmvercmp(const char * a, const char * b)
* @param key dependency
* @return 1 if dependency overlaps, 0 otherwise
*/
-int rpmCheckRpmlibProvides(const rpmDepSet key)
+int rpmCheckRpmlibProvides(const rpmds key)
/*@*/;
/** \ingroup rpmcli
@@ -1299,7 +1117,7 @@ typedef enum rpmVerifySignatureReturn_e {
* @retval result detailed text result of signature verification
* @return result of signature verification
*/
-rpmVerifySignatureReturn rpmVerifySignature(const rpmTransactionSet ts,
+rpmVerifySignatureReturn rpmVerifySignature(const rpmts ts,
/*@out@*/ char * result)
/*@globals fileSystem, internalState @*/
/*@modifies ts, *result, fileSystem, internalState @*/;
diff --git a/lib/rpmlibprov.c b/lib/rpmlibprov.c
index 92ab4a778..0b26b9f06 100644
--- a/lib/rpmlibprov.c
+++ b/lib/rpmlibprov.c
@@ -6,6 +6,7 @@
#include <rpmlib.h>
+#include "rpmps.h"
#include "rpmds.h"
#include "debug.h"
@@ -65,18 +66,18 @@ void rpmShowRpmlibProvides(FILE * fp)
}
}
-int rpmCheckRpmlibProvides(const rpmDepSet key)
+int rpmCheckRpmlibProvides(const rpmds key)
{
const struct rpmlibProvides_s * rlp;
int rc = 0;
for (rlp = rpmlibProvides; rlp->featureName != NULL; rlp++) {
if (rlp->featureEVR && rlp->featureFlags) {
- rpmDepSet pro;
- pro = dsSingle(RPMTAG_PROVIDENAME, rlp->featureName,
+ rpmds pro;
+ pro = rpmdsSingle(RPMTAG_PROVIDENAME, rlp->featureName,
rlp->featureEVR, rlp->featureFlags);
- rc = dsCompare(pro, key);
- pro = dsFree(pro);
+ rc = rpmdsCompare(pro, key);
+ pro = rpmdsFree(pro);
}
if (rc)
break;
diff --git a/lib/problems.c b/lib/rpmps.c
index bdf35a741..fde4b82e8 100644
--- a/lib/problems.c
+++ b/lib/rpmps.c
@@ -1,11 +1,12 @@
/**
- * \file lib/problems.c
+ * \file lib/rpmps.c
*/
#include "system.h"
#include <rpmlib.h>
+#include "rpmps.h"
#include "rpmts.h"
#include "misc.h"
@@ -18,7 +19,7 @@
/*@unchecked@*/
static int _ps_debug = 0;
-rpmProblemSet XrpmpsUnlink(rpmProblemSet ps, const char * msg,
+rpmps XrpmpsUnlink(rpmps ps, const char * msg,
const char * fn, unsigned ln)
{
/*@-modfilesystem@*/
@@ -31,7 +32,7 @@ fprintf(stderr, "--> ps %p -- %d %s at %s:%u\n", ps, ps->nrefs, msg, fn, ln);
/*@=refcounttrans@*/
}
-rpmProblemSet XrpmpsLink(rpmProblemSet ps, const char * msg,
+rpmps XrpmpsLink(rpmps ps, const char * msg,
const char * fn, unsigned ln)
{
ps->nrefs++;
@@ -44,13 +45,13 @@ fprintf(stderr, "--> ps %p ++ %d %s at %s:%u\n", ps, ps->nrefs, msg, fn, ln);
/*@=refcounttrans@*/
}
-rpmProblemSet rpmProblemSetCreate(void)
+rpmps rpmpsCreate(void)
{
- rpmProblemSet ps = xcalloc(1, sizeof(*ps));
+ rpmps ps = xcalloc(1, sizeof(*ps));
return rpmpsLink(ps, "create");
}
-rpmProblemSet rpmProblemSetFree(rpmProblemSet ps)
+rpmps rpmpsFree(rpmps ps)
{
if (ps == NULL) return NULL;
ps = rpmpsUnlink(ps, "dereference");
@@ -71,7 +72,7 @@ rpmProblemSet rpmProblemSetFree(rpmProblemSet ps)
return NULL;
}
-void rpmProblemSetAppend(rpmProblemSet ps, rpmProblemType type,
+void rpmpsAppend(rpmps ps, rpmProblemType type,
const char * pkgNEVR, fnpyKey key,
const char * dn, const char * bn,
const char * altNEVR, unsigned long ulong1)
@@ -114,7 +115,7 @@ void rpmProblemSetAppend(rpmProblemSet ps, rpmProblemType type,
#define XSTRCMP(a, b) ((!(a) && !(b)) || ((a) && (b) && !strcmp((a), (b))))
-int rpmProblemSetTrim(rpmProblemSet ps, rpmProblemSet filter)
+int rpmpsTrim(rpmps ps, rpmps filter)
{
rpmProblem t;
rpmProblem f;
@@ -291,7 +292,7 @@ void rpmProblemPrint(FILE *fp, rpmProblem prob)
msg = _free(msg);
}
-void rpmProblemSetPrint(FILE *fp, rpmProblemSet ps)
+void rpmpsPrint(FILE *fp, rpmps ps)
{
int i;
@@ -329,8 +330,8 @@ static int sameProblem(const rpmProblem ap, const rpmProblem bp)
return 0;
}
-/* XXX FIXME: merge into rpmProblemSetPrint */
-void printDepProblems(FILE * fp, rpmProblemSet ps)
+/* XXX FIXME: merge into rpmpsPrint */
+void printDepProblems(FILE * fp, rpmps ps)
{
int i;
diff --git a/lib/rpmps.h b/lib/rpmps.h
new file mode 100644
index 000000000..0561989ca
--- /dev/null
+++ b/lib/rpmps.h
@@ -0,0 +1,193 @@
+#ifndef H_RPMPS
+#define H_RPMPS
+
+/** \ingroup rpmps
+ * \file lib/rpmps.h
+ * Structures and prototypes used for an "rpmps" problem set.
+ */
+
+/**
+ * Raw data for an element of a problem set.
+ */
+typedef /*@abstract@*/ struct rpmProblem_s * rpmProblem;
+
+/**
+ * Transaction problems found while processing a transaction set/
+ */
+typedef /*@abstract@*/ /*@refcounted@*/ struct rpmps_s * rpmps;
+
+/**
+ * Enumerate transaction set problem types.
+ */
+typedef enum rpmProblemType_e {
+ RPMPROB_BADARCH, /*!< package ... is for a different architecture */
+ RPMPROB_BADOS, /*!< package ... is for a different operating system */
+ RPMPROB_PKG_INSTALLED, /*!< package ... is already installed */
+ RPMPROB_BADRELOCATE,/*!< path ... is not relocateable for package ... */
+ RPMPROB_REQUIRES, /*!< package ... has unsatisfied Requires: ... */
+ RPMPROB_CONFLICT, /*!< package ... has unsatisfied Conflicts: ... */
+ RPMPROB_NEW_FILE_CONFLICT, /*!< file ... conflicts between attemped installs of ... */
+ RPMPROB_FILE_CONFLICT,/*!< file ... from install of ... conflicts with file from package ... */
+ RPMPROB_OLDPACKAGE, /*!< package ... (which is newer than ...) is already installed */
+ RPMPROB_DISKSPACE, /*!< installing package ... needs ... on the ... filesystem */
+ RPMPROB_DISKNODES, /*!< installing package ... needs ... on the ... filesystem */
+ RPMPROB_BADPRETRANS /*!< (unimplemented) */
+ } rpmProblemType;
+
+/**
+ */
+struct rpmProblem_s {
+/*@only@*/ /*@null@*/
+ char * pkgNEVR;
+/*@only@*/ /*@null@*/
+ char * altNEVR;
+/*@exposed@*/ /*@null@*/
+ fnpyKey key;
+ rpmProblemType type;
+ int ignoreProblem;
+/*@only@*/ /*@null@*/
+ char * str1;
+ unsigned long ulong1;
+};
+
+/**
+ */
+struct rpmps_s {
+ int numProblems; /*!< Current probs array size. */
+ int numProblemsAlloced; /*!< Allocated probs array size. */
+ rpmProblem probs; /*!< Array of specific problems. */
+/*@refs@*/
+ int nrefs; /*!< Reference count. */
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ */
+void printDepFlags(FILE *fp, const char *version, int flags)
+ /*@globals fileSystem @*/
+ /*@modifies *fp, fileSystem @*/;
+
+/**
+ * Print a problem array.
+ * @param fp output file
+ * @param ps dependency problems
+ */
+void printDepProblems(FILE * fp, /*@null@*/ const rpmps ps)
+ /*@globals fileSystem @*/
+ /*@modifies *fp, fileSystem @*/;
+
+/**
+ * Return formatted string representation of a problem.
+ * @param prob rpm problem
+ * @return formatted string (malloc'd)
+ */
+/*@-redecl@*/ /* LCL: is confused. */
+/*@only@*/ extern const char * rpmProblemString(const rpmProblem prob)
+ /*@*/;
+/*@=redecl@*/
+
+/**
+ * Unreference a problem set instance.
+ * @param ps problem set
+ * @param msg
+ * @return problem set
+ */
+/*@unused@*/
+rpmps rpmpsUnlink (/*@killref@*/ /*@returned@*/ rpmps ps,
+ const char * msg)
+ /*@modifies ps @*/;
+
+/** @todo Remove debugging entry from the ABI. */
+/*@null@*/
+rpmps XrpmpsUnlink (/*@killref@*/ /*@returned@*/ rpmps ps,
+ const char * msg, const char * fn, unsigned ln)
+ /*@modifies ps @*/;
+#define rpmpsUnlink(_ps, _msg) XrpmpsUnlink(_ps, _msg, __FILE__, __LINE__)
+
+/**
+ * Reference a problem set instance.
+ * @param ps transaction set
+ * @param msg
+ * @return new transaction set reference
+ */
+/*@unused@*/
+rpmps rpmpsLink (rpmps ps, const char * msg)
+ /*@modifies ps @*/;
+
+/** @todo Remove debugging entry from the ABI. */
+rpmps XrpmpsLink (rpmps ps,
+ const char * msg, const char * fn, unsigned ln)
+ /*@modifies ps @*/;
+#define rpmpsLink(_ps, _msg) XrpmpsLink(_ps, _msg, __FILE__, __LINE__)
+
+/**
+ * Create a problem set.
+ */
+rpmps rpmpsCreate(void)
+ /*@*/;
+
+/**
+ * Destroy a problem set.
+ * @param ps problem set
+ * @return NULL always
+ */
+/*@null@*/
+rpmps rpmpsFree(/*@killref@*/ /*@only@*/ /*@null@*/ rpmps ps)
+ /*@modifies ps @*/;
+
+/**
+ * Output formatted string representation of a problem to file handle.
+ * @deprecated API: prob used to be passed by value, now passed by reference.
+ * @param fp file handle
+ * @param prob rpm problem
+ */
+void rpmProblemPrint(FILE *fp, rpmProblem prob)
+ /*@globals fileSystem @*/
+ /*@modifies prob, *fp, fileSystem @*/;
+
+/**
+ * Print problems to file handle.
+ * @param fp file handle
+ * @param ps problem set
+ */
+void rpmpsPrint(FILE *fp, /*@null@*/ rpmps ps)
+ /*@globals fileSystem @*/
+ /*@modifies *fp, ps, fileSystem @*/;
+
+/**
+ * Append a problem to set.
+ */
+void rpmpsAppend(/*@null@*/ rpmps ps, rpmProblemType type,
+ /*@null@*/ const char * pkgNEVR,
+ /*@exposed@*/ /*@null@*/ fnpyKey key,
+ /*@null@*/ const char * dn, /*@null@*/ const char * bn,
+ /*@null@*/ const char * altNEVR,
+ unsigned long ulong1)
+ /*@modifies ps @*/;
+
+/**
+ * Filter a problem set.
+ *
+ * As the problem sets are generated in an order solely dependent
+ * on the ordering of the packages in the transaction, and that
+ * ordering can't be changed, the problem sets must be parallel to
+ * one another. Additionally, the filter set must be a subset of the
+ * target set, given the operations available on transaction set.
+ * This is good, as it lets us perform this trim in linear time, rather
+ * then logarithmic or quadratic.
+ *
+ * @param ps problem set
+ * @param filter problem filter (or NULL)
+ * @return 0 no problems, 1 if problems remain
+ */
+int rpmpsTrim(/*@null@*/ rpmps ps, /*@null@*/ rpmps filter)
+ /*@modifies ps @*/;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_RPMPS */
diff --git a/lib/rpmte.c b/lib/rpmte.c
index b98710d17..37968f633 100644
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -1,12 +1,14 @@
/** \ingroup rpmdep
* \file lib/rpmte.c
- * Routine(s) to handle a transactionElement.
+ * Routine(s) to handle an "rpmte" transaction element.
*/
#include "system.h"
#include <rpmlib.h>
#include "psm.h"
+#include "rpmps.h"
+
#include "rpmds.h"
#include "rpmfi.h"
#include "rpmte.h"
@@ -18,13 +20,22 @@
int _te_debug = 0;
/*@access alKey @*/
-/*@access teIterator @*/
-/*@access transactionElement @*/
-/*@access rpmTransactionSet @*/
+/*@access rpmtei @*/
+/*@access rpmte @*/
+/*@access rpmts @*/
+
+void rpmteCleanDS(rpmte te)
+{
+ te->this = rpmdsFree(te->this);
+ te->provides = rpmdsFree(te->provides);
+ te->requires = rpmdsFree(te->requires);
+ te->conflicts = rpmdsFree(te->conflicts);
+ te->obsoletes = rpmdsFree(te->obsoletes);
+}
/**
*/
-static void delTE(transactionElement p)
+static void delTE(rpmte p)
/*@modifies p @*/
{
rpmRelocation * r;
@@ -37,12 +48,9 @@ static void delTE(transactionElement p)
p->relocs = _free(p->relocs);
}
- p->this = dsFree(p->this);
- p->provides = dsFree(p->provides);
- p->requires = dsFree(p->requires);
- p->conflicts = dsFree(p->conflicts);
- p->obsoletes = dsFree(p->obsoletes);
- p->fi = fiFree(p->fi, 1);
+ rpmteCleanDS(p);
+
+ p->fi = rpmfiFree(p->fi, 1);
/*@-noeffectuncon@*/
if (p->fd != NULL)
@@ -67,7 +75,7 @@ static void delTE(transactionElement p)
/**
*/
-static void addTE(rpmTransactionSet ts, transactionElement p, Header h,
+static void addTE(rpmts ts, rpmte p, Header h,
/*@dependent@*/ /*@null@*/ fnpyKey key,
/*@null@*/ rpmRelocation * relocs)
/*@modifies ts, p, h @*/
@@ -102,12 +110,12 @@ static void addTE(rpmTransactionSet ts, transactionElement p, Header h,
p->epoch = NULL;
/*@=branchstate@*/
- p->this = dsThis(h, RPMTAG_PROVIDENAME, RPMSENSE_EQUAL);
- p->provides = dsNew(h, RPMTAG_PROVIDENAME, scareMem);
- p->fi = fiNew(ts, NULL, h, RPMTAG_BASENAMES, scareMem);
- p->requires = dsNew(h, RPMTAG_REQUIRENAME, scareMem);
- p->conflicts = dsNew(h, RPMTAG_CONFLICTNAME, scareMem);
- p->obsoletes = dsNew(h, RPMTAG_OBSOLETENAME, scareMem);
+ p->this = rpmdsThis(h, RPMTAG_PROVIDENAME, RPMSENSE_EQUAL);
+ p->provides = rpmdsNew(h, RPMTAG_PROVIDENAME, scareMem);
+ p->fi = rpmfiNew(ts, NULL, h, RPMTAG_BASENAMES, scareMem);
+ p->requires = rpmdsNew(h, RPMTAG_REQUIRENAME, scareMem);
+ p->conflicts = rpmdsNew(h, RPMTAG_CONFLICTNAME, scareMem);
+ p->obsoletes = rpmdsNew(h, RPMTAG_OBSOLETENAME, scareMem);
p->key = key;
@@ -134,7 +142,7 @@ static void addTE(rpmTransactionSet ts, transactionElement p, Header h,
}
}
-transactionElement teFree(transactionElement te)
+rpmte rpmteFree(rpmte te)
{
if (te != NULL) {
delTE(te);
@@ -144,14 +152,14 @@ transactionElement teFree(transactionElement te)
return NULL;
}
-transactionElement teNew(const rpmTransactionSet ts, Header h,
+rpmte rpmteNew(const rpmts ts, Header h,
rpmTransactionType type,
fnpyKey key,
rpmRelocation * relocs,
int dboffset,
alKey pkgKey)
{
- transactionElement te = xcalloc(1, sizeof(*te));
+ rpmte te = xcalloc(1, sizeof(*te));
addTE(ts, te, h, key, relocs);
switch (type) {
@@ -168,48 +176,47 @@ transactionElement teNew(const rpmTransactionSet ts, Header h,
return te;
}
-rpmTransactionType teGetType(transactionElement te)
+rpmTransactionType rpmteType(rpmte te)
{
- return te->type;
+ return (te != NULL ? te->type : -1);
}
-const char * teGetN(transactionElement te)
- /*@*/
+const char * rpmteN(rpmte te)
{
return (te != NULL ? te->name : NULL);
}
-const char * teGetE(transactionElement te)
+const char * rpmteE(rpmte te)
{
return (te != NULL ? te->epoch : NULL);
}
-const char * teGetV(transactionElement te)
+const char * rpmteV(rpmte te)
{
return (te != NULL ? te->version : NULL);
}
-const char * teGetR(transactionElement te)
+const char * rpmteR(rpmte te)
{
return (te != NULL ? te->release : NULL);
}
-const char * teGetA(transactionElement te)
+const char * rpmteA(rpmte te)
{
return (te != NULL ? te->arch : NULL);
}
-const char * teGetO(transactionElement te)
+const char * rpmteO(rpmte te)
{
return (te != NULL ? te->os : NULL);
}
-int teGetMultiLib(transactionElement te)
+int rpmteMultiLib(rpmte te)
{
return (te != NULL ? te->multiLib : 0);
}
-int teSetMultiLib(transactionElement te, int nmultiLib)
+int rpmteSetMultiLib(rpmte te, int nmultiLib)
{
int omultiLib = 0;
if (te != NULL) {
@@ -219,12 +226,12 @@ int teSetMultiLib(transactionElement te, int nmultiLib)
return omultiLib;
}
-int teGetDepth(transactionElement te)
+int rpmteDepth(rpmte te)
{
return (te != NULL ? te->depth : 0);
}
-int teSetDepth(transactionElement te, int ndepth)
+int rpmteSetDepth(rpmte te, int ndepth)
{
int odepth = 0;
if (te != NULL) {
@@ -234,12 +241,12 @@ int teSetDepth(transactionElement te, int ndepth)
return odepth;
}
-int teGetNpreds(transactionElement te)
+int rpmteNpreds(rpmte te)
{
return (te != NULL ? te->npreds : 0);
}
-int teSetNpreds(transactionElement te, int npreds)
+int rpmteSetNpreds(rpmte te, int npreds)
{
int opreds = 0;
if (te != NULL) {
@@ -249,12 +256,12 @@ int teSetNpreds(transactionElement te, int npreds)
return opreds;
}
-int teGetTree(transactionElement te)
+int rpmteTree(rpmte te)
{
return (te != NULL ? te->tree : 0);
}
-int teSetTree(transactionElement te, int ntree)
+int rpmteSetTree(rpmte te, int ntree)
{
int otree = 0;
if (te != NULL) {
@@ -264,14 +271,14 @@ int teSetTree(transactionElement te, int ntree)
return otree;
}
-transactionElement teGetParent(transactionElement te)
+rpmte rpmteParent(rpmte te)
{
return (te != NULL ? te->parent : NULL);
}
-transactionElement teSetParent(transactionElement te, transactionElement pte)
+rpmte rpmteSetParent(rpmte te, rpmte pte)
{
- transactionElement opte = NULL;
+ rpmte opte = NULL;
/*@-branchstate@*/
if (te != NULL) {
opte = te->parent;
@@ -283,12 +290,12 @@ transactionElement teSetParent(transactionElement te, transactionElement pte)
return opte;
}
-int teGetDegree(transactionElement te)
+int rpmteDegree(rpmte te)
{
return (te != NULL ? te->degree : 0);
}
-int teSetDegree(transactionElement te, int ndegree)
+int rpmteSetDegree(rpmte te, int ndegree)
{
int odegree = 0;
if (te != NULL) {
@@ -298,21 +305,21 @@ int teSetDegree(transactionElement te, int ndegree)
return odegree;
}
-tsortInfo teGetTSI(transactionElement te)
+tsortInfo rpmteTSI(rpmte te)
{
/*@-compdef -retalias -retexpose -usereleased @*/
return te->tsi;
/*@=compdef =retalias =retexpose =usereleased @*/
}
-void teFreeTSI(transactionElement te)
+void rpmteFreeTSI(rpmte te)
{
- if (te != NULL && teGetTSI(te) != NULL) {
+ if (te != NULL && rpmteTSI(te) != NULL) {
tsortInfo tsi;
/* Clean up tsort remnants (if any). */
- while ((tsi = teGetTSI(te)->tsi_next) != NULL) {
- teGetTSI(te)->tsi_next = tsi->tsi_next;
+ while ((tsi = rpmteTSI(te)->tsi_next) != NULL) {
+ rpmteTSI(te)->tsi_next = tsi->tsi_next;
tsi->tsi_next = NULL;
tsi = _free(tsi);
}
@@ -323,29 +330,20 @@ void teFreeTSI(transactionElement te)
/*@=nullstate@*/
}
-void teNewTSI(transactionElement te)
+void rpmteNewTSI(rpmte te)
{
if (te != NULL) {
- teFreeTSI(te);
+ rpmteFreeTSI(te);
te->tsi = xcalloc(1, sizeof(*te->tsi));
}
}
-void teCleanDS(transactionElement te)
-{
- te->this = dsFree(te->this);
- te->provides = dsFree(te->provides);
- te->requires = dsFree(te->requires);
- te->conflicts = dsFree(te->conflicts);
- te->obsoletes = dsFree(te->obsoletes);
-}
-
-alKey teGetAddedKey(transactionElement te)
+alKey rpmteAddedKey(rpmte te)
{
return (te != NULL ? te->u.addedKey : RPMAL_NOMATCH);
}
-alKey teSetAddedKey(transactionElement te, alKey npkgKey)
+alKey rpmteSetAddedKey(rpmte te, alKey npkgKey)
{
alKey opkgKey = RPMAL_NOMATCH;
if (te != NULL) {
@@ -356,34 +354,34 @@ alKey teSetAddedKey(transactionElement te, alKey npkgKey)
}
-alKey teGetDependsOnKey(transactionElement te)
+alKey rpmteDependsOnKey(rpmte te)
{
return (te != NULL ? te->u.removed.dependsOnKey : RPMAL_NOMATCH);
}
-int teGetDBOffset(transactionElement te)
+int rpmteDBOffset(rpmte te)
{
return (te != NULL ? te->u.removed.dboffset : 0);
}
-const char * teGetNEVR(transactionElement te)
+const char * rpmteNEVR(rpmte te)
{
return (te != NULL ? te->NEVR : NULL);
}
-FD_t teGetFd(transactionElement te)
+FD_t rpmteFd(rpmte te)
{
/*@-compdef -refcounttrans -retalias -retexpose -usereleased @*/
return (te != NULL ? te->fd : NULL);
/*@=compdef =refcounttrans =retalias =retexpose =usereleased @*/
}
-fnpyKey teGetKey(transactionElement te)
+fnpyKey rpmteKey(rpmte te)
{
return (te != NULL ? te->key : NULL);
}
-rpmDepSet teGetDS(transactionElement te, rpmTag tag)
+rpmds rpmteDS(rpmte te, rpmTag tag)
{
/*@-compdef -refcounttrans -retalias -retexpose -usereleased @*/
if (te == NULL)
@@ -408,7 +406,7 @@ rpmDepSet teGetDS(transactionElement te, rpmTag tag)
/*@=compdef =refcounttrans =retalias =retexpose =usereleased @*/
}
-TFI_t teGetFI(transactionElement te, rpmTag tag)
+rpmfi rpmteFI(rpmte te, rpmTag tag)
{
/*@-compdef -refcounttrans -retalias -retexpose -usereleased @*/
if (te == NULL)
@@ -421,12 +419,12 @@ TFI_t teGetFI(transactionElement te, rpmTag tag)
/*@=compdef =refcounttrans =retalias =retexpose =usereleased @*/
}
-int teiGetOc(teIterator tei)
+int rpmteiGetOc(rpmtei tei)
{
return tei->ocsave;
}
-teIterator XteFreeIterator(/*@only@*//*@null@*/ teIterator tei,
+rpmtei XrpmteiFree(/*@only@*//*@null@*/ rpmtei tei,
const char * fn, unsigned int ln)
{
if (tei)
@@ -438,13 +436,12 @@ fprintf(stderr, "*** tei %p -- %s:%d\n", tei, fn, ln);
return _free(tei);
}
-teIterator XteInitIterator(rpmTransactionSet ts,
- const char * fn, unsigned int ln)
+rpmtei XrpmteiInit(rpmts ts, const char * fn, unsigned int ln)
{
- teIterator tei = NULL;
+ rpmtei tei = NULL;
tei = xcalloc(1, sizeof(*tei));
- tei->ts = rpmtsLink(ts, "teIterator");
+ tei->ts = rpmtsLink(ts, "rpmtei");
tei->reverse = ((ts->transFlags & RPMTRANS_FLAG_REVERSE) ? 1 : 0);
tei->oc = (tei->reverse ? (ts->orderCount - 1) : 0);
tei->ocsave = tei->oc;
@@ -455,9 +452,16 @@ fprintf(stderr, "*** tei %p ++ %s:%d\n", tei, fn, ln);
return tei;
}
-transactionElement teNextIterator(teIterator tei)
+/**
+ * Return next transaction element.
+ * @param tei transaction element iterator
+ * @return transaction element, NULL on termination
+ */
+static /*@dependent@*/ /*@null@*/
+rpmte teNextIterator(rpmtei tei)
+ /*@modifies tei @*/
{
- transactionElement te = NULL;
+ rpmte te = NULL;
int oc = -1;
if (tei == NULL || tei->ts == NULL || tei->ts->order == NULL)
@@ -478,9 +482,9 @@ transactionElement teNextIterator(teIterator tei)
/*@=compdef =usereleased@*/
}
-transactionElement teNext(teIterator tei, rpmTransactionType type)
+rpmte rpmteiNext(rpmtei tei, rpmTransactionType type)
{
- transactionElement p;
+ rpmte p;
while ((p = teNextIterator(tei)) != NULL) {
if (type == 0 || (p->type & type) != 0)
diff --git a/lib/rpmte.h b/lib/rpmte.h
index 68b5c7e10..008e3cb45 100644
--- a/lib/rpmte.h
+++ b/lib/rpmte.h
@@ -3,15 +3,15 @@
/** \ingroup rpmdep rpmtrans
* \file lib/rpmte.h
- * Structures used for a transactionElement.
+ * Structures used for an "rpmte" transaction element.
*/
typedef /*@abstract@*/ struct tsortInfo_s * tsortInfo;
-typedef /*@abstract@*/ struct teIterator_s * teIterator;
+typedef /*@abstract@*/ struct rpmtei_s * rpmtei;
-/*@unchecked@*/
/*@-exportlocal@*/
+/*@unchecked@*/
extern int _te_debug;
/*@=exportlocal@*/
@@ -23,14 +23,14 @@ struct tsortInfo_s {
union {
int count;
/*@exposed@*/ /*@dependent@*/ /*@null@*/
- transactionElement suc;
+ rpmte suc;
} tsi_u;
#define tsi_count tsi_u.count
#define tsi_suc tsi_u.suc
/*@owned@*/ /*@null@*/
struct tsortInfo_s * tsi_next;
/*@exposed@*/ /*@dependent@*/ /*@null@*/
- transactionElement tsi_chain;
+ rpmte tsi_chain;
int tsi_reqx;
int tsi_qcnt;
};
@@ -46,7 +46,7 @@ typedef enum rpmTransactionType_e {
/** \ingroup rpmdep
* A single package instance to be installed/removed atomically.
*/
-struct transactionElement_s {
+struct rpmte_s {
rpmTransactionType type; /*!< Package disposition (installed/removed). */
/*@refcounted@*/ /*@null@*/
@@ -66,7 +66,7 @@ struct transactionElement_s {
/*@only@*/ /*@null@*/
const char * os; /*!< Operating system hint. */
- transactionElement parent; /*!< Parent transaction element. */
+ rpmte parent; /*!< Parent transaction element. */
int degree; /*!< No. of immediate children. */
int depth; /*!< Max. depth in dependency tree. */
int npreds; /*!< No. of predecessors. */
@@ -75,17 +75,17 @@ struct transactionElement_s {
tsortInfo tsi; /*!< Dependency ordering chains. */
/*@refcounted@*/ /*@null@*/
- rpmDepSet this; /*!< This package's provided NEVR. */
+ rpmds this; /*!< This package's provided NEVR. */
/*@refcounted@*/ /*@null@*/
- rpmDepSet provides; /*!< Provides: dependencies. */
+ rpmds provides; /*!< Provides: dependencies. */
/*@refcounted@*/ /*@null@*/
- rpmDepSet requires; /*!< Requires: dependencies. */
+ rpmds requires; /*!< Requires: dependencies. */
/*@refcounted@*/ /*@null@*/
- rpmDepSet conflicts; /*!< Conflicts: dependencies. */
+ rpmds conflicts; /*!< Conflicts: dependencies. */
/*@refcounted@*/ /*@null@*/
- rpmDepSet obsoletes; /*!< Obsoletes: dependencies. */
+ rpmds obsoletes; /*!< Obsoletes: dependencies. */
/*@refcounted@*/ /*@null@*/
- TFI_t fi; /*!< File information. */
+ rpmfi fi; /*!< File information. */
uint_32 multiLib; /*!< (TR_ADDED) MULTILIB */
@@ -113,12 +113,12 @@ struct transactionElement_s {
/**
* Iterator across transaction elements, forward on install, backward on erase.
*/
-struct teIterator_s {
+struct rpmtei_s {
/*@refcounted@*/
- rpmTransactionSet ts; /*!< transaction set. */
- int reverse; /*!< reversed traversal? */
- int ocsave; /*!< last returned iterator index. */
- int oc; /*!< iterator index. */
+ rpmts ts; /*!< transaction set. */
+ int reverse; /*!< reversed traversal? */
+ int ocsave; /*!< last returned iterator index. */
+ int oc; /*!< iterator index. */
};
#ifdef __cplusplus
@@ -131,8 +131,9 @@ extern "C" {
* @return NULL always
*/
/*@null@*/
-transactionElement teFree(/*@only@*/ /*@null@*/ transactionElement te)
+rpmte rpmteFree(/*@only@*/ /*@null@*/ rpmte te)
/*@modifies te@*/;
+
/**
* Create a transaction element.
* @param ts transaction set
@@ -145,8 +146,7 @@ transactionElement teFree(/*@only@*/ /*@null@*/ transactionElement te)
* @return new transaction element
*/
/*@only@*/ /*@null@*/
-transactionElement teNew(const rpmTransactionSet ts, Header h,
- rpmTransactionType type,
+rpmte rpmteNew(const rpmts ts, Header h, rpmTransactionType type,
/*@exposed@*/ /*@dependent@*/ /*@null@*/ fnpyKey key,
/*@null@*/ rpmRelocation * relocs,
int dboffset,
@@ -158,7 +158,7 @@ transactionElement teNew(const rpmTransactionSet ts, Header h,
* @param te transaction element
* @return type
*/
-rpmTransactionType teGetType(transactionElement te)
+rpmTransactionType rpmteType(rpmte te)
/*@*/;
/**
@@ -167,7 +167,7 @@ rpmTransactionType teGetType(transactionElement te)
* @return name string
*/
/*@observer@*/
-const char * teGetN(transactionElement te)
+const char * rpmteN(rpmte te)
/*@*/;
/**
@@ -176,7 +176,7 @@ const char * teGetN(transactionElement te)
* @return epoch string
*/
/*@observer@*/ /*@null@*/
-const char * teGetE(transactionElement te)
+const char * rpmteE(rpmte te)
/*@*/;
/**
@@ -185,7 +185,7 @@ const char * teGetE(transactionElement te)
* @return version string
*/
/*@observer@*/ /*@null@*/
-const char * teGetV(transactionElement te)
+const char * rpmteV(rpmte te)
/*@*/;
/**
@@ -194,7 +194,7 @@ const char * teGetV(transactionElement te)
* @return release string
*/
/*@observer@*/ /*@null@*/
-const char * teGetR(transactionElement te)
+const char * rpmteR(rpmte te)
/*@*/;
/**
@@ -203,7 +203,7 @@ const char * teGetR(transactionElement te)
* @return arch string
*/
/*@observer@*/ /*@null@*/
-const char * teGetA(transactionElement te)
+const char * rpmteA(rpmte te)
/*@*/;
/**
@@ -212,7 +212,7 @@ const char * teGetA(transactionElement te)
* @return os string
*/
/*@observer@*/ /*@null@*/
-const char * teGetO(transactionElement te)
+const char * rpmteO(rpmte te)
/*@*/;
/**
@@ -220,7 +220,7 @@ const char * teGetO(transactionElement te)
* @param te transaction element
* @return multilib flags
*/
-int teGetMultiLib(transactionElement te)
+int rpmteMultiLib(rpmte te)
/*@*/;
/**
@@ -229,7 +229,7 @@ int teGetMultiLib(transactionElement te)
* @param nmultiLib new multilib flags
* @return previous multilib flags
*/
-int teSetMultiLib(transactionElement te, int nmultiLib)
+int rpmteSetMultiLib(rpmte te, int nmultiLib)
/*@modifies te @*/;
/**
@@ -237,7 +237,7 @@ int teSetMultiLib(transactionElement te, int nmultiLib)
* @param te transaction element
* @return depth
*/
-int teGetDepth(transactionElement te)
+int rpmteDepth(rpmte te)
/*@*/;
/**
@@ -246,7 +246,7 @@ int teGetDepth(transactionElement te)
* @param ndepth new depth
* @return previous depth
*/
-int teSetDepth(transactionElement te, int ndepth)
+int rpmteSetDepth(rpmte te, int ndepth)
/*@modifies te @*/;
/**
@@ -254,7 +254,7 @@ int teSetDepth(transactionElement te, int ndepth)
* @param te transaction element
* @return no. of predecessors
*/
-int teGetNpreds(transactionElement te)
+int rpmteNpreds(rpmte te)
/*@*/;
/**
@@ -263,7 +263,7 @@ int teGetNpreds(transactionElement te)
* @param npreds new no. of predecessors
* @return previous no. of predecessors
*/
-int teSetNpreds(transactionElement te, int npreds)
+int rpmteSetNpreds(rpmte te, int npreds)
/*@modifies te @*/;
/**
@@ -271,7 +271,7 @@ int teSetNpreds(transactionElement te, int npreds)
* @param te transaction element
* @return tree index
*/
-int teGetTree(transactionElement te)
+int rpmteTree(rpmte te)
/*@*/;
/**
@@ -280,7 +280,7 @@ int teGetTree(transactionElement te)
* @param ntree new tree index
* @return previous tree index
*/
-int teSetTree(transactionElement te, int ntree)
+int rpmteSetTree(rpmte te, int ntree)
/*@modifies te @*/;
/**
@@ -289,7 +289,7 @@ int teSetTree(transactionElement te, int ntree)
* @return parent transaction element
*/
/*@observer@*/ /*@unused@*/
-transactionElement teGetParent(transactionElement te)
+rpmte rpmteParent(rpmte te)
/*@*/;
/**
@@ -298,7 +298,7 @@ transactionElement teGetParent(transactionElement te)
* @param pte new parent transaction element
* @return previous parent transaction element
*/
-transactionElement teSetParent(transactionElement te, transactionElement pte)
+rpmte rpmteSetParent(rpmte te, rpmte pte)
/*@modifies te @*/;
/**
@@ -306,7 +306,7 @@ transactionElement teSetParent(transactionElement te, transactionElement pte)
* @param te transaction element
* @return tree index
*/
-int teGetDegree(transactionElement te)
+int rpmteDegree(rpmte te)
/*@*/;
/**
@@ -315,7 +315,7 @@ int teGetDegree(transactionElement te)
* @param ndegree new number of children
* @return previous number of children
*/
-int teSetDegree(transactionElement te, int ndegree)
+int rpmteSetDegree(rpmte te, int ndegree)
/*@modifies te @*/;
/**
@@ -323,21 +323,21 @@ int teSetDegree(transactionElement te, int ndegree)
* @param te transaction element
* @return tsort info
*/
-tsortInfo teGetTSI(transactionElement te)
+tsortInfo rpmteTSI(rpmte te)
/*@*/;
/**
* Destroy tsort info of transaction element.
* @param te transaction element
*/
-void teFreeTSI(transactionElement te)
+void rpmteFreeTSI(rpmte te)
/*@modifies te @*/;
/**
* Initialize tsort info of transaction element.
* @param te transaction element
*/
-void teNewTSI(transactionElement te)
+void rpmteNewTSI(rpmte te)
/*@modifies te @*/;
/**
@@ -345,7 +345,7 @@ void teNewTSI(transactionElement te)
* @param te transaction element
*/
/*@unused@*/
-void teCleanDS(transactionElement te)
+void rpmteCleanDS(rpmte te)
/*@modifies te @*/;
/**
@@ -354,7 +354,7 @@ void teCleanDS(transactionElement te)
* @return pkgKey
*/
/*@exposed@*/ /*@dependent@*/ /*@null@*/
-alKey teGetAddedKey(transactionElement te)
+alKey rpmteAddedKey(rpmte te)
/*@*/;
/**
@@ -364,7 +364,7 @@ alKey teGetAddedKey(transactionElement te)
* @return previous pkgKey
*/
/*@exposed@*/ /*@dependent@*/ /*@null@*/
-alKey teSetAddedKey(transactionElement te,
+alKey rpmteSetAddedKey(rpmte te,
/*@exposed@*/ /*@dependent@*/ /*@null@*/ alKey npkgKey)
/*@modifies te @*/;
@@ -374,7 +374,7 @@ alKey teSetAddedKey(transactionElement te,
* @return dependent pkgKey
*/
/*@exposed@*/ /*@dependent@*/ /*@null@*/
-alKey teGetDependsOnKey(transactionElement te)
+alKey rpmteDependsOnKey(rpmte te)
/*@*/;
/**
@@ -382,7 +382,7 @@ alKey teGetDependsOnKey(transactionElement te)
* @param te transaction element
* @return rpmdb instance
*/
-int teGetDBOffset(transactionElement te)
+int rpmteDBOffset(rpmte te)
/*@*/;
/**
@@ -391,7 +391,7 @@ int teGetDBOffset(transactionElement te)
* @return name-version-release string
*/
/*@observer@*/
-const char * teGetNEVR(transactionElement te)
+const char * rpmteNEVR(rpmte te)
/*@*/;
/**
@@ -399,7 +399,7 @@ const char * teGetNEVR(transactionElement te)
* @param te transaction element
* @return file handle
*/
-FD_t teGetFd(transactionElement te)
+FD_t rpmteFd(rpmte te)
/*@*/;
/**
@@ -408,7 +408,7 @@ FD_t teGetFd(transactionElement te)
* @return key
*/
/*@exposed@*/
-fnpyKey teGetKey(transactionElement te)
+fnpyKey rpmteKey(rpmte te)
/*@*/;
/**
@@ -417,7 +417,7 @@ fnpyKey teGetKey(transactionElement te)
* @param tag dependency tag
* @return dependency tag set
*/
-rpmDepSet teGetDS(transactionElement te, rpmTag tag)
+rpmds rpmteDS(rpmte te, rpmTag tag)
/*@*/;
/**
@@ -426,7 +426,7 @@ rpmDepSet teGetDS(transactionElement te, rpmTag tag)
* @param tag file info tag
* @return file info tag set
*/
-TFI_t teGetFI(transactionElement te, rpmTag tag)
+rpmfi rpmteFI(rpmte te, rpmTag tag)
/*@*/;
/**
@@ -434,7 +434,7 @@ TFI_t teGetFI(transactionElement te, rpmTag tag)
* @param tei transaction element iterator
* @return transaction element index
*/
-int teiGetOc(teIterator tei)
+int rpmteiGetOc(rpmtei tei)
/*@*/;
/**
@@ -443,7 +443,7 @@ int teiGetOc(teIterator tei)
* @return NULL always
*/
/*@unused@*/ /*@null@*/
-teIterator teFreeIterator(/*@only@*//*@null@*/ teIterator tei)
+rpmtei rpmteiFree(/*@only@*//*@null@*/ rpmtei tei)
/*@*/;
/**
@@ -454,10 +454,10 @@ teIterator teFreeIterator(/*@only@*//*@null@*/ teIterator tei)
* @return NULL always
*/
/*@null@*/
-teIterator XteFreeIterator(/*@only@*//*@null@*/ teIterator tei,
+rpmtei XrpmteiFree(/*@only@*//*@null@*/ rpmtei tei,
const char * fn, unsigned int ln)
/*@*/;
-#define teFreeIterator(_tei) XteFreeIterator(_tei, __FILE__, __LINE__)
+#define rpmteiFree(_tei) XrpmteiFree(_tei, __FILE__, __LINE__)
/**
* Create transaction element iterator.
@@ -465,7 +465,7 @@ teIterator XteFreeIterator(/*@only@*//*@null@*/ teIterator tei,
* @return transaction element iterator
*/
/*@unused@*/ /*@only@*/
-teIterator teInitIterator(rpmTransactionSet ts)
+rpmtei rpmteiInit(rpmts ts)
/*@modifies ts @*/;
/**
@@ -476,28 +476,19 @@ teIterator teInitIterator(rpmTransactionSet ts)
* @return transaction element iterator
*/
/*@unused@*/ /*@only@*/
-teIterator XteInitIterator(rpmTransactionSet ts,
+rpmtei XrpmteiInit(rpmts ts,
const char * fn, unsigned int ln)
/*@modifies ts @*/;
-#define teInitIterator(_ts) XteInitIterator(_ts, __FILE__, __LINE__)
-
-/**
- * Return next transaction element
- * @param tei transaction element iterator
- * @return transaction element, NULL on termination
- */
-/*@dependent@*/ /*@null@*/
-transactionElement teNextIterator(teIterator tei)
- /*@modifies tei @*/;
+#define rpmteiInit(_ts) XrpmteiInit(_ts, __FILE__, __LINE__)
/**
* Return next transaction element of type.
* @param tei transaction element iterator
- * @param type transaction element type selector
+ * @param type transaction element type selector (0 for any)
* @return next transaction element of type, NULL on termination
*/
/*@dependent@*/ /*@null@*/
-transactionElement teNext(teIterator tei, rpmTransactionType type)
+rpmte rpmteiNext(rpmtei tei, rpmTransactionType type)
/*@modifies tei @*/;
#ifdef __cplusplus
diff --git a/lib/rpmts.c b/lib/rpmts.c
index 0b06b2a99..a5def14ba 100644
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -1,6 +1,6 @@
/** \ingroup rpmdep
* \file lib/rpmts.c
- * Routine(s) to handle an rpmTransactionSet.
+ * Routine(s) to handle a "rpmts" transaction sets.
*/
#include "system.h"
@@ -9,6 +9,7 @@
#include <rpmpgp.h> /* XXX rpmtsFree() needs pgpFreeDig */
#include "rpmdb.h" /* XXX stealing db->db_mode. */
+#include "rpmps.h"
#include "rpmds.h"
#include "rpmfi.h"
@@ -16,13 +17,41 @@
#include "rpmte.h"
#include "rpmts.h"
+/* XXX FIXME: merge with existing (broken?) tests in system.h */
+/* portability fiddles */
+#if STATFS_IN_SYS_STATVFS
+/*@-incondefs@*/
+# include <sys/statvfs.h>
+#if defined(__LCLINT__)
+/*@-declundef -exportheader -protoparammatch @*/ /* LCL: missing annotation */
+extern int statvfs (const char * file, /*@out@*/ struct statvfs * buf)
+ /*@globals fileSystem @*/
+ /*@modifies *buf, fileSystem @*/;
+/*@=declundef =exportheader =protoparammatch @*/
+/*@=incondefs@*/
+#endif
+#else
+# if STATFS_IN_SYS_VFS
+# include <sys/vfs.h>
+# else
+# if STATFS_IN_SYS_MOUNT
+# include <sys/mount.h>
+# else
+# if STATFS_IN_SYS_STATFS
+# include <sys/statfs.h>
+# endif
+# endif
+# endif
+#endif
+
#include "debug.h"
/*@access rpmdb @*/ /* XXX db->db_chrootDone, NULL */
/*@access FD_t @*/ /* XXX compared with NULL */
-/*@access rpmProblemSet @*/
-/*@access rpmTransactionSet @*/
+/*@access rpmps @*/
+/*@access rpmDiskSpaceInfo @*/
+/*@access rpmts @*/
/*@access fnpyKey @*/
/*@unchecked@*/
@@ -45,7 +74,7 @@ char * hGetNEVR(Header h, const char ** np)
return NVR;
}
-rpmTransactionSet XrpmtsUnlink(rpmTransactionSet ts, const char * msg, const char * fn, unsigned ln)
+rpmts XrpmtsUnlink(rpmts ts, const char * msg, const char * fn, unsigned ln)
{
/*@-modfilesystem@*/
if (_ts_debug)
@@ -55,7 +84,7 @@ fprintf(stderr, "--> ts %p -- %d %s at %s:%u\n", ts, ts->nrefs, msg, fn, ln);
return NULL;
}
-rpmTransactionSet XrpmtsLink(rpmTransactionSet ts, const char * msg, const char * fn, unsigned ln)
+rpmts XrpmtsLink(rpmts ts, const char * msg, const char * fn, unsigned ln)
{
ts->nrefs++;
/*@-modfilesystem@*/
@@ -65,7 +94,7 @@ fprintf(stderr, "--> ts %p ++ %d %s at %s:%u\n", ts, ts->nrefs, msg, fn, ln);
/*@-refcounttrans@*/ return ts; /*@=refcounttrans@*/
}
-int rpmtsCloseDB(rpmTransactionSet ts)
+int rpmtsCloseDB(rpmts ts)
{
int rc = 0;
@@ -76,7 +105,7 @@ int rpmtsCloseDB(rpmTransactionSet ts)
return rc;
}
-int rpmtsOpenDB(rpmTransactionSet ts, int dbmode)
+int rpmtsOpenDB(rpmts ts, int dbmode)
{
int rc = 0;
@@ -101,13 +130,13 @@ int rpmtsOpenDB(rpmTransactionSet ts, int dbmode)
return rc;
}
-rpmdbMatchIterator rpmtsInitIterator(const rpmTransactionSet ts, int rpmtag,
+rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, int rpmtag,
const void * keyp, size_t keylen)
{
return rpmdbInitIterator(ts->rdb, rpmtag, keyp, keylen);
}
-static int rpmtsCloseSDB(rpmTransactionSet ts)
+static int rpmtsCloseSDB(rpmts ts)
/*@globals fileSystem @*/
/*@modifies ts, fileSystem @*/
{
@@ -120,7 +149,7 @@ static int rpmtsCloseSDB(rpmTransactionSet ts)
return rc;
}
-static int rpmtsOpenSDB(rpmTransactionSet ts)
+static int rpmtsOpenSDB(rpmts ts)
/*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
/*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/
{
@@ -157,7 +186,7 @@ static int sugcmp(const void * a, const void * b) /*@*/
return strcmp(astr, bstr);
}
-int rpmtsSolve(rpmTransactionSet ts, rpmDepSet ds)
+int rpmtsSolve(rpmts ts, rpmds ds)
{
const char * errstr;
const char * str;
@@ -176,10 +205,10 @@ int rpmtsSolve(rpmTransactionSet ts, rpmDepSet ds)
if (ts->goal != TSM_INSTALL)
return rc;
- if (dsiGetTagN(ds) != RPMTAG_REQUIRENAME)
+ if (rpmdsTagN(ds) != RPMTAG_REQUIRENAME)
return rc;
- keyp = dsiGetN(ds);
+ keyp = rpmdsN(ds);
if (keyp == NULL)
return rc;
@@ -253,7 +282,7 @@ exit:
/*@=nullstate@*/
}
-int rpmtsAvailable(rpmTransactionSet ts, const rpmDepSet ds)
+int rpmtsAvailable(rpmts ts, const rpmds ds)
{
fnpyKey * sugkey;
int rc = 1; /* assume not found */
@@ -278,9 +307,9 @@ int rpmtsAvailable(rpmTransactionSet ts, const rpmDepSet ds)
/*@=nullstate@*/
}
-rpmProblemSet rpmtsGetProblems(rpmTransactionSet ts)
+rpmps rpmtsGetProblems(rpmts ts)
{
- rpmProblemSet ps = NULL;
+ rpmps ps = NULL;
if (ts) {
if (ts->probs) {
if (ts->probs->numProblems > 0)
@@ -290,16 +319,16 @@ rpmProblemSet rpmtsGetProblems(rpmTransactionSet ts)
return ps;
}
-void rpmtsClean(rpmTransactionSet ts)
+void rpmtsClean(rpmts ts)
{
if (ts) {
- teIterator pi; transactionElement p;
+ rpmtei pi; rpmte p;
/* Clean up after dependency checks. */
- pi = teInitIterator(ts);
- while ((p = teNextIterator(pi)) != NULL)
- teCleanDS(p);
- pi = teFreeIterator(pi);
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, 0)) != NULL)
+ rpmteCleanDS(p);
+ pi = rpmteiFree(pi);
ts->addedPackages = alFree(ts->addedPackages);
ts->numAddedPackages = 0;
@@ -307,7 +336,7 @@ void rpmtsClean(rpmTransactionSet ts)
ts->suggests = _free(ts->suggests);
ts->nsuggests = 0;
- ts->probs = rpmProblemSetFree(ts->probs);
+ ts->probs = rpmpsFree(ts->probs);
if (ts->sig != NULL)
ts->sig = headerFreeData(ts->sig, ts->sigtype);
@@ -317,10 +346,10 @@ void rpmtsClean(rpmTransactionSet ts)
}
}
-rpmTransactionSet rpmtsFree(rpmTransactionSet ts)
+rpmts rpmtsFree(rpmts ts)
{
if (ts) {
- teIterator pi; transactionElement p;
+ rpmtei pi; rpmte p;
int oc;
(void) rpmtsUnlink(ts, "tsCreate");
@@ -336,7 +365,7 @@ rpmTransactionSet rpmtsFree(rpmTransactionSet ts)
ts->availablePackages = alFree(ts->availablePackages);
ts->numAvailablePackages = 0;
- ts->di = _free(ts->di);
+ ts->dsi = _free(ts->dsi);
ts->removedPackages = _free(ts->removedPackages);
if (ts->scriptFd != NULL) {
ts->scriptFd =
@@ -346,12 +375,12 @@ rpmTransactionSet rpmtsFree(rpmTransactionSet ts)
ts->rootDir = _free(ts->rootDir);
ts->currDir = _free(ts->currDir);
- for (pi = teInitIterator(ts), oc = 0; (p = teNextIterator(pi)) != NULL; oc++) {
+ for (pi = rpmteiInit(ts), oc = 0; (p = rpmteiNext(pi, 0)) != NULL; oc++) {
/*@-type -unqualifiedtrans @*/
- ts->order[oc] = teFree(ts->order[oc]);
+ ts->order[oc] = rpmteFree(ts->order[oc]);
/*@=type =unqualifiedtrans @*/
}
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
/*@-type +voidabstract @*/ /* FIX: double indirection */
ts->order = _free(ts->order);
/*@=type =voidabstract @*/
@@ -371,7 +400,7 @@ rpmTransactionSet rpmtsFree(rpmTransactionSet ts)
return NULL;
}
-int rpmtsSetVerifySigFlags(rpmTransactionSet ts, int vsflags)
+int rpmtsSetVerifySigFlags(rpmts ts, int vsflags)
/*@modifies ts @*/
{
int ret = 0;
@@ -382,7 +411,7 @@ int rpmtsSetVerifySigFlags(rpmTransactionSet ts, int vsflags)
return ret;
}
-const char * rpmtsGetRootDir(rpmTransactionSet ts)
+const char * rpmtsGetRootDir(rpmts ts)
{
const char * rootDir = NULL;
if (ts != NULL) {
@@ -391,7 +420,7 @@ const char * rpmtsGetRootDir(rpmTransactionSet ts)
return rootDir;
}
-void rpmtsSetRootDir(rpmTransactionSet ts, const char * rootDir)
+void rpmtsSetRootDir(rpmts ts, const char * rootDir)
{
if (ts != NULL) {
size_t rootLen;
@@ -419,7 +448,7 @@ void rpmtsSetRootDir(rpmTransactionSet ts, const char * rootDir)
}
}
-const char * rpmtsGetCurrDir(rpmTransactionSet ts)
+const char * rpmtsGetCurrDir(rpmts ts)
{
const char * currDir = NULL;
if (ts != NULL) {
@@ -428,7 +457,7 @@ const char * rpmtsGetCurrDir(rpmTransactionSet ts)
return currDir;
}
-void rpmtsSetCurrDir(rpmTransactionSet ts, const char * currDir)
+void rpmtsSetCurrDir(rpmts ts, const char * currDir)
{
if (ts != NULL) {
ts->currDir = _free(ts->currDir);
@@ -437,7 +466,7 @@ void rpmtsSetCurrDir(rpmTransactionSet ts, const char * currDir)
}
}
-FD_t rpmtsGetScriptFd(rpmTransactionSet ts)
+FD_t rpmtsGetScriptFd(rpmts ts)
{
FD_t scriptFd = NULL;
if (ts != NULL) {
@@ -448,7 +477,7 @@ FD_t rpmtsGetScriptFd(rpmTransactionSet ts)
/*@=compdef =refcounttrans =usereleased@*/
}
-void rpmtsSetScriptFd(rpmTransactionSet ts, FD_t scriptFd)
+void rpmtsSetScriptFd(rpmts ts, FD_t scriptFd)
{
if (ts != NULL) {
@@ -461,7 +490,7 @@ void rpmtsSetScriptFd(rpmTransactionSet ts, FD_t scriptFd)
}
}
-int rpmtsGetChrootDone(rpmTransactionSet ts)
+int rpmtsGetChrootDone(rpmts ts)
{
int chrootDone = 0;
if (ts != NULL) {
@@ -470,7 +499,7 @@ int rpmtsGetChrootDone(rpmTransactionSet ts)
return chrootDone;
}
-int rpmtsSetChrootDone(rpmTransactionSet ts, int chrootDone)
+int rpmtsSetChrootDone(rpmts ts, int chrootDone)
{
int ochrootDone = 0;
if (ts != NULL) {
@@ -482,7 +511,7 @@ int rpmtsSetChrootDone(rpmTransactionSet ts, int chrootDone)
return ochrootDone;
}
-int_32 rpmtsGetTid(rpmTransactionSet ts)
+int_32 rpmtsGetTid(rpmts ts)
{
int_32 tid = 0;
if (ts != NULL) {
@@ -491,7 +520,7 @@ int_32 rpmtsGetTid(rpmTransactionSet ts)
return tid;
}
-int_32 rpmtsSetTid(rpmTransactionSet ts, int_32 tid)
+int_32 rpmtsSetTid(rpmts ts, int_32 tid)
{
int_32 otid = 0;
if (ts != NULL) {
@@ -501,7 +530,7 @@ int_32 rpmtsSetTid(rpmTransactionSet ts, int_32 tid)
return otid;
}
-rpmdb rpmtsGetRdb(rpmTransactionSet ts)
+rpmdb rpmtsGetRdb(rpmts ts)
{
rpmdb rdb = NULL;
if (ts != NULL) {
@@ -512,7 +541,168 @@ rpmdb rpmtsGetRdb(rpmTransactionSet ts)
/*@=compdef =refcounttrans =usereleased @*/
}
-rpmtsFlags rpmtsGetFlags(rpmTransactionSet ts)
+int rpmtsInitDSI(const rpmts ts)
+{
+ rpmDiskSpaceInfo dsi;
+ struct stat sb;
+ int rc;
+ int i;
+
+ if (ts->ignoreSet & RPMPROB_FILTER_DISKSPACE)
+ return 0;
+
+ rc = rpmGetFilesystemList(&ts->filesystems, &ts->filesystemCount);
+ if (rc || ts->filesystems == NULL || ts->filesystemCount <= 0)
+ return rc;
+
+ /* Get available space on mounted file systems. */
+
+ rpmMessage(RPMMESS_DEBUG, _("getting list of mounted filesystems\n"));
+
+ ts->dsi = _free(ts->dsi);
+ ts->dsi = xcalloc((ts->filesystemCount + 1), sizeof(*ts->dsi));
+
+ dsi = ts->dsi;
+
+ if (dsi != NULL)
+ for (i = 0; (i < ts->filesystemCount) && dsi; i++, dsi++) {
+#if STATFS_IN_SYS_STATVFS
+ struct statvfs sfb;
+ memset(&sfb, 0, sizeof(sfb));
+ rc = statvfs(ts->filesystems[i], &sfb);
+#else
+ struct statfs sfb;
+ memset(&sfb, 0, sizeof(sfb));
+# if STAT_STATFS4
+/* This platform has the 4-argument version of the statfs call. The last two
+ * should be the size of struct statfs and 0, respectively. The 0 is the
+ * filesystem type, and is always 0 when statfs is called on a mounted
+ * filesystem, as we're doing.
+ */
+ rc = statfs(ts->filesystems[i], &sfb, sizeof(sfb), 0);
+# else
+ rc = statfs(ts->filesystems[i], &sfb);
+# endif
+#endif
+ if (rc)
+ break;
+
+ rc = stat(ts->filesystems[i], &sb);
+ if (rc)
+ break;
+ dsi->dev = sb.st_dev;
+
+ dsi->bsize = sfb.f_bsize;
+ dsi->bneeded = 0;
+ dsi->ineeded = 0;
+#ifdef STATFS_HAS_F_BAVAIL
+ dsi->bavail = sfb.f_bavail;
+#else
+/* FIXME: the statfs struct doesn't have a member to tell how many blocks are
+ * available for non-superusers. f_blocks - f_bfree is probably too big, but
+ * it's about all we can do.
+ */
+ dsi->bavail = sfb.f_blocks - sfb.f_bfree;
+#endif
+ /* XXX Avoid FAT and other file systems that have not inodes. */
+ dsi->iavail = !(sfb.f_ffree == 0 && sfb.f_files == 0)
+ ? sfb.f_ffree : -1;
+ }
+ return rc;
+}
+
+void rpmtsUpdateDSI(const rpmts ts, dev_t dev,
+ uint_32 fileSize, uint_32 prevSize, uint_32 fixupSize,
+ fileAction action)
+{
+ rpmDiskSpaceInfo dsi;
+ uint_32 bneeded;
+
+ dsi = ts->dsi;
+ if (dsi) {
+ while (dsi->bsize && dsi->dev != dev)
+ dsi++;
+ if (dsi->bsize == 0)
+ dsi = NULL;
+ }
+ if (dsi == NULL)
+ return;
+
+ bneeded = BLOCK_ROUND(fileSize, dsi->bsize);
+
+ switch (action) {
+ case FA_BACKUP:
+ case FA_SAVE:
+ case FA_ALTNAME:
+ dsi->ineeded++;
+ dsi->bneeded += bneeded;
+ /*@switchbreak@*/ break;
+
+ /*
+ * FIXME: If two packages share a file (same md5sum), and
+ * that file is being replaced on disk, will dsi->bneeded get
+ * adjusted twice? Quite probably!
+ */
+ case FA_CREATE:
+ dsi->bneeded += bneeded;
+ dsi->bneeded -= BLOCK_ROUND(prevSize, dsi->bsize);
+ /*@switchbreak@*/ break;
+
+ case FA_ERASE:
+ dsi->ineeded--;
+ dsi->bneeded -= bneeded;
+ /*@switchbreak@*/ break;
+
+ default:
+ /*@switchbreak@*/ break;
+ }
+
+ if (fixupSize)
+ dsi->bneeded -= BLOCK_ROUND(fixupSize, dsi->bsize);
+}
+
+void rpmtsCheckDSIProblems(const rpmts ts, const rpmte te)
+{
+ rpmDiskSpaceInfo dsi;
+ rpmps ps;
+ int fc;
+ int i;
+
+ if (ts->filesystems == NULL || ts->filesystemCount <= 0)
+ return;
+
+ dsi = ts->dsi;
+ if (dsi == NULL)
+ return;
+ fc = rpmfiFC( rpmteFI(te, RPMTAG_BASENAMES) );
+ if (fc <= 0)
+ return;
+
+ ps = rpmtsGetProblems(ts);
+ for (i = 0; i < ts->filesystemCount; i++, dsi++) {
+
+ /* XXX Avoid FAT and other file systems that have not inodes. */
+ if (dsi->iavail <= 0)
+ continue;
+
+ if (adj_fs_blocks(dsi->bneeded) > dsi->bavail) {
+ rpmpsAppend(ps, RPMPROB_DISKSPACE,
+ rpmteNEVR(te), rpmteKey(te),
+ ts->filesystems[i], NULL, NULL,
+ (adj_fs_blocks(dsi->bneeded) - dsi->bavail) * dsi->bsize);
+ }
+
+ if (adj_fs_blocks(dsi->ineeded) > dsi->iavail) {
+ rpmpsAppend(ps, RPMPROB_DISKNODES,
+ rpmteNEVR(te), rpmteKey(te),
+ ts->filesystems[i], NULL, NULL,
+ (adj_fs_blocks(dsi->ineeded) - dsi->iavail));
+ }
+ }
+ ps = rpmpsFree(ps);
+}
+
+rpmtsFlags rpmtsGetFlags(rpmts ts)
{
rpmtsFlags otransFlags = 0;
if (ts != NULL) {
@@ -521,7 +711,7 @@ rpmtsFlags rpmtsGetFlags(rpmTransactionSet ts)
return otransFlags;
}
-rpmtsFlags rpmtsSetFlags(rpmTransactionSet ts, rpmtsFlags transFlags)
+rpmtsFlags rpmtsSetFlags(rpmts ts, rpmtsFlags transFlags)
{
rpmtsFlags otransFlags = 0;
if (ts != NULL) {
@@ -531,7 +721,7 @@ rpmtsFlags rpmtsSetFlags(rpmTransactionSet ts, rpmtsFlags transFlags)
return otransFlags;
}
-int rpmtsSetNotifyCallback(rpmTransactionSet ts,
+int rpmtsSetNotifyCallback(rpmts ts,
rpmCallbackFunction notify, rpmCallbackData notifyData)
{
if (ts != NULL) {
@@ -541,22 +731,22 @@ int rpmtsSetNotifyCallback(rpmTransactionSet ts,
return 0;
}
-int rpmtsGetKeys(const rpmTransactionSet ts, fnpyKey ** ep, int * nep)
+int rpmtsGetKeys(const rpmts ts, fnpyKey ** ep, int * nep)
{
int rc = 0;
if (nep) *nep = ts->orderCount;
if (ep) {
- teIterator pi; transactionElement p;
+ rpmtei pi; rpmte p;
fnpyKey * e;
*ep = e = xmalloc(ts->orderCount * sizeof(*e));
- pi = teInitIterator(ts);
- while ((p = teNextIterator(pi)) != NULL) {
- switch (teGetType(p)) {
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, 0)) != NULL) {
+ switch (rpmteType(p)) {
case TR_ADDED:
/*@-dependenttrans@*/
- *e = teGetKey(p);
+ *e = rpmteKey(p);
/*@=dependenttrans@*/
/*@switchbreak@*/ break;
case TR_REMOVED:
@@ -566,20 +756,20 @@ int rpmtsGetKeys(const rpmTransactionSet ts, fnpyKey ** ep, int * nep)
}
e++;
}
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
}
return rc;
}
-rpmTransactionSet rpmtsCreate(void)
+rpmts rpmtsCreate(void)
{
- rpmTransactionSet ts;
+ rpmts ts;
ts = xcalloc(1, sizeof(*ts));
ts->goal = TSM_UNKNOWN;
ts->filesystemCount = 0;
ts->filesystems = NULL;
- ts->di = NULL;
+ ts->dsi = NULL;
ts->rdb = NULL;
ts->dbmode = O_RDONLY;
diff --git a/lib/rpmts.h b/lib/rpmts.h
index 64c502ad6..c07d606cb 100644
--- a/lib/rpmts.h
+++ b/lib/rpmts.h
@@ -3,7 +3,7 @@
/** \ingroup rpmts
* \file lib/rpmts.h
- * Structures and prototypes used for an rpmTransactionSet
+ * Structures and prototypes used for an "rpmts" transaction set.
*/
#include <rpmhash.h> /* XXX hashTable */
@@ -19,6 +19,32 @@ extern int _ts_debug;
extern int _cacheDependsRC;
/*@=exportlocal@*/
+/** \ingroup rpmts
+ */
+typedef /*@abstract@*/ struct diskspaceInfo_s * rpmDiskSpaceInfo;
+
+/** \ingroup rpmts
+ */
+struct diskspaceInfo_s {
+ dev_t dev; /*!< File system device number. */
+ signed long bneeded; /*!< No. of blocks needed. */
+ signed long ineeded; /*!< No. of inodes needed. */
+ int bsize; /*!< File system block size. */
+ signed long bavail; /*!< No. of blocks available. */
+ signed long iavail; /*!< No. of inodes available. */
+};
+
+/** \ingroup rpmts
+ * Adjust for root only reserved space. On linux e2fs, this is 5%.
+ */
+#define adj_fs_blocks(_nb) (((_nb) * 21) / 20)
+
+/* argon thought a shift optimization here was a waste of time... he's
+ probably right :-( */
+#define BLOCK_ROUND(size, block) (((size) + (block) - 1) / (block))
+
+/** \ingroup rpmts
+ */
typedef enum tsStage_e {
TSM_UNKNOWN = 0,
TSM_INSTALL = 7,
@@ -28,12 +54,12 @@ typedef enum tsStage_e {
/** \ingroup rpmts
* The set of packages to be installed/removed atomically.
*/
-struct rpmTransactionSet_s {
+struct rpmts_s {
rpmtsFlags transFlags; /*!< Bit(s) to control operation. */
tsmStage goal; /*!< Transaction goal (i.e. mode) */
/*@null@*/
- int (*solve) (rpmTransactionSet ts, const rpmDepSet key)
+ int (*solve) (rpmts ts, const rpmds key)
/*@modifies ts @*/; /*!< Search for NEVRA key. */
int nsuggests; /*!< No. of depCheck suggestions. */
/*@only@*/ /*@null@*/
@@ -47,7 +73,7 @@ struct rpmTransactionSet_s {
rpmCallbackData notifyData; /*!< Callback private data. */
/*@refcounted@*/ /*@null@*/
- rpmProblemSet probs; /*!< Current problems in transaction. */
+ rpmps probs; /*!< Current problems in transaction. */
rpmprobFilterFlags ignoreSet;
/*!< Bits to filter current problems. */
@@ -55,7 +81,7 @@ struct rpmTransactionSet_s {
/*@dependent@*/ /*@null@*/
const char ** filesystems; /*!< Mounted filesystem names. */
/*@only@*/ /*@null@*/
- struct diskspaceInfo * di; /*!< Per filesystem disk/inode usage. */
+ rpmDiskSpaceInfo dsi; /*!< Per filesystem disk/inode usage. */
int dbmode; /*!< Database open mode. */
/*@refcounted@*/ /*@null@*/
@@ -78,7 +104,7 @@ struct rpmTransactionSet_s {
int numAvailablePackages; /*!< No. available package instances. */
/*@owned@*/
- transactionElement * order; /*!< Packages sorted by dependencies. */
+ rpmte * order; /*!< Packages sorted by dependencies. */
int orderCount; /*!< No. of transaction elements. */
int orderAlloced; /*!< No. of allocated transaction elements. */
@@ -128,7 +154,7 @@ extern "C" {
* @param ts transaction set
* @return 0 on success
*/
-int rpmtsCheck(rpmTransactionSet ts)
+int rpmtsCheck(rpmts ts)
/*@globals fileSystem, internalState @*/
/*@modifies ts, fileSystem, internalState @*/;
@@ -151,7 +177,7 @@ int rpmtsCheck(rpmTransactionSet ts)
* @param ts transaction set
* @return no. of (added) packages that could not be ordered
*/
-int rpmtsOrder(rpmTransactionSet ts)
+int rpmtsOrder(rpmts ts)
/*@globals fileSystem, internalState@*/
/*@modifies ts, fileSystem, internalState @*/;
@@ -163,9 +189,7 @@ int rpmtsOrder(rpmTransactionSet ts)
* @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)
+int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet)
/*@globals rpmGlobalMacroContext,
fileSystem, internalState@*/
/*@modifies ts, rpmGlobalMacroContext,
@@ -178,13 +202,13 @@ int rpmtsRun(rpmTransactionSet ts,
* @return NULL always
*/
/*@unused@*/ /*@null@*/
-rpmTransactionSet rpmtsUnlink (/*@killref@*/ /*@only@*/ rpmTransactionSet ts,
+rpmts rpmtsUnlink (/*@killref@*/ /*@only@*/ rpmts ts,
const char * msg)
/*@modifies ts @*/;
/** @todo Remove debugging entry from the ABI. */
/*@null@*/
-rpmTransactionSet XrpmtsUnlink (/*@killref@*/ /*@only@*/ rpmTransactionSet ts,
+rpmts XrpmtsUnlink (/*@killref@*/ /*@only@*/ rpmts ts,
const char * msg, const char * fn, unsigned ln)
/*@modifies ts @*/;
#define rpmtsUnlink(_ts, _msg) XrpmtsUnlink(_ts, _msg, __FILE__, __LINE__)
@@ -196,11 +220,11 @@ rpmTransactionSet XrpmtsUnlink (/*@killref@*/ /*@only@*/ rpmTransactionSet ts,
* @return new transaction set reference
*/
/*@unused@*/
-rpmTransactionSet rpmtsLink (rpmTransactionSet ts, const char * msg)
+rpmts rpmtsLink (rpmts ts, const char * msg)
/*@modifies ts @*/;
/** @todo Remove debugging entry from the ABI. */
-rpmTransactionSet XrpmtsLink (rpmTransactionSet ts,
+rpmts XrpmtsLink (rpmts ts,
const char * msg, const char * fn, unsigned ln)
/*@modifies ts @*/;
#define rpmtsLink(_ts, _msg) XrpmtsLink(_ts, _msg, __FILE__, __LINE__)
@@ -210,7 +234,7 @@ rpmTransactionSet XrpmtsLink (rpmTransactionSet ts,
* @param ts transaction set
* @return 0 on success
*/
-int rpmtsCloseDB(rpmTransactionSet ts)
+int rpmtsCloseDB(rpmts ts)
/*@globals fileSystem @*/
/*@modifies ts, fileSystem @*/;
@@ -220,7 +244,7 @@ int rpmtsCloseDB(rpmTransactionSet ts)
* @param dbmode O_RDONLY or O_RDWR
* @return 0 on success
*/
-int rpmtsOpenDB(rpmTransactionSet ts, int dbmode)
+int rpmtsOpenDB(rpmts ts, int dbmode)
/*@globals fileSystem, internalState @*/
/*@modifies ts, fileSystem, internalState @*/;
@@ -233,7 +257,7 @@ int rpmtsOpenDB(rpmTransactionSet ts, int dbmode)
* @return NULL on failure
*/
/*@only@*/ /*@null@*/
-rpmdbMatchIterator rpmtsInitIterator(const rpmTransactionSet ts, int rpmtag,
+rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, int rpmtag,
/*@null@*/ const void * keyp, size_t keylen)
/*@globals fileSystem @*/
/*@modifies ts, fileSystem @*/;
@@ -245,7 +269,7 @@ rpmdbMatchIterator rpmtsInitIterator(const rpmTransactionSet ts, int rpmtag,
* @return 0 if resolved (and added to ts), 1 not found
*/
/*@-exportlocal@*/
-int rpmtsSolve(rpmTransactionSet ts, rpmDepSet ds)
+int rpmtsSolve(rpmts ts, rpmds ds)
/*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
/*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/;
/*@=exportlocal@*/
@@ -257,7 +281,7 @@ int rpmtsSolve(rpmTransactionSet ts, rpmDepSet ds)
* @return 0 if resolved (and added to ts), 1 not found
*/
/*@unused@*/
-int rpmtsAvailable(rpmTransactionSet ts, const rpmDepSet ds)
+int rpmtsAvailable(rpmts ts, const rpmds ds)
/*@globals fileSystem @*/
/*@modifies ts, fileSystem @*/;
@@ -267,14 +291,14 @@ int rpmtsAvailable(rpmTransactionSet ts, const rpmDepSet ds)
* @return current problem set (or NULL)
*/
/*@null@*/
-rpmProblemSet rpmtsGetProblems(rpmTransactionSet ts)
+rpmps rpmtsGetProblems(rpmts ts)
/*@modifies ts @*/;
/** \ingroup rpmts
* Re-create an empty transaction set.
* @param ts transaction set
*/
-void rpmtsClean(rpmTransactionSet ts)
+void rpmtsClean(rpmts ts)
/*@modifies ts @*/;
/** \ingroup rpmts
@@ -283,8 +307,7 @@ void rpmtsClean(rpmTransactionSet ts)
* @return NULL always
*/
/*@null@*/
-rpmTransactionSet
-rpmtsFree(/*@killref@*/ /*@only@*//*@null@*/ rpmTransactionSet ts)
+rpmts rpmtsFree(/*@killref@*/ /*@only@*//*@null@*/ rpmts ts)
/*@globals fileSystem @*/
/*@modifies ts, fileSystem @*/;
@@ -294,7 +317,7 @@ rpmtsFree(/*@killref@*/ /*@only@*//*@null@*/ rpmTransactionSet ts)
* @param vsflags new verify signatures flags
* @retrun previous value
*/
-int rpmtsSetVerifySigFlags(rpmTransactionSet ts, int vsflags)
+int rpmtsSetVerifySigFlags(rpmts ts, int vsflags)
/*@modifies ts @*/;
/** \ingroup rpmts
@@ -303,7 +326,7 @@ int rpmtsSetVerifySigFlags(rpmTransactionSet ts, int vsflags)
* @return transaction rootDir
*/
/*@observer@*/ /*@null@*/
-const char * rpmtsGetRootDir(rpmTransactionSet ts)
+const char * rpmtsGetRootDir(rpmts ts)
/*@*/;
/** \ingroup rpmts
@@ -311,7 +334,7 @@ const char * rpmtsGetRootDir(rpmTransactionSet ts)
* @param ts transaction set
* @param rootDir new transaction rootDir (or NULL)
*/
-void rpmtsSetRootDir(rpmTransactionSet ts, /*@null@*/ const char * rootDir)
+void rpmtsSetRootDir(rpmts ts, /*@null@*/ const char * rootDir)
/*@modifies ts @*/;
/** \ingroup rpmts
@@ -320,7 +343,7 @@ void rpmtsSetRootDir(rpmTransactionSet ts, /*@null@*/ const char * rootDir)
* @return transaction currDir
*/
/*@observer@*/ /*@null@*/
-const char * rpmtsGetCurrDir(rpmTransactionSet ts)
+const char * rpmtsGetCurrDir(rpmts ts)
/*@*/;
/** \ingroup rpmts
@@ -328,7 +351,7 @@ const char * rpmtsGetCurrDir(rpmTransactionSet ts)
* @param ts transaction set
* @param currDir new transaction currDir (or NULL)
*/
-void rpmtsSetCurrDir(rpmTransactionSet ts, /*@null@*/ const char * currDir)
+void rpmtsSetCurrDir(rpmts ts, /*@null@*/ const char * currDir)
/*@modifies ts @*/;
/** \ingroup rpmts
@@ -337,7 +360,7 @@ void rpmtsSetCurrDir(rpmTransactionSet ts, /*@null@*/ const char * currDir)
* @return transaction script file handle
*/
/*@null@*/
-FD_t rpmtsGetScriptFd(rpmTransactionSet ts)
+FD_t rpmtsGetScriptFd(rpmts ts)
/*@*/;
/** \ingroup rpmts
@@ -345,7 +368,7 @@ FD_t rpmtsGetScriptFd(rpmTransactionSet ts)
* @param ts transaction set
* @param scriptFd new script file handle (or NULL)
*/
-void rpmtsSetScriptFd(rpmTransactionSet ts, /*@null@*/ FD_t scriptFd)
+void rpmtsSetScriptFd(rpmts ts, /*@null@*/ FD_t scriptFd)
/*@modifies ts, scriptFd @*/;
/** \ingroup rpmts
@@ -353,7 +376,7 @@ void rpmtsSetScriptFd(rpmTransactionSet ts, /*@null@*/ FD_t scriptFd)
* @param ts transaction set
* @return chrootDone flag
*/
-int rpmtsGetChrootDone(rpmTransactionSet ts)
+int rpmtsGetChrootDone(rpmts ts)
/*@*/;
/** \ingroup rpmts
@@ -362,7 +385,7 @@ int rpmtsGetChrootDone(rpmTransactionSet ts)
* @param chrootDone new chrootDone flag
* @return previous chrootDone flag
*/
-int rpmtsSetChrootDone(rpmTransactionSet ts, int chrootDone)
+int rpmtsSetChrootDone(rpmts ts, int chrootDone)
/*@modifies ts @*/;
/** \ingroup rpmts
@@ -370,7 +393,7 @@ int rpmtsSetChrootDone(rpmTransactionSet ts, int chrootDone)
* @param ts transaction set
* @return chrootDone flag
*/
-int_32 rpmtsGetTid(rpmTransactionSet ts)
+int_32 rpmtsGetTid(rpmts ts)
/*@*/;
/** \ingroup rpmts
@@ -379,7 +402,7 @@ int_32 rpmtsGetTid(rpmTransactionSet ts)
* @param tid new transaction id
* @return previous transaction id
*/
-int_32 rpmtsSetTid(rpmTransactionSet ts, int_32 tid)
+int_32 rpmtsSetTid(rpmts ts, int_32 tid)
/*@modifies ts @*/;
/** \ingroup rpmts
@@ -388,24 +411,55 @@ int_32 rpmtsSetTid(rpmTransactionSet ts, int_32 tid)
* @return transaction database handle
*/
/*@null@*/
-rpmdb rpmtsGetRdb(rpmTransactionSet ts)
+rpmdb rpmtsGetRdb(rpmts ts)
/*@*/;
/** \ingroup rpmts
- * Get transaction flags, i.e. bits to control rpmtsRun().
+ * Initialize disk space info for each and every mounted file systems.
+ * @param ts transaction set
+ * @return 0 on success
+ */
+int rpmtsInitDSI(const rpmts ts)
+ /*@globals fileSystem, internalState @*/
+ /*@modifies ts, fileSystem, internalState @*/;
+
+/** \ingroup rpmts
+ * Update disk space info for a file.
+ * @param ts transaction set
+ * @param dev mount point device
+ * @param fileSize file size
+ * @param prevSize previous file size (if upgrading)
+ * @param fixupSize size difference (if
+ * @param action file disposition
+ */
+void rpmtsUpdateDSI(const rpmts ts, dev_t dev,
+ uint_32 fileSize, uint_32 prevSize, uint_32 fixupSize,
+ fileAction action)
+ /*@modifies ts @*/;
+
+/** \ingroup rpmts
+ * Check a transaction element for disk space problems.
+ * @param ts transaction set
+ * @param te current transaction element
+ */
+void rpmtsCheckDSIProblems(const rpmts ts, const rpmte te)
+ /*@modifies ts @*/;
+
+/** \ingroup rpmts
+ * Get transaction flags, i.e. bits that control rpmtsRun().
* @param ts transaction set
* @return transaction flags
*/
-rpmtsFlags rpmtsGetFlags(rpmTransactionSet ts)
+rpmtsFlags rpmtsGetFlags(rpmts ts)
/*@*/;
/** \ingroup rpmts
- * Set transaction flags, i.e. bits to control rpmtsRun().
+ * Set transaction flags, i.e. bits that control rpmtsRun().
* @param ts transaction set
* @param transFlags new transaction flags
* @return previous transaction flags
*/
-rpmtsFlags rpmtsSetFlags(rpmTransactionSet ts, rpmtsFlags transFlags)
+rpmtsFlags rpmtsSetFlags(rpmts ts, rpmtsFlags transFlags)
/*@modifies ts @*/;
/** \ingroup rpmts
@@ -419,7 +473,7 @@ rpmtsFlags rpmtsSetFlags(rpmTransactionSet ts, rpmtsFlags transFlags)
* @param notifyData progress callback private data
* @return 0 on success
*/
-int rpmtsSetNotifyCallback(rpmTransactionSet ts,
+int rpmtsSetNotifyCallback(rpmts ts,
/*@observer@*/ rpmCallbackFunction notify,
/*@observer@*/ rpmCallbackData notifyData)
/*@modifies ts @*/;
@@ -429,7 +483,7 @@ int rpmtsSetNotifyCallback(rpmTransactionSet ts,
* @return new transaction set
*/
/*@only@*/
-rpmTransactionSet rpmtsCreate(void)
+rpmts rpmtsCreate(void)
/*@*/;
/** \ingroup rpmts
@@ -449,7 +503,7 @@ rpmTransactionSet rpmtsCreate(void)
* @param relocs package file relocations
* @return 0 on success, 1 on I/O error, 2 needs capabilities
*/
-int rpmtsAddPackage(rpmTransactionSet ts, Header h,
+int rpmtsAddPackage(rpmts ts, Header h,
/*@exposed@*/ /*@null@*/ const fnpyKey key, int upgrade,
/*@null@*/ rpmRelocation * relocs)
/*@globals fileSystem, internalState @*/
@@ -463,7 +517,7 @@ int rpmtsAddPackage(rpmTransactionSet ts, Header h,
* @param key package private data
*/
/*@unused@*/
-void rpmtsAvailablePackage(rpmTransactionSet ts, Header h,
+void rpmtsAvailablePackage(rpmts ts, Header h,
/*@exposed@*/ /*@null@*/ fnpyKey key)
/*@modifies h, ts @*/;
@@ -474,7 +528,7 @@ void rpmtsAvailablePackage(rpmTransactionSet ts, Header h,
* @param dboffset rpm database instance
* @return 0 on success
*/
-int rpmtsRemovePackage(rpmTransactionSet ts, Header h, int dboffset)
+int rpmtsRemovePackage(rpmts ts, Header h, int dboffset)
/*@modifies ts, h @*/;
/** \ingroup rpmts
@@ -486,7 +540,7 @@ int rpmtsRemovePackage(rpmTransactionSet ts, Header h, int dboffset)
* @return 0 always
*/
/*@unused@*/
-int rpmtsGetKeys(rpmTransactionSet ts,
+int rpmtsGetKeys(rpmts ts,
/*@null@*/ /*@out@*/ fnpyKey ** ep,
/*@null@*/ /*@out@*/ int * nep)
/*@modifies ts, ep, nep @*/;
diff --git a/lib/signature.c b/lib/signature.c
index f6754b86e..fa9c896a6 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -8,6 +8,7 @@
#include <rpmlib.h>
#include <rpmmacro.h> /* XXX for rpmGetPath() */
#include "rpmdb.h"
+#include "rpmps.h"
#include "rpmts.h"
@@ -17,7 +18,7 @@
#include "signature.h"
#include "debug.h"
-/*@access rpmTransactionSet@*/
+/*@access rpmts @*/
/*@access Header@*/ /* XXX compared with NULL */
/*@access FD_t@*/ /* XXX compared with NULL */
/*@access DIGEST_CTX@*/ /* XXX compared with NULL */
@@ -790,7 +791,7 @@ static /*@observer@*/ const char * rpmSigString(rpmVerifySignatureReturn res)
}
static rpmVerifySignatureReturn
-verifySizeSignature(const rpmTransactionSet ts, /*@out@*/ char * t)
+verifySizeSignature(const rpmts ts, /*@out@*/ char * t)
/*@modifies *t @*/
{
rpmVerifySignatureReturn res;
@@ -824,7 +825,7 @@ exit:
}
static rpmVerifySignatureReturn
-verifyMD5Signature(const rpmTransactionSet ts, /*@out@*/ char * t,
+verifyMD5Signature(const rpmts ts, /*@out@*/ char * t,
/*@null@*/ DIGEST_CTX md5ctx)
/*@modifies *t @*/
{
@@ -874,7 +875,7 @@ exit:
* @return RPMSIG_OK on success
*/
static rpmVerifySignatureReturn
-verifySHA1Signature(const rpmTransactionSet ts, /*@out@*/ char * t,
+verifySHA1Signature(const rpmts ts, /*@out@*/ char * t,
/*@null@*/ DIGEST_CTX sha1ctx)
/*@modifies *t @*/
{
@@ -920,7 +921,7 @@ exit:
* @return RPMSIG_OK on success, RPMSIG_NOKEY if not found
*/
static rpmVerifySignatureReturn
-rpmtsFindPubkey(rpmTransactionSet ts)
+rpmtsFindPubkey(rpmts ts)
/*@globals fileSystem, internalState @*/
/*@modifies ts, fileSystem, internalState */
{
@@ -1058,7 +1059,7 @@ static inline unsigned char nibble(char c)
* @return RPMSIG_OK on success
*/
static rpmVerifySignatureReturn
-verifyPGPSignature(rpmTransactionSet ts, /*@out@*/ char * t,
+verifyPGPSignature(rpmts ts, /*@out@*/ char * t,
/*@null@*/ DIGEST_CTX md5ctx)
/*@globals fileSystem, internalState @*/
/*@modifies ts, *t, fileSystem, internalState */
@@ -1167,7 +1168,7 @@ exit:
* @return RPMSIG_OK on success
*/
static rpmVerifySignatureReturn
-verifyGPGSignature(rpmTransactionSet ts, /*@out@*/ char * t,
+verifyGPGSignature(rpmts ts, /*@out@*/ char * t,
/*@null@*/ DIGEST_CTX sha1ctx)
/*@globals fileSystem, internalState @*/
/*@modifies ts, *t, fileSystem, internalState */
@@ -1249,7 +1250,7 @@ exit:
}
rpmVerifySignatureReturn
-rpmVerifySignature(const rpmTransactionSet ts, char * result)
+rpmVerifySignature(const rpmts ts, char * result)
{
rpmVerifySignatureReturn res;
diff --git a/lib/transaction.c b/lib/transaction.c
index 76cdeddef..a176a5446 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -9,6 +9,8 @@
#include "psm.h"
+#include "rpmps.h"
+
#include "rpmds.h"
#include "rpmfi.h"
#include "rpmte.h"
@@ -19,38 +21,11 @@
#include "legacy.h" /* XXX domd5 */
#include "misc.h" /* XXX stripTrailingChar, splitString, currentDirectory */
-/* XXX FIXME: merge with existing (broken?) tests in system.h */
-/* portability fiddles */
-#if STATFS_IN_SYS_STATVFS
-/*@-incondefs@*/
-# include <sys/statvfs.h>
-#if defined(__LCLINT__)
-/*@-declundef -exportheader -protoparammatch @*/ /* LCL: missing annotation */
-extern int statvfs (const char * file, /*@out@*/ struct statvfs * buf)
- /*@globals fileSystem @*/
- /*@modifies *buf, fileSystem @*/;
-/*@=declundef =exportheader =protoparammatch @*/
-/*@=incondefs@*/
-#endif
-#else
-# if STATFS_IN_SYS_VFS
-# include <sys/vfs.h>
-# else
-# if STATFS_IN_SYS_MOUNT
-# include <sys/mount.h>
-# else
-# if STATFS_IN_SYS_STATFS
-# include <sys/statfs.h>
-# endif
-# endif
-# endif
-#endif
-
#include "debug.h"
/*@access FD_t @*/ /* XXX compared with NULL */
/*@access Header @*/ /* XXX compared with NULL */
-/*@access rpmProblemSet @*/ /* XXX need rpmProblemSetOK() */
+/*@access rpmps @*/ /* XXX need rpmProblemSetOK() */
/*@access dbiIndexSet @*/
/*@access rpmdb @*/
@@ -59,30 +34,10 @@ extern int statvfs (const char * file, /*@out@*/ struct statvfs * buf)
/*@access alKey @*/
/*@access fnpyKey @*/
-/*@access TFI_t @*/
-
-/*@access teIterator @*/
-/*@access rpmTransactionSet @*/
-
-/**
- */
-struct diskspaceInfo {
- dev_t dev; /*!< File system device number. */
- signed long bneeded; /*!< No. of blocks needed. */
- signed long ineeded; /*!< No. of inodes needed. */
- int bsize; /*!< File system block size. */
- signed long bavail; /*!< No. of blocks available. */
- signed long iavail; /*!< No. of inodes available. */
-};
-
-/**
- * Adjust for root only reserved space. On linux e2fs, this is 5%.
- */
-#define adj_fs_blocks(_nb) (((_nb) * 21) / 20)
+/*@access rpmfi @*/
-/* argon thought a shift optimization here was a waste of time... he's
- probably right :-( */
-#define BLOCK_ROUND(size, block) (((size) + (block) - 1) / (block))
+/*@access rpmtei @*/
+/*@access rpmts @*/
/**
*/
@@ -120,13 +75,13 @@ static int sharedCmp(const void * one, const void * two)
/**
*/
-static fileAction decideFileFate(const rpmTransactionSet ts,
- const TFI_t ofi, TFI_t nfi)
+static fileAction decideFileFate(const rpmts ts,
+ const rpmfi ofi, rpmfi nfi)
/*@globals fileSystem @*/
/*@modifies nfi, fileSystem @*/
{
- const char * fn = tfiGetFN(nfi);
- int newFlags = tfiGetFFlags(nfi);
+ const char * fn = rpmfiFN(nfi);
+ int newFlags = rpmfiFFlags(nfi);
char buffer[1024];
fileTypes dbWhat, newWhat, diskWhat;
struct stat sb;
@@ -217,7 +172,7 @@ static fileAction decideFileFate(const rpmTransactionSet ts,
/**
*/
-static int filecmp(TFI_t afi, TFI_t bfi)
+static int filecmp(rpmfi afi, rpmfi bfi)
/*@*/
{
fileTypes awhat = whatis(afi->fmodes[afi->i]);
@@ -251,17 +206,17 @@ static int filecmp(TFI_t afi, TFI_t bfi)
/**
*/
/* XXX only ts->{probs,rpmdb} modified */
-static int handleInstInstalledFiles(const rpmTransactionSet ts,
- transactionElement p, TFI_t fi,
+static int handleInstInstalledFiles(const rpmts ts,
+ rpmte p, rpmfi fi,
sharedFileInfo shared,
int sharedCount, int reportConflicts)
/*@globals fileSystem @*/
/*@modifies ts, fi, fileSystem @*/
{
const char * altNEVR = NULL;
- TFI_t otherFi = NULL;
+ rpmfi otherFi = NULL;
int numReplaced = 0;
- rpmProblemSet ps;
+ rpmps ps;
int i;
{ rpmdbMatchIterator mi;
@@ -272,7 +227,7 @@ static int handleInstInstalledFiles(const rpmTransactionSet ts,
&shared->otherPkg, sizeof(shared->otherPkg));
while ((h = rpmdbNextIterator(mi)) != NULL) {
altNEVR = hGetNEVR(h, NULL);
- otherFi = fiNew(ts, NULL, h, RPMTAG_BASENAMES, scareMem);
+ otherFi = rpmfiNew(ts, NULL, h, RPMTAG_BASENAMES, scareMem);
break;
}
mi = rpmdbFreeIterator(mi);
@@ -288,10 +243,10 @@ static int handleInstInstalledFiles(const rpmTransactionSet ts,
int otherFileNum, fileNum;
otherFileNum = shared->otherFileNum;
- (void) tfiSetFX(otherFi, otherFileNum);
+ (void) rpmfiSetFX(otherFi, otherFileNum);
fileNum = shared->pkgFileNum;
- (void) tfiSetFX(fi, fileNum);
+ (void) rpmfiSetFX(fi, fileNum);
#ifdef DYING
/* XXX another tedious segfault, assume file state normal. */
@@ -304,13 +259,13 @@ static int handleInstInstalledFiles(const rpmTransactionSet ts,
if (filecmp(otherFi, fi)) {
if (reportConflicts) {
- rpmProblemSetAppend(ps, RPMPROB_FILE_CONFLICT,
- teGetNEVR(p), teGetKey(p),
- tfiGetDN(fi), tfiGetBN(fi),
+ rpmpsAppend(ps, RPMPROB_FILE_CONFLICT,
+ rpmteNEVR(p), rpmteKey(p),
+ rpmfiDN(fi), rpmfiBN(fi),
altNEVR,
0);
}
- if (!(tfiGetFFlags(otherFi) | tfiGetFFlags(fi)) & RPMFILE_CONFIG) {
+ if (!(rpmfiFFlags(otherFi) | rpmfiFFlags(fi)) & RPMFILE_CONFIG) {
/*@-assignexpose@*/ /* FIX: p->replaced, not fi */
if (!shared->isRemoved)
fi->replaced[numReplaced++] = *shared;
@@ -318,7 +273,7 @@ static int handleInstInstalledFiles(const rpmTransactionSet ts,
}
}
- if ((tfiGetFFlags(otherFi) | tfiGetFFlags(fi)) & RPMFILE_CONFIG) {
+ if ((rpmfiFFlags(otherFi) | rpmfiFFlags(fi)) & RPMFILE_CONFIG) {
fileAction action;
action = decideFileFate(ts, otherFi, fi);
fi->actions[fileNum] = action;
@@ -326,10 +281,10 @@ static int handleInstInstalledFiles(const rpmTransactionSet ts,
fi->replacedSizes[fileNum] = otherFi->fsizes[otherFi->i];
}
- ps = rpmProblemSetFree(ps);
+ ps = rpmpsFree(ps);
altNEVR = _free(altNEVR);
- otherFi = fiFree(otherFi, 1);
+ otherFi = rpmfiFree(otherFi, 1);
fi->replaced = xrealloc(fi->replaced, /* XXX memory leak */
sizeof(*fi->replaced) * (numReplaced + 1));
@@ -341,7 +296,7 @@ static int handleInstInstalledFiles(const rpmTransactionSet ts,
/**
*/
/* XXX only ts->rpmdb modified */
-static int handleRmvdInstalledFiles(const rpmTransactionSet ts, TFI_t fi,
+static int handleRmvdInstalledFiles(const rpmts ts, rpmfi fi,
sharedFileInfo shared, int sharedCount)
/*@globals fileSystem @*/
/*@modifies ts, fi, fileSystem @*/
@@ -385,6 +340,7 @@ static int handleRmvdInstalledFiles(const rpmTransactionSet ts, TFI_t fi,
static int _fps_debug = 0;
static int fpsCompare (const void * one, const void * two)
+ /*@*/
{
const struct fingerPrint_s * a = (const struct fingerPrint_s *)one;
const struct fingerPrint_s * b = (const struct fingerPrint_s *)two;
@@ -522,42 +478,36 @@ bingoFps->baseName);
}
/**
- * Update disk space needs on each partition for this package.
+ * Update disk space needs on each partition for this package's files.
*/
/* XXX only ts->{probs,di} modified */
-static void handleOverlappedFiles(const rpmTransactionSet ts,
- const transactionElement p, TFI_t fi)
+static void handleOverlappedFiles(const rpmts ts,
+ const rpmte p, rpmfi fi)
/*@globals fileSystem @*/
/*@modifies ts, fi, fileSystem @*/
{
- struct diskspaceInfo * ds = NULL;
uint_32 fixupSize = 0;
- rpmProblemSet ps;
+ rpmps ps;
const char * fn;
int i, j;
ps = rpmtsGetProblems(ts);
- fi = tfiInit(fi, 0);
- if (fi != NULL) /* XXX lclint */
- while ((i = tfiNext(fi)) >= 0) {
+ fi = rpmfiInit(fi, 0);
+ if (fi != NULL)
+ while ((i = rpmfiNext(fi)) >= 0) {
struct fingerPrint_s * fiFps;
int otherPkgNum, otherFileNum;
- TFI_t otherFi;
- const TFI_t * recs;
+ rpmfi otherFi;
+ const rpmfi * recs;
int numRecs;
if (XFA_SKIPPING(fi->actions[i]))
continue;
- fn = tfiGetFN(fi);
+ fn = rpmfiFN(fi);
fiFps = fi->fps + i;
- if (ts->di) {
- ds = ts->di;
- while (ds->bsize && ds->dev != fi->fps[i].entry->dev) ds++;
- if (!ds->bsize) ds = NULL;
- fixupSize = 0;
- }
+ fixupSize = 0;
/*
* Retrieve all records that apply to this file. Note that the
@@ -571,6 +521,7 @@ static void handleOverlappedFiles(const rpmTransactionSet ts,
/*
* If this package is being added, look only at other packages
* being added -- removed packages dance to a different tune.
+ *
* If both this and the other package are being added, overlapped
* files must be identical (or marked as a conflict). The
* disposition of already installed config files leads to
@@ -602,31 +553,32 @@ static void handleOverlappedFiles(const rpmTransactionSet ts,
otherFi = recs[otherPkgNum];
/* Added packages need only look at other added packages. */
- if (teGetType(p) == TR_ADDED && teGetType(otherFi->te) != TR_ADDED)
+ if (rpmteType(p) == TR_ADDED && rpmteType(otherFi->te) != TR_ADDED)
/*@innercontinue@*/ continue;
otherFps = otherFi->fps;
- otherFc = tfiGetFC(otherFi);
+ otherFc = rpmfiFC(otherFi);
otherFileNum = findFps(fiFps, otherFps, otherFc);
- (void) tfiSetFX(otherFi, otherFileNum);
+ (void) rpmfiSetFX(otherFi, otherFileNum);
/* XXX is this test still necessary? */
+assert(otherFi->actions[otherFileNum] != FA_UNKNOWN);
if (otherFi->actions[otherFileNum] != FA_UNKNOWN)
/*@innerbreak@*/ break;
}
- switch (teGetType(p)) {
+ switch (rpmteType(p)) {
case TR_ADDED:
{ struct stat sb;
if (otherPkgNum < 0) {
/* XXX is this test still necessary? */
if (fi->actions[i] != FA_UNKNOWN)
/*@switchbreak@*/ break;
- if ((tfiGetFFlags(fi) & RPMFILE_CONFIG) &&
+ if ((rpmfiFFlags(fi) & RPMFILE_CONFIG) &&
!lstat(fn, &sb)) {
/* Here is a non-overlapped pre-existing config file. */
- fi->actions[i] = (tfiGetFFlags(fi) & RPMFILE_NOREPLACE)
+ fi->actions[i] = (rpmfiFFlags(fi) & RPMFILE_NOREPLACE)
? FA_ALTNAME : FA_BACKUP;
} else {
fi->actions[i] = FA_CREATE;
@@ -639,19 +591,19 @@ assert(otherFi != NULL);
if ((ts->ignoreSet & RPMPROB_FILTER_REPLACENEWFILES)
&& filecmp(otherFi, fi))
{
- rpmProblemSetAppend(ps, RPMPROB_NEW_FILE_CONFLICT,
- teGetNEVR(p), teGetKey(p),
+ rpmpsAppend(ps, RPMPROB_NEW_FILE_CONFLICT,
+ rpmteNEVR(p), rpmteKey(p),
fn, NULL,
- teGetNEVR(otherFi->te),
+ rpmteNEVR(otherFi->te),
0);
}
/* Try to get the disk accounting correct even if a conflict. */
fixupSize = otherFi->fsizes[otherFileNum];
- if ((tfiGetFFlags(fi) & RPMFILE_CONFIG) && !lstat(fn, &sb)) {
+ if ((rpmfiFFlags(fi) & RPMFILE_CONFIG) && !lstat(fn, &sb)) {
/* Here is an overlapped pre-existing config file. */
- fi->actions[i] = (tfiGetFFlags(fi) & RPMFILE_NOREPLACE)
+ fi->actions[i] = (rpmfiFFlags(fi) & RPMFILE_NOREPLACE)
? FA_ALTNAME : FA_SKIP;
} else {
fi->actions[i] = FA_CREATE;
@@ -674,69 +626,29 @@ assert(otherFi != NULL);
/*@switchbreak@*/ break;
if (fi->fstates && fi->fstates[i] != RPMFILE_STATE_NORMAL)
/*@switchbreak@*/ break;
- if (!(S_ISREG(fi->fmodes[i]) && (tfiGetFFlags(fi) & RPMFILE_CONFIG))) {
+ if (!(S_ISREG(fi->fmodes[i]) && (rpmfiFFlags(fi) & RPMFILE_CONFIG))) {
fi->actions[i] = FA_ERASE;
/*@switchbreak@*/ break;
}
/* Here is a pre-existing modified config file that needs saving. */
{ char md5sum[50];
-#ifdef DYING
- if (fi->md5s != NULL) {
-#endif
- const unsigned char * md5 = fi->md5s + (16 * i);
- if (!domd5(fn, md5sum, 0) && memcmp(md5, md5sum, 16)) {
- fi->actions[i] = FA_BACKUP;
- /*@switchbreak@*/ break;
- }
-#ifdef DYING
- } else {
- const char * fmd5 = fi->fmd5s[i];
- if (!domd5(fn, md5sum, 1) && strcmp(fmd5, md5sum)) {
- fi->actions[i] = FA_BACKUP;
- /*@switchbreak@*/ break;
- }
+ const unsigned char * md5 = fi->md5s + (16 * i);
+ if (!domd5(fn, md5sum, 0) && memcmp(md5, md5sum, 16)) {
+ fi->actions[i] = FA_BACKUP;
+ /*@switchbreak@*/ break;
}
-#endif
}
fi->actions[i] = FA_ERASE;
/*@switchbreak@*/ break;
}
- if (ds) {
- uint_32 s = BLOCK_ROUND(fi->fsizes[i], ds->bsize);
-
- switch (fi->actions[i]) {
- case FA_BACKUP:
- case FA_SAVE:
- case FA_ALTNAME:
- ds->ineeded++;
- ds->bneeded += s;
- /*@switchbreak@*/ break;
-
- /*
- * FIXME: If two packages share a file (same md5sum), and
- * that file is being replaced on disk, will ds->bneeded get
- * decremented twice? Quite probably!
- */
- case FA_CREATE:
- ds->bneeded += s;
- ds->bneeded -= BLOCK_ROUND(fi->replacedSizes[i], ds->bsize);
- /*@switchbreak@*/ break;
+ /* Update disk space info for a file. */
+ rpmtsUpdateDSI(ts, fi->fps[i].entry->dev,
+ fi->fsizes[i], fi->replacedSizes[i], fixupSize, fi->actions[i]);
- case FA_ERASE:
- ds->ineeded--;
- ds->bneeded -= s;
- /*@switchbreak@*/ break;
-
- default:
- /*@switchbreak@*/ break;
- }
-
- ds->bneeded -= BLOCK_ROUND(fixupSize, ds->bsize);
- }
}
- ps = rpmProblemSetFree(ps);
+ ps = rpmpsFree(ps);
}
/**
@@ -746,13 +658,13 @@ assert(otherFi != NULL);
* @param h installed header
* @return 0 if not newer, 1 if okay
*/
-static int ensureOlder(rpmTransactionSet ts,
- const transactionElement p, const Header h)
+static int ensureOlder(rpmts ts,
+ const rpmte p, const Header h)
/*@modifies ts @*/
{
int_32 reqFlags = (RPMSENSE_LESS | RPMSENSE_EQUAL);
const char * reqEVR;
- rpmDepSet req;
+ rpmds req;
char * t;
int nb;
int rc;
@@ -760,29 +672,29 @@ static int ensureOlder(rpmTransactionSet ts,
if (p == NULL || h == NULL)
return 1;
- nb = strlen(teGetNEVR(p)) + (teGetE(p) != NULL ? strlen(teGetE(p)) : 0) + 1;
+ nb = strlen(rpmteNEVR(p)) + (rpmteE(p) != NULL ? strlen(rpmteE(p)) : 0) + 1;
t = alloca(nb);
*t = '\0';
reqEVR = t;
- if (teGetE(p) != NULL) t = stpcpy( stpcpy(t, teGetE(p)), ":");
- if (teGetV(p) != NULL) t = stpcpy(t, teGetV(p));
+ if (rpmteE(p) != NULL) t = stpcpy( stpcpy(t, rpmteE(p)), ":");
+ if (rpmteV(p) != NULL) t = stpcpy(t, rpmteV(p));
*t++ = '-';
- if (teGetR(p) != NULL) t = stpcpy(t, teGetR(p));
+ if (rpmteR(p) != NULL) t = stpcpy(t, rpmteR(p));
- req = dsSingle(RPMTAG_REQUIRENAME, teGetN(p), reqEVR, reqFlags);
+ req = rpmdsSingle(RPMTAG_REQUIRENAME, rpmteN(p), reqEVR, reqFlags);
rc = headerMatchesDepFlags(h, req);
- req = dsFree(req);
+ req = rpmdsFree(req);
if (rc == 0) {
- rpmProblemSet ps = rpmtsGetProblems(ts);
+ rpmps ps = rpmtsGetProblems(ts);
const char * altNEVR = hGetNEVR(h, NULL);
- rpmProblemSetAppend(ps, RPMPROB_OLDPACKAGE,
- teGetNEVR(p), teGetKey(p),
+ rpmpsAppend(ps, RPMPROB_OLDPACKAGE,
+ rpmteNEVR(p), rpmteKey(p),
NULL, NULL,
altNEVR,
0);
altNEVR = _free(altNEVR);
- ps = rpmProblemSetFree(ps);
+ ps = rpmpsFree(ps);
rc = 1;
} else
rc = 0;
@@ -793,7 +705,7 @@ static int ensureOlder(rpmTransactionSet ts,
/**
*/
/*@-mustmod@*/ /* FIX: fi->actions is modified. */
-static void skipFiles(const rpmTransactionSet ts, TFI_t fi)
+static void skipFiles(const rpmts ts, rpmfi fi)
/*@globals rpmGlobalMacroContext @*/
/*@modifies fi, rpmGlobalMacroContext @*/
{
@@ -831,22 +743,22 @@ static void skipFiles(const rpmTransactionSet ts, TFI_t fi)
/*@=branchstate@*/
/* Compute directory refcount, skip directory if now empty. */
- dc = tfiGetDC(fi);
+ dc = rpmfiDC(fi);
drc = alloca(dc * sizeof(*drc));
memset(drc, 0, dc * sizeof(*drc));
dff = alloca(dc * sizeof(*dff));
memset(dff, 0, dc * sizeof(*dff));
- fi = tfiInit(fi, 0);
+ fi = rpmfiInit(fi, 0);
if (fi != NULL) /* XXX lclint */
- while ((i = tfiNext(fi)) >= 0)
+ while ((i = rpmfiNext(fi)) >= 0)
{
char **nsp;
- bn = tfiGetBN(fi);
+ bn = rpmfiBN(fi);
bnlen = strlen(bn);
- ix = tfiGetDX(fi);
- dn = tfiGetDN(fi);
+ ix = rpmfiDX(fi);
+ dn = rpmfiDN(fi);
dnlen = strlen(dn);
if (dn == NULL)
continue; /* XXX can't happen */
@@ -924,7 +836,7 @@ static void skipFiles(const rpmTransactionSet ts, TFI_t fi)
/*
* Skip documentation if requested.
*/
- if (noDocs && (tfiGetFFlags(fi) & RPMFILE_DOC)) {
+ if (noDocs && (rpmfiFFlags(fi) & RPMFILE_DOC)) {
drc[ix]--; dff[ix] = 1;
fi->actions[i] = FA_SKIPNSTATE;
continue;
@@ -936,8 +848,8 @@ static void skipFiles(const rpmTransactionSet ts, TFI_t fi)
if (fi != NULL) /* XXX can't happen */
for (j = 0; j < dc; j++)
#else
- if ((fi = tdiInit(fi)) != NULL)
- while (j = tdiNext(fi) >= 0)
+ if ((fi = rpmfiInitD(fi)) != NULL)
+ while (j = rpmfiNextD(fi) >= 0)
#endif
{
@@ -954,9 +866,9 @@ static void skipFiles(const rpmTransactionSet ts, TFI_t fi)
}
/* If explicitly included in the package, skip the directory. */
- fi = tfiInit(fi, 0);
+ fi = rpmfiInit(fi, 0);
if (fi != NULL) /* XXX lclint */
- while ((i = tfiNext(fi)) >= 0) {
+ while ((i = rpmfiNext(fi)) >= 0) {
const char * dir;
if (XFA_SKIPPING(fi->actions[i]))
@@ -988,19 +900,19 @@ static void skipFiles(const rpmTransactionSet ts, TFI_t fi)
/**
* Return transaction element's file info.
- * @todo Take a TFI_t refcount here.
+ * @todo Take a rpmfi refcount here.
* @param tei transaction element iterator
* @return transaction element file info
*/
static /*@null@*/
-TFI_t teiGetFi(const teIterator tei)
+rpmfi rpmteiGetFi(const rpmtei tei)
/*@*/
{
- TFI_t fi = NULL;
+ rpmfi fi = NULL;
if (tei != NULL && tei->ocsave != -1) {
- /*@-type -abstract@*/ /* FIX: transactionElement not opaque */
- transactionElement te = tei->ts->order[tei->ocsave];
+ /*@-type -abstract@*/ /* FIX: rpmte not opaque */
+ rpmte te = tei->ts->order[tei->ocsave];
/*@-assignexpose@*/
if ((fi = te->fi) != NULL)
fi->te = te;
@@ -1012,25 +924,23 @@ TFI_t teiGetFi(const teIterator tei)
/*@=compdef =refcounttrans =usereleased @*/
}
-#define NOTIFY(_ts, _al) if ((_ts)->notify) (void) (_ts)->notify _al
+#define NOTIFY(_ts, _al) /*@i@*/ if ((_ts)->notify) (void) (_ts)->notify _al
-int rpmtsRun(rpmTransactionSet ts,
- rpmProblemSet okProbs, rpmprobFilterFlags ignoreSet)
+int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet)
{
int i, j;
int ourrc = 0;
int totalFileCount = 0;
- TFI_t fi;
- struct diskspaceInfo * dip;
+ rpmfi fi;
sharedFileInfo shared, sharedList;
int numShared;
int nexti;
alKey lastKey;
fingerPrintCache fpc;
- rpmProblemSet ps;
+ rpmps ps;
PSM_t psm = memset(alloca(sizeof(*psm)), 0, sizeof(*psm));
- teIterator pi; transactionElement p;
- teIterator qi; transactionElement q;
+ rpmtei pi; rpmte p;
+ rpmtei qi; rpmte q;
int xx;
/* FIXME: what if the same package is included in ts twice? */
@@ -1044,8 +954,8 @@ int rpmtsRun(rpmTransactionSet ts,
if (rpmtsGetFlags(ts) & (RPMTRANS_FLAG_JUSTDB | RPMTRANS_FLAG_MULTILIB))
(void) rpmtsSetFlags(ts, (rpmtsGetFlags(ts) | _noTransScripts | _noTransTriggers));
- ts->probs = rpmProblemSetFree(ts->probs);
- ts->probs = rpmProblemSetCreate();
+ ts->probs = rpmpsFree(ts->probs);
+ ts->probs = rpmpsCreate();
ts->ignoreSet = ignoreSet;
{ const char * currDir = currentDirectory();
@@ -1063,62 +973,7 @@ int rpmtsRun(rpmTransactionSet ts,
psm->ts = rpmtsLink(ts, "tsRun");
/* Get available space on mounted file systems. */
- if (!(ts->ignoreSet & RPMPROB_FILTER_DISKSPACE) &&
- !rpmGetFilesystemList(&ts->filesystems, &ts->filesystemCount))
- {
- struct stat sb;
-
- rpmMessage(RPMMESS_DEBUG, _("getting list of mounted filesystems\n"));
-
- ts->di = _free(ts->di);
- dip = ts->di = xcalloc((ts->filesystemCount + 1), sizeof(*ts->di));
-
- for (i = 0; (i < ts->filesystemCount) && dip; i++) {
-#if STATFS_IN_SYS_STATVFS
- struct statvfs sfb;
- memset(&sfb, 0, sizeof(sfb));
- if (statvfs(ts->filesystems[i], &sfb))
-#else
- struct statfs sfb;
-# if STAT_STATFS4
-/* This platform has the 4-argument version of the statfs call. The last two
- * should be the size of struct statfs and 0, respectively. The 0 is the
- * filesystem type, and is always 0 when statfs is called on a mounted
- * filesystem, as we're doing.
- */
- memset(&sfb, 0, sizeof(sfb));
- if (statfs(ts->filesystems[i], &sfb, sizeof(sfb), 0))
-# else
- memset(&sfb, 0, sizeof(sfb));
- if (statfs(ts->filesystems[i], &sfb))
-# endif
-#endif
- {
- dip = NULL;
- } else {
- ts->di[i].bsize = sfb.f_bsize;
- ts->di[i].bneeded = 0;
- ts->di[i].ineeded = 0;
-#ifdef STATFS_HAS_F_BAVAIL
- ts->di[i].bavail = sfb.f_bavail;
-#else
-/* FIXME: the statfs struct doesn't have a member to tell how many blocks are
- * available for non-superusers. f_blocks - f_bfree is probably too big, but
- * it's about all we can do.
- */
- ts->di[i].bavail = sfb.f_blocks - sfb.f_bfree;
-#endif
- /* XXX Avoid FAT and other file systems that have not inodes. */
- ts->di[i].iavail = !(sfb.f_ffree == 0 && sfb.f_files == 0)
- ? sfb.f_ffree : -1;
-
- xx = stat(ts->filesystems[i], &sb);
- ts->di[i].dev = sb.st_dev;
- }
- }
-
- if (dip) ts->di[i].bsize = 0;
- }
+ xx = rpmtsInitDSI(ts);
/* ===============================================
* For packages being installed:
@@ -1130,48 +985,48 @@ int rpmtsRun(rpmTransactionSet ts,
*/
ps = rpmtsGetProblems(ts);
/* The ordering doesn't matter here */
- pi = teInitIterator(ts);
- while ((p = teNext(pi, TR_ADDED)) != NULL) {
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, TR_ADDED)) != NULL) {
rpmdbMatchIterator mi;
int fc;
- if ((fi = teiGetFi(pi)) == NULL)
+ if ((fi = rpmteiGetFi(pi)) == NULL)
continue; /* XXX can't happen */
- fc = tfiGetFC(fi);
+ fc = rpmfiFC(fi);
if (!(ts->ignoreSet & RPMPROB_FILTER_IGNOREARCH))
- if (!archOkay(teGetA(p)))
- rpmProblemSetAppend(ps, RPMPROB_BADARCH,
- teGetNEVR(p), teGetKey(p),
- teGetA(p), NULL,
+ if (!archOkay(rpmteA(p)))
+ rpmpsAppend(ps, RPMPROB_BADARCH,
+ rpmteNEVR(p), rpmteKey(p),
+ rpmteA(p), NULL,
NULL, 0);
if (!(ts->ignoreSet & RPMPROB_FILTER_IGNOREOS))
- if (!osOkay(teGetO(p)))
- rpmProblemSetAppend(ps, RPMPROB_BADOS,
- teGetNEVR(p), teGetKey(p),
- teGetO(p), NULL,
+ if (!osOkay(rpmteO(p)))
+ rpmpsAppend(ps, RPMPROB_BADOS,
+ rpmteNEVR(p), rpmteKey(p),
+ rpmteO(p), NULL,
NULL, 0);
if (!(ts->ignoreSet & RPMPROB_FILTER_OLDPACKAGE)) {
Header h;
- mi = rpmtsInitIterator(ts, RPMTAG_NAME, teGetN(p), 0);
+ mi = rpmtsInitIterator(ts, RPMTAG_NAME, rpmteN(p), 0);
while ((h = rpmdbNextIterator(mi)) != NULL)
xx = ensureOlder(ts, p, h);
mi = rpmdbFreeIterator(mi);
}
/* XXX multilib should not display "already installed" problems */
- if (!(ts->ignoreSet & RPMPROB_FILTER_REPLACEPKG) && !teGetMultiLib(p)) {
- mi = rpmtsInitIterator(ts, RPMTAG_NAME, teGetN(p), 0);
+ if (!(ts->ignoreSet & RPMPROB_FILTER_REPLACEPKG) && !rpmteMultiLib(p)) {
+ mi = rpmtsInitIterator(ts, RPMTAG_NAME, rpmteN(p), 0);
xx = rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_DEFAULT,
- teGetV(p));
+ rpmteV(p));
xx = rpmdbSetIteratorRE(mi, RPMTAG_RELEASE, RPMMIRE_DEFAULT,
- teGetR(p));
+ rpmteR(p));
while (rpmdbNextIterator(mi) != NULL) {
- rpmProblemSetAppend(ps, RPMPROB_PKG_INSTALLED,
- teGetNEVR(p), teGetKey(p),
+ rpmpsAppend(ps, RPMPROB_PKG_INSTALLED,
+ rpmteNEVR(p), rpmteKey(p),
NULL, NULL,
NULL, 0);
/*@innerbreak@*/ break;
@@ -1183,21 +1038,21 @@ int rpmtsRun(rpmTransactionSet ts,
totalFileCount += fc;
}
- pi = teFreeIterator(pi);
- ps = rpmProblemSetFree(ps);
+ pi = rpmteiFree(pi);
+ ps = rpmpsFree(ps);
/* The ordering doesn't matter here */
- pi = teInitIterator(ts);
- while ((p = teNext(pi, TR_REMOVED)) != NULL) {
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, TR_REMOVED)) != NULL) {
int fc;
- if ((fi = teiGetFi(pi)) == NULL)
+ if ((fi = rpmteiGetFi(pi)) == NULL)
continue; /* XXX can't happen */
- fc = tfiGetFC(fi);
+ fc = rpmfiFC(fi);
totalFileCount += fc;
}
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
/* ===============================================
* Initialize transaction element file info for package:
@@ -1208,21 +1063,21 @@ int rpmtsRun(rpmTransactionSet ts,
* calling fpLookupList only once. I'm not sure that the speedup is
* worth the trouble though.
*/
- pi = teInitIterator(ts);
- while ((p = teNextIterator(pi)) != NULL) {
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, 0)) != NULL) {
int fc;
- if ((fi = teiGetFi(pi)) == NULL)
+ if ((fi = rpmteiGetFi(pi)) == NULL)
continue; /* XXX can't happen */
- fc = tfiGetFC(fi);
+ fc = rpmfiFC(fi);
-#ifdef DYING /* XXX W2DO? this is now done in teiGetFi, okay ??? */
- fi->magic = TFIMAGIC;
+#ifdef DYING /* XXX W2DO? this is now done in rpmteiGetFi, okay ??? */
+ fi->magic = RPMFIMAGIC;
fi->te = p;
#endif
/*@-branchstate@*/
- switch (teGetType(p)) {
+ switch (rpmteType(p)) {
case TR_ADDED:
fi->record = 0;
/* Skip netshared paths, not our i18n files, and excluded docs */
@@ -1230,14 +1085,14 @@ int rpmtsRun(rpmTransactionSet ts,
skipFiles(ts, fi);
/*@switchbreak@*/ break;
case TR_REMOVED:
- fi->record = teGetDBOffset(p);
+ fi->record = rpmteDBOffset(p);
/*@switchbreak@*/ break;
}
/*@=branchstate@*/
fi->fps = (fc > 0 ? xmalloc(fc * sizeof(*fi->fps)) : NULL);
}
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
if (!rpmtsGetChrootDone(ts)) {
const char * rootDir = rpmtsGetRootDir(ts);
@@ -1255,19 +1110,19 @@ int rpmtsRun(rpmTransactionSet ts,
/* ===============================================
* Add fingerprint for each file not skipped.
*/
- pi = teInitIterator(ts);
- while ((p = teNextIterator(pi)) != NULL) {
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, 0)) != NULL) {
int fc;
- if ((fi = teiGetFi(pi)) == NULL)
+ if ((fi = rpmteiGetFi(pi)) == NULL)
continue; /* XXX can't happen */
- fc = tfiGetFC(fi);
+ fc = rpmfiFC(fi);
fpLookupList(fpc, fi->dnl, fi->bnl, fi->dil, fc, fi->fps);
/*@-branchstate@*/
- fi = tfiInit(fi, 0);
+ fi = rpmfiInit(fi, 0);
if (fi != NULL) /* XXX lclint */
- while ((i = tfiNext(fi)) >= 0) {
+ while ((i = rpmfiNext(fi)) >= 0) {
if (XFA_SKIPPING(fi->actions[i]))
/*@innercontinue@*/ continue;
/*@-dependenttrans@*/
@@ -1276,31 +1131,27 @@ int rpmtsRun(rpmTransactionSet ts,
}
/*@=branchstate@*/
}
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
- /*@-noeffectuncon @*/ /* FIX: check rc */
NOTIFY(ts, (NULL, RPMCALLBACK_TRANS_START, 6, ts->orderCount,
NULL, ts->notifyData));
- /*@=noeffectuncon@*/
/* ===============================================
* Compute file disposition for each package in transaction set.
*/
ps = rpmtsGetProblems(ts);
- pi = teInitIterator(ts);
- while ((p = teNextIterator(pi)) != NULL) {
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, 0)) != NULL) {
dbiIndexSet * matches;
int knownBad;
int fc;
- if ((fi = teiGetFi(pi)) == NULL)
+ if ((fi = rpmteiGetFi(pi)) == NULL)
continue; /* XXX can't happen */
- fc = tfiGetFC(fi);
+ fc = rpmfiFC(fi);
- /*@-noeffectuncon @*/ /* FIX: check rc */
- NOTIFY(ts, (NULL, RPMCALLBACK_TRANS_PROGRESS, teiGetOc(pi),
+ NOTIFY(ts, (NULL, RPMCALLBACK_TRANS_PROGRESS, rpmteiGetOc(pi),
ts->orderCount, NULL, ts->notifyData));
- /*@=noeffectuncon@*/
if (fc == 0) continue;
@@ -1308,20 +1159,20 @@ int rpmtsRun(rpmTransactionSet ts,
matches = xcalloc(fc, sizeof(*matches));
if (rpmdbFindFpList(rpmtsGetRdb(ts), fi->fps, matches, fc)) {
psm->ts = rpmtsUnlink(ts, "tsRun (rpmFindFpList fail)");
- ps = rpmProblemSetFree(ps);
+ ps = rpmpsFree(ps);
return 1; /* XXX WTFO? */
}
numShared = 0;
- fi = tfiInit(fi, 0);
- while ((i = tfiNext(fi)) >= 0)
+ fi = rpmfiInit(fi, 0);
+ while ((i = rpmfiNext(fi)) >= 0)
numShared += dbiIndexSetCount(matches[i]);
/* Build sorted file info list for this package. */
shared = sharedList = xcalloc((numShared + 1), sizeof(*sharedList));
- fi = tfiInit(fi, 0);
- while ((i = tfiNext(fi)) >= 0) {
+ fi = rpmfiInit(fi, 0);
+ while ((i = rpmfiNext(fi)) >= 0) {
/*
* Take care not to mark files as replaced in packages that will
* have been removed before we will get here.
@@ -1330,14 +1181,14 @@ int rpmtsRun(rpmTransactionSet ts,
int ro;
ro = dbiIndexRecordOffset(matches[i], j);
knownBad = 0;
- qi = teInitIterator(ts);
- while ((q = teNext(qi, TR_REMOVED)) != NULL) {
+ qi = rpmteiInit(ts);
+ while ((q = rpmteiNext(qi, TR_REMOVED)) != NULL) {
if (ro == knownBad)
/*@innerbreak@*/ break;
- if (teGetDBOffset(q) == ro)
+ if (rpmteDBOffset(q) == ro)
knownBad = ro;
}
- qi = teFreeIterator(qi);
+ qi = rpmteiFree(qi);
shared->pkgFileNum = i;
shared->otherPkg = dbiIndexRecordOffset(matches[i], j);
@@ -1378,7 +1229,7 @@ int rpmtsRun(rpmTransactionSet ts,
}
/* Determine the fate of each file. */
- switch (teGetType(p)) {
+ switch (rpmteType(p)) {
case TR_ADDED:
xx = handleInstInstalledFiles(ts, p, fi, shared, nexti - i,
!(beingRemoved || (ts->ignoreSet & RPMPROB_FILTER_REPLACEOLDFILES)));
@@ -1397,39 +1248,16 @@ int rpmtsRun(rpmTransactionSet ts,
handleOverlappedFiles(ts, p, fi);
/* Check added package has sufficient space on each partition used. */
- switch (teGetType(p)) {
+ switch (rpmteType(p)) {
case TR_ADDED:
- if (!(ts->di && tfiGetFC(fi) > 0))
- /*@switchbreak@*/ break;
- for (i = 0; i < ts->filesystemCount; i++) {
-
- dip = ts->di + i;
-
- /* XXX Avoid FAT and other file systems that have not inodes. */
- if (dip->iavail <= 0)
- /*@innercontinue@*/ continue;
-
- if (adj_fs_blocks(dip->bneeded) > dip->bavail) {
- rpmProblemSetAppend(ps, RPMPROB_DISKSPACE,
- teGetNEVR(p), teGetKey(p),
- ts->filesystems[i], NULL, NULL,
- (adj_fs_blocks(dip->bneeded) - dip->bavail) * dip->bsize);
- }
-
- if (adj_fs_blocks(dip->ineeded) > dip->iavail) {
- rpmProblemSetAppend(ps, RPMPROB_DISKNODES,
- teGetNEVR(p), teGetKey(p),
- ts->filesystems[i], NULL, NULL,
- (adj_fs_blocks(dip->ineeded) - dip->iavail));
- }
- }
+ rpmtsCheckDSIProblems(ts, p);
/*@switchbreak@*/ break;
case TR_REMOVED:
/*@switchbreak@*/ break;
}
}
- pi = teFreeIterator(pi);
- ps = rpmProblemSetFree(ps);
+ pi = rpmteiFree(pi);
+ ps = rpmpsFree(ps);
if (rpmtsGetChrootDone(ts)) {
const char * currDir = rpmtsGetCurrDir(ts);
@@ -1441,23 +1269,21 @@ int rpmtsRun(rpmTransactionSet ts,
xx = chdir(currDir);
}
- /*@-noeffectuncon @*/ /* FIX: check rc */
NOTIFY(ts, (NULL, RPMCALLBACK_TRANS_STOP, 6, ts->orderCount,
NULL, ts->notifyData));
- /*@=noeffectuncon @*/
/* ===============================================
* Free unused memory as soon as possible.
*/
- pi = teInitIterator(ts);
- while ((p = teNextIterator(pi)) != NULL) {
- if ((fi = teiGetFi(pi)) == NULL)
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, 0)) != NULL) {
+ if ((fi = rpmteiGetFi(pi)) == NULL)
continue; /* XXX can't happen */
- if (tfiGetFC(fi) == 0)
+ if (rpmfiFC(fi) == 0)
continue;
fi->fps = _free(fi->fps);
}
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
fpc = fpCacheFree(fpc);
ts->ht = htFree(ts->ht);
@@ -1467,7 +1293,7 @@ int rpmtsRun(rpmTransactionSet ts,
*/
if ((rpmtsGetFlags(ts) & RPMTRANS_FLAG_BUILD_PROBS)
|| (ts->probs->numProblems &&
- (okProbs != NULL || rpmProblemSetTrim(ts->probs, okProbs)))
+ (okProbs != NULL || rpmpsTrim(ts->probs, okProbs)))
)
{
if (psm->ts != NULL)
@@ -1479,10 +1305,10 @@ int rpmtsRun(rpmTransactionSet ts,
* Save removed files before erasing.
*/
if (rpmtsGetFlags(ts) & (RPMTRANS_FLAG_DIRSTASH | RPMTRANS_FLAG_REPACKAGE)) {
- pi = teInitIterator(ts);
- while ((p = teNextIterator(pi)) != NULL) {
- fi = teiGetFi(pi);
- switch (teGetType(p)) {
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, 0)) != NULL) {
+ fi = rpmteiGetFi(pi);
+ switch (rpmteType(p)) {
case TR_ADDED:
/*@switchbreak@*/ break;
case TR_REMOVED:
@@ -1497,73 +1323,73 @@ int rpmtsRun(rpmTransactionSet ts,
/*@switchbreak@*/ break;
}
}
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
}
/* ===============================================
* Install and remove packages.
*/
lastKey = (alKey)-2; /* erased packages have -1 */
- pi = teInitIterator(ts);
+ pi = rpmteiInit(ts);
/*@-branchstate@*/ /* FIX: fi reload needs work */
- while ((p = teNextIterator(pi)) != NULL) {
+ while ((p = rpmteiNext(pi, 0)) != NULL) {
alKey pkgKey;
Header h;
int gotfd;
gotfd = 0;
- if ((fi = teiGetFi(pi)) == NULL)
+ if ((fi = rpmteiGetFi(pi)) == NULL)
continue; /* XXX can't happen */
psm->te = p;
psm->fi = rpmfiLink(fi, "tsInstall");
- switch (teGetType(p)) {
+ switch (rpmteType(p)) {
case TR_ADDED:
- pkgKey = teGetAddedKey(p);
+ pkgKey = rpmteAddedKey(p);
- rpmMessage(RPMMESS_DEBUG, "========== +++ %s\n", teGetNEVR(p));
+ rpmMessage(RPMMESS_DEBUG, "========== +++ %s\n", rpmteNEVR(p));
h = NULL;
- /*@-type@*/ /* FIX: transactionElement not opaque */
+ /*@-type@*/ /* FIX: rpmte not opaque */
{
/*@-noeffectuncon@*/ /* FIX: notify annotations */
p->fd = ts->notify(fi->h, RPMCALLBACK_INST_OPEN_FILE, 0, 0,
- teGetKey(p), ts->notifyData);
+ rpmteKey(p), ts->notifyData);
/*@=noeffectuncon@*/
- if (teGetFd(p) != NULL) {
+ if (rpmteFd(p) != NULL) {
rpmRC rpmrc;
- rpmrc = rpmReadPackageFile(ts, teGetFd(p),
+ rpmrc = rpmReadPackageFile(ts, rpmteFd(p),
"rpmtsRun", &h);
if (!(rpmrc == RPMRC_OK || rpmrc == RPMRC_BADSIZE)) {
/*@-noeffectuncon@*/ /* FIX: notify annotations */
p->fd = ts->notify(fi->h, RPMCALLBACK_INST_CLOSE_FILE,
0, 0,
- teGetKey(p), ts->notifyData);
+ rpmteKey(p), ts->notifyData);
/*@=noeffectuncon@*/
p->fd = NULL;
ourrc++;
}
- if (teGetFd(p) != NULL) gotfd = 1;
+ if (rpmteFd(p) != NULL) gotfd = 1;
}
}
/*@=type@*/
- if (teGetFd(p) != NULL) {
+ if (rpmteFd(p) != NULL) {
{
char * fstates = fi->fstates;
fileAction * actions = fi->actions;
fi->fstates = NULL;
fi->actions = NULL;
- psm->fi = fiFree(psm->fi, 1);
- (void) fiFree(fi, 0);
+ psm->fi = rpmfiFree(psm->fi, 1);
+ (void) rpmfiFree(fi, 0);
/*@-usereleased@*/
-fi->magic = TFIMAGIC;
+fi->magic = RPMFIMAGIC;
fi->te = p;
fi->record = 0;
- (void) fiNew(ts, fi, h, RPMTAG_BASENAMES, 1);
+ (void) rpmfiNew(ts, fi, h, RPMTAG_BASENAMES, 1);
psm->fi = rpmfiLink(fi, "tsInstall");
fi->fstates = _free(fi->fstates);
fi->fstates = fstates;
@@ -1572,7 +1398,7 @@ fi->actions = actions;
/*@=usereleased@*/
}
- if (teGetMultiLib(p))
+ if (rpmteMultiLib(p))
(void) rpmtsSetFlags(ts, (rpmtsGetFlags(ts) | RPMTRANS_FLAG_MULTILIB));
else
(void) rpmtsSetFlags(ts, (rpmtsGetFlags(ts) & ~RPMTRANS_FLAG_MULTILIB));
@@ -1592,7 +1418,7 @@ fi->actions = actions;
if (gotfd) {
/*@-noeffectuncon @*/ /* FIX: check rc */
(void) ts->notify(fi->h, RPMCALLBACK_INST_CLOSE_FILE, 0, 0,
- teGetKey(p), ts->notifyData);
+ rpmteKey(p), ts->notifyData);
/*@=noeffectuncon @*/
/*@-type@*/
p->fd = NULL;
@@ -1600,9 +1426,9 @@ fi->actions = actions;
}
/*@switchbreak@*/ break;
case TR_REMOVED:
- rpmMessage(RPMMESS_DEBUG, "========== --- %s\n", teGetNEVR(p));
+ rpmMessage(RPMMESS_DEBUG, "========== --- %s\n", rpmteNEVR(p));
/* If install failed, then we shouldn't erase. */
- if (teGetDependsOnKey(p) != lastKey) {
+ if (rpmteDependsOnKey(p) != lastKey) {
if (psmStage(psm, PSM_PKGERASE))
ourrc++;
}
@@ -1613,11 +1439,11 @@ fi->actions = actions;
psm->fi = NULL;
psm->te = NULL;
/*@-type@*/ /* FIX: p is almost opaque */
- p->fi = fiFree(fi, 1);
+ p->fi = rpmfiFree(fi, 1);
/*@=type@*/
}
/*@=branchstate@*/
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
psm->ts = rpmtsUnlink(psm->ts, "tsRun");
diff --git a/lib/ts.c b/lib/ts.c
index 4e1fd1f57..86c6f2c81 100644
--- a/lib/ts.c
+++ b/lib/ts.c
@@ -86,7 +86,7 @@ static const char * ftsInfoStr(int fts_info) {
return ftsInfoStrings[ fts_info ];
}
-static int ftsPrint(FTS * ftsp, FTSENT * fts, rpmTransactionSet ts)
+static int ftsPrint(FTS * ftsp, FTSENT * fts, rpmts ts)
{
struct ftsglob_s * bhg;
const char ** patterns;
@@ -290,7 +290,7 @@ main(int argc, const char *argv[])
{
poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
const char * rootDir = "";
- rpmTransactionSet ts = NULL;
+ rpmts ts = NULL;
FTS * ftsp;
int ftsOpts = (FTS_COMFOLLOW | FTS_LOGICAL | FTS_NOSTAT);
FTSENT * fts;
@@ -370,7 +370,7 @@ if (!_debug) {
#ifdef NOTYET
if (!_debug) {
- { rpmProblemSet ps;
+ { rpmps ps;
xx = rpmtsCheck(ts);
@@ -379,7 +379,7 @@ if (!_debug) {
rpmMessage(RPMMESS_ERROR, _("Failed dependencies:\n"));
printDepProblems(stderr, ps);
}
- ps = rpmProblemSetFree(ts);
+ ps = rpmpsFree(ts);
}
(void) rpmtsOrder(ts);
diff --git a/lib/verify.c b/lib/verify.c
index 4e1396243..1cced4f1d 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -7,6 +7,7 @@
#include <rpmio_internal.h> /* XXX PGPHASHALGO and RPMDIGEST_NONE */
#include <rpmlib.h>
+#include "rpmps.h"
#include "psm.h"
#include "rpmfi.h"
@@ -19,20 +20,20 @@
#include "misc.h" /* XXX for uidToUname() and gnameToGid() */
#include "debug.h"
-/*@access rpmProblemSet @*/
+/*@access rpmps @*/
/*@access rpmProblem @*/
/*@access PSM_t @*/ /* XXX for %verifyscript through psmStage() */
/*@access FD_t @*/ /* XXX compared with NULL */
#define S_ISDEV(m) (S_ISBLK((m)) || S_ISCHR((m)))
-int rpmVerifyFile(const rpmTransactionSet ts, const TFI_t fi,
+int rpmVerifyFile(const rpmts ts, const rpmfi fi,
rpmVerifyAttrs * result, rpmVerifyAttrs omitMask)
{
- unsigned short fmode = tfiGetFMode(fi);
- rpmfileAttrs fileAttrs = tfiGetFFlags(fi);
- rpmVerifyAttrs flags = tfiGetVFlags(fi);
- const char * filespec = tfiGetFN(fi);
+ unsigned short fmode = rpmfiFMode(fi);
+ rpmfileAttrs fileAttrs = rpmfiFFlags(fi);
+ rpmVerifyAttrs flags = rpmfiVFlags(fi);
+ const char * filespec = rpmfiFN(fi);
const char * rootDir;
int rc;
struct stat sb;
@@ -62,7 +63,7 @@ int rpmVerifyFile(const rpmTransactionSet ts, const TFI_t fi,
/*
* Check to see if the file was installed - if not pretend all is OK.
*/
- switch (tfiGetFState(fi)) {
+ switch (rpmfiFState(fi)) {
case RPMFILE_STATE_NETSHARED:
case RPMFILE_STATE_REPLACED:
case RPMFILE_STATE_NOTINSTALLED:
@@ -121,7 +122,7 @@ int rpmVerifyFile(const rpmTransactionSet ts, const TFI_t fi,
if (rc)
*result |= (RPMVERIFY_READFAIL|RPMVERIFY_MD5);
else {
- const unsigned char * md5 = tfiGetMD5(fi);
+ const unsigned char * md5 = rpmfiMD5(fi);
if (md5 == NULL || memcmp(md5sum, md5, sizeof(md5sum)))
*result |= RPMVERIFY_MD5;
}
@@ -134,7 +135,7 @@ int rpmVerifyFile(const rpmTransactionSet ts, const TFI_t fi,
if ((size = Readlink(filespec, linkto, sizeof(linkto)-1)) == -1)
*result |= (RPMVERIFY_READLINKFAIL|RPMVERIFY_LINKTO);
else {
- const char * flink = tfiGetFLink(fi);
+ const char * flink = rpmfiFLink(fi);
linkto[size] = '\0';
if (flink == NULL || strcmp(linkto, flink))
*result |= RPMVERIFY_LINKTO;
@@ -142,7 +143,7 @@ int rpmVerifyFile(const rpmTransactionSet ts, const TFI_t fi,
}
if (flags & RPMVERIFY_FILESIZE) {
- if (sb.st_size != tfiGetFSize(fi))
+ if (sb.st_size != rpmfiFSize(fi))
*result |= RPMVERIFY_FILESIZE;
}
@@ -174,26 +175,26 @@ int rpmVerifyFile(const rpmTransactionSet ts, const TFI_t fi,
{
*result |= RPMVERIFY_RDEV;
} else if (S_ISDEV(fmode) && S_ISDEV(sb.st_mode)) {
- if (sb.st_rdev != tfiGetFRdev(fi))
+ if (sb.st_rdev != rpmfiFRdev(fi))
*result |= RPMVERIFY_RDEV;
}
}
if (flags & RPMVERIFY_MTIME) {
- if (sb.st_mtime != tfiGetFMtime(fi))
+ if (sb.st_mtime != rpmfiFMtime(fi))
*result |= RPMVERIFY_MTIME;
}
if (flags & RPMVERIFY_USER) {
const char * name = uidToUname(sb.st_uid);
- const char * fuser = tfiGetFUser(fi);
+ const char * fuser = rpmfiFUser(fi);
if (name == NULL || fuser == NULL || strcmp(name, fuser))
*result |= RPMVERIFY_USER;
}
if (flags & RPMVERIFY_GROUP) {
const char * name = uidToUname(sb.st_gid);
- const char * fgroup = tfiGetFGroup(fi);
+ const char * fgroup = rpmfiFGroup(fi);
if (name == NULL || fgroup == NULL || strcmp(name, fgroup))
*result |= RPMVERIFY_GROUP;
}
@@ -210,8 +211,8 @@ int rpmVerifyFile(const rpmTransactionSet ts, const TFI_t fi,
* @param scriptFd file handle to use for stderr (or NULL)
* @return 0 on success
*/
-static int rpmVerifyScript(/*@unused@*/ QVA_t qva, rpmTransactionSet ts,
- TFI_t fi, /*@null@*/ FD_t scriptFd)
+static int rpmVerifyScript(/*@unused@*/ QVA_t qva, rpmts ts,
+ rpmfi fi, /*@null@*/ FD_t scriptFd)
/*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
/*@modifies ts, fi, scriptFd, rpmGlobalMacroContext,
fileSystem, internalState @*/
@@ -247,7 +248,7 @@ static int rpmVerifyScript(/*@unused@*/ QVA_t qva, rpmTransactionSet ts,
* @param fi file info set
* @return 0 no problems, 1 problems found
*/
-static int verifyHeader(QVA_t qva, const rpmTransactionSet ts, TFI_t fi)
+static int verifyHeader(QVA_t qva, const rpmts ts, rpmfi fi)
/*@globals fileSystem, internalState @*/
/*@modifies fi, fileSystem, internalState @*/
{
@@ -264,13 +265,13 @@ static int verifyHeader(QVA_t qva, const rpmTransactionSet ts, TFI_t fi)
*te = '\0';
fi = rpmfiLink(fi, "verifyHeader");
- fi = tfiInit(fi, 0);
+ fi = rpmfiInit(fi, 0);
if (fi != NULL) /* XXX lclint */
- while ((i = tfiNext(fi)) >= 0) {
+ while ((i = rpmfiNext(fi)) >= 0) {
rpmfileAttrs fileAttrs;
int rc;
- fileAttrs = tfiGetFFlags(fi);
+ fileAttrs = rpmfiFFlags(fi);
/* If not verifying %ghost, skip ghost files. */
if (!(qva->qva_fflags & RPMFILE_GHOST)
@@ -280,7 +281,7 @@ static int verifyHeader(QVA_t qva, const rpmTransactionSet ts, TFI_t fi)
rc = rpmVerifyFile(ts, fi, &verifyResult, omitMask);
if (rc) {
if (!(fileAttrs & RPMFILE_MISSINGOK) || rpmIsVerbose()) {
- sprintf(te, _("missing %s"), tfiGetFN(fi));
+ sprintf(te, _("missing %s"), rpmfiFN(fi));
te += strlen(te);
ec = rc;
}
@@ -321,7 +322,7 @@ static int verifyHeader(QVA_t qva, const rpmTransactionSet ts, TFI_t fi)
(fileAttrs & RPMFILE_GHOST) ? 'g' :
(fileAttrs & RPMFILE_LICENSE) ? 'l' :
(fileAttrs & RPMFILE_README) ? 'r' : ' '),
- tfiGetFN(fi));
+ rpmfiFN(fi));
te += strlen(te);
}
@@ -345,12 +346,12 @@ static int verifyHeader(QVA_t qva, const rpmTransactionSet ts, TFI_t fi)
* @param h header
* @return 0 no problems, 1 problems found
*/
-static int verifyDependencies(/*@unused@*/ QVA_t qva, rpmTransactionSet ts,
+static int verifyDependencies(/*@unused@*/ QVA_t qva, rpmts ts,
Header h)
/*@globals fileSystem, internalState @*/
/*@modifies ts, h, fileSystem, internalState @*/
{
- rpmProblemSet ps;
+ rpmps ps;
int rc = 0; /* assume no problems */
int xx;
int i;
@@ -385,7 +386,7 @@ static int verifyDependencies(/*@unused@*/ QVA_t qva, rpmTransactionSet ts,
/* XXX FIXME: should probably supply the "[R|C] " type prefix */
te = stpcpy(te, altNEVR+2);
}
- ps = rpmProblemSetFree(ps);
+ ps = rpmpsFree(ps);
if (te > t) {
*te++ = '\n';
@@ -403,14 +404,14 @@ static int verifyDependencies(/*@unused@*/ QVA_t qva, rpmTransactionSet ts,
return rc;
}
-int showVerifyPackage(QVA_t qva, rpmTransactionSet ts, Header h)
+int showVerifyPackage(QVA_t qva, rpmts ts, Header h)
{
int scareMem = 1; /* XXX only rpmVerifyScript needs now */
- TFI_t fi;
+ rpmfi fi;
int ec = 0;
int rc;
- fi = fiNew(ts, NULL, h, RPMTAG_BASENAMES, scareMem);
+ fi = rpmfiNew(ts, NULL, h, RPMTAG_BASENAMES, scareMem);
if (fi != NULL) {
if (qva->qva_flags & VERIFY_DEPS) {
@@ -431,13 +432,13 @@ int showVerifyPackage(QVA_t qva, rpmTransactionSet ts, Header h)
rc = Fclose(fdo);
}
- fi = fiFree(fi, 1);
+ fi = rpmfiFree(fi, 1);
}
return ec;
}
-int rpmcliVerify(rpmTransactionSet ts, QVA_t qva, const char ** argv)
+int rpmcliVerify(rpmts ts, QVA_t qva, const char ** argv)
{
const char * arg;
int vsflags;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 41cd08e07..04a739f18 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -34,7 +34,6 @@ lib/misc.c
lib/package.c
lib/poptI.c
lib/poptQV.c
-lib/problems.c
lib/psm.c
lib/query.c
lib/rpmal.c
@@ -42,6 +41,7 @@ lib/rpmchecksig.c
lib/rpmds.c
lib/rpminstall.c
lib/rpmlead.c
+lib/rpmps.c
lib/rpmrc.c
lib/rpmte.c
lib/rpmts.c
diff --git a/po/cs.po b/po/cs.po
index 99214cab2..929d6a845 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-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:39
+#: build.c:40
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "chybné závislosti pøi sestavování:\n"
-#: build.c:70
+#: build.c:71
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "Nelze otevøít spec soubor %s: %s\n"
-#: build.c:150 build.c:162
+#: build.c:151 build.c:163
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "Nelze otevøít rouru pro tar: %m\n"
#. Give up
-#: build.c:169
+#: build.c:170
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr "Nelze èíst spec soubor z %s\n"
-#: build.c:197
+#: build.c:198
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "Nelze pøejmenovat %s na %s: %m\n"
-#: build.c:237
+#: build.c:238
#, c-format
msgid "failed to stat %s: %m\n"
msgstr "nemohu zjistit stav %s: %m\n"
-#: build.c:242
+#: build.c:243
#, c-format
msgid "File %s is not a regular file.\n"
msgstr "Soubor %s není obyèejnı soubor.\n"
-#: build.c:251
+#: build.c:252
#, 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:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Sestavuji cílové platformy: %s\n"
-#: build.c:321
+#: build.c:322
#, 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:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr "vypsat pou¾ívanou verzi rpm"
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr "poskytnout vıstu s ménì detaily"
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr "poskytnout detailnìj¹í vıstup"
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr "definování makra <jméno> s obsahem <tìlo>"
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr "'<jméno> <tìlo>'"
-#: rpmqv.c:121
+#: rpmqv.c:122
msgid "print macro expansion of <expr>+"
msgstr "vypsat expanzi makra <vıraz>+"
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr "<vıraz>+"
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr "odeslat stdout do <pøíkazu>"
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr "<pøík>"
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr "pou¾ít <adr> jako adresáø nejvy¹¹í úrovnì"
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr "<adresáø>"
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr "èíst <soubor:...> místo implicitního makro souboru"
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr "<soubor:...>"
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "èíst <soubor:...> místo implicitního rpmrc souboru"
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr "zobrazit finální konfiguraci rpmrc a maker"
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr "zakázat pou¾ití libio(3) API"
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr "ladit protokol datového toku"
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr "ladit rpmio I/O"
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr "ladit manipulaci s URL cache"
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr "Volby dotazù (s -q or --query):"
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr "Vollby kontroly (s -V or --verify):"
-#: rpmqv.c:183
+#: rpmqv.c:184
msgid "Signature options:"
msgstr "Volby signatury:"
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr "Volby databáze:"
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"Sestavovací volby s [ <spec_soubor> | <tar_soubor> | <zdrojovı_balíèek> ]:"
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr "Volby pro Instalaci/Aktualizaci/Mazání:"
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr "Spoleèné volby pro v¹echny módy:"
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verze %s\n"
-#: rpmqv.c:238
+#: rpmqv.c:239
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (c) 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:239
+#: rpmqv.c:240
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:251
+#: rpmqv.c:252
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Pou¾ití: %s {--help}\n"
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr "Volba --rcfile byla odstranìna.\n"
-#: rpmqv.c:605
+#: rpmqv.c:606
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Pou¾ijte volbu \"--macros <soubor:...>\".\n"
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Interní chyba pøi zpracování parametrù (%d) :-(\n"
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr "specifikovat lze jen jeden hlavní re¾im"
-#: rpmqv.c:681
+#: rpmqv.c:682
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:685
+#: rpmqv.c:686
msgid "unexpected query flags"
msgstr "neoèekávanı pøíznak pro dotaz"
-#: rpmqv.c:688
+#: rpmqv.c:689
msgid "unexpected query format"
msgstr "neoèekávanı formát dotazu"
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr "neoèekávanı zdroj dotazu"
-#: rpmqv.c:732
+#: rpmqv.c:733
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath zadána pro operaci, která databázi nepou¾ívá"
-#: rpmqv.c:738
+#: rpmqv.c:739
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:740
+#: rpmqv.c:741
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:743
+#: rpmqv.c:744
msgid "only one of --prefix or --relocate may be used"
msgstr "pou¾ít lze jen jeden z parametrù --prefix nebo --relocate"
-#: rpmqv.c:746
+#: rpmqv.c:747
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:749
+#: rpmqv.c:750
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:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr "parametry pro --prefix musejí zaèínat znakem /"
-#: rpmqv.c:755
+#: rpmqv.c:756
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:759
+#: rpmqv.c:760
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:764
+#: rpmqv.c:765
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:768
+#: rpmqv.c:769
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:772
+#: rpmqv.c:773
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:776
+#: rpmqv.c:777
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:780
+#: rpmqv.c:781
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "pou¾ít lze jen jeden z parametrù --excludedocs a --includedocs"
-#: rpmqv.c:784
+#: rpmqv.c:785
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:788
+#: rpmqv.c:789
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:793
+#: rpmqv.c:794
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:797
+#: rpmqv.c:798
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:801
+#: rpmqv.c:802
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:806
+#: rpmqv.c:807
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:811
+#: rpmqv.c:812
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:816
+#: rpmqv.c:817
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:820
+#: rpmqv.c:821
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:825
+#: rpmqv.c:826
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:830
+#: rpmqv.c:831
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:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr "parametry pro --root (-r) musejí zaèínat znakem /"
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr "¾ádné soubory k podepsání\n"
-#: rpmqv.c:871
+#: rpmqv.c:872
#, c-format
msgid "cannot access file %s\n"
msgstr "pøístup k souboru %s se nezdaøil\n"
-#: rpmqv.c:890
+#: rpmqv.c:891
msgid "pgp not found: "
msgstr "pgp nenalezeno: "
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr "Vlo¾te heslovou frázi: "
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr "Chybná heslová fráze\n"
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr "Heslová fráze je v poøádku.\n"
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "©patná %%_signature spec v souboru maker.\n"
-#: rpmqv.c:913
+#: rpmqv.c:914
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:930
+#: rpmqv.c:931
msgid "exec failed\n"
msgstr "spu¹tìní selhalo\n"
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr "ke znovusestavení nezadány ¾ádné balíèky"
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr "pro sestavení nezadány ¾ádné spec soubory"
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr "pro sestavení nezadány ¾ádné tar soubory"
-#: rpmqv.c:1055
+#: rpmqv.c:1056
#, fuzzy
msgid "no packages given for erase"
msgstr "k podepsání nezadány ¾ádné balíèky"
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr "nezadány ¾ádné balíèky pro instalaci"
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr "k dotazu nezadány ¾ádné parametry"
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr "pro kontrolu nezadány ¾ádné balíèky"
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr "neoèekávané parametry pro --querytags "
-#: rpmqv.c:1149
+#: rpmqv.c:1150
#, fuzzy
msgid "no arguments given"
msgstr "k dotazu nezadány ¾ádné parametry"
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
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:152
+#: build/files.c:1826 build/pack.c:154
#, 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:85
+#: build/pack.c:87
#, 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:88
+#: build/pack.c:90
#, c-format
msgid "create archive failed: %s\n"
msgstr "vytváøení archívu selhalo: %s\n"
-#: build/pack.c:110
+#: build/pack.c:112
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "zápis cpio_copy selhal: %s\n"
-#: build/pack.c:117
+#: build/pack.c:119
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "ètení cpio_copy selhalo: %s\n"
-#: build/pack.c:220
+#: build/pack.c:222
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "Nemohu otevøít PreIn soubor: %s\n"
-#: build/pack.c:227
+#: build/pack.c:229
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "Nemohu otevøít PreUn soubor: %s\n"
-#: build/pack.c:234
+#: build/pack.c:236
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "Nemohu otevøít PostIn soubor: %s\n"
-#: build/pack.c:241
+#: build/pack.c:243
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "Nemohu otevøít PostUn soubor: %s\n"
-#: build/pack.c:249
+#: build/pack.c:251
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "Nemohu otevøít VerifyScript soubor: %s\n"
-#: build/pack.c:264
+#: build/pack.c:266
#, 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:292
+#: build/pack.c:294
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr "readRPM: otevøení %s: %s\n"
-#: build/pack.c:302
+#: build/pack.c:304
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr "readRPM: ètení %s: %s\n"
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: Fseek selhal: %s\n"
-#: build/pack.c:339
+#: build/pack.c:341
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s není RPM balíèek\n"
-#: build/pack.c:348
+#: build/pack.c:350
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: ètení hlavièky z %s\n"
-#: build/pack.c:477
+#: build/pack.c:479
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "Nemohu pøeèíst hlavièku z %s: %s\n"
-#: build/pack.c:496
+#: build/pack.c:498
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "Nemohu zapsat hlavièku do %s: %s\n"
-#: build/pack.c:506
+#: build/pack.c:508
msgid "Bad CSA data\n"
msgstr "©patná CSA data\n"
-#: build/pack.c:542
+#: build/pack.c:544
#, fuzzy
msgid "Unable to write final header\n"
msgstr "Nemohu zapsat hlavièku do %s: %s\n"
-#: build/pack.c:562
+#: build/pack.c:564
#, c-format
msgid "Generating signature: %d\n"
msgstr "Generuji podpis: %d\n"
-#: build/pack.c:580
+#: build/pack.c:582
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "Nemohu pøeèíst hlavièku z %s: %s\n"
-#: build/pack.c:588
+#: build/pack.c:590
#, c-format
msgid "Could not open %s: %s\n"
msgstr "Nemohu otevøít %s: %s\n"
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Nemohu zapsat balíèek: %s\n"
-#: build/pack.c:639
+#: build/pack.c:641
#, 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:650
+#: build/pack.c:652
#, 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:664
+#: build/pack.c:666
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Nemohu zapsat hlavièku do %s: %s\n"
-#: build/pack.c:674
+#: build/pack.c:676
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Nemohu pøeèíst payload z %s: %s\n"
-#: build/pack.c:680
+#: build/pack.c:682
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Nemohu zapsat payload do %s: %s\n"
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr "Zapsáno: %s\n"
-#: build/pack.c:772
+#: build/pack.c:774
#, 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:789
+#: build/pack.c:791
#, c-format
msgid "cannot create %s: %s\n"
msgstr "nemohu vytvoøit %s: %s\n"
@@ -1434,36 +1434,36 @@ msgstr ""
msgid " failed - "
msgstr "selhal - "
-#: lib/depends.c:155
+#: lib/depends.c:156
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "balíèek %s je ji¾ nainstalován"
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s ANO (rpmrc poskytuje)\n"
-#: lib/depends.c:425
+#: lib/depends.c:426
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s ANO (rpmlib poskytuje)\n"
-#: lib/depends.c:446
+#: lib/depends.c:447
#, fuzzy
msgid "(db files)"
msgstr "¹patnı db soubor %s\n"
-#: lib/depends.c:458
+#: lib/depends.c:459
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s ANO (db poskytuje)\n"
-#: lib/depends.c:471
+#: lib/depends.c:472
#, fuzzy
msgid "(db package)"
msgstr "¾ádné balíèky\n"
@@ -1479,12 +1479,12 @@ 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:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr "========== ukládání tsort relací\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1492,20 +1492,20 @@ msgid ""
msgstr ""
"========== tsorting balíèkù (poøadí, #pøedchùdce, #následovník, hloubka)\n"
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n"
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr "SMYÈKA:\n"
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr "========== pokraèuje tsort ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1554,47 +1554,47 @@ msgstr "nemohu otevøít %s: %s\n"
msgid "file %s is on an unknown device\n"
msgstr "soubor %s je na neznámém zaøízení\n"
-#: lib/fsm.c:318
+#: lib/fsm.c:320
#, fuzzy
msgid "========== Directories not explictly included in package:\n"
msgstr "========= Adresáøe, které nebyly explicitnì zaøazeny do balíèku:\n"
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, fuzzy, c-format
msgid "%10d %s\n"
msgstr "%9d %s\n"
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr "vytvoøen adresáø %s s právy %04o.\n"
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, c-format
msgid "%s saved as %s\n"
msgstr "%s ulo¾eno jako %s\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s odstranìní %s selhalo: Adresáø není prázdnı\n"
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s rmdir %s selhal: %s\n"
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s unlink %s selhal: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, c-format
msgid "%s created as %s\n"
msgstr "%s vytvoøen jako %s\n"
@@ -1604,41 +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:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead selhalo\n"
-#: lib/package.c:181
+#: lib/package.c:182
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:189
+#: lib/package.c:190
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:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature selhalo\n"
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Není dostupnı ¾ádnı podpis\n"
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead selhalo\n"
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread selhalo: %s\n"
@@ -2067,384 +2067,304 @@ msgstr "podepsat balíèek (zahodit aktuální podpis)"
msgid "generate signature"
msgstr "generovat PGP/GPG podpis"
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: 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: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:231
-#, c-format
-msgid "package %s is already installed"
-msgstr "balíèek %s je ji¾ nainstalován"
-
-#: 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: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: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: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: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: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: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: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: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: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:365
-#, fuzzy
-msgid "conflicts with"
-msgstr " koliduje s %s-%s-%s\n"
-
-#: 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:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 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"
-#: lib/psm.c:448
+#: lib/psm.c:449
#, c-format
msgid "cannot create %%%s %s\n"
msgstr "nemohu vytvoøit %s: %s\n"
-#: lib/psm.c:454
+#: lib/psm.c:455
#, c-format
msgid "cannot write to %%%s %s\n"
msgstr "nemohu zapsat do %%%s %s\n"
-#: lib/psm.c:485
+#: lib/psm.c:486
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:601
+#: lib/psm.c:602
msgid "source package contains no .spec file\n"
msgstr "zdrojovı balíèek neobsahuje .spec soubor\n"
-#: lib/psm.c:720
+#: lib/psm.c:721
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "%s: spou¹tím %s skript(y) (pokud existují)\n"
-#: lib/psm.c:890
+#: lib/psm.c:891
#, 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:897
+#: lib/psm.c:898
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "provedení %s skripletu z %s-%s-%s selhalo, návratovı kód: %d\n"
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, fuzzy, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr "%s: %s-%s-%s obsahuje %d souborù, test = %d\n"
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, fuzzy, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s: scriptlet %s selhal (%d), pøeskakuji %s-%s-%s\n"
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, c-format
msgid "user %s does not exist - using root\n"
msgstr "u¾ivatel %s neexistuje - pou¾it u¾ivatel root\n"
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, c-format
msgid "group %s does not exist - using root\n"
msgstr "skupina %s neexistuje - pou¾ita skupina root\n"
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "rozbalování archívu selhalo %s%s: %s\n"
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr " na souboru "
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "nemohu otevøít %s: %s\n"
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "%s selhalo\n"
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, c-format
msgid "incorrect format: %s\n"
msgstr "nesprávnı formát: %s\n"
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr "(neobsahuje ¾ádné soubory)"
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr "normální "
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr "nahrazen "
-#: lib/query.c:289
+#: lib/query.c:290
msgid "not installed "
msgstr "neinstalován "
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr "sdílen v síti "
-#: lib/query.c:295
+#: lib/query.c:296
#, c-format
msgid "(unknown %3d) "
msgstr "(neznámı %3d) "
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr "(chybí stav) "
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
msgid "package has neither file owner or id lists\n"
msgstr "balíèek nemá vlastníka souboru ani seznamy id\n"
-#: lib/query.c:465
+#: lib/query.c:466
#, c-format
msgid "can't query %s: %s\n"
msgstr "nemohu provést dotaz %s: %s\n"
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, c-format
msgid "open of %s failed: %s\n"
msgstr "otevøení %s selhalo: %s\n"
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr "dotaz na %s se nezdaøil\n"
-#: lib/query.c:637
+#: lib/query.c:638
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:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "¾ádnı balíèek neaktivuje %s\n"
-#: lib/query.c:707
+#: lib/query.c:708
#, 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:728
+#: lib/query.c:729
msgid "no packages\n"
msgstr "¾ádné balíèky\n"
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "skupina %s neobsahuje ¾ádné balíèky\n"
-#: lib/query.c:758
+#: lib/query.c:759
#, c-format
msgid "no package triggers %s\n"
msgstr "¾ádnı balíèek neaktivuje %s\n"
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "Nemohu èíst %s: %s.\n"
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "¾ádnı balíèek neaktivuje %s\n"
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr "¾ádnı balíèek nevy¾aduje %s\n"
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr "¾ádnı balíèek neposkytuje %s\n"
-#: lib/query.c:911
+#: lib/query.c:912
#, c-format
msgid "file %s: %s\n"
msgstr "soubor %s: %s\n"
-#: lib/query.c:915
+#: lib/query.c:916
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "soubor %s nevlastní ¾ádnı balíèek\n"
-#: lib/query.c:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr "neplatné èíslo balíèku: %s\n"
-#: lib/query.c:945
+#: lib/query.c:946
#, c-format
msgid "package record number: %u\n"
msgstr "záznam balíèku èíslo: %u\n"
-#: lib/query.c:950
+#: lib/query.c:951
#, c-format
msgid "record %u could not be read\n"
msgstr "záznam %d nelze pøeèíst\n"
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, c-format
msgid "package %s is not installed\n"
msgstr "balíèek %s není nainstalován\n"
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
#, fuzzy
msgid "(added files)"
msgstr "¹patnı db soubor %s\n"
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
#, fuzzy
msgid "(added provide)"
msgstr "%s: %-45s ANO (db poskytuje)\n"
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: otevøení selhalo: %s\n"
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
msgid "makeTempFile failed\n"
msgstr "makeTempFile selhalo\n"
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite selhalo: %s\n"
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: RPM v1.0 nelze podepsat\n"
-#: lib/rpmchecksig.c:175
+#: lib/rpmchecksig.c:176
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: Nemohu znovu podepsat RPM v2.0\n"
-#: lib/rpmchecksig.c:274
+#: lib/rpmchecksig.c:275
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead selhalo: %s\n"
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature selhalo: %s\n"
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead selhalo\n"
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Není dostupnı ¾ádnı podpis (RPM v1.0)\n"
-#: lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr "NENÍ OK"
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
msgid " (MISSING KEYS:"
msgstr " (CHYBÍ KLÍÈ:"
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr " (NEDÙVÌRYHODNİ KLÍÈ:"
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr "OK"
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "NO "
msgstr "NE "
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr "ANO"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2453,105 +2373,105 @@ msgstr ""
"Závislost \"B\" potøebuje období (pøedpokládáno stejné jako \"A\")\n"
"\tA %s\tB %s\n"
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n"
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr "Pøipravuji..."
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
msgid "Preparing packages for installation..."
msgstr "Pøipravuji balíèky pro instalaci..."
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, c-format
msgid "Retrieving %s\n"
msgstr "Stahuji %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr " ... jako %s\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "pøeskakuji %s - pøenos selhal - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, c-format
msgid "package %s is not relocateable\n"
msgstr "balíèek %s není pøemístitelnı\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, c-format
msgid "error reading from file %s\n"
msgstr "chyba pøi ètení ze souboru %s\n"
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, 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:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nemù¾e bıt nainstalován\n"
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, 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:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "nevyøe¹ené závislosti:\n"
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
msgid "installing binary packages\n"
msgstr "instaluji binární balíèky\n"
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "nemohu otevøít soubor %s: %s\n"
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" urèuje více balíèkù\n"
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
msgid "removing these packages would break dependencies:\n"
msgstr "odstranìní tìchto balíèkù by poru¹ilo závislosti:\n"
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, c-format
msgid "cannot open %s: %s\n"
msgstr "nemohu otevøít %s: %s\n"
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr "Instaluji %s\n"
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2561,6 +2481,86 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "ètení selhalo: %s (%d)\n"
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, fuzzy, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr "balíèek %s je pro jinou architekturu"
+
+#: lib/rpmps.c:221
+#, 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/rpmps.c:226
+#, c-format
+msgid "package %s is already installed"
+msgstr "balíèek %s je ji¾ nainstalován"
+
+#: lib/rpmps.c:231
+#, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "cesta %s v balíèku %s není pøemístitelná"
+
+#: lib/rpmps.c:236
+#, 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/rpmps.c:241
+#, 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/rpmps.c:246
+#, 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/rpmps.c:251
+#, 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/rpmps.c:261
+#, 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/rpmps.c:266
+#, 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/rpmps.c:270
+#, 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/rpmps.c:274
+#, 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/rpmps.c:279
+#, 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/rpmps.c:360
+#, fuzzy
+msgid "conflicts with"
+msgstr " koliduje s %s-%s-%s\n"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "is needed by"
+msgstr " je nutné pro %s-%s-%s\n"
+
#: lib/rpmrc.c:191
#, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2656,171 +2656,172 @@ 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:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "nemohu otevøít databázi balíèkù v %s\n"
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr "získávám seznam pøipojenıch systémù souborù\n"
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr "není obyèejnı soubor -- pøeskakuji kontrolu velikosti\n"
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
"Pøedpokl. délka: %12d = hlavièka(%d)+signatura(%d)+vıplò(%d)+data(%d)\n"
-#: lib/signature.c:147
+#: lib/signature.c:148
#, c-format
msgid " Actual size: %12d\n"
msgstr "Aktuální délka: %12d\n"
-#: lib/signature.c:167
+#: lib/signature.c:168
msgid "No signature\n"
msgstr "Chybí podpis\n"
-#: lib/signature.c:171
+#: lib/signature.c:172
msgid "Old PGP signature\n"
msgstr "Starı PGP podpis\n"
-#: lib/signature.c:182
+#: lib/signature.c:183
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Starı (pouze interní) podpis! Jak jste to získali!?\n"
-#: lib/signature.c:232
+#: lib/signature.c:233
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "Podpisu: velikost(%d)+vata(%d)\n"
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "Nemohu spustit %s: %s\n"
-#: lib/signature.c:327
+#: lib/signature.c:328
msgid "pgp failed\n"
msgstr "pgp selhalo\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
msgid "pgp failed to write signature\n"
msgstr "pgp selhalo pøi zápisu podpisu\n"
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr "Velikost podpisu PGP: %d\n"
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
msgid "unable to read the signature\n"
msgstr "nemohu èíst podpis\n"
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "Pøeèteno %d bajtù PGP podpisu\n"
-#: lib/signature.c:425
+#: lib/signature.c:426
msgid "gpg failed\n"
msgstr "gpg selhalo\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
msgid "gpg failed to write signature\n"
msgstr "gpg selhalo pøi zápisu podpisu\n"
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr "Velikost GPG podpisu: %d\n"
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "Pøeèteno %d bajtù GPG podpisu\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "©patná %%_signature spec v souboru maker\n"
-#: lib/signature.c:743
+#: lib/signature.c:744
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Musíte nastavit \"%%_gpg_name\" ve svém makro souboru\n"
-#: lib/signature.c:756
+#: lib/signature.c:757
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Musíte nastavit \"%%_pgp_name\" ve svém makro souboru\n"
-#: lib/signature.c:800
+#: lib/signature.c:801
#, fuzzy
msgid "Header+Payload size: "
msgstr "Velikost hlavièky je pøili¹ velká"
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
#, fuzzy
msgid "V3 RSA/MD5 signature: "
msgstr "vynechat pøípadné MD5 souèty"
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
#, fuzzy
msgid "V3 DSA signature: "
msgstr "Chybí podpis\n"
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, fuzzy, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Podpisu: velikost(%d)+vata(%d)\n"
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, 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:1004
+#: lib/transaction.c:887
#, c-format
msgid "excluding directory %s\n"
msgstr "vynechávám adresáø %s\n"
-#: 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:283
+#: lib/verify.c:284
#, c-format
msgid "missing %s"
msgstr "chybí %s"
-#: lib/verify.c:379
+#: lib/verify.c:380
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: "
diff --git a/po/da.po b/po/da.po
index c70ffb702..08c9959d2 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-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:39
+#: build.c:40
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "afhængighedskrav for pakkeopbygning kunne ikke imødekommes:\n"
-#: build.c:70
+#: build.c:71
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "Kan ikke åbne spec-fil %s: %s\n"
-#: build.c:150 build.c:162
+#: build.c:151 build.c:163
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "Kunne ikke åbne tar-videreførsel: %m\n"
#. Give up
-#: build.c:169
+#: build.c:170
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr "Kunne ikke læse spec-fil fra %s\n"
-#: build.c:197
+#: build.c:198
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "Kunne ikke omdøbe %s til %s: %m\n"
-#: build.c:237
+#: build.c:238
#, c-format
msgid "failed to stat %s: %m\n"
msgstr "kunne ikke finde %s: %m\n"
-#: build.c:242
+#: build.c:243
#, c-format
msgid "File %s is not a regular file.\n"
msgstr "Filen %s er ikke en regulær fil.\n"
-#: build.c:251
+#: build.c:252
#, 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:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Opbygger mål-platforme: %s\n"
-#: build.c:321
+#: build.c:322
#, 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:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr "vis versionen af rpm som benyttes"
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr "medtag mindre detaljerede oplysninger"
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr "medtag mere detaljerede oplysninger"
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr "definér makro <navn> med værdi <vrdi>"
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr "'<navn> <indhold>'"
-#: rpmqv.c:121
+#: rpmqv.c:122
msgid "print macro expansion of <expr>+"
msgstr "udlæs makroudvidelse af <udtryk>+"
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr "<udtryk>+"
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr "send standard-ud til <kmd>"
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr "<kmd>"
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr "brug <katalog> som topniveau-katalog"
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr "<katalog>"
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr "læs <fil:...> i stedet for standard makrofil(er)"
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr "<fil:...>"
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "læs <fil:...> i stedet for standard rpmrc-fil(er)"
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr "vis den endelige rpmrc og makrokonfiguration"
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr "undlad at benytte libio(3)-API"
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr "aflus protokol-datastrøm"
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr "aflus rpmio I/O"
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr "aflus URL-bufferhåndtering"
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr "Forespørgselstilvalg (med -q eller --query):"
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr "Verifikationstilvalg (med -V eller --verify):"
-#: rpmqv.c:183
+#: rpmqv.c:184
msgid "Signature options:"
msgstr "Signaturtilvalg"
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr "Databasetilvalg:"
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr "Opbygningstilvalg med [ <spec-fil> | <tararkiv> | <kildepakke> ]:"
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr "Fælles tilvalg for alle rpm-tilstande:"
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "fil %s: %s\n"
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr "RPM version %s\n"
-#: rpmqv.c:238
+#: rpmqv.c:239
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:239
+#: rpmqv.c:240
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:251
+#: rpmqv.c:252
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Brug: %s {--help}\n"
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr "Tilvalget --rcfile er fjernet.\n"
-#: rpmqv.c:605
+#: rpmqv.c:606
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Brug \"--macros <fil:...>\" i stedet..\n"
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Intern fejl i parameterfortolkningen (%d) :-(\n"
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr "kun ét hovedtilvalg kan angives"
-#: rpmqv.c:681
+#: rpmqv.c:682
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:685
+#: rpmqv.c:686
msgid "unexpected query flags"
msgstr "uventet forespørgselsflag"
-#: rpmqv.c:688
+#: rpmqv.c:689
msgid "unexpected query format"
msgstr "uventet forespørgselsformat"
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr "uventet forespørgselskilde"
-#: rpmqv.c:732
+#: rpmqv.c:733
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath angivet ved en operation, der ikke benytter en database"
-#: rpmqv.c:738
+#: rpmqv.c:739
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "kun installation, opgradering, rmsource og rmspec kan tvinges igennem"
-#: rpmqv.c:740
+#: rpmqv.c:741
msgid "files may only be relocated during package installation"
msgstr "filer kan kun omrokeres under installation"
-#: rpmqv.c:743
+#: rpmqv.c:744
msgid "only one of --prefix or --relocate may be used"
msgstr "kun én af --prefix eller --relocate kan bruges"
-#: rpmqv.c:746
+#: rpmqv.c:747
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:749
+#: rpmqv.c:750
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix kan kun bruges, når nye pakker installeres"
-#: rpmqv.c:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr "parametre til --prefix skal starte med et /"
-#: rpmqv.c:755
+#: rpmqv.c:756
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) kan kun angives ved installation"
-#: rpmqv.c:759
+#: rpmqv.c:760
msgid "--percent may only be specified during package installation"
msgstr "--percent kan kun angives ved installation"
-#: rpmqv.c:764
+#: rpmqv.c:765
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles kan kun angives ved installation"
-#: rpmqv.c:768
+#: rpmqv.c:769
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs kan kun angives ved installation"
-#: rpmqv.c:772
+#: rpmqv.c:773
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs kan kun angives ved installation"
-#: rpmqv.c:776
+#: rpmqv.c:777
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs kan kun angives ved installation"
-#: rpmqv.c:780
+#: rpmqv.c:781
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "kun én af --excludedocs og --includedocs kan angives"
-#: rpmqv.c:784
+#: rpmqv.c:785
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch kan kun angives ved installation"
-#: rpmqv.c:788
+#: rpmqv.c:789
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos kan kun angives ved installation"
-#: rpmqv.c:793
+#: rpmqv.c:794
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize kan kun angives ved installation"
-#: rpmqv.c:797
+#: rpmqv.c:798
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches kan kun angives ved installation"
-#: rpmqv.c:801
+#: rpmqv.c:802
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles kan kun angives ved installation"
-#: rpmqv.c:806
+#: rpmqv.c:807
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb kan kun angives ved installation og sletning"
-#: rpmqv.c:811
+#: rpmqv.c:812
#, 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:816
+#: rpmqv.c:817
#, 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:820
+#: rpmqv.c:821
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:825
+#: rpmqv.c:826
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test kan kun angives ved installation, sletning og opbygning"
-#: rpmqv.c:830
+#: rpmqv.c:831
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:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr "parameteren til --root (-r) skal starte med et /"
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr "ingen filer at underskrive\n"
-#: rpmqv.c:871
+#: rpmqv.c:872
#, c-format
msgid "cannot access file %s\n"
msgstr "kan ikke tilgå filen %s\n"
-#: rpmqv.c:890
+#: rpmqv.c:891
msgid "pgp not found: "
msgstr "pgp ikke fundet: "
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr "Indtast adgangskode: "
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr "Adgangskode ikke godkendt\n"
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr "Adgangskode godkendt.\n"
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Ugyldig angivelse af %%_signature i makrofil.\n"
-#: rpmqv.c:913
+#: rpmqv.c:914
msgid "--sign may only be used during package building"
msgstr "--sign kan kun bruges ved pakkeopbygning"
-#: rpmqv.c:930
+#: rpmqv.c:931
msgid "exec failed\n"
msgstr "eksekvering mislykkedes\n"
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr "ingen pakkefiler angivet til genopbygning"
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr "ingen spec-fil angivet til opbygning"
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr "ingen tar-arkiver angivet til opbygning"
-#: rpmqv.c:1055
+#: rpmqv.c:1056
#, fuzzy
msgid "no packages given for erase"
msgstr "ingen pakker angivet ved signering"
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr "ingen pakker angivet ved installation"
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr "ingen parametre angivet ved forespørgsel"
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr "ingen parametre angivet ved verifikation"
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr "uventede parametre til --querytags "
-#: rpmqv.c:1149
+#: rpmqv.c:1150
#, fuzzy
msgid "no arguments given"
msgstr "ingen parametre angivet ved forespørgsel"
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
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:152
+#: build/files.c:1826 build/pack.c:154
#, 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:85
+#: build/pack.c:87
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "arkivoprettelse mislykkedes ved fil %s: %s\n"
-#: build/pack.c:88
+#: build/pack.c:90
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "arkivoprettelse mislykkedes ved fil %s: %s\n"
-#: build/pack.c:110
+#: build/pack.c:112
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "cpio_copy-skrivning mislykkedes: %s\n"
-#: build/pack.c:117
+#: build/pack.c:119
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "cpio_copy-læsning mislykkedes: %s\n"
-#: build/pack.c:220
+#: build/pack.c:222
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "Kunne ikke åbne 'PreIn'-fil: %s\n"
-#: build/pack.c:227
+#: build/pack.c:229
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "Kunne ikke åbne 'PreUn'-fil: %s\n"
-#: build/pack.c:234
+#: build/pack.c:236
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "Kunne ikke åbne 'PostIn'-fil: %s\n"
-#: build/pack.c:241
+#: build/pack.c:243
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "Kunne ikke åbne 'PostUn'-fil: %s\n"
-#: build/pack.c:249
+#: build/pack.c:251
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "Kunne ikke åbne 'VerifyScript'-fil: %s\n"
-#: build/pack.c:264
+#: build/pack.c:266
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "Kunne ikke åbne skriptfilen Trigger: %s\n"
-#: build/pack.c:292
+#: build/pack.c:294
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr "readRPM: åbn %s: %s\n"
-#: build/pack.c:302
+#: build/pack.c:304
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr "readRPM: læs %s: %s\n"
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: Fread mislykkedes: %s\n"
-#: build/pack.c:339
+#: build/pack.c:341
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s er ikke nogen RPM-pakke\n"
-#: build/pack.c:348
+#: build/pack.c:350
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: læser hoved fra %s\n"
-#: build/pack.c:477
+#: build/pack.c:479
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "Kunne ikke læse hoved fra %s: %s\n"
-#: build/pack.c:496
+#: build/pack.c:498
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "Kunne ikke skrive hoved til %s: %s\n"
-#: build/pack.c:506
+#: build/pack.c:508
msgid "Bad CSA data\n"
msgstr "Ugyldige CSA-data\n"
-#: build/pack.c:542
+#: build/pack.c:544
#, fuzzy
msgid "Unable to write final header\n"
msgstr "Kunne ikke skrive hoved til %s: %s\n"
-#: build/pack.c:562
+#: build/pack.c:564
#, c-format
msgid "Generating signature: %d\n"
msgstr "Genererer signatur: %d\n"
-#: build/pack.c:580
+#: build/pack.c:582
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "Kunne ikke læse hoved fra %s: %s\n"
-#: build/pack.c:588
+#: build/pack.c:590
#, c-format
msgid "Could not open %s: %s\n"
msgstr "Kunne ikke åbne %s: %s\n"
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Kunne ikke skrive pakke: %s\n"
-#: build/pack.c:639
+#: build/pack.c:641
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Kunne ikke åbne sigtarget %s: %s\n"
-#: build/pack.c:650
+#: build/pack.c:652
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "Kunne ikke læse hoved fra %s: %s\n"
-#: build/pack.c:664
+#: build/pack.c:666
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Kunne ikke skrive hoved til %s: %s\n"
-#: build/pack.c:674
+#: build/pack.c:676
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Kunne ikke læse pakkeindhold fra %s: %s\n"
-#: build/pack.c:680
+#: build/pack.c:682
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n"
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr "Skrev: %s\n"
-#: build/pack.c:772
+#: build/pack.c:774
#, 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:789
+#: build/pack.c:791
#, c-format
msgid "cannot create %s: %s\n"
msgstr "kan ikke oprette %s: %s\n"
@@ -1435,36 +1435,36 @@ msgstr ""
msgid " failed - "
msgstr " mislykkedes - "
-#: lib/depends.c:155
+#: lib/depends.c:156
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "pakken %s er allerede installeret"
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s JA (rpmrc tilfører)\n"
-#: lib/depends.c:425
+#: lib/depends.c:426
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s JA (rpmlib tilfører)\n"
-#: lib/depends.c:446
+#: lib/depends.c:447
#, fuzzy
msgid "(db files)"
msgstr "ugyldig db-fil %s\n"
-#: lib/depends.c:458
+#: lib/depends.c:459
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s JA (db tilfører)\n"
-#: lib/depends.c:471
+#: lib/depends.c:472
#, fuzzy
msgid "(db package)"
msgstr "ingen pakker\n"
@@ -1480,31 +1480,31 @@ msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n"
#. Record all relations.
-#: lib/depends.c:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr "========== gemmer tsort-relationer\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n"
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr "LØKKE:\n"
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr "========== fortsætter tsort ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1553,46 +1553,46 @@ msgstr "kunne ikke åbne %s: %s\n"
msgid "file %s is on an unknown device\n"
msgstr "fil %s er på en ukendt enhed\n"
-#: lib/fsm.c:318
+#: lib/fsm.c:320
msgid "========== Directories not explictly included in package:\n"
msgstr ""
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, fuzzy, c-format
msgid "%10d %s\n"
msgstr "linie %d: %s\n"
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, c-format
msgid "%s saved as %s\n"
msgstr "%s gemt som %s\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "kan ikke fjerne %s - katalog ikke tomt\n"
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "fjernelse (rmdir) af %s mislykkedes: %s\n"
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "åbning af %s mislykkedes %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, c-format
msgid "%s created as %s\n"
msgstr "%s oprettet som %s\n"
@@ -1602,42 +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:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/package.c:181
+#: lib/package.c:182
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:189
+#: lib/package.c:190
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:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature mislykkedes\n"
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen tilgængelig signatur\n"
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread mislykkedes: %s\n"
@@ -2081,388 +2081,307 @@ msgstr "underskriv en pakke (slet nuværende signatur)"
msgid "generate signature"
msgstr "generér PGP/GPG-signatur"
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: 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: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:231
-#, c-format
-msgid "package %s is already installed"
-msgstr "pakken %s er allerede installeret"
-
-#: 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: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: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: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: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: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: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: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: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:284
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s"
-msgstr "ukendt fejl %d under arbejdet med pakken %s"
-
-#: lib/problems.c:365
-#, fuzzy
-msgid "conflicts with"
-msgstr " skaber konflikt med %s-%s-%s\n"
-
-#: 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:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 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"
-#: lib/psm.c:448
+#: lib/psm.c:449
#, fuzzy, c-format
msgid "cannot create %%%s %s\n"
msgstr "kan ikke oprette %s: %s\n"
-#: lib/psm.c:454
+#: lib/psm.c:455
#, fuzzy, c-format
msgid "cannot write to %%%s %s\n"
msgstr "kunne ikke skrive til %s\n"
-#: lib/psm.c:485
+#: lib/psm.c:486
msgid "source package expected, binary found\n"
msgstr "kildepakke forventet, binær fundet\n"
-#: lib/psm.c:601
+#: lib/psm.c:602
msgid "source package contains no .spec file\n"
msgstr "kildepakke indeholder ingen .spec-fil\n"
-#: lib/psm.c:720
+#: lib/psm.c:721
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "kører postinstallations-skript (hvis det findes)\n"
-#: lib/psm.c:890
+#: lib/psm.c:891
#, 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:897
+#: lib/psm.c:898
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
"kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n"
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, fuzzy, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr "pakke: %s-%s-%s filer test = %d\n"
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, c-format
msgid "user %s does not exist - using root\n"
msgstr "bruger %s eksisterer ikke - bruger root\n"
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, c-format
msgid "group %s does not exist - using root\n"
msgstr "gruppe %s eksisterer ikke - bruger root\n"
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "udpakning af arkiv mislykkedes%s%s: %s\n"
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr " for fil "
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "kunne ikke åbne %s: %s\n"
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "%s mislykkedes\n"
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, c-format
msgid "incorrect format: %s\n"
msgstr "ugyldigt format: %s\n"
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr "(indeholder ingen filer)"
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr "normal "
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr "erstattet "
-#: lib/query.c:289
+#: lib/query.c:290
msgid "not installed "
msgstr "ej installeret"
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr "ej delt "
-#: lib/query.c:295
+#: lib/query.c:296
#, c-format
msgid "(unknown %3d) "
msgstr "(ukendt %3d) "
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr "(ingen status)"
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
msgid "package has neither file owner or id lists\n"
msgstr "pakke har hverken filejerskabs- eller id-lister\n"
-#: lib/query.c:465
+#: lib/query.c:466
#, c-format
msgid "can't query %s: %s\n"
msgstr "kunne ikke forespørge %s: %s\n"
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, c-format
msgid "open of %s failed: %s\n"
msgstr "åbning af %s mislykkedes %s\n"
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr "forespørgsel af %s mislykkedes\n"
-#: lib/query.c:637
+#: lib/query.c:638
msgid "old format source packages cannot be queried\n"
msgstr "pakke med gammelt kildeformat kan ikke forespørges\n"
-#: lib/query.c:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "ingen pakker udløser %s\n"
-#: lib/query.c:707
+#: lib/query.c:708
#, 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:728
+#: lib/query.c:729
msgid "no packages\n"
msgstr "ingen pakker\n"
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "gruppe %s indeholder ingen pakker\n"
-#: lib/query.c:758
+#: lib/query.c:759
#, c-format
msgid "no package triggers %s\n"
msgstr "ingen pakker udløser %s\n"
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "Kunne ikke læse %s: %s.\n"
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "ingen pakker udløser %s\n"
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr "ingen pakker kræver %s\n"
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr "ingen pakker tilfører %s\n"
-#: lib/query.c:911
+#: lib/query.c:912
#, c-format
msgid "file %s: %s\n"
msgstr "fil %s: %s\n"
-#: lib/query.c:915
+#: lib/query.c:916
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "filen %s tilhører ingen pakke\n"
-#: lib/query.c:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr "ugyldigt pakkenummer: %s\n"
-#: lib/query.c:945
+#: lib/query.c:946
#, c-format
msgid "package record number: %u\n"
msgstr "pakkens post-nummer: %u\n"
-#: lib/query.c:950
+#: lib/query.c:951
#, fuzzy, c-format
msgid "record %u could not be read\n"
msgstr "post %d kunne ikke læses\n"
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, c-format
msgid "package %s is not installed\n"
msgstr "pakken %s er ikke installeret\n"
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
#, fuzzy
msgid "(added files)"
msgstr "ugyldig db-fil %s\n"
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
#, fuzzy
msgid "(added provide)"
msgstr "%s: %-45s JA (db tilfører)\n"
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: åbning mislykkedes: %s\n"
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
msgid "makeTempFile failed\n"
msgstr "makeTempFile mislykkedes\n"
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite mislykkedes: %s\n"
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: Kan ikke underskrive v1.0 RPM\n"
-#: lib/rpmchecksig.c:175
+#: lib/rpmchecksig.c:176
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: Kan ikke genunderskrive v2.0 RPM\n"
-#: lib/rpmchecksig.c:274
+#: lib/rpmchecksig.c:275
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead mislykkedes: %s\n"
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature mislykkedes: %s\n"
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ingen tilgængelig signatur (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr "IKKE O.K."
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
msgid " (MISSING KEYS:"
msgstr " (MANGLENDE NØGLER: "
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr " (IKKE-BETROEDE NØGLER:"
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr "O.K."
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
#, fuzzy
msgid "NO "
msgstr "IKKE O.K."
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2471,105 +2390,105 @@ msgstr ""
"\"B\"-afhængighed kræver en epoke (antager samme som \"A\")\n"
"\tA %s\tB %s\n"
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n"
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr "Forbereder..."
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
msgid "Preparing packages for installation..."
msgstr "Forbereder pakker til installation..."
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, c-format
msgid "Retrieving %s\n"
msgstr "Modtager %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "overspringer %s - overførsel mislykkedes - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakke %s kan ikke omrokeres\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, c-format
msgid "error reading from file %s\n"
msgstr "fejl ved læsning fra filen %s\n"
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, 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:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kunne ikke installeres\n"
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "fandt %d kilde- og %d binærpakker\n"
-#: lib/rpminstall.c:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "afhængighedskrav, der ikke kunne imødekommes:\n"
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
msgid "installing binary packages\n"
msgstr "installerer binærpakker\n"
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "kunne ikke åbne fil %s: %s\n"
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" angiver flere pakker\n"
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
msgid "removing these packages would break dependencies:\n"
msgstr "fjernelse af disse pakker ville bryde afhængighederne:\n"
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kunne ikke åbne %s: %s\n"
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2579,6 +2498,87 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "læsning mislykkedes: %s (%d)\n"
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, fuzzy, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr "pakken %s hører til en anden arkitektur"
+
+#: lib/rpmps.c:221
+#, fuzzy, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr "pakken %s hører til et andet operativsystem"
+
+#: lib/rpmps.c:226
+#, c-format
+msgid "package %s is already installed"
+msgstr "pakken %s er allerede installeret"
+
+#: lib/rpmps.c:231
+#, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "sti %s i pakke %s kan ikke omrokeres"
+
+#: lib/rpmps.c:236
+#, 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/rpmps.c:241
+#, 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/rpmps.c:246
+#, 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/rpmps.c:251
+#, 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/rpmps.c:261
+#, 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/rpmps.c:266
+#, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr "pakke %s prætransaktion-systemkald: %s mislykkedes: %s"
+
+#: lib/rpmps.c:270
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Requires: %s\n"
+msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n"
+
+#: lib/rpmps.c:274
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Conflicts: %s\n"
+msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n"
+
+#: lib/rpmps.c:279
+#, c-format
+msgid "unknown error %d encountered while manipulating package %s"
+msgstr "ukendt fejl %d under arbejdet med pakken %s"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "conflicts with"
+msgstr " skaber konflikt med %s-%s-%s\n"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "is needed by"
+msgstr " kræves af %s-%s-%s\n"
+
#: lib/rpmrc.c:191
#, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2676,170 +2676,171 @@ 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:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "kunne ikke åbne Packages-database i %s\n"
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr "henter liste over monterede filsystemer\n"
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr "filen er ikke regulær -- overspringer størrelsestjek\n"
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr "Forventet størrelse: %12d = indled(%d)+sign(%d)+fyld(%d)+data(%d)\n"
-#: lib/signature.c:147
+#: lib/signature.c:148
#, c-format
msgid " Actual size: %12d\n"
msgstr " Faktisk størrelse: %12d\n"
-#: lib/signature.c:167
+#: lib/signature.c:168
msgid "No signature\n"
msgstr "Ingen signatur\n"
-#: lib/signature.c:171
+#: lib/signature.c:172
msgid "Old PGP signature\n"
msgstr "Gammel PGP-signatur\n"
-#: lib/signature.c:182
+#: lib/signature.c:183
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Gammel (internt brug) signatur! Hvordan fik du fingre i den!?\n"
-#: lib/signature.c:232
+#: lib/signature.c:233
#, fuzzy, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "Signaturstørrelse: %d\n"
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "Kunne ikke udføre %s: %s\n"
-#: lib/signature.c:327
+#: lib/signature.c:328
msgid "pgp failed\n"
msgstr "pgp fejlede\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
msgid "pgp failed to write signature\n"
msgstr "pgp kunne ikke skrive signatur\n"
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr "PGP-signaturstørrelse: %d\n"
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
msgid "unable to read the signature\n"
msgstr "kunne ikke læse signaturen\n"
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "Fik %d byte af PGP-signatur\n"
-#: lib/signature.c:425
+#: lib/signature.c:426
msgid "gpg failed\n"
msgstr "gpg fejlede\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
msgid "gpg failed to write signature\n"
msgstr "gpg kunne ikke skrive signaturen\n"
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr "GPG-signaturstørrelse: %d\n"
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "Fik %d byte GPG-signatur\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Ugyldig angivelse af '%%_signature'-spec i makrofil.\n"
-#: lib/signature.c:743
+#: lib/signature.c:744
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Du skal angive \"%%_gpg_name\" i din makrofil\n"
-#: lib/signature.c:756
+#: lib/signature.c:757
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Du skal angive \"%%_pgp_name\" i din makrofil\n"
-#: lib/signature.c:800
+#: lib/signature.c:801
#, fuzzy
msgid "Header+Payload size: "
msgstr "Hovedstørrelse er for stor"
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
#, fuzzy
msgid "V3 RSA/MD5 signature: "
msgstr "overspring eventuelle MD5-signaturer"
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
#, fuzzy
msgid "V3 DSA signature: "
msgstr "Ingen signatur\n"
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, fuzzy, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Signaturfyld : %d\n"
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s oversprunget grundet manglende ok-flag\n"
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, c-format
msgid "excluding directory %s\n"
msgstr "ekskluderer kataloget %s\n"
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr "henter liste over monterede filsystemer\n"
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, c-format
msgid "missing %s"
msgstr "manglende %s"
-#: lib/verify.c:379
+#: lib/verify.c:380
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "Ikke-tilfredsstillede afhængighedskrav for %s-%s-%s: "
diff --git a/po/de.po b/po/de.po
index 94ab27f29..5c5e21322 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-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:39
+#: build.c:40
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n"
# , c-format
-#: build.c:70
+#: build.c:71
#, 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:150 build.c:162
+#: build.c:151 build.c:163
#, fuzzy, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "Öffnen von %s fehlgeschlagen\n"
# , c-format
#. Give up
-#: build.c:169
+#: build.c:170
#, fuzzy, c-format
msgid "Failed to read spec file from %s\n"
msgstr "Lesen von %s fehlgeschlagen: %s."
# , c-format
-#: build.c:197
+#: build.c:198
#, fuzzy, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "Lesen von %s fehlgeschlagen: %s."
# , c-format
-#: build.c:237
+#: build.c:238
#, fuzzy, c-format
msgid "failed to stat %s: %m\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: build.c:242
+#: build.c:243
#, fuzzy, c-format
msgid "File %s is not a regular file.\n"
msgstr "%s scheint kein RPM-Paket zu sein\n"
-#: build.c:251
+#: build.c:252
#, 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:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:321
+#: build.c:322
#, 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:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr "Die benutzte RPM-Version anzeigen"
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:122
#, fuzzy
msgid "print macro expansion of <expr>+"
msgstr "Die benutzte RPM-Version anzeigen"
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr "Standard-Ausgabe nach <BEFEHL> umleiten"
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr "<VERZ> als Stammverzeichnis benutzen"
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:183
+#: rpmqv.c:184
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr ""
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr ""
# , c-format
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
# , c-format
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr "RPM Version %s\n"
-#: rpmqv.c:238
+#: rpmqv.c:239
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright © 1998 - Red Hat Software"
-#: rpmqv.c:239
+#: rpmqv.c:240
#, 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:251
+#: rpmqv.c:252
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "Benutzung: rpm {--help}"
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:605
+#: rpmqv.c:606
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Benutzen Sie stattdessen -e oder --erase\n"
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr "Es darf nur ein Hauptmodus angegeben werden"
-#: rpmqv.c:681
+#: rpmqv.c:682
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:685
+#: rpmqv.c:686
#, fuzzy
msgid "unexpected query flags"
msgstr "Unerwartete Quelle der Anfrage"
-#: rpmqv.c:688
+#: rpmqv.c:689
#, fuzzy
msgid "unexpected query format"
msgstr "Unerwartete Quelle der Anfrage"
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr "Unerwartete Quelle der Anfrage"
-#: rpmqv.c:732
+#: rpmqv.c:733
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:738
+#: rpmqv.c:739
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "nur die Installation und Aktualisierung darf erzwungen werden"
-#: rpmqv.c:740
+#: rpmqv.c:741
msgid "files may only be relocated during package installation"
msgstr "Dateien können nur während der Paketinstallation verschoben werden"
-#: rpmqv.c:743
+#: rpmqv.c:744
msgid "only one of --prefix or --relocate may be used"
msgstr "nur eines der Argumente --prefix oder --relocate darf angegeben werden"
-#: rpmqv.c:746
+#: rpmqv.c:747
#, 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:749
+#: rpmqv.c:750
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix darf nur bei der Installation neuer Pakete benutzt werden"
-#: rpmqv.c:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr "Argumente zu --prefix müssen mit einem / beginnen"
-#: rpmqv.c:755
+#: rpmqv.c:756
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:759
+#: rpmqv.c:760
msgid "--percent may only be specified during package installation"
msgstr "--percent darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:764
+#: rpmqv.c:765
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:768
+#: rpmqv.c:769
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:772
+#: rpmqv.c:773
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:776
+#: rpmqv.c:777
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:780
+#: rpmqv.c:781
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
"nur eines der Argumente --excludedocs und --includedocs darf angegeben werden"
-#: rpmqv.c:784
+#: rpmqv.c:785
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:788
+#: rpmqv.c:789
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:793
+#: rpmqv.c:794
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:797
+#: rpmqv.c:798
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches darf nur während der Paketdeinstallaiton angegeben werden"
-#: rpmqv.c:801
+#: rpmqv.c:802
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:806
+#: rpmqv.c:807
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:811
+#: rpmqv.c:812
#, 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:816
+#: rpmqv.c:817
#, 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:820
+#: rpmqv.c:821
#, 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:825
+#: rpmqv.c:826
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:830
+#: rpmqv.c:831
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:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr "Argumente zu --root (-r) müssen mit einem / beginnen"
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:871
+#: rpmqv.c:872
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: rpmqv.c:890
+#: rpmqv.c:891
#, fuzzy
msgid "pgp not found: "
msgstr "Datei auf dem Server nicht gefunden"
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr "Die Passwortüberprüfung ist fehlgeschlagen\n"
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr "Das Passwort ist richtig.\n"
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:913
+#: rpmqv.c:914
msgid "--sign may only be used during package building"
msgstr "--sign darf nur während der Paketerstellung benutzt werden"
-#: rpmqv.c:930
+#: rpmqv.c:931
#, fuzzy
msgid "exec failed\n"
msgstr "%s: Öffnen fehlgeschlagen\n"
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr "Es wurden keine Paketdateien für die Neuerstellung angegeben"
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr "Es wurde kein spec-Datei für die Erstellung angegeben"
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr "Es wurde keine tar-Datei für die Erstellung angegeben"
-#: rpmqv.c:1055
+#: rpmqv.c:1056
#, fuzzy
msgid "no packages given for erase"
msgstr "Es wurden keine Pakete für die Signatur angeben"
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr "Es wurden keine Pakete für die Installation angegeben"
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr "Es wurden keine Argumente für die Anfrage angegeben"
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr "Es wurden keine Argumente für die Überprüfung angegeben"
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr "Unerwartete Argumente zu --querytags "
-#: rpmqv.c:1149
+#: rpmqv.c:1150
#, fuzzy
msgid "no arguments given"
msgstr "Es wurden keine Argumente für die Anfrage angegeben"
# , c-format
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
#, 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:152
+#: build/files.c:1826 build/pack.c:154
#, 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:85
+#: build/pack.c:87
#, fuzzy, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
# , c-format
-#: build/pack.c:88
+#: build/pack.c:90
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: build/pack.c:110
+#: build/pack.c:112
#, fuzzy, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "lesen fehlgeschlagen: %s (%d)"
-#: build/pack.c:117
+#: build/pack.c:119
#, fuzzy, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "lesen fehlgeschlagen: %s (%d)"
-#: build/pack.c:220
+#: build/pack.c:222
#, fuzzy, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "Fehler: kann Datei %s nicht öffnen\n"
-#: build/pack.c:227
+#: build/pack.c:229
#, fuzzy, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "Fehler: kann Datei %s nicht öffnen\n"
-#: build/pack.c:234
+#: build/pack.c:236
#, fuzzy, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "Fehler: kann Datei %s nicht öffnen\n"
-#: build/pack.c:241
+#: build/pack.c:243
#, fuzzy, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "Fehler: kann Datei %s nicht öffnen\n"
-#: build/pack.c:249
+#: build/pack.c:251
#, fuzzy, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "Fehler: kann Datei %s nicht öffnen\n"
-#: build/pack.c:264
+#: build/pack.c:266
#, 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:292
+#: build/pack.c:294
#, fuzzy, c-format
msgid "readRPM: open %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
# , c-format
-#: build/pack.c:302
+#: build/pack.c:304
#, fuzzy, c-format
msgid "readRPM: read %s: %s\n"
msgstr "Lesen von %s fehlgeschlagen: %s."
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: build/pack.c:339
+#: build/pack.c:341
#, 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:348
+#: build/pack.c:350
#, fuzzy, c-format
msgid "readRPM: reading header from %s\n"
msgstr "Fehler beim Eintrag %s von %s"
# , c-format
-#: build/pack.c:477
+#: build/pack.c:479
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "Nicht möglich %s zu schreiben"
# , c-format
-#: build/pack.c:496
+#: build/pack.c:498
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "Nicht möglich %s zu schreiben"
-#: build/pack.c:506
+#: build/pack.c:508
msgid "Bad CSA data\n"
msgstr ""
# , c-format
-#: build/pack.c:542
+#: build/pack.c:544
#, fuzzy
msgid "Unable to write final header\n"
msgstr "Nicht möglich %s zu schreiben"
-#: build/pack.c:562
+#: build/pack.c:564
#, fuzzy, c-format
msgid "Generating signature: %d\n"
msgstr "PGP-Signatur generieren"
# , c-format
-#: build/pack.c:580
+#: build/pack.c:582
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "Nicht möglich %s zu schreiben"
# , c-format
-#: build/pack.c:588
+#: build/pack.c:590
#, fuzzy, c-format
msgid "Could not open %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen\n"
# , c-format
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Nicht möglich %s zu schreiben"
# , c-format
-#: build/pack.c:639
+#: build/pack.c:641
#, fuzzy, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Nicht möglich %s zu schreiben"
# , c-format
-#: build/pack.c:650
+#: build/pack.c:652
#, fuzzy, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "Nicht möglich %s zu schreiben"
# , c-format
-#: build/pack.c:664
+#: build/pack.c:666
#, fuzzy, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Nicht möglich %s zu schreiben"
# , c-format
-#: build/pack.c:674
+#: build/pack.c:676
#, fuzzy, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Nicht möglich %s zu schreiben"
# , c-format
-#: build/pack.c:680
+#: build/pack.c:682
#, fuzzy, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Nicht möglich %s zu schreiben"
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr ""
-#: build/pack.c:772
+#: build/pack.c:774
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:789
+#: build/pack.c:791
#, fuzzy, c-format
msgid "cannot create %s: %s\n"
msgstr "kann Datei %s nicht öffnen: "
@@ -1568,37 +1568,37 @@ msgstr ""
msgid " failed - "
msgstr "pgp fehlgeschlagen"
-#: lib/depends.c:155
+#: lib/depends.c:156
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
#, fuzzy
msgid "(rpmrc provides)"
msgstr "die Datei »%s« gehört zu keinem Paket\n"
-#: lib/depends.c:425
+#: lib/depends.c:426
#, fuzzy
msgid "(rpmlib provides)"
msgstr "die Datei »%s« gehört zu keinem Paket\n"
# , c-format
-#: lib/depends.c:446
+#: lib/depends.c:447
#, fuzzy
msgid "(db files)"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: lib/depends.c:458
+#: lib/depends.c:459
#, fuzzy
msgid "(db provides)"
msgstr "die Datei »%s« gehört zu keinem Paket\n"
-#: lib/depends.c:471
+#: lib/depends.c:472
#, fuzzy
msgid "(db package)"
msgstr "Anfrage an alle Pakete"
@@ -1615,31 +1615,31 @@ msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
#. Record all relations.
-#: lib/depends.c:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1691,47 +1691,47 @@ msgstr "Öffnen von %s fehlgeschlagen: %s"
msgid "file %s is on an unknown device\n"
msgstr ""
-#: lib/fsm.c:318
+#: lib/fsm.c:320
msgid "========== Directories not explictly included in package:\n"
msgstr ""
# , c-format
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, fuzzy, c-format
msgid "%10d %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "kann %s nicht entfernen - Verzeichnis ist nicht leer"
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "Entfernen von %s fehlgeschlagen: %s"
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "öffnen von %s fehlgeschlagen: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "kann Datei %s nicht öffnen: "
@@ -1741,45 +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:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/package.c:181
+#: lib/package.c:182
#, 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:189
+#: lib/package.c:190
#, 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:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Keine Signatur verfügbar\n"
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
@@ -2245,509 +2245,425 @@ msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
msgid "generate signature"
msgstr "PGP-Signatur generieren"
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-# FIXME shared, besser: "mit anderen geteilte ..."
-#: 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: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:231
-#, fuzzy, c-format
-msgid "package %s is already installed"
-msgstr "Paket %s ist nicht installiert\n"
-
-#: 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:241
-#, c-format
-msgid "file %s conflicts between attempted installs of %s and %s"
-msgstr ""
-
-#: 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: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:256
-#, c-format
-msgid "installing package %s needs %ld%cb on the %s filesystem"
-msgstr ""
-
-#: 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: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:275
-#, fuzzy, c-format
-msgid "package %s has unsatisfied Requires: %s\n"
-msgstr "Paket %s wird nicht in %s aufgeführt"
-
-#: 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:284
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s"
-msgstr ""
-
-#: lib/problems.c:365
-#, fuzzy
-msgid "conflicts with"
-msgstr " steht im Konflikt mit %s-%s-%s\n"
-
-#: 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:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/psm.c:448
+#: lib/psm.c:449
#, fuzzy, c-format
msgid "cannot create %%%s %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: lib/psm.c:454
+#: lib/psm.c:455
#, fuzzy, c-format
msgid "cannot write to %%%s %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: lib/psm.c:485
+#: lib/psm.c:486
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:601
+#: lib/psm.c:602
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
-#: lib/psm.c:720
+#: lib/psm.c:721
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "Keine Stufen ausführen"
-#: lib/psm.c:890
+#: lib/psm.c:891
#, 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:897
+#: lib/psm.c:898
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "Ausführung des Skripts fehlgeschlagen"
# FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, fuzzy, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, fuzzy, c-format
msgid "group %s does not exist - using root\n"
msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "öffnen von %s fehlgeschlagen: %s\n"
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr ""
# , c-format
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "pgp fehlgeschlagen"
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "Fehler beim Format %s\n"
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr "(beinhaltet keine Dateien)"
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr ""
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr ""
-#: lib/query.c:289
+#: lib/query.c:290
#, fuzzy
msgid "not installed "
msgstr "Paket %s ist nicht installiert\n"
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr ""
-#: lib/query.c:295
+#: lib/query.c:296
#, fuzzy, c-format
msgid "(unknown %3d) "
msgstr "(unbekannter Typ)"
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr ""
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "Paket hat keinen Namen"
-#: lib/query.c:465
+#: lib/query.c:466
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "Fehler: kann %s nicht öffnen\n"
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "öffnen von %s fehlgeschlagen: %s\n"
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr "Anfrage von %s fehlgeschlagen\n"
-#: lib/query.c:637
+#: lib/query.c:638
msgid "old format source packages cannot be queried\n"
msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n"
-#: lib/query.c:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "kein Paket triggert %s\n"
-#: lib/query.c:707
+#: lib/query.c:708
#, fuzzy, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "Anfrage von %s fehlgeschlagen\n"
-#: lib/query.c:728
+#: lib/query.c:729
#, fuzzy
msgid "no packages\n"
msgstr "Anfrage an alle Pakete"
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
-#: lib/query.c:758
+#: lib/query.c:759
#, c-format
msgid "no package triggers %s\n"
msgstr "kein Paket triggert %s\n"
# , c-format
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "Lesen von %s fehlgeschlagen: %s."
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "kein Paket triggert %s\n"
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr "kein Paket verlangt %s\n"
# oder besser: ... listet %s auf? -ke-
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr "kein Paket stellt %s bereit\n"
# , c-format
-#: lib/query.c:911
+#: lib/query.c:912
#, fuzzy, c-format
msgid "file %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: lib/query.c:915
+#: lib/query.c:916
#, 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:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr "ungültige Paket-Nummer: %s\n"
-#: lib/query.c:945
+#: lib/query.c:946
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "ungültige Paket-Nummer: %s\n"
-#: lib/query.c:950
+#: lib/query.c:951
#, fuzzy, c-format
msgid "record %u could not be read\n"
msgstr "Eintrag %d konnte nicht gelesen werden\n"
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, c-format
msgid "package %s is not installed\n"
msgstr "Paket %s ist nicht installiert\n"
# , c-format
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
#, fuzzy
msgid "(added files)"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
#, fuzzy
msgid "(added provide)"
msgstr "die Datei »%s« gehört zu keinem Paket\n"
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: Öffnen fehlgeschlagen\n"
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "%s: Öffnen fehlgeschlagen\n"
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: Kann v1.0-RPM nicht signieren\n"
-#: lib/rpmchecksig.c:175
+#: lib/rpmchecksig.c:176
#, 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:274
+#: lib/rpmchecksig.c:275
#, fuzzy, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
#, fuzzy
msgid " (MISSING KEYS:"
msgstr " (FEHLENDE SCHLüSSEL)"
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "NO "
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "Paket %s wird nicht in %s aufgeführt"
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "Es wurden keine Pakete für die Installation angegeben"
# , c-format
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, 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:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "Fehler: %s kann nicht installiert werden\n"
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
-#: lib/rpminstall.c:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n"
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
#, fuzzy
msgid "installing binary packages\n"
msgstr "Paket installieren"
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" bezeichnet mehrere Pakete\n"
# oder besser: "... verletzen" ?
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
msgid "removing these packages would break dependencies:\n"
msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n"
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "Fehler: kann %s nicht öffnen\n"
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr "Installiere %s\n"
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
@@ -2757,6 +2673,90 @@ msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
msgid "read failed: %s (%d)\n"
msgstr "lesen fehlgeschlagen: %s (%d)"
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+# FIXME shared, besser: "mit anderen geteilte ..."
+#: lib/rpmps.c:216
+#, 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/rpmps.c:221
+#, fuzzy, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
+
+#: lib/rpmps.c:226
+#, fuzzy, c-format
+msgid "package %s is already installed"
+msgstr "Paket %s ist nicht installiert\n"
+
+#: lib/rpmps.c:231
+#, fuzzy, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "Paket %s ist nicht installiert\n"
+
+#: lib/rpmps.c:236
+#, c-format
+msgid "file %s conflicts between attempted installs of %s and %s"
+msgstr ""
+
+#: lib/rpmps.c:241
+#, 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/rpmps.c:246
+#, fuzzy, c-format
+msgid "package %s (which is newer than %s) is already installed"
+msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
+
+#: lib/rpmps.c:251
+#, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:261
+#, c-format
+msgid "installing package %s needs %ld inodes on the %s filesystem"
+msgstr ""
+
+# FIXME shared, besser: "mit anderen geteilte ..."
+#: lib/rpmps.c:266
+#, fuzzy, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
+
+#: lib/rpmps.c:270
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Requires: %s\n"
+msgstr "Paket %s wird nicht in %s aufgeführt"
+
+#: lib/rpmps.c:274
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Conflicts: %s\n"
+msgstr "Paket %s wird nicht in %s aufgeführt"
+
+#: lib/rpmps.c:279
+#, c-format
+msgid "unknown error %d encountered while manipulating package %s"
+msgstr ""
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "conflicts with"
+msgstr " steht im Konflikt mit %s-%s-%s\n"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "is needed by"
+msgstr " wird von %s-%s-%s gebraucht\n"
+
#: lib/rpmrc.c:191
#, fuzzy, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2855,177 +2855,178 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
-#: lib/rpmts.c:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr ""
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:147
+#: lib/signature.c:148
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:167
+#: lib/signature.c:168
#, fuzzy
msgid "No signature\n"
msgstr "%s: Keine Signatur verfügbar\n"
-#: lib/signature.c:171
+#: lib/signature.c:172
#, fuzzy
msgid "Old PGP signature\n"
msgstr "PGP-Signatur generieren"
-#: lib/signature.c:182
+#: lib/signature.c:183
#, fuzzy
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Alte Signatur (nur intern)! Wie bist du daran gekommen!?"
-#: lib/signature.c:232
+#: lib/signature.c:233
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "Konnte pgp nicht durchführen"
-#: lib/signature.c:327
+#: lib/signature.c:328
#, fuzzy
msgid "pgp failed\n"
msgstr "pgp fehlgeschlagen"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
#, fuzzy
msgid "pgp failed to write signature\n"
msgstr "pgp fehlgeschlagen beim Schreiben der Signatur"
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
#, fuzzy
msgid "unable to read the signature\n"
msgstr "nicht möglich, die Signatur zu lesen"
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:425
+#: lib/signature.c:426
#, fuzzy
msgid "gpg failed\n"
msgstr "pgp fehlgeschlagen"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "pgp fehlgeschlagen beim Schreiben der Signatur"
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:743
+#: lib/signature.c:744
#, fuzzy, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
-#: lib/signature.c:756
+#: lib/signature.c:757
#, fuzzy, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
-#: lib/signature.c:800
+#: lib/signature.c:801
msgid "Header+Payload size: "
msgstr ""
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
#, fuzzy
msgid "V3 RSA/MD5 signature: "
msgstr "alle MD5-Signaturen überspringen"
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
#, fuzzy
msgid "V3 DSA signature: "
msgstr "%s: Keine Signatur verfügbar\n"
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, fuzzy, c-format
msgid "excluding directory %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr ""
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, fuzzy, c-format
msgid "missing %s"
msgstr "fehlende { nach %{"
-#: lib/verify.c:379
+#: lib/verify.c:380
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: "
diff --git a/po/fi.po b/po/fi.po
index 6819486a9..b50bf3c61 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-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:39
+#: build.c:40
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "puuttuvat riippuvuudet:\n"
-#: build.c:70
+#: build.c:71
#, fuzzy, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "En voi avata %s luettavaksi: %s."
-#: build.c:150 build.c:162
+#: build.c:151 build.c:163
#, fuzzy, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "%s:n avaus epäonnistui\n"
#. Give up
-#: build.c:169
+#: build.c:170
#, fuzzy, c-format
msgid "Failed to read spec file from %s\n"
msgstr "En voi lukea %s: %s."
-#: build.c:197
+#: build.c:198
#, fuzzy, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "En voi lukea %s: %s."
-#: build.c:237
+#: build.c:238
#, fuzzy, c-format
msgid "failed to stat %s: %m\n"
msgstr "en voinut avata %s: %s"
-#: build.c:242
+#: build.c:243
#, fuzzy, c-format
msgid "File %s is not a regular file.\n"
msgstr "%s ei vaikuta RPM-paketilta\n"
-#: build.c:251
+#: build.c:252
#, 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:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:321
+#: build.c:322
#, 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:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr "tulosta käytetyn rpm:n versio"
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:122
#, fuzzy
msgid "print macro expansion of <expr>+"
msgstr "tulosta käytetyn rpm:n versio"
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr "lähetä vakiotuloste <komento>:lle"
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr "käytä <hakem> ylimpänä hakemistona"
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:183
+#: rpmqv.c:184
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr ""
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "en voinut avata %s: %s"
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versio %s\n"
-#: rpmqv.c:238
+#: rpmqv.c:239
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:240
#, 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:251
+#: rpmqv.c:252
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "käyttö: rpm {--help}"
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:605
+#: rpmqv.c:606
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Käytä sen sijaan -e tai --erase .\n"
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr "vain yksi päämoodi voidaan määritellä"
-#: rpmqv.c:681
+#: rpmqv.c:682
msgid "one type of query/verify may be performed at a time"
msgstr "yhden tyyppinen kysely/tarkistus voidaan suorittaa kerralla"
-#: rpmqv.c:685
+#: rpmqv.c:686
#, fuzzy
msgid "unexpected query flags"
msgstr "odottamaton kyselyn lähde"
-#: rpmqv.c:688
+#: rpmqv.c:689
#, fuzzy
msgid "unexpected query format"
msgstr "odottamaton kyselyn lähde"
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr "odottamaton kyselyn lähde"
-#: rpmqv.c:732
+#: rpmqv.c:733
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath parametri annettu toiminnolle, joka ei käytä tietokantaa"
-#: rpmqv.c:738
+#: rpmqv.c:739
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "vain asennus tai päivitys voidaan pakottaa"
-#: rpmqv.c:740
+#: rpmqv.c:741
msgid "files may only be relocated during package installation"
msgstr "tiedostoja voidaan siirtää toiselle polulle vain asennettaessa"
-#: rpmqv.c:743
+#: rpmqv.c:744
msgid "only one of --prefix or --relocate may be used"
msgstr "vain toinen --prefix tai --relocate voidaan antaa"
-#: rpmqv.c:746
+#: rpmqv.c:747
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate: voidaan käyttää vain uusia paketteja asennettaessa"
-#: rpmqv.c:749
+#: rpmqv.c:750
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix: voidaan käyttää vain uusia paketteja asennettaessa"
-#: rpmqv.c:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix parametrien pitää alkaa /-merkillä"
-#: rpmqv.c:755
+#: rpmqv.c:756
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h): voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:759
+#: rpmqv.c:760
msgid "--percent may only be specified during package installation"
msgstr "--percent: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:764
+#: rpmqv.c:765
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:768
+#: rpmqv.c:769
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:772
+#: rpmqv.c:773
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:776
+#: rpmqv.c:777
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:780
+#: rpmqv.c:781
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "vain toinen --excludedocs tai --includedocs voidaan antaa"
-#: rpmqv.c:784
+#: rpmqv.c:785
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:788
+#: rpmqv.c:789
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:793
+#: rpmqv.c:794
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:797
+#: rpmqv.c:798
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches: voidaan käyttää vain paketteja poistettaessa"
-#: rpmqv.c:801
+#: rpmqv.c:802
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:806
+#: rpmqv.c:807
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
-#: rpmqv.c:811
+#: rpmqv.c:812
#, 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:816
+#: rpmqv.c:817
#, 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:820
+#: rpmqv.c:821
#, 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:825
+#: rpmqv.c:826
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:830
+#: rpmqv.c:831
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:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr "parametrit --root (-r):lle alettava /-merkillä"
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:871
+#: rpmqv.c:872
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: rpmqv.c:890
+#: rpmqv.c:891
#, fuzzy
msgid "pgp not found: "
msgstr "Tiedostoa ei löytynyt palvelimelta"
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:913
+#: rpmqv.c:914
msgid "--sign may only be used during package building"
msgstr "--sign: voidaan käyttää vain paketteja käännettäessä"
-#: rpmqv.c:930
+#: rpmqv.c:931
#, fuzzy
msgid "exec failed\n"
msgstr "%s: avaus ei onnistunut\n"
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr "uudelleenkäännolle ei määritelty paketteja"
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr "käännökselle ei annettu määrittelytiedostoja"
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr "käännökselle ei määritelty tar-tiedostoja"
-#: rpmqv.c:1055
+#: rpmqv.c:1056
#, fuzzy
msgid "no packages given for erase"
msgstr "allekirjoitukselle ei määritelty paketteja"
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr "asennukselle ei määritelty paketteja"
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr "kyselylle ei annettu parametrejä"
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr "tarkistukselle ei annettu parametrejä"
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr "--querytags: odottamattomia parametrejä"
-#: rpmqv.c:1149
+#: rpmqv.c:1150
#, fuzzy
msgid "no arguments given"
msgstr "kyselylle ei annettu parametrejä"
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
#, 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:152
+#: build/files.c:1826 build/pack.c:154
#, 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:85
+#: build/pack.c:87
#, fuzzy, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "en voinut avata %s: %s"
-#: build/pack.c:88
+#: build/pack.c:90
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "en voinut avata %s: %s"
-#: build/pack.c:110
+#: build/pack.c:112
#, fuzzy, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "luku epäonnistui: %s (%d)"
-#: build/pack.c:117
+#: build/pack.c:119
#, fuzzy, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "luku epäonnistui: %s (%d)"
-#: build/pack.c:220
+#: build/pack.c:222
#, fuzzy, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "virhe: tiedostoa %s ei voi avata\n"
-#: build/pack.c:227
+#: build/pack.c:229
#, fuzzy, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "virhe: tiedostoa %s ei voi avata\n"
-#: build/pack.c:234
+#: build/pack.c:236
#, fuzzy, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "virhe: tiedostoa %s ei voi avata\n"
-#: build/pack.c:241
+#: build/pack.c:243
#, fuzzy, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "virhe: tiedostoa %s ei voi avata\n"
-#: build/pack.c:249
+#: build/pack.c:251
#, fuzzy, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "virhe: tiedostoa %s ei voi avata\n"
-#: build/pack.c:264
+#: build/pack.c:266
#, fuzzy, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "virhe: tiedostoa %s ei voi avata\n"
-#: build/pack.c:292
+#: build/pack.c:294
#, fuzzy, c-format
msgid "readRPM: open %s: %s\n"
msgstr "en voinut avata %s: %s"
-#: build/pack.c:302
+#: build/pack.c:304
#, fuzzy, c-format
msgid "readRPM: read %s: %s\n"
msgstr "En voi lukea %s: %s."
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
-#: build/pack.c:339
+#: build/pack.c:341
#, fuzzy, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "virhe: %s ei vaikuta RPM paketilta\n"
-#: build/pack.c:348
+#: build/pack.c:350
#, fuzzy, c-format
msgid "readRPM: reading header from %s\n"
msgstr "virhe luettaessa tietuetta %s %s:stä"
-#: build/pack.c:477
+#: build/pack.c:479
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:496
+#: build/pack.c:498
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:506
+#: build/pack.c:508
msgid "Bad CSA data\n"
msgstr ""
-#: build/pack.c:542
+#: build/pack.c:544
#, fuzzy
msgid "Unable to write final header\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:562
+#: build/pack.c:564
#, fuzzy, c-format
msgid "Generating signature: %d\n"
msgstr "generoi PGP-allekirjoitus"
-#: build/pack.c:580
+#: build/pack.c:582
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:588
+#: build/pack.c:590
#, fuzzy, c-format
msgid "Could not open %s: %s\n"
msgstr "%s:n avaus epäonnistui\n"
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:639
+#: build/pack.c:641
#, fuzzy, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:650
+#: build/pack.c:652
#, fuzzy, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:664
+#: build/pack.c:666
#, fuzzy, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:674
+#: build/pack.c:676
#, fuzzy, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:680
+#: build/pack.c:682
#, fuzzy, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr ""
-#: build/pack.c:772
+#: build/pack.c:774
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:789
+#: build/pack.c:791
#, fuzzy, c-format
msgid "cannot create %s: %s\n"
msgstr "en voinut avata tiedostoa %s: "
@@ -1460,36 +1460,36 @@ msgstr ""
msgid " failed - "
msgstr "pgp epäonnistui"
-#: lib/depends.c:155
+#: lib/depends.c:156
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
#, fuzzy
msgid "(rpmrc provides)"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/depends.c:425
+#: lib/depends.c:426
#, fuzzy
msgid "(rpmlib provides)"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/depends.c:446
+#: lib/depends.c:447
#, fuzzy
msgid "(db files)"
msgstr "en voinut avata %s: %s"
-#: lib/depends.c:458
+#: lib/depends.c:459
#, fuzzy
msgid "(db provides)"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/depends.c:471
+#: lib/depends.c:472
#, fuzzy
msgid "(db package)"
msgstr "kysele kaikki paketit"
@@ -1505,31 +1505,31 @@ msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
#. Record all relations.
-#: lib/depends.c:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1578,46 +1578,46 @@ msgstr "en voinut avata %s: %s"
msgid "file %s is on an unknown device\n"
msgstr ""
-#: lib/fsm.c:318
+#: lib/fsm.c:320
msgid "========== Directories not explictly included in package:\n"
msgstr ""
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, fuzzy, c-format
msgid "%10d %s\n"
msgstr "en voinut avata %s: %s"
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "en voi poistaa %s -hakemisto ei ole tyhjä"
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s:n rmdir epäonnistui: %s"
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s:n avaus ei onnistunut: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "en voinut avata tiedostoa %s: "
@@ -1627,45 +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:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/package.c:181
+#: lib/package.c:182
#, 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:189
+#: lib/package.c:190
#, 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:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature epäonnistui\n"
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ei allekirjoitusta saatavilla\n"
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
@@ -2128,497 +2128,417 @@ msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
msgid "generate signature"
msgstr "generoi PGP-allekirjoitus"
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: 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: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:231
-#, fuzzy, c-format
-msgid "package %s is already installed"
-msgstr "paketti %s ei ole asennettu\n"
-
-#: 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:241
-#, c-format
-msgid "file %s conflicts between attempted installs of %s and %s"
-msgstr ""
-
-#: 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: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:256
-#, c-format
-msgid "installing package %s needs %ld%cb on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:266
-#, c-format
-msgid "installing package %s needs %ld inodes on the %s filesystem"
-msgstr ""
-
-#: 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:275
-#, fuzzy, c-format
-msgid "package %s has unsatisfied Requires: %s\n"
-msgstr "paketti %s ei ole %s:ssä"
-
-#: 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:284
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s"
-msgstr ""
-
-#: lib/problems.c:365
-#, fuzzy
-msgid "conflicts with"
-msgstr " on ristiriidassa %s-%s-%s:n kanssa\n"
-
-#: lib/problems.c:365
-#, fuzzy
-msgid "is needed by"
-msgstr "vaatii %s-%s-%s\n"
-
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/psm.c:448
+#: lib/psm.c:449
#, fuzzy, c-format
msgid "cannot create %%%s %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: lib/psm.c:454
+#: lib/psm.c:455
#, fuzzy, c-format
msgid "cannot write to %%%s %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: lib/psm.c:485
+#: lib/psm.c:486
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:601
+#: lib/psm.c:602
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: lib/psm.c:720
+#: lib/psm.c:721
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "älä suorita mitään vaiheita"
-#: lib/psm.c:890
+#: lib/psm.c:891
#, 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:897
+#: lib/psm.c:898
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "skriptin ajo epäonnistui"
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, fuzzy, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n"
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, fuzzy, c-format
msgid "group %s does not exist - using root\n"
msgstr "ryhmässä %s ei ole paketteja\n"
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "%s:n avaus ei onnistunut: %s\n"
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr ""
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "en voinut avata %s: %s"
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "pgp epäonnistui"
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "virhe formaatissa: %s\n"
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr "(ei tiedostoja)"
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr ""
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr ""
-#: lib/query.c:289
+#: lib/query.c:290
#, fuzzy
msgid "not installed "
msgstr "paketti %s ei ole asennettu\n"
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr ""
-#: lib/query.c:295
+#: lib/query.c:296
#, fuzzy, c-format
msgid "(unknown %3d) "
msgstr "(tuntematon tyyppi)"
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr ""
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "paketilla ei ole nimeä"
-#: lib/query.c:465
+#: lib/query.c:466
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "virhe: en voi avata %s\n"
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "%s:n avaus ei onnistunut: %s\n"
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr "%s:n kysely ei onnistunut\n"
-#: lib/query.c:637
+#: lib/query.c:638
msgid "old format source packages cannot be queried\n"
msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n"
-#: lib/query.c:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "mikään paketti ei laukaise %s:a\n"
-#: lib/query.c:707
+#: lib/query.c:708
#, fuzzy, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "%s:n kysely ei onnistunut\n"
-#: lib/query.c:728
+#: lib/query.c:729
#, fuzzy
msgid "no packages\n"
msgstr "kysele kaikki paketit"
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "ryhmässä %s ei ole paketteja\n"
-#: lib/query.c:758
+#: lib/query.c:759
#, c-format
msgid "no package triggers %s\n"
msgstr "mikään paketti ei laukaise %s:a\n"
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "En voi lukea %s: %s."
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "mikään paketti ei laukaise %s:a\n"
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr "mikään pakettie ei tarvitse %s:a\n"
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr "mikään paketti ei tarjoa %s:a\n"
-#: lib/query.c:911
+#: lib/query.c:912
#, fuzzy, c-format
msgid "file %s: %s\n"
msgstr "en voinut avata %s: %s"
-#: lib/query.c:915
+#: lib/query.c:916
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/query.c:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr "virheellinen paketin numero: %s\n"
-#: lib/query.c:945
+#: lib/query.c:946
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "virheellinen paketin numero: %s\n"
-#: lib/query.c:950
+#: lib/query.c:951
#, fuzzy, c-format
msgid "record %u could not be read\n"
msgstr "tietuetta %d ei voitu lukea\n"
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, c-format
msgid "package %s is not installed\n"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
#, fuzzy
msgid "(added files)"
msgstr "en voinut avata %s: %s"
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
#, fuzzy
msgid "(added provide)"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: avaus ei onnistunut\n"
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "%s: avaus ei onnistunut\n"
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: En voi allekirjoittaa v1.0 RPM:ää\n"
-#: lib/rpmchecksig.c:175
+#: lib/rpmchecksig.c:176
#, 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:274
+#: lib/rpmchecksig.c:275
#, fuzzy, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmReadSignature epäonnistui\n"
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
#, fuzzy
msgid " (MISSING KEYS:"
msgstr "(PUUTTUVAT AVAIMET)"
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "NO "
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "paketti %s ei ole %s:ssä"
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "asennukselle ei määritelty paketteja"
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, c-format
msgid "Retrieving %s\n"
msgstr "Haen: %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "virhe: %s ei voida asentaa\n"
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "ryhmässä %s ei ole paketteja\n"
-#: lib/rpminstall.c:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "puuttuvat riippuvuudet:\n"
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
#, fuzzy
msgid "installing binary packages\n"
msgstr "asenna paketti"
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" määrittää useita paketteja\n"
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
msgid "removing these packages would break dependencies:\n"
msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n"
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "virhe: en voi avata %s\n"
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr "Asennan: %s\n"
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "poistolle ei määritelty paketteja"
@@ -2628,6 +2548,86 @@ msgstr "poistolle ei määritelty paketteja"
msgid "read failed: %s (%d)\n"
msgstr "luku epäonnistui: %s (%d)"
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, fuzzy, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n"
+
+#: lib/rpmps.c:221
+#, fuzzy, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n"
+
+#: lib/rpmps.c:226
+#, fuzzy, c-format
+msgid "package %s is already installed"
+msgstr "paketti %s ei ole asennettu\n"
+
+#: lib/rpmps.c:231
+#, fuzzy, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "paketti %s ei ole asennettu\n"
+
+#: lib/rpmps.c:236
+#, c-format
+msgid "file %s conflicts between attempted installs of %s and %s"
+msgstr ""
+
+#: lib/rpmps.c:241
+#, 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/rpmps.c:246
+#, 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/rpmps.c:251
+#, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:261
+#, c-format
+msgid "installing package %s needs %ld inodes on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:266
+#, fuzzy, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n"
+
+#: lib/rpmps.c:270
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Requires: %s\n"
+msgstr "paketti %s ei ole %s:ssä"
+
+#: lib/rpmps.c:274
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Conflicts: %s\n"
+msgstr "paketti %s ei ole %s:ssä"
+
+#: lib/rpmps.c:279
+#, c-format
+msgid "unknown error %d encountered while manipulating package %s"
+msgstr ""
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "conflicts with"
+msgstr " on ristiriidassa %s-%s-%s:n kanssa\n"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "is needed by"
+msgstr "vaatii %s-%s-%s\n"
+
#: lib/rpmrc.c:191
#, fuzzy, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2723,177 +2723,178 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "En voi avata %s luettavaksi: %s."
-#: lib/rpmts.c:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "virhe: en voi avata %s%s/packages.rpm\n"
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr ""
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:147
+#: lib/signature.c:148
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:167
+#: lib/signature.c:168
#, fuzzy
msgid "No signature\n"
msgstr "%s: Ei allekirjoitusta saatavilla\n"
-#: lib/signature.c:171
+#: lib/signature.c:172
#, fuzzy
msgid "Old PGP signature\n"
msgstr "generoi PGP-allekirjoitus"
-#: lib/signature.c:182
+#: lib/signature.c:183
#, fuzzy
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Vanha (sisäisen käytön) allekirjoitus! Mistä sait sen!?"
-#: lib/signature.c:232
+#: lib/signature.c:233
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "En voinut ajaa pgp:tä"
-#: lib/signature.c:327
+#: lib/signature.c:328
#, fuzzy
msgid "pgp failed\n"
msgstr "pgp epäonnistui"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
#, fuzzy
msgid "pgp failed to write signature\n"
msgstr "pgp ei voinut kirjoittaa allekirjoitusta"
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
#, fuzzy
msgid "unable to read the signature\n"
msgstr "en voinut lukea allekirjoitusta"
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:425
+#: lib/signature.c:426
#, fuzzy
msgid "gpg failed\n"
msgstr "pgp epäonnistui"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "pgp ei voinut kirjoittaa allekirjoitusta"
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:743
+#: lib/signature.c:744
#, fuzzy, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa"
-#: lib/signature.c:756
+#: lib/signature.c:757
#, fuzzy, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa"
-#: lib/signature.c:800
+#: lib/signature.c:801
msgid "Header+Payload size: "
msgstr ""
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
#, fuzzy
msgid "V3 RSA/MD5 signature: "
msgstr "ohita MD5-allekirjoitukset"
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
#, fuzzy
msgid "V3 DSA signature: "
msgstr "%s: Ei allekirjoitusta saatavilla\n"
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, fuzzy, c-format
msgid "excluding directory %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr ""
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, fuzzy, c-format
msgid "missing %s"
msgstr "puuttuva '{' '%':n jälkeen"
-#: lib/verify.c:379
+#: lib/verify.c:380
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:"
diff --git a/po/fr.po b/po/fr.po
index 0a0853f99..72f57c24b 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-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:39
+#: build.c:40
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build.c:70
+#: build.c:71
#, fuzzy, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build.c:150 build.c:162
+#: build.c:151 build.c:163
#, fuzzy, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "impossible d'ouvrir: %s\n"
#. Give up
-#: build.c:169
+#: build.c:170
#, fuzzy, c-format
msgid "Failed to read spec file from %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build.c:197
+#: build.c:198
#, fuzzy, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build.c:237
+#: build.c:238
#, fuzzy, c-format
msgid "failed to stat %s: %m\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build.c:242
+#: build.c:243
#, fuzzy, c-format
msgid "File %s is not a regular file.\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: build.c:251
+#: build.c:252
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
#. parse up the build operators
-#: build.c:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:321
+#: build.c:322
#, 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:111
+#: rpmqv.c:112
#, fuzzy
msgid "print the version of rpm being used"
msgstr " --version\t\t- affiche la version de rpm utilise"
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:122
#, fuzzy
msgid "print macro expansion of <expr>+"
msgstr " --version\t\t- affiche la version de rpm utilise"
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:128
#, fuzzy
msgid "use <dir> as the top level directory"
msgstr " --root <dir>\t- utilise <dir> comme rpertoire racine"
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:183
+#: rpmqv.c:184
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr ""
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:238
+#: rpmqv.c:239
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:240
#, 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:251
+#: rpmqv.c:252
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:605
+#: rpmqv.c:606
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Utilisez de prfrence -e ou --erase.\n"
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr "un seul mode majeur peut tre spcifi"
-#: rpmqv.c:681
+#: rpmqv.c:682
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:685
+#: rpmqv.c:686
#, fuzzy
msgid "unexpected query flags"
msgstr "source de requte inattendue"
-#: rpmqv.c:688
+#: rpmqv.c:689
#, fuzzy
msgid "unexpected query format"
msgstr "source de requte inattendue"
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr "source de requte inattendue"
-#: rpmqv.c:732
+#: rpmqv.c:733
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:739
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "seules l'installation et la mise jour peuvent tre forces"
-#: rpmqv.c:740
+#: rpmqv.c:741
#, 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:743
+#: rpmqv.c:744
#, fuzzy
msgid "only one of --prefix or --relocate may be used"
msgstr "un seul mode majeur peut tre spcifi"
-#: rpmqv.c:746
+#: rpmqv.c:747
#, 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:749
+#: rpmqv.c:750
#, 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:752
+#: rpmqv.c:753
#, fuzzy
msgid "arguments to --prefix must begin with a /"
msgstr "les arguments de --root (-r) doivent commencer par un /"
-#: rpmqv.c:755
+#: rpmqv.c:756
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:759
+#: rpmqv.c:760
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:764
+#: rpmqv.c:765
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:768
+#: rpmqv.c:769
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:772
+#: rpmqv.c:773
#, 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:776
+#: rpmqv.c:777
#, 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:780
+#: rpmqv.c:781
#, fuzzy
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "un seul mode majeur peut tre spcifi"
-#: rpmqv.c:784
+#: rpmqv.c:785
#, 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:788
+#: rpmqv.c:789
#, 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:793
+#: rpmqv.c:794
#, 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:797
+#: rpmqv.c:798
#, 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:801
+#: rpmqv.c:802
#, 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:806
+#: rpmqv.c:807
#, 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:811
+#: rpmqv.c:812
#, 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:816
+#: rpmqv.c:817
#, 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:820
+#: rpmqv.c:821
#, 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:825
+#: rpmqv.c:826
#, 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:830
+#: rpmqv.c:831
#, 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:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr "les arguments de --root (-r) doivent commencer par un /"
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:871
+#: rpmqv.c:872
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:890
+#: rpmqv.c:891
#, fuzzy
msgid "pgp not found: "
msgstr "aucun package n'a t spcifi pour la dsinstallation"
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr "La vrification du mot de passe a chou\n"
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr "Mot de passe correct.\n"
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:913
+#: rpmqv.c:914
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:930
+#: rpmqv.c:931
#, fuzzy
msgid "exec failed\n"
msgstr "La construction a chou.\n"
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr "aucun package n'a t spcifi pour la reconstruction"
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr "aucun package n'a t spcifi pour la construction"
-#: rpmqv.c:1033
+#: rpmqv.c:1034
#, fuzzy
msgid "no tar files given for build"
msgstr "aucun package n'a t spcifi pour la construction"
-#: rpmqv.c:1055
+#: rpmqv.c:1056
#, fuzzy
msgid "no packages given for erase"
msgstr "aucun package n'a t spcifi pour la dsinstallation"
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr "aucun argument n'a t fourni pour la requte"
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr "aucun argument n'a t fourni pour la vrification"
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1149
+#: rpmqv.c:1150
#, fuzzy
msgid "no arguments given"
msgstr "aucun argument n'a t fourni pour la requte"
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
#, 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:152
+#: build/files.c:1826 build/pack.c:154
#, 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:85
+#: build/pack.c:87
#, fuzzy, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:88
+#: build/pack.c:90
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:110
+#: build/pack.c:112
#, fuzzy, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:117
+#: build/pack.c:119
#, fuzzy, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:220
+#: build/pack.c:222
#, fuzzy, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:227
+#: build/pack.c:229
#, fuzzy, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:234
+#: build/pack.c:236
#, fuzzy, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:241
+#: build/pack.c:243
#, fuzzy, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:249
+#: build/pack.c:251
#, fuzzy, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:264
+#: build/pack.c:266
#, fuzzy, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:292
+#: build/pack.c:294
#, fuzzy, c-format
msgid "readRPM: open %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:302
+#: build/pack.c:304
#, fuzzy, c-format
msgid "readRPM: read %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:339
+#: build/pack.c:341
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr ""
-#: build/pack.c:348
+#: build/pack.c:350
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr ""
-#: build/pack.c:477
+#: build/pack.c:479
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:496
+#: build/pack.c:498
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:506
+#: build/pack.c:508
msgid "Bad CSA data\n"
msgstr ""
-#: build/pack.c:542
+#: build/pack.c:544
#, fuzzy
msgid "Unable to write final header\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:562
+#: build/pack.c:564
#, fuzzy, c-format
msgid "Generating signature: %d\n"
msgstr " --sign - genre une signature PGP"
-#: build/pack.c:580
+#: build/pack.c:582
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:588
+#: build/pack.c:590
#, fuzzy, c-format
msgid "Could not open %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:639
+#: build/pack.c:641
#, fuzzy, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:650
+#: build/pack.c:652
#, fuzzy, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:664
+#: build/pack.c:666
#, fuzzy, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:674
+#: build/pack.c:676
#, fuzzy, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:680
+#: build/pack.c:682
#, fuzzy, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr ""
-#: build/pack.c:772
+#: build/pack.c:774
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:789
+#: build/pack.c:791
#, fuzzy, c-format
msgid "cannot create %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -1491,33 +1491,33 @@ msgstr ""
msgid " failed - "
msgstr "La construction a chou.\n"
-#: lib/depends.c:155
+#: lib/depends.c:156
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:425
+#: lib/depends.c:426
msgid "(rpmlib provides)"
msgstr ""
-#: lib/depends.c:446
+#: lib/depends.c:447
#, fuzzy
msgid "(db files)"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/depends.c:458
+#: lib/depends.c:459
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:471
+#: lib/depends.c:472
#, fuzzy
msgid "(db package)"
msgstr "aucun package n'a t spcifi pour l'installation"
@@ -1533,31 +1533,31 @@ msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "impossible d'ouvrir: %s\n"
#. Record all relations.
-#: lib/depends.c:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1604,46 +1604,46 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "file %s is on an unknown device\n"
msgstr ""
-#: lib/fsm.c:318
+#: lib/fsm.c:320
msgid "========== Directories not explictly included in package:\n"
msgstr ""
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, fuzzy, c-format
msgid "%10d %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "La construction a chou.\n"
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "La construction a chou.\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -1653,41 +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:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:181
+#: lib/package.c:182
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:189
+#: lib/package.c:190
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -2166,493 +2166,415 @@ msgstr ""
msgid "generate signature"
msgstr " --sign - genre une signature PGP"
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: 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: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:231
-#, fuzzy, c-format
-msgid "package %s is already installed"
-msgstr "aucun package n'a t spcifi pour l'installation"
-
-#: 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:241
-#, c-format
-msgid "file %s conflicts between attempted installs of %s and %s"
-msgstr ""
-
-#: lib/problems.c:246
-#, c-format
-msgid "file %s from install of %s conflicts with file from package %s"
-msgstr ""
-
-#: 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:256
-#, c-format
-msgid "installing package %s needs %ld%cb on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:266
-#, c-format
-msgid "installing package %s needs %ld inodes on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:271
-#, c-format
-msgid "package %s pre-transaction syscall(s): %s failed: %s"
-msgstr ""
-
-#: 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: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:284
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s"
-msgstr ""
-
-#: lib/problems.c:365
-msgid "conflicts with"
-msgstr ""
-
-#: lib/problems.c:365
-msgid "is needed by"
-msgstr ""
-
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/psm.c:448
+#: lib/psm.c:449
#, fuzzy, c-format
msgid "cannot create %%%s %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/psm.c:454
+#: lib/psm.c:455
#, fuzzy, c-format
msgid "cannot write to %%%s %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/psm.c:485
+#: lib/psm.c:486
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:601
+#: lib/psm.c:602
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr ""
" -f <file>+ - interroge le package qui appartient <file>"
-#: lib/psm.c:720
+#: lib/psm.c:721
#, c-format
msgid "%s: running %s scriptlet\n"
msgstr ""
-#: lib/psm.c:890
+#: lib/psm.c:891
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:897
+#: lib/psm.c:898
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, fuzzy, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "La construction a chou.\n"
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr ""
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "La construction a chou.\n"
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr ""
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr ""
-#: lib/query.c:289
+#: lib/query.c:290
#, fuzzy
msgid "not installed "
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr ""
-#: lib/query.c:295
+#: lib/query.c:296
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr ""
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/query.c:465
+#: lib/query.c:466
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "La construction a chou.\n"
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:637
+#: lib/query.c:638
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/query.c:707
+#: lib/query.c:708
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:728
+#: lib/query.c:729
#, fuzzy
msgid "no packages\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:759
#, fuzzy, c-format
msgid "no package triggers %s\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:911
+#: lib/query.c:912
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:915
+#: lib/query.c:916
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:945
+#: lib/query.c:946
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:950
+#: lib/query.c:951
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, fuzzy, c-format
msgid "package %s is not installed\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
#, fuzzy
msgid "(added files)"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
msgid "(added provide)"
msgstr ""
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "La construction a chou.\n"
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:175
+#: lib/rpmchecksig.c:176
#, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:274
+#: lib/rpmchecksig.c:275
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "NO "
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "aucun package n'a t spcifi pour la dsinstallation"
@@ -2662,6 +2584,84 @@ msgstr "aucun package n'a t spcifi pour la dsinstallation"
msgid "read failed: %s (%d)\n"
msgstr "impossible d'ouvrir: %s\n"
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, fuzzy, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr "aucun package n'a t spcifi pour l'installation"
+
+#: lib/rpmps.c:221
+#, fuzzy, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr "aucun package n'a t spcifi pour l'installation"
+
+#: lib/rpmps.c:226
+#, fuzzy, c-format
+msgid "package %s is already installed"
+msgstr "aucun package n'a t spcifi pour l'installation"
+
+#: lib/rpmps.c:231
+#, fuzzy, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "aucun package n'a t spcifi pour l'installation"
+
+#: lib/rpmps.c:236
+#, c-format
+msgid "file %s conflicts between attempted installs of %s and %s"
+msgstr ""
+
+#: lib/rpmps.c:241
+#, c-format
+msgid "file %s from install of %s conflicts with file from package %s"
+msgstr ""
+
+#: lib/rpmps.c:246
+#, 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/rpmps.c:251
+#, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:261
+#, c-format
+msgid "installing package %s needs %ld inodes on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:266
+#, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr ""
+
+#: lib/rpmps.c:270
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Requires: %s\n"
+msgstr "aucun package n'a t spcifi pour l'installation"
+
+#: lib/rpmps.c:274
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Conflicts: %s\n"
+msgstr "aucun package n'a t spcifi pour l'installation"
+
+#: lib/rpmps.c:279
+#, c-format
+msgid "unknown error %d encountered while manipulating package %s"
+msgstr ""
+
+#: lib/rpmps.c:360
+msgid "conflicts with"
+msgstr ""
+
+#: lib/rpmps.c:360
+msgid "is needed by"
+msgstr ""
+
#: lib/rpmrc.c:191
#, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2757,174 +2757,175 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmts.c:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr ""
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:147
+#: lib/signature.c:148
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:167
+#: lib/signature.c:168
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:171
+#: lib/signature.c:172
#, fuzzy
msgid "Old PGP signature\n"
msgstr " --sign - genre une signature PGP"
-#: lib/signature.c:182
+#: lib/signature.c:183
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:232
+#: lib/signature.c:233
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/signature.c:327
+#: lib/signature.c:328
#, fuzzy
msgid "pgp failed\n"
msgstr "La construction a chou.\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
#, fuzzy
msgid "pgp failed to write signature\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
#, fuzzy
msgid "unable to read the signature\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:425
+#: lib/signature.c:426
#, fuzzy
msgid "gpg failed\n"
msgstr "La construction a chou.\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:743
+#: lib/signature.c:744
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:756
+#: lib/signature.c:757
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:800
+#: lib/signature.c:801
msgid "Header+Payload size: "
msgstr ""
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
msgid "V3 RSA/MD5 signature: "
msgstr ""
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
#, fuzzy
msgid "V3 DSA signature: "
msgstr " --sign - genre une signature PGP"
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, c-format
msgid "excluding directory %s\n"
msgstr ""
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr ""
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:379
+#: lib/verify.c:380
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "impossible d'ouvrir: %s\n"
diff --git a/po/gl.po b/po/gl.po
index 2e996b0cb..024959c54 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-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:39
+#: build.c:40
msgid "Failed build dependencies:\n"
msgstr ""
-#: build.c:70
+#: build.c:71
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr ""
-#: build.c:150 build.c:162
+#: build.c:151 build.c:163
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr ""
#. Give up
-#: build.c:169
+#: build.c:170
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr ""
-#: build.c:197
+#: build.c:198
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr ""
-#: build.c:237
+#: build.c:238
#, c-format
msgid "failed to stat %s: %m\n"
msgstr ""
-#: build.c:242
+#: build.c:243
#, c-format
msgid "File %s is not a regular file.\n"
msgstr ""
-#: build.c:251
+#: build.c:252
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
#. parse up the build operators
-#: build.c:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:321
+#: build.c:322
#, c-format
msgid "Building for target %s\n"
msgstr ""
@@ -73,357 +73,357 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:122
msgid "print macro expansion of <expr>+"
msgstr ""
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:183
+#: rpmqv.c:184
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr ""
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:238
+#: rpmqv.c:239
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:240
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:251
+#: rpmqv.c:252
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:605
+#: rpmqv.c:606
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:681
+#: rpmqv.c:682
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:685
+#: rpmqv.c:686
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:688
+#: rpmqv.c:689
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:732
+#: rpmqv.c:733
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:739
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:740
+#: rpmqv.c:741
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:743
+#: rpmqv.c:744
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:747
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:750
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:756
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:759
+#: rpmqv.c:760
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:764
+#: rpmqv.c:765
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:768
+#: rpmqv.c:769
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:772
+#: rpmqv.c:773
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:776
+#: rpmqv.c:777
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:780
+#: rpmqv.c:781
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:784
+#: rpmqv.c:785
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:788
+#: rpmqv.c:789
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:793
+#: rpmqv.c:794
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:797
+#: rpmqv.c:798
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:801
+#: rpmqv.c:802
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:806
+#: rpmqv.c:807
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:811
+#: rpmqv.c:812
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:816
+#: rpmqv.c:817
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:820
+#: rpmqv.c:821
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:825
+#: rpmqv.c:826
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:830
+#: rpmqv.c:831
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:871
+#: rpmqv.c:872
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:890
+#: rpmqv.c:891
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:913
+#: rpmqv.c:914
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:930
+#: rpmqv.c:931
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1055
+#: rpmqv.c:1056
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1149
+#: rpmqv.c:1150
msgid "no arguments given"
msgstr ""
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
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:152
+#: build/files.c:1826 build/pack.c:154
#, c-format
msgid "line: %s\n"
msgstr ""
@@ -705,152 +705,152 @@ msgstr ""
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
-#: build/pack.c:85
+#: build/pack.c:87
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr ""
-#: build/pack.c:88
+#: build/pack.c:90
#, c-format
msgid "create archive failed: %s\n"
msgstr ""
-#: build/pack.c:110
+#: build/pack.c:112
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr ""
-#: build/pack.c:117
+#: build/pack.c:119
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr ""
-#: build/pack.c:220
+#: build/pack.c:222
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr ""
-#: build/pack.c:227
+#: build/pack.c:229
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr ""
-#: build/pack.c:234
+#: build/pack.c:236
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr ""
-#: build/pack.c:241
+#: build/pack.c:243
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr ""
-#: build/pack.c:249
+#: build/pack.c:251
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr ""
-#: build/pack.c:264
+#: build/pack.c:266
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr ""
-#: build/pack.c:292
+#: build/pack.c:294
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr ""
-#: build/pack.c:302
+#: build/pack.c:304
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr ""
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr ""
-#: build/pack.c:339
+#: build/pack.c:341
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr ""
-#: build/pack.c:348
+#: build/pack.c:350
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr ""
-#: build/pack.c:477
+#: build/pack.c:479
msgid "Unable to create immutable header region.\n"
msgstr ""
-#: build/pack.c:496
+#: build/pack.c:498
msgid "Unable to write temp header\n"
msgstr ""
-#: build/pack.c:506
+#: build/pack.c:508
msgid "Bad CSA data\n"
msgstr ""
-#: build/pack.c:542
+#: build/pack.c:544
msgid "Unable to write final header\n"
msgstr ""
-#: build/pack.c:562
+#: build/pack.c:564
#, c-format
msgid "Generating signature: %d\n"
msgstr ""
-#: build/pack.c:580
+#: build/pack.c:582
msgid "Unable to reload signature header.\n"
msgstr ""
-#: build/pack.c:588
+#: build/pack.c:590
#, c-format
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
-#: build/pack.c:639
+#: build/pack.c:641
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr ""
-#: build/pack.c:650
+#: build/pack.c:652
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr ""
-#: build/pack.c:664
+#: build/pack.c:666
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr ""
-#: build/pack.c:674
+#: build/pack.c:676
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr ""
-#: build/pack.c:680
+#: build/pack.c:682
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr ""
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr ""
-#: build/pack.c:772
+#: build/pack.c:774
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:789
+#: build/pack.c:791
#, c-format
msgid "cannot create %s: %s\n"
msgstr ""
@@ -1404,32 +1404,32 @@ msgstr ""
msgid " failed - "
msgstr ""
-#: lib/depends.c:155
+#: lib/depends.c:156
#, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr ""
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:425
+#: lib/depends.c:426
msgid "(rpmlib provides)"
msgstr ""
-#: lib/depends.c:446
+#: lib/depends.c:447
msgid "(db files)"
msgstr ""
-#: lib/depends.c:458
+#: lib/depends.c:459
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:471
+#: lib/depends.c:472
msgid "(db package)"
msgstr ""
@@ -1444,31 +1444,31 @@ msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1515,46 +1515,46 @@ msgstr ""
msgid "file %s is on an unknown device\n"
msgstr ""
-#: lib/fsm.c:318
+#: lib/fsm.c:320
msgid "========== Directories not explictly included in package:\n"
msgstr ""
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, c-format
msgid "%10d %s\n"
msgstr ""
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, c-format
msgid "%s saved as %s\n"
msgstr ""
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -1564,41 +1564,41 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:181
+#: lib/package.c:182
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:189
+#: lib/package.c:190
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2006,484 +2006,406 @@ msgstr ""
msgid "generate signature"
msgstr ""
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: lib/problems.c:221
-#, c-format
-msgid "package %s is intended for a %s architecture"
-msgstr ""
-
-#: lib/problems.c:226
-#, c-format
-msgid "package %s is intended for a %s operating system"
-msgstr ""
-
-#: lib/problems.c:231
-#, c-format
-msgid "package %s is already installed"
-msgstr ""
-
-#: lib/problems.c:236
-#, c-format
-msgid "path %s in package %s is not relocateable"
-msgstr ""
-
-#: lib/problems.c:241
-#, c-format
-msgid "file %s conflicts between attempted installs of %s and %s"
-msgstr ""
-
-#: lib/problems.c:246
-#, c-format
-msgid "file %s from install of %s conflicts with file from package %s"
-msgstr ""
-
-#: lib/problems.c:251
-#, c-format
-msgid "package %s (which is newer than %s) is already installed"
-msgstr ""
-
-#: lib/problems.c:256
-#, c-format
-msgid "installing package %s needs %ld%cb on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:266
-#, c-format
-msgid "installing package %s needs %ld inodes on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:271
-#, c-format
-msgid "package %s pre-transaction syscall(s): %s failed: %s"
-msgstr ""
-
-#: lib/problems.c:275
-#, c-format
-msgid "package %s has unsatisfied Requires: %s\n"
-msgstr ""
-
-#: lib/problems.c:279
-#, c-format
-msgid "package %s has unsatisfied Conflicts: %s\n"
-msgstr ""
-
-#: lib/problems.c:284
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s"
-msgstr ""
-
-#: lib/problems.c:365
-msgid "conflicts with"
-msgstr ""
-
-#: lib/problems.c:365
-msgid "is needed by"
-msgstr ""
-
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/psm.c:448
+#: lib/psm.c:449
#, c-format
msgid "cannot create %%%s %s\n"
msgstr ""
-#: lib/psm.c:454
+#: lib/psm.c:455
#, c-format
msgid "cannot write to %%%s %s\n"
msgstr ""
-#: lib/psm.c:485
+#: lib/psm.c:486
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:601
+#: lib/psm.c:602
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:720
+#: lib/psm.c:721
#, c-format
msgid "%s: running %s scriptlet\n"
msgstr ""
-#: lib/psm.c:890
+#: lib/psm.c:891
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:897
+#: lib/psm.c:898
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr ""
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr ""
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, c-format
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr ""
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr ""
-#: lib/query.c:289
+#: lib/query.c:290
msgid "not installed "
msgstr ""
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr ""
-#: lib/query.c:295
+#: lib/query.c:296
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr ""
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:465
+#: lib/query.c:466
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:637
+#: lib/query.c:638
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
-#: lib/query.c:707
+#: lib/query.c:708
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:728
+#: lib/query.c:729
msgid "no packages\n"
msgstr ""
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:759
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, c-format
msgid "malformed %s: %s\n"
msgstr ""
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, c-format
msgid "no package matches %s: %s\n"
msgstr ""
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:911
+#: lib/query.c:912
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:915
+#: lib/query.c:916
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:945
+#: lib/query.c:946
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:950
+#: lib/query.c:951
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, c-format
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
msgid "(added files)"
msgstr ""
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
msgid "(added provide)"
msgstr ""
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:175
+#: lib/rpmchecksig.c:176
#, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:274
+#: lib/rpmchecksig.c:275
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "NO "
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2493,6 +2415,84 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr ""
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr ""
+
+#: lib/rpmps.c:221
+#, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr ""
+
+#: lib/rpmps.c:226
+#, c-format
+msgid "package %s is already installed"
+msgstr ""
+
+#: lib/rpmps.c:231
+#, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr ""
+
+#: lib/rpmps.c:236
+#, c-format
+msgid "file %s conflicts between attempted installs of %s and %s"
+msgstr ""
+
+#: lib/rpmps.c:241
+#, c-format
+msgid "file %s from install of %s conflicts with file from package %s"
+msgstr ""
+
+#: lib/rpmps.c:246
+#, c-format
+msgid "package %s (which is newer than %s) is already installed"
+msgstr ""
+
+#: lib/rpmps.c:251
+#, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:261
+#, c-format
+msgid "installing package %s needs %ld inodes on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:266
+#, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr ""
+
+#: lib/rpmps.c:270
+#, c-format
+msgid "package %s has unsatisfied Requires: %s\n"
+msgstr ""
+
+#: lib/rpmps.c:274
+#, c-format
+msgid "package %s has unsatisfied Conflicts: %s\n"
+msgstr ""
+
+#: lib/rpmps.c:279
+#, c-format
+msgid "unknown error %d encountered while manipulating package %s"
+msgstr ""
+
+#: lib/rpmps.c:360
+msgid "conflicts with"
+msgstr ""
+
+#: lib/rpmps.c:360
+msgid "is needed by"
+msgstr ""
+
#: lib/rpmrc.c:191
#, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2588,167 +2588,168 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/rpmts.c:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr ""
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:147
+#: lib/signature.c:148
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:167
+#: lib/signature.c:168
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:171
+#: lib/signature.c:172
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:182
+#: lib/signature.c:183
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:232
+#: lib/signature.c:233
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, c-format
msgid "Could not exec %s: %s\n"
msgstr ""
-#: lib/signature.c:327
+#: lib/signature.c:328
msgid "pgp failed\n"
msgstr ""
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
msgid "pgp failed to write signature\n"
msgstr ""
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:425
+#: lib/signature.c:426
msgid "gpg failed\n"
msgstr ""
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:743
+#: lib/signature.c:744
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:756
+#: lib/signature.c:757
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:800
+#: lib/signature.c:801
msgid "Header+Payload size: "
msgstr ""
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
msgid "V3 RSA/MD5 signature: "
msgstr ""
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
msgid "V3 DSA signature: "
msgstr ""
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, c-format
msgid "excluding directory %s\n"
msgstr ""
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr ""
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:379
+#: lib/verify.c:380
#, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr ""
diff --git a/po/is.po b/po/is.po
index 8052847be..bad679d7b 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-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:39
+#: build.c:40
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "gat ekki útbúiğ pakkaskilyrği:\n"
-#: build.c:70
+#: build.c:71
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "Get ekki opnağ spec skrána %s: %s\n"
-#: build.c:150 build.c:162
+#: build.c:151 build.c:163
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "Gat ekki opnağ pípu í tar: %m\n"
#. Give up
-#: build.c:169
+#: build.c:170
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr "Gat ekki lesiğ spec skrá frá %s\n"
-#: build.c:197
+#: build.c:198
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "Gat ekki endurnefnt %s sem %s: %m\n"
-#: build.c:237
+#: build.c:238
#, c-format
msgid "failed to stat %s: %m\n"
msgstr "gat ekki skoğağ %s: %m\n"
-#: build.c:242
+#: build.c:243
#, c-format
msgid "File %s is not a regular file.\n"
msgstr "Skráin %s er ekki venjuleg skrá.\n"
-#: build.c:251
+#: build.c:252
#, 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:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Şıği fyrir markkerfi: %s\n"
-#: build.c:321
+#: build.c:322
#, 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:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr "prenta útgáfunúmer rpm sem veriğ er ağ nota"
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr "skilgreina fjölva <nafn> meğ gildinu <gildi>"
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr "'<nafn> <gildi>'"
-#: rpmqv.c:121
+#: rpmqv.c:122
msgid "print macro expansion of <expr>+"
msgstr "prenta útvíkkun fjölva <expr>+"
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr "<expr>+"
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr "senda frálag í <skipun>"
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr "sına endanlega rpmrc og stillingar fjölva"
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:183
+#: rpmqv.c:184
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr ""
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr "RPM útgáfa %s\n"
-#: rpmqv.c:238
+#: rpmqv.c:239
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Höfundarréttur (C) 1998-2000 - Red Hat Inc"
-#: rpmqv.c:239
+#: rpmqv.c:240
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:251
+#: rpmqv.c:252
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:605
+#: rpmqv.c:606
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:681
+#: rpmqv.c:682
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:685
+#: rpmqv.c:686
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:688
+#: rpmqv.c:689
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:732
+#: rpmqv.c:733
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:739
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:740
+#: rpmqv.c:741
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:743
+#: rpmqv.c:744
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:747
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:750
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:756
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:759
+#: rpmqv.c:760
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:764
+#: rpmqv.c:765
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:768
+#: rpmqv.c:769
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:772
+#: rpmqv.c:773
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:776
+#: rpmqv.c:777
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:780
+#: rpmqv.c:781
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:784
+#: rpmqv.c:785
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:788
+#: rpmqv.c:789
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:793
+#: rpmqv.c:794
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:797
+#: rpmqv.c:798
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:801
+#: rpmqv.c:802
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:806
+#: rpmqv.c:807
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:811
+#: rpmqv.c:812
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:816
+#: rpmqv.c:817
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:820
+#: rpmqv.c:821
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:825
+#: rpmqv.c:826
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:830
+#: rpmqv.c:831
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:871
+#: rpmqv.c:872
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:890
+#: rpmqv.c:891
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:913
+#: rpmqv.c:914
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:930
+#: rpmqv.c:931
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1055
+#: rpmqv.c:1056
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1149
+#: rpmqv.c:1150
msgid "no arguments given"
msgstr ""
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
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:152
+#: build/files.c:1826 build/pack.c:154
#, 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:85
+#: build/pack.c:87
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "safnskráarsmíğ brást á skrá %s: %s\n"
-#: build/pack.c:88
+#: build/pack.c:90
#, c-format
msgid "create archive failed: %s\n"
msgstr "safnskráarsmíğ brást: %s\n"
-#: build/pack.c:110
+#: build/pack.c:112
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr ""
-#: build/pack.c:117
+#: build/pack.c:119
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr ""
-#: build/pack.c:220
+#: build/pack.c:222
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "Gat ekki opnağ PreIn skrá: %s\n"
-#: build/pack.c:227
+#: build/pack.c:229
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "Gat ekki opnağ PreUn skrá: %s\n"
-#: build/pack.c:234
+#: build/pack.c:236
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "Gat ekki opnağ PostIn skrá: %s\n"
-#: build/pack.c:241
+#: build/pack.c:243
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "Gat ekki opnağ PostUn skrá: %s\n"
-#: build/pack.c:249
+#: build/pack.c:251
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "Get ekki opnağ VerifyScript skrá: %s\n"
-#: build/pack.c:264
+#: build/pack.c:266
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr ""
-#: build/pack.c:292
+#: build/pack.c:294
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr ""
-#: build/pack.c:302
+#: build/pack.c:304
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr ""
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: Fseek brást: %s\n"
-#: build/pack.c:339
+#: build/pack.c:341
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr ""
-#: build/pack.c:348
+#: build/pack.c:350
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr ""
-#: build/pack.c:477
+#: build/pack.c:479
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "Get ekki lesiğ haus úr %s: %s\n"
-#: build/pack.c:496
+#: build/pack.c:498
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "Gat ekki ritağ haus í %s: %s\n"
-#: build/pack.c:506
+#: build/pack.c:508
msgid "Bad CSA data\n"
msgstr ""
-#: build/pack.c:542
+#: build/pack.c:544
#, fuzzy
msgid "Unable to write final header\n"
msgstr "Gat ekki ritağ haus í %s: %s\n"
-#: build/pack.c:562
+#: build/pack.c:564
#, c-format
msgid "Generating signature: %d\n"
msgstr ""
-#: build/pack.c:580
+#: build/pack.c:582
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "Get ekki lesiğ haus úr %s: %s\n"
-#: build/pack.c:588
+#: build/pack.c:590
#, c-format
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Get ekki ritağ í pakka: %s\n"
-#: build/pack.c:639
+#: build/pack.c:641
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Get ekki opnağ sigtarget %s: %s\n"
-#: build/pack.c:650
+#: build/pack.c:652
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "Get ekki lesiğ haus úr %s: %s\n"
-#: build/pack.c:664
+#: build/pack.c:666
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Gat ekki ritağ haus í %s: %s\n"
-#: build/pack.c:674
+#: build/pack.c:676
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Get ekki lesiğ innihald %s: %s\n"
-#: build/pack.c:680
+#: build/pack.c:682
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Get ekki ritağ innihald í %s: %s\n"
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr "Skrifaği: %s\n"
-#: build/pack.c:772
+#: build/pack.c:774
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:789
+#: build/pack.c:791
#, c-format
msgid "cannot create %s: %s\n"
msgstr ""
@@ -1411,32 +1411,32 @@ msgstr ""
msgid " failed - "
msgstr ""
-#: lib/depends.c:155
+#: lib/depends.c:156
#, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr ""
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:425
+#: lib/depends.c:426
msgid "(rpmlib provides)"
msgstr ""
-#: lib/depends.c:446
+#: lib/depends.c:447
msgid "(db files)"
msgstr ""
-#: lib/depends.c:458
+#: lib/depends.c:459
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:471
+#: lib/depends.c:472
#, fuzzy
msgid "(db package)"
msgstr "uppfæra pakka"
@@ -1452,31 +1452,31 @@ msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1523,46 +1523,46 @@ msgstr "gat ekki opnağ %s: %s\n"
msgid "file %s is on an unknown device\n"
msgstr ""
-#: lib/fsm.c:318
+#: lib/fsm.c:320
msgid "========== Directories not explictly included in package:\n"
msgstr ""
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, fuzzy, c-format
msgid "%10d %s\n"
msgstr "%9d %s\n"
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, c-format
msgid "%s saved as %s\n"
msgstr "%s vistağ sem %s\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s rmdir %s brást: %s\n"
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s gat ekki eytt %s: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, c-format
msgid "%s created as %s\n"
msgstr "%s búiğ til sem %s\n"
@@ -1572,41 +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:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:181
+#: lib/package.c:182
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:189
+#: lib/package.c:190
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: Fseek brást: %s\n"
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2024,485 +2024,407 @@ msgstr ""
msgid "generate signature"
msgstr "búa til undirskrift"
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: lib/problems.c:221
-#, c-format
-msgid "package %s is intended for a %s architecture"
-msgstr ""
-
-#: lib/problems.c:226
-#, c-format
-msgid "package %s is intended for a %s operating system"
-msgstr ""
-
-#: lib/problems.c:231
-#, c-format
-msgid "package %s is already installed"
-msgstr ""
-
-#: lib/problems.c:236
-#, c-format
-msgid "path %s in package %s is not relocateable"
-msgstr ""
-
-#: lib/problems.c:241
-#, c-format
-msgid "file %s conflicts between attempted installs of %s and %s"
-msgstr ""
-
-#: lib/problems.c:246
-#, c-format
-msgid "file %s from install of %s conflicts with file from package %s"
-msgstr ""
-
-#: lib/problems.c:251
-#, c-format
-msgid "package %s (which is newer than %s) is already installed"
-msgstr ""
-
-#: lib/problems.c:256
-#, c-format
-msgid "installing package %s needs %ld%cb on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:266
-#, c-format
-msgid "installing package %s needs %ld inodes on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:271
-#, c-format
-msgid "package %s pre-transaction syscall(s): %s failed: %s"
-msgstr ""
-
-#: lib/problems.c:275
-#, c-format
-msgid "package %s has unsatisfied Requires: %s\n"
-msgstr ""
-
-#: lib/problems.c:279
-#, c-format
-msgid "package %s has unsatisfied Conflicts: %s\n"
-msgstr ""
-
-#: lib/problems.c:284
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s"
-msgstr ""
-
-#: lib/problems.c:365
-msgid "conflicts with"
-msgstr ""
-
-#: lib/problems.c:365
-msgid "is needed by"
-msgstr ""
-
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/psm.c:448
+#: lib/psm.c:449
#, c-format
msgid "cannot create %%%s %s\n"
msgstr "gat ekki búiğ til %%%s %s\n"
-#: lib/psm.c:454
+#: lib/psm.c:455
#, c-format
msgid "cannot write to %%%s %s\n"
msgstr "get ekki ritağ í %%%s %s\n"
-#: lib/psm.c:485
+#: lib/psm.c:486
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:601
+#: lib/psm.c:602
msgid "source package contains no .spec file\n"
msgstr "pakkinn inniheldur enga .spec skrá\n"
-#: lib/psm.c:720
+#: lib/psm.c:721
#, c-format
msgid "%s: running %s scriptlet\n"
msgstr ""
-#: lib/psm.c:890
+#: lib/psm.c:891
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:897
+#: lib/psm.c:898
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr ""
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "gat ekki opnağ %s: %s\n"
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "%s brást\n"
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr ""
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr ""
-#: lib/query.c:289
+#: lib/query.c:290
msgid "not installed "
msgstr ""
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr ""
-#: lib/query.c:295
+#: lib/query.c:296
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr ""
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:465
+#: lib/query.c:466
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:637
+#: lib/query.c:638
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "gat ekki búiğ til %%%s %s\n"
-#: lib/query.c:707
+#: lib/query.c:708
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:728
+#: lib/query.c:729
msgid "no packages\n"
msgstr ""
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:759
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "Get ekki lesiğ %s: %s.\n"
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "gat ekki búiğ til %%%s %s\n"
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:911
+#: lib/query.c:912
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:915
+#: lib/query.c:916
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:945
+#: lib/query.c:946
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:950
+#: lib/query.c:951
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, c-format
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
msgid "(added files)"
msgstr ""
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
msgid "(added provide)"
msgstr ""
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:175
+#: lib/rpmchecksig.c:176
#, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:274
+#: lib/rpmchecksig.c:275
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: Fseek brást: %s\n"
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "NO "
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "gat ekki útbúiğ pakkaskilyrği:\n"
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2512,6 +2434,84 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr ""
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr ""
+
+#: lib/rpmps.c:221
+#, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr ""
+
+#: lib/rpmps.c:226
+#, c-format
+msgid "package %s is already installed"
+msgstr ""
+
+#: lib/rpmps.c:231
+#, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr ""
+
+#: lib/rpmps.c:236
+#, c-format
+msgid "file %s conflicts between attempted installs of %s and %s"
+msgstr ""
+
+#: lib/rpmps.c:241
+#, c-format
+msgid "file %s from install of %s conflicts with file from package %s"
+msgstr ""
+
+#: lib/rpmps.c:246
+#, c-format
+msgid "package %s (which is newer than %s) is already installed"
+msgstr ""
+
+#: lib/rpmps.c:251
+#, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:261
+#, c-format
+msgid "installing package %s needs %ld inodes on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:266
+#, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr ""
+
+#: lib/rpmps.c:270
+#, c-format
+msgid "package %s has unsatisfied Requires: %s\n"
+msgstr ""
+
+#: lib/rpmps.c:274
+#, c-format
+msgid "package %s has unsatisfied Conflicts: %s\n"
+msgstr ""
+
+#: lib/rpmps.c:279
+#, c-format
+msgid "unknown error %d encountered while manipulating package %s"
+msgstr ""
+
+#: lib/rpmps.c:360
+msgid "conflicts with"
+msgstr ""
+
+#: lib/rpmps.c:360
+msgid "is needed by"
+msgstr ""
+
#: lib/rpmrc.c:191
#, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2607,167 +2607,168 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Get ekki opnağ %s til lesturs: %s.\n"
-#: lib/rpmts.c:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "get ekki opnağ pakka gagnagrunn í\n"
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr ""
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:147
+#: lib/signature.c:148
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:167
+#: lib/signature.c:168
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:171
+#: lib/signature.c:172
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:182
+#: lib/signature.c:183
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:232
+#: lib/signature.c:233
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "Gat ekki keyrt %s: %s\n"
-#: lib/signature.c:327
+#: lib/signature.c:328
msgid "pgp failed\n"
msgstr "pgp brást\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
msgid "pgp failed to write signature\n"
msgstr "pgp gat ekki lesiğ undirskriftina\n"
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
msgid "unable to read the signature\n"
msgstr "get ekki lesiğ undirskriftina\n"
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:425
+#: lib/signature.c:426
msgid "gpg failed\n"
msgstr "ggp brást\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
msgid "gpg failed to write signature\n"
msgstr "gpg get ekki lesiğ undirskriftina\n"
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:743
+#: lib/signature.c:744
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:756
+#: lib/signature.c:757
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:800
+#: lib/signature.c:801
msgid "Header+Payload size: "
msgstr ""
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
msgid "V3 RSA/MD5 signature: "
msgstr ""
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
msgid "V3 DSA signature: "
msgstr ""
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, c-format
msgid "excluding directory %s\n"
msgstr ""
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr ""
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, c-format
msgid "missing %s"
msgstr "vantar %s"
-#: lib/verify.c:379
+#: lib/verify.c:380
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "Óuppfyllt pakkaskilyrği fyrir %s-%s-%s: "
diff --git a/po/ja.po b/po/ja.po
index 5e8e57a9a..a5eee4e19 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-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:39
+#: build.c:40
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "°Í¸À­¤Î·çÇ¡:\n"
-#: build.c:70
+#: build.c:71
#, fuzzy, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "spec ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó: %s\n"
-#: build.c:150 build.c:162
+#: build.c:151 build.c:163
#, fuzzy, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "tar ¥Ñ¥¤¥×¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n"
#. Give up
-#: build.c:169
+#: build.c:170
#, fuzzy, c-format
msgid "Failed to read spec file from %s\n"
msgstr "%s ¤«¤é spec ¥Õ¥¡¥¤¥ë¤ÎÆɤ߹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
-#: build.c:197
+#: build.c:198
#, fuzzy, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "%s ¤ò %s ¤Ë¤¹¤ë̾Á°¤ÎÊѹ¹¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
-#: build.c:237
+#: build.c:238
#, fuzzy, c-format
msgid "failed to stat %s: %m\n"
msgstr "stat %s ¤Ë¼ºÇÔ: %s"
-#: build.c:242
+#: build.c:243
#, fuzzy, c-format
msgid "File %s is not a regular file.\n"
msgstr "ÉáÄ̤Υե¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Ş¤»¤ó: %s\n"
-#: build.c:251
+#: build.c:252
#, fuzzy, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï ¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹¡£\n"
#. parse up the build operators
-#: build.c:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr "ºîÀ®Ã楿¡¼¥²¥Ã¥È¥×¥é¥Ã¥È¥Õ¥©¡¼¥à: %s\n"
-#: build.c:321
+#: build.c:322
#, 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:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ğ¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Ş¤¹"
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:122
#, fuzzy
msgid "print macro expansion of <expr>+"
msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ğ¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Ş¤¹"
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr "ɸ½à½ĞÎϤò <cmd> ¤Ø¥Ñ¥¤¥×¤·¤Ş¤¹"
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr "¥È¥Ã¥×¥Ç¥£¥ì¥¯¥È¥ê¤È¤·¤Æ <dir> ¤ò»ÈÍѤ·¤Ş¤¹"
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:183
+#: rpmqv.c:184
#, fuzzy
msgid "Signature options:"
msgstr "½ğ̾¥µ¥¤¥º: %d\n"
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr ""
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s: %s\n"
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr "RPM ¥Ğ¡¼¥¸¥ç¥ó %s\n"
-#: rpmqv.c:238
+#: rpmqv.c:239
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
@@ -206,72 +206,72 @@ msgstr ""
"ËİÌõ¼Ô ¿ÀÅÄ ½¼ <kanda@nn.iij4u.or.jp>\n"
"¸íÌõÅù¤Ï¿ÀÅĤޤÇ"
-#: rpmqv.c:239
+#: rpmqv.c:240
#, fuzzy
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "GNU°ìÈ̸øÍ­»ÈÍѵöÂú½ñ¤Î²¼¤Ç¼«Í³¤ËÇÛÉۤǤ­¤Ş¤¹"
-#: rpmqv.c:251
+#: rpmqv.c:252
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "»ÈÍÑË¡: rpm {--help}"
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:605
+#: rpmqv.c:606
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "-e ¤« --erase ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤\n"
-#: rpmqv.c:611
+#: rpmqv.c:612
#, fuzzy, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "°ú¿ô½èÍı(%d)¤Ç¤ÎÆâÉô¥¨¥é¡¼ :-(\n"
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr "°ì¤Ä¤Î¥á¥¸¥ã¡¼¥â¡¼¥É¤Î¤ß¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤"
-#: rpmqv.c:681
+#: rpmqv.c:682
msgid "one type of query/verify may be performed at a time"
msgstr "Ì䤤¹ç¤ï¤»/¸¡¾Ú¤Ï°ìÅ٤˰ì¤Ä¤·¤«¼Â¹Ô¤Ç¤­¤Ş¤»¤ó"
-#: rpmqv.c:685
+#: rpmqv.c:686
#, fuzzy
msgid "unexpected query flags"
msgstr "ͽ´ü¤»¤ÌÌ䤤¹ç¤ï¤»¤Î¥Õ¥é¥°"
-#: rpmqv.c:688
+#: rpmqv.c:689
#, fuzzy
msgid "unexpected query format"
msgstr "ͽ´ü¤»¤ÌÌ䤤¹ç¤ï¤»¤Î¥Õ¥©¡¼¥Ş¥Ã¥È"
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr "ͽ´ü¤»¤ÌÌ䤤¹ç¤ï¤»¤Î¥½¡¼¥¹"
-#: rpmqv.c:732
+#: rpmqv.c:733
msgid "--dbpath given for operation that does not use a database"
msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò»ÈÍѤ·¤Ê¤¤¤Î¤Ë --dbpath ¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Ş¤¹"
-#: rpmqv.c:738
+#: rpmqv.c:739
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"¥¤¥ó¥¹¥È¡¼¥ë¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¡¢¥½¡¼¥¹ºï½ü¡¢¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ëºï½ü»ş¤Î¤ß¶¯À©¤Ç¤­"
"¤Ş¤¹"
-#: rpmqv.c:740
+#: rpmqv.c:741
msgid "files may only be relocated during package installation"
msgstr "¥Õ¥¡¥¤¥ë¤Ï¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ßºÆÇÛÃ֤Ǥ­¤Ş¤¹"
-#: rpmqv.c:743
+#: rpmqv.c:744
msgid "only one of --prefix or --relocate may be used"
msgstr "--prefix ¤â¤·¤¯¤Ï --relocate ¤Î¤¤¤º¤ì¤«¤Î¤ß»ÈÍѤǤ­¤Ş¤¹"
-#: rpmqv.c:746
+#: rpmqv.c:747
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
@@ -279,82 +279,82 @@ msgstr ""
"--relocate ¤È --excludepath ¤Ï¿·¤·¤¤¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¤­¤Î¤ß»ÈÍÑ"
"¤Ç¤­¤Ş¤¹"
-#: rpmqv.c:749
+#: rpmqv.c:750
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix ¤Ï¿·µ¬¤Ë¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¤­¤Î¤ß»ÈÍѤǤ­¤Ş¤¹"
-#: rpmqv.c:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix ¤Ø¤Î°ú¿ô¤Ï / ¤«¤é»Ï¤Ş¤é¤Í¤Ğ¤Ê¤ê¤Ş¤»¤ó"
-#: rpmqv.c:755
+#: rpmqv.c:756
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
-#: rpmqv.c:759
+#: rpmqv.c:760
msgid "--percent may only be specified during package installation"
msgstr "--percent ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
-#: rpmqv.c:764
+#: rpmqv.c:765
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
-#: rpmqv.c:768
+#: rpmqv.c:769
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
-#: rpmqv.c:772
+#: rpmqv.c:773
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
-#: rpmqv.c:776
+#: rpmqv.c:777
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
-#: rpmqv.c:780
+#: rpmqv.c:781
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "--excludedocs ¤È --includedocs ¤Ï¤É¤Á¤é¤«°ìÊı¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
-#: rpmqv.c:784
+#: rpmqv.c:785
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
-#: rpmqv.c:788
+#: rpmqv.c:789
msgid "--ignoreos may only be specified during package installation"
msgstr "-ignoreos ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
-#: rpmqv.c:793
+#: rpmqv.c:794
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "-ignoresize ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
-#: rpmqv.c:797
+#: rpmqv.c:798
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Îºï½ü»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
-#: rpmqv.c:801
+#: rpmqv.c:802
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
-#: rpmqv.c:806
+#: rpmqv.c:807
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
-#: rpmqv.c:811
+#: rpmqv.c:812
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
-#: rpmqv.c:816
+#: rpmqv.c:817
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
-#: rpmqv.c:820
+#: rpmqv.c:821
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -362,13 +362,13 @@ msgid ""
msgstr ""
"--nodeps ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤ÎºîÀ®¡¢¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢¸¡¾Ú»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
-#: rpmqv.c:825
+#: rpmqv.c:826
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢ºîÀ®»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
-#: rpmqv.c:830
+#: rpmqv.c:831
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -376,88 +376,88 @@ msgstr ""
"--root (-r) ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢Ì䤤¹ç¤ï¤»¡¢¥Ç¡¼¥¿¥Ù¡¼¥¹ºÆ¹½ÃÛ»ş¤Î¤ß»ØÄê¤Ç"
"¤­¤Ş¤¹"
-#: rpmqv.c:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) ¤Î°ú¿ô¤Ï / ¤«¤é»Ï¤Ş¤é¤Í¤Ğ¤Ê¤ê¤Ş¤»¤ó"
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr "½ğ̾¤¹¤ë¤¿¤á¤Î¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Ş¤»¤ó\n"
-#: rpmqv.c:871
+#: rpmqv.c:872
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Ş¤»¤ó\n"
-#: rpmqv.c:890
+#: rpmqv.c:891
#, fuzzy
msgid "pgp not found: "
msgstr "pgp ¤¬¸«¤Ä¤«¤ê¤Ş¤»¤ó: "
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆşÎϤ·¤Æ¤¯¤À¤µ¤¤: "
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¥Á¥§¥Ã¥¯¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÏÀµ¾ï¤Ç¤¹¡¥\n"
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "¥Ş¥¯¥í¥Õ¥¡¥¤¥ëÃæ¤Î̵¸ú¤Ê %%_signature ¡£\n"
-#: rpmqv.c:913
+#: rpmqv.c:914
msgid "--sign may only be used during package building"
msgstr "--sign ¤Ï¥Ñ¥Ã¥±¡¼¥¸ºîÀ®»ş¤Î¤ß»ÈÍѤǤ­¤Ş¤¹"
-#: rpmqv.c:930
+#: rpmqv.c:931
msgid "exec failed\n"
msgstr "¼Â¹Ô¼ºÇÔ\n"
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr "ºÆºîÀ®¤¹¤ë¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Ş¤»¤ó"
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr "ºîÀ®¤Î¤¿¤á¤Î spec ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Ş¤»¤ó"
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr "ºîÀ®(build)¤Î¤¿¤á¤Î tar ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Ş¤»¤ó"
-#: rpmqv.c:1055
+#: rpmqv.c:1056
#, fuzzy
msgid "no packages given for erase"
msgstr "½ğ̾¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Ş¤»¤ó"
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Ş¤»¤ó"
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Ş¤»¤ó"
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr "¸¡¾Ú¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Ş¤»¤ó"
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr "--querytags ¤Î°ú¿ô¤¬´Ö°ã¤Ã¤Æ¤¤¤Ş¤¹"
-#: rpmqv.c:1149
+#: rpmqv.c:1150
#, fuzzy
msgid "no arguments given"
msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Ş¤»¤ó"
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
#, 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:152
+#: build/files.c:1826 build/pack.c:154
#, 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:85
+#: build/pack.c:87
#, fuzzy, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤Ç¥¢¡¼¥«¥¤¥Ö¤ÎºîÀ®¤Ë¼ºÇÔ: %s"
-#: build/pack.c:88
+#: build/pack.c:90
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤Ç¥¢¡¼¥«¥¤¥Ö¤ÎºîÀ®¤Ë¼ºÇÔ: %s"
-#: build/pack.c:110
+#: build/pack.c:112
#, fuzzy, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "cpio_copy ¤Ç½ñ¤­¹ş¤ß¼ºÇÔ: %s"
-#: build/pack.c:117
+#: build/pack.c:119
#, fuzzy, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "cpio_copy ¤ÇÆɤ߹ş¤ß¼ºÇÔ: %s"
-#: build/pack.c:220
+#: build/pack.c:222
#, fuzzy, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "PreIn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
-#: build/pack.c:227
+#: build/pack.c:229
#, fuzzy, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "PreUn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
-#: build/pack.c:234
+#: build/pack.c:236
#, fuzzy, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "PostIn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
-#: build/pack.c:241
+#: build/pack.c:243
#, fuzzy, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "PostUn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
-#: build/pack.c:249
+#: build/pack.c:251
#, fuzzy, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "VerifyScript ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
-#: build/pack.c:264
+#: build/pack.c:266
#, fuzzy, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "¥È¥ê¥¬¡¼¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
-#: build/pack.c:292
+#: build/pack.c:294
#, fuzzy, c-format
msgid "readRPM: open %s: %s\n"
msgstr "readRPM: %s ¤Î¥ª¡¼¥×¥ó: %s\n"
-#: build/pack.c:302
+#: build/pack.c:304
#, fuzzy, c-format
msgid "readRPM: read %s: %s\n"
msgstr "readRPM: %s ¤ÎÆɤ߹ş¤ß: %s\n"
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
-#: build/pack.c:339
+#: build/pack.c:341
#, fuzzy, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s ¤Ï RPM ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Ş¤»¤ó\n"
-#: build/pack.c:348
+#: build/pack.c:350
#, fuzzy, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: %s ¤«¤é¤Î¥Ø¥Ã¥À¤ÎÆɤ߹ş¤ß\n"
-#: build/pack.c:477
+#: build/pack.c:479
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó: %s"
-#: build/pack.c:496
+#: build/pack.c:498
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s"
-#: build/pack.c:506
+#: build/pack.c:508
#, fuzzy
msgid "Bad CSA data\n"
msgstr "ÉÔÀµ¤Ê CSA ¥Ç¡¼¥¿"
-#: build/pack.c:542
+#: build/pack.c:544
#, fuzzy
msgid "Unable to write final header\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s"
-#: build/pack.c:562
+#: build/pack.c:564
#, c-format
msgid "Generating signature: %d\n"
msgstr "½ğ̾¤ÎÀ¸À®Ãæ: %d\n"
-#: build/pack.c:580
+#: build/pack.c:582
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó: %s"
-#: build/pack.c:588
+#: build/pack.c:590
#, fuzzy, c-format
msgid "Could not open %s: %s\n"
msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s"
-#: build/pack.c:639
+#: build/pack.c:641
#, fuzzy, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "sigtarget ¤ÎÆɤ߹ş¤ß¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
-#: build/pack.c:650
+#: build/pack.c:652
#, fuzzy, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó: %s"
-#: build/pack.c:664
+#: build/pack.c:666
#, fuzzy, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s"
-#: build/pack.c:674
+#: build/pack.c:676
#, fuzzy, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó: %s"
-#: build/pack.c:680
+#: build/pack.c:682
#, fuzzy, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s"
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr "½ñ¤­¹ş¤ßÃæ: %s\n"
-#: build/pack.c:772
+#: build/pack.c:774
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î ½ĞÎÏ¥Õ¥¡¥¤¥ë̾¤òÀ¸À®¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s\n"
-#: build/pack.c:789
+#: build/pack.c:791
#, fuzzy, c-format
msgid "cannot create %s: %s\n"
msgstr "%s ¤òºîÀ®¤Ç¤­¤Ş¤»¤ó: %s\n"
@@ -1483,36 +1483,36 @@ msgstr ""
msgid " failed - "
msgstr "¼ºÇÔ - "
-#: lib/depends.c:155
+#: lib/depends.c:156
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤¹"
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
-#: lib/depends.c:425
+#: lib/depends.c:426
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
-#: lib/depends.c:446
+#: lib/depends.c:447
#, fuzzy
msgid "(db files)"
msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s"
-#: lib/depends.c:458
+#: lib/depends.c:459
#, fuzzy
msgid "(db provides)"
msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
-#: lib/depends.c:471
+#: lib/depends.c:472
#, fuzzy
msgid "(db package)"
msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Ş¤·¤¿\n"
@@ -1528,31 +1528,31 @@ msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Ş¤¹\n"
#. Record all relations.
-#: lib/depends.c:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1601,46 +1601,46 @@ msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
msgid "file %s is on an unknown device\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤ÏÉÔÌÀ¤Ê¥Ç¥Ğ¥¤¥¹¤Ç¤¹"
-#: lib/fsm.c:318
+#: lib/fsm.c:320
msgid "========== Directories not explictly included in package:\n"
msgstr ""
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, fuzzy, c-format
msgid "%10d %s\n"
msgstr "%d ¹ÔÌÜ: %s"
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "·Ù¹ğ: %s ¤Ï %s ¤È¤·¤ÆÊݸ¤µ¤ì¤Ş¤¹"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s ¤òºï½ü¤Ç¤­¤Ş¤»¤ó - ¥Ç¥£¥ì¥¯¥È¥ê¤¬¶õ¤Ç¤¢¤ê¤Ş¤»¤ó"
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s ¤Î rmdir ¤Ë¼ºÇÔ: %s"
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "·Ù¹ğ: %s ¤Ï %s ¤È¤·¤ÆºîÀ®¤µ¤ì¤Ş¤¹"
@@ -1650,45 +1650,45 @@ msgstr "·Ù¹ğ: %s ¤Ï %s ¤È¤·¤ÆºîÀ®¤µ¤ì¤Ş¤¹"
msgid "error creating temporary file %s\n"
msgstr "°ì»ş¥Õ¥¡¥¤¥ë %s ¤ÎºîÀ®¥¨¥é¡¼"
-#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
-#: lib/package.c:181
+#: lib/package.c:182
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
"¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ğ¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤¹"
-#: lib/package.c:189
+#: lib/package.c:190
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ğ¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤¹"
-#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Í­¸ú¤Ê½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó\n"
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
@@ -2162,400 +2162,311 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ğ̾¤·¤Ş¤¹(¸½ºß¤Î½ğ̾¤Ï¼Î¤Æ¤é¤ì¤Ş¤¹)"
msgid "generate signature"
msgstr "PGP/GPG ½ğ̾¤òÀ¸À®¤·¤Ş¤¹"
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: lib/problems.c:221
-#, fuzzy, c-format
-msgid "package %s is intended for a %s architecture"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¸ş¤±¤Ç¤¹"
-
-#: 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:231
-#, fuzzy, c-format
-msgid "package %s is already installed"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤¹"
-
-#: lib/problems.c:236
-#, fuzzy, c-format
-msgid "path %s in package %s is not relocateable"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Ş¤»¤ó"
-
-#: 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: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: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: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: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:271
-#, c-format
-msgid "package %s pre-transaction syscall(s): %s failed: %s"
-msgstr ""
-
-#: lib/problems.c:275
-#, fuzzy, c-format
-msgid "package %s has unsatisfied Requires: %s\n"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëş¤¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s\n"
-
-#: lib/problems.c:279
-#, fuzzy, c-format
-msgid "package %s has unsatisfied Conflicts: %s\n"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëş¤¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s\n"
-
-#: lib/problems.c:284
-#, fuzzy, c-format
-msgid "unknown error %d encountered while manipulating package %s"
-msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼ %d ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ÎÁàºîÃæ¤Ë¤ª¤­¤Ş¤·¤¿"
-
-#: lib/problems.c:365
-#, fuzzy
-msgid "conflicts with"
-msgstr " %s-%s-%s ¤È¶¥¹ç¤·¤Ş¤¹\n"
-
-#: lib/problems.c:365
-#, fuzzy
-msgid "is needed by"
-msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Ş¤¹\n"
-
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr "¥Ç¡¼¥¿¥¿¥¤¥× %d ¤Ï¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤»¤ó\n"
-#: lib/psm.c:448
+#: lib/psm.c:449
#, fuzzy, c-format
msgid "cannot create %%%s %s\n"
msgstr "%s ¤òºîÀ®¤Ç¤­¤Ş¤»¤ó: %s\n"
-#: lib/psm.c:454
+#: lib/psm.c:455
#, fuzzy, c-format
msgid "cannot write to %%%s %s\n"
msgstr "%s ¤Ø½ñ¤­¹ş¤á¤Ş¤»¤ó"
-#: lib/psm.c:485
+#: lib/psm.c:486
#, fuzzy
msgid "source package expected, binary found\n"
msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Ş¤¹¡¢¥Ğ¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Ş¤·¤¿"
-#: lib/psm.c:601
+#: lib/psm.c:602
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Ş¤ó¤Ç¤¤¤Ş¤»¤ó"
-#: lib/psm.c:720
+#: lib/psm.c:721
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "¥İ¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ğ)¤ò¼Â¹Ô¤·¤Ş¤¹\n"
-#: lib/psm.c:890
+#: lib/psm.c:891
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ"
-#: lib/psm.c:897
+#: lib/psm.c:898
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ"
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, fuzzy, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n"
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, fuzzy, c-format
msgid "user %s does not exist - using root\n"
msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Ş¤»¤ó - root ¤ò»ÈÍѤ·¤Ş¤¹"
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, fuzzy, c-format
msgid "group %s does not exist - using root\n"
msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Ş¤»¤ó - root ¤ò»ÈÍѤ·¤Ş¤¹"
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s"
-#: lib/psm.c:1551
+#: lib/psm.c:1552
#, fuzzy
msgid " on file "
msgstr "¥Õ¥¡¥¤¥ë¾å"
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "%s ¼ºÇÔ"
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "¥Õ¥©¡¼¥Ş¥Ã¥ÈÃæ¤Î¥¨¥é¡¼: %s\n"
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr "¥Õ¥¡¥¤¥ë¤ò´Ş¤ó¤Ç¤¤¤Ş¤»¤ó"
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr "Ä̾ï"
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr "ÃÖ¤­´¹¤¨¤é¤ì¤Æ¤¤¤Ş¤¹"
-#: lib/query.c:289
+#: lib/query.c:290
msgid "not installed "
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤»¤ó"
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr "¥Í¥Ã¥È¶¦Í­"
-#: lib/query.c:295
+#: lib/query.c:296
#, c-format
msgid "(unknown %3d) "
msgstr "(̤ÃΤΠ%3d)"
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr "(²¿¤Î¾õÂ֤⤢¤ê¤Ş¤»¤ó)"
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥Õ¥¡¥¤¥ë½êÍ­¼Ô¤ä id ¥ê¥¹¥È¤ò¤É¤Á¤é¤â»ı¤Ã¤Æ¤¤¤Ş¤»¤ó"
-#: lib/query.c:465
+#: lib/query.c:466
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Ş¤»¤ó: %s\n"
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n"
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr "%s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
-#: lib/query.c:637
+#: lib/query.c:638
msgid "old format source packages cannot be queried\n"
msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤­¤Ş¤»¤ó\n"
-#: lib/query.c:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
-#: lib/query.c:707
+#: lib/query.c:708
#, fuzzy, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡¢¥Ñ¡¼¥¹¤Ç¤­¤Ş¤»¤ó\n"
-#: lib/query.c:728
+#: lib/query.c:729
#, fuzzy
msgid "no packages\n"
msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Ş¤·¤¿\n"
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "¥°¥ë¡¼¥× %s ¤Ë°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
-#: lib/query.c:758
+#: lib/query.c:759
#, c-format
msgid "no package triggers %s\n"
msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "%s ¤òÆɤà¤Î¤Ë¼ºÇÔ: $s¡£"
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr "%s ¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr "%s ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
-#: lib/query.c:911
+#: lib/query.c:912
#, c-format
msgid "file %s: %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s: %s\n"
-#: lib/query.c:915
+#: lib/query.c:916
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï¤É¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤â°¤·¤Æ¤¤¤Ş¤»¤ó\n"
-#: lib/query.c:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr "̵¸ú¤Ê¥Ñ¥Ã¥±¡¼¥¸ÈÖ¹æ: %s\n"
-#: lib/query.c:945
+#: lib/query.c:946
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥ÉÈÖ¹æ %d\n"
-#: lib/query.c:950
+#: lib/query.c:951
#, fuzzy, c-format
msgid "record %u could not be read\n"
msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿\n"
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, c-format
msgid "package %s is not installed\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤»¤ó\n"
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
#, fuzzy
msgid "(added files)"
msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s"
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
#, fuzzy
msgid "(added provide)"
msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: fdOpen ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "makeTempFile ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: v1.0 ¤Î RPM ¤Ë¤Ï½ğ̾¤Ç¤­¤Ş¤»¤ó\n"
-#: lib/rpmchecksig.c:175
+#: lib/rpmchecksig.c:176
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: v2.0 ¤Î RPM ¤Ë¤ÏºÆ½ğ̾¤Ç¤­¤Ş¤»¤ó\n"
-#: lib/rpmchecksig.c:274
+#: lib/rpmchecksig.c:275
#, fuzzy, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writedLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Í­¸ú¤Ê½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó(v1.0 RPM)\n"
-#: lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
#, fuzzy
msgid " (MISSING KEYS:"
msgstr " (¥­¡¼¤Îʶ¼º) "
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr " (¿®Íê¤Ç¤­¤Ê¤¤¸°:"
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "NO "
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2564,106 +2475,106 @@ msgstr ""
"\"B\" ¤Î°Í¸À­¤Ï epoch ¤òɬÍפȤ·¤Ş¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n"
"\tA %s\tB %s\n"
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëş¤¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s\n"
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Ş¤»¤ó"
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, c-format
msgid "Retrieving %s\n"
msgstr "%s ¤ò¼èÆÀ¤·¤Æ¤¤¤Ş¤¹\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr "%s ¤È¤·¤Æ...\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s ¤ò¥¹¥­¥Ã¥×¤·¤Ş¤¹ - žÁ÷¼ºÇÔ - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Ş¤»¤ó"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤«¤é¤ÎÆɤ߹ş¤ß¥¨¥é¡¼ "
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¤è¤ê¿·¤·¤¤ RPM ¤Î¥Ğ¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹\n"
-#: lib/rpminstall.c:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Ş¤»¤ó\n"
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ğ¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Ş¤·¤¿\n"
-#: lib/rpminstall.c:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "°Í¸À­¤Î·çÇ¡:\n"
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
msgid "installing binary packages\n"
msgstr "¥Ğ¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n"
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó: %s"
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ¤ÏÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤¤¤Ş¤¹\n"
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
msgid "removing these packages would break dependencies:\n"
msgstr "¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤È°Í¸À­¤òÇ˲õ¤·¤Ş¤¹:\n"
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó\n"
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n"
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2673,6 +2584,95 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "Æɤ߹ş¤ß¤Î¼ºÇÔ: %s (%d)"
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, fuzzy, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¸ş¤±¤Ç¤¹"
+
+#: lib/rpmps.c:221
+#, fuzzy, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë OS ¸ş¤±¤Ç¤¹"
+
+#: lib/rpmps.c:226
+#, fuzzy, c-format
+msgid "package %s is already installed"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤¹"
+
+#: lib/rpmps.c:231
+#, fuzzy, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Ş¤»¤ó"
+
+#: lib/rpmps.c:236
+#, fuzzy, c-format
+msgid "file %s conflicts between attempted installs of %s and %s"
+msgstr ""
+"¥Õ¥¡¥¤¥ë %s ¤Ï %s-%s-%s ¤È %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Î¥Õ¥¡¥¤¥ë¤È¶¥¹ç¤·¤Æ¤¤¤Ş¤¹"
+
+#: lib/rpmps.c:241
+#, 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/rpmps.c:246
+#, fuzzy, c-format
+msgid "package %s (which is newer than %s) is already installed"
+msgstr ""
+"¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s (%s-%s-%s¤è¤ê¤â¿·¤·¤¤¤â¤Î) ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş"
+"¤¹"
+
+#: lib/rpmps.c:251
+#, fuzzy, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
+msgstr ""
+"¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å"
+"¤Ç)"
+
+#: lib/rpmps.c:261
+#, fuzzy, c-format
+msgid "installing package %s needs %ld inodes on the %s filesystem"
+msgstr ""
+"¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å"
+"¤Ç)"
+
+#: lib/rpmps.c:266
+#, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr ""
+
+#: lib/rpmps.c:270
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Requires: %s\n"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëş¤¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s\n"
+
+#: lib/rpmps.c:274
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Conflicts: %s\n"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëş¤¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s\n"
+
+#: lib/rpmps.c:279
+#, fuzzy, c-format
+msgid "unknown error %d encountered while manipulating package %s"
+msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼ %d ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ÎÁàºîÃæ¤Ë¤ª¤­¤Ş¤·¤¿"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "conflicts with"
+msgstr " %s-%s-%s ¤È¶¥¹ç¤·¤Ş¤¹\n"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "is needed by"
+msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Ş¤¹\n"
+
#: lib/rpmrc.c:191
#, fuzzy, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2768,177 +2768,178 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Æɤ߹ş¤à¤¿¤á¤Ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó: %s¡£"
-#: lib/rpmts.c:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó\n"
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr "¥Ş¥¦¥ó¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ê¥¹¥È¤ò¼èÆÀ¤·¤Æ¤¤¤Ş¤¹\n"
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr ""
"¥Õ¥¡¥¤¥ë¤Ï°ìÈ̤Υե¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Ş¤»¤ó -- ¥µ¥¤¥º¥Á¥§¥Ã¥¯¤ò¥¹¥­¥Ã¥×¤·¤Ş¤¹\n"
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:147
+#: lib/signature.c:148
#, fuzzy, c-format
msgid " Actual size: %12d\n"
msgstr "½ğ̾¥µ¥¤¥º: %d\n"
-#: lib/signature.c:167
+#: lib/signature.c:168
msgid "No signature\n"
msgstr "½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó\n"
-#: lib/signature.c:171
+#: lib/signature.c:172
msgid "Old PGP signature\n"
msgstr "¸Å¤¤ PGP ½ğ̾\n"
-#: lib/signature.c:182
+#: lib/signature.c:183
#, fuzzy
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "¸Å¤¤(ÆâÉô¤À¤±¤Î)½ğ̾! ¤É¤¦¤ä¤Ã¤Æ¤½¤ì¤ò¼ê¤Ë¤¤¤ì¤Ş¤·¤¿¤«!?"
-#: lib/signature.c:232
+#: lib/signature.c:233
#, fuzzy, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "½ğ̾¥µ¥¤¥º: %d\n"
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "%s ¤ò¼Â¹Ô¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
-#: lib/signature.c:327
+#: lib/signature.c:328
#, fuzzy
msgid "pgp failed\n"
msgstr "pgp ¼ºÇÔ"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
#, fuzzy
msgid "pgp failed to write signature\n"
msgstr "pgp ¤¬½ğ̾¤ò½ñ¤­¹ş¤à¤Î¤Ë¼ºÇÔ¤·¤Ş¤·¤¿"
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr "PGP ½ğ̾¥µ¥¤¥º: %s\n"
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
#, fuzzy
msgid "unable to read the signature\n"
msgstr "½ğ̾¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó"
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "PGP ½ğ̾¤Î %d ¥Ğ¥¤¥È¤ò¼èÆÀ\n"
-#: lib/signature.c:425
+#: lib/signature.c:426
#, fuzzy
msgid "gpg failed\n"
msgstr "gpg ¼ºÇÔ"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "gpg ¤¬½ğ̾¤ò½ñ¤­¹ş¤à¤Î¤Ë¼ºÇÔ¤·¤Ş¤·¤¿"
-#: lib/signature.c:437
+#: lib/signature.c:438
#, fuzzy, c-format
msgid "GPG sig size: %d\n"
msgstr "GPG ½ğ̾¥µ¥¤¥º: %s\n"
-#: lib/signature.c:456
+#: lib/signature.c:457
#, fuzzy, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "GPG ½ğ̾¤Î %d ¥Ğ¥¤¥È¤ò¼èÆÀ\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, fuzzy, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "¥Ş¥¯¥í¥Õ¥¡¥¤¥ëÃæ¤Î̵¸ú¤Ê %%_signature ¡£\n"
-#: lib/signature.c:743
+#: lib/signature.c:744
#, fuzzy, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "¥Ş¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó"
-#: lib/signature.c:756
+#: lib/signature.c:757
#, fuzzy, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "¥Ş¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó"
-#: lib/signature.c:800
+#: lib/signature.c:801
#, fuzzy
msgid "Header+Payload size: "
msgstr "¥Ø¥Ã¥À¥µ¥¤¥º¤¬Â礭¤¹¤®¤Ş¤¹"
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
#, fuzzy
msgid "V3 RSA/MD5 signature: "
msgstr "MD5 ½ğ̾¤ò¥¹¥­¥Ã¥×¤·¤Ş¤¹"
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
#, fuzzy
msgid "V3 DSA signature: "
msgstr "½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó\n"
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, fuzzy, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "½ğ̾¥Ñ¥Ã¥É: %d\n"
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Ş¤¹\n"
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, fuzzy, c-format
msgid "excluding directory %s\n"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n"
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr "¥Ş¥¦¥ó¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ê¥¹¥È¤ò¼èÆÀ¤·¤Æ¤¤¤Ş¤¹\n"
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, fuzzy, c-format
msgid "missing %s"
msgstr "%s ¤¬¸«¤Ä¤«¤ê¤Ş¤»¤ó\n"
-#: lib/verify.c:379
+#: lib/verify.c:380
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À­¤òËş¤¿¤·¤Æ¤¤¤Ş¤»¤ó:"
diff --git a/po/ko.po b/po/ko.po
index c24551c82..d3091fe98 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-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:39
+#: build.c:40
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "ÀÇÁ¸¼º ¹®Á¦·Î Á¦ÀÛ¿¡ ½ÇÆĞÇÔ:\n"
-#: build.c:70
+#: build.c:71
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "%s spec ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
-#: build.c:150 build.c:162
+#: build.c:151 build.c:163
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "tar ÆÄÀÌÇÁ¸¦ ¿©´Âµ¥ ½ÇÆĞÇÔ: %m\n"
#. Give up
-#: build.c:169
+#: build.c:170
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr "%s ¿¡¼­ spec ÆÄÀÏÀ» Àдµ¥ ½ÇÆĞÇß½À´Ï´Ù\n"
-#: build.c:197
+#: build.c:198
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "%s ¿¡¼­ %s (À¸)·Î À̸§ º¯°æÇϴµ¥ ½ÇÆĞÇÔ: %m\n"
-#: build.c:237
+#: build.c:238
#, c-format
msgid "failed to stat %s: %m\n"
msgstr "%s ÀÇ »óÅÂ(stat)¸¦ Ç¥½ÃÇϴµ¥ ½ÇÆĞÇÔ: %m\n"
-#: build.c:242
+#: build.c:243
#, c-format
msgid "File %s is not a regular file.\n"
msgstr "%s ÆÄÀÏÀº Á¤±Ô(regular) ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù.\n"
-#: build.c:251
+#: build.c:252
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr "%s ÆÄÀÏÀº spec ÆÄÀÏÀÌ ¾Æ´Ñ °Í °°½À´Ï´Ù.\n"
#. parse up the build operators
-#: build.c:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr "¸ñÇ¥´ë»ó(target) Ç÷§ÆûÀ¸·Î Á¦ÀÛ Áß: %s\n"
-#: build.c:321
+#: build.c:322
#, 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:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr "ÇöÀç »ç¿ë ÁßÀÎ rpm ¹öÀüÀ» Ç¥½ÃÇÕ´Ï´Ù"
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr "ÀÚ¼¼ÇÑ Ãâ·ÂÀ» Á¦°øÇÕ´Ï´Ù"
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr "¾ÆÁÖ »ó¼¼ÇÑ Ãâ·ÂÀ» Á¦°øÇÕ´Ï´Ù"
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr "<º»¹®> ÀÇ ³»¿ë(value)À¸·Î <À̸§> ¸ÅÅ©·Î¸¦ Á¤ÀÇÇÕ´Ï´Ù"
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr "'<À̸§> <º»¹®>'"
-#: rpmqv.c:121
+#: rpmqv.c:122
msgid "print macro expansion of <expr>+"
msgstr "<Ç¥Çö½Ä>+ ÀÇ ¸ÅÅ©·Î È®ÀåÀ» Ãâ·ÂÇÕ´Ï´Ù"
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr "<Ç¥Çö½Ä>+"
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr "Ç¥ÁØÃâ·ÂÀ» <¸í·É> À¸·Î º¸³À´Ï´Ù"
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr "<¸í·É>"
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr "<µğ·ºÅ丮> ¸¦ ÃÖ»óÀ§ µğ·ºÅ丮·Î »ç¿ëÇÕ´Ï´Ù"
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr "<µğ·ºÅ丮>"
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr "±âº» ¸ÅÅ©·Î ÆÄÀÏ ´ë½Å <ÆÄÀÏ:..> À» ÀоîµéÀÔ´Ï´Ù"
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr "<ÆÄÀÏ:..>"
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "±âº» rpmrc ÆÄÀÏ ´ë½Å <ÆÄÀÏ:..> À» ÀоîµéÀÔ´Ï´Ù"
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr "ÇöÀç ¼³Á¤µÇ¾î ÀÖ´Â rpmrcÀÇ ³»¿ë°ú ¸ÅÅ©·Î¸¦ º¸¿©Áİ´Ï´Ù"
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr "libio(3) APIÀÇ »ç¿ëÀ» ÇØÁ¦ÇÕ´Ï´Ù"
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr "µ¥ÀÌÅÍ ½ºÆ®¸² ÇÁ·ÎÅäÄİÀ» µğ¹ö±× ÇÕ´Ï´Ù"
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr "rpmio ÀÔ/Ãâ·ÂÀ» µğ¹ö±× ÇÕ´Ï´Ù"
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr "URL ij½Ã Çڵ鸵À» µğ¹ö±× ÇÕ´Ï´Ù"
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr "ÁúÀÇ ¿É¼Ç (-q ¶Ç´Â --query ¿Í ÇÔ²² »ç¿ë):"
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr "°ËÁõ ¿É¼Ç (-V ¶Ç´Â --verify ¿Í ÇÔ²² »ç¿ë):"
-#: rpmqv.c:183
+#: rpmqv.c:184
msgid "Signature options:"
msgstr "¼­¸í ¿É¼Ç:"
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr "µ¥ÀÌÅͺ£À̽º ¿É¼Ç:"
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"´ÙÀ½°ú ÇÔ²² »ç¿ëµÉ Á¦ÀÛ ¿É¼Ç [ <specÆÄÀÏ> | <tarÆÄÀÏ> | <¼Ò½º ÆĞÅ°Áö> ]:"
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr "¼³Ä¡/¾÷±×·¹À̵å/»èÁ¦ ¿É¼Ç:"
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr "¸ğµç rpm ¸ğµå¿¡¼­ÀÇ ÀϹİÀûÀÎ ¿É¼Ç:"
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr "RPM - %s\n"
-#: rpmqv.c:238
+#: rpmqv.c:239
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:239
+#: rpmqv.c:240
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "ÀÌ ÇÁ·Î±×·¥Àº GNU Public License ³»¿¡¼­ ÀÚÀ¯·Ó°Ô Àç¹èÆ÷µÉ ¼ö ÀÖ½À´Ï´Ù."
-#: rpmqv.c:251
+#: rpmqv.c:252
#, c-format
msgid "Usage: %s {--help}\n"
msgstr " »ç¿ë¹ı: %s {--help}\n"
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr "--rcfile ¿É¼ÇÀÌ Á¦°ÅµÇ¾ú½À´Ï´Ù.\n"
-#: rpmqv.c:605
+#: rpmqv.c:606
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "´ë½Å \"--macros <ÆÄÀÏ:..>\" À» »ç¿ëÇÕ´Ï´Ù.\n"
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "(%d) ÀÇ Àμö ó¸® °úÁ¤ Áß ³»ºÎ ¿À·ù°¡ ¹ß»ıÇß½À´Ï´Ù :-(\n"
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr "ÇϳªÀÇ ÁÖ¿ä(major) ¸ğµå¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:681
+#: rpmqv.c:682
msgid "one type of query/verify may be performed at a time"
msgstr "ÁúÀÇ/°ËÁõ Áß¿¡¼­ ÇÑ°¡Áö À¯ÇüÀº µ¿½Ã¿¡ ¼öÇàµÉ ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:685
+#: rpmqv.c:686
msgid "unexpected query flags"
msgstr "ºÎÀûÀıÇÑ ÁúÀÇ Ç÷¡±× ÀÔ´Ï´Ù"
-#: rpmqv.c:688
+#: rpmqv.c:689
msgid "unexpected query format"
msgstr "ºÎÀûÀıÇÑ ÁúÀÇ Çü½Ä ÀÔ´Ï´Ù"
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr "ºÎÀûÀıÇÑ ÁúÀÇ ¼Ò½º ÀÔ´Ï´Ù"
-#: rpmqv.c:732
+#: rpmqv.c:733
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath ´Â µ¥ÀÌÅͺ£À̽º¸¦ »ç¿ëÇÏÁö ¾Ê±â À§ÇÑ ¿É¼ÇÀÔ´Ï´Ù"
-#: rpmqv.c:738
+#: rpmqv.c:739
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "¼³Ä¡, ¾÷±×·¹À̵å, ¼Ò½º »èÁ¦, spec ÆÄÀÏ »èÁ¦½Ã¿¡¸¸ ¼öÇàµË´Ï´Ù"
-#: rpmqv.c:740
+#: rpmqv.c:741
msgid "files may only be relocated during package installation"
msgstr "ÆĞÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÆÄÀÏÀ» Àç¹èÄ¡ÇÒ ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:743
+#: rpmqv.c:744
msgid "only one of --prefix or --relocate may be used"
msgstr "--prefix ¶Ç´Â --relocate ¿É¼Ç Áß Çϳª¸¸ »ç¿ëÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:746
+#: rpmqv.c:747
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate ¿Í --excludepath ¿É¼ÇÀº ÃÖ½ÅÀÇ ÆĞÅ°Áö¸¦ ¼³Ä¡ÇÒ ¶§¿¡¸¸ »ç¿ëÇÏ½Ç ¼ö "
"ÀÖ½À´Ï´Ù"
-#: rpmqv.c:749
+#: rpmqv.c:750
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix ¿É¼ÇÀº ÃÖ½ÅÀÇ ÆĞÅ°Áö¸¦ ¼³Ä¡ÇÒ ¶§¿¡¸¸ »ç¿ëÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix ¿É¼ÇÀÇ Àμö´Â ¹İµå½Ã '/' ·Î ½ÃÀ۵Ǿî¾ß ÇÕ´Ï´Ù"
-#: rpmqv.c:755
+#: rpmqv.c:756
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) ¿É¼ÇÀº ÆĞÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:759
+#: rpmqv.c:760
msgid "--percent may only be specified during package installation"
msgstr "--percent ¿É¼ÇÀº ÆĞÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:764
+#: rpmqv.c:765
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles ¿É¼ÇÀº ÆĞÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:768
+#: rpmqv.c:769
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs ¿É¼ÇÀº ÆĞÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:772
+#: rpmqv.c:773
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs ¿É¼ÇÀº ÆĞÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:776
+#: rpmqv.c:777
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs ¿É¼ÇÀº ÆĞÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:780
+#: rpmqv.c:781
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "--excludedocs ¿Í --includedocs ¿É¼Ç¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:784
+#: rpmqv.c:785
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch ¿É¼ÇÀº ÆĞÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:788
+#: rpmqv.c:789
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos ¿É¼ÇÀº ÆĞÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:793
+#: rpmqv.c:794
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize ¿É¼ÇÀº ÆĞÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:797
+#: rpmqv.c:798
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches ¿É¼ÇÀº ÆĞÅ°Áö »èÁ¦½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:801
+#: rpmqv.c:802
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles ¿É¼ÇÀº ÆĞÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:806
+#: rpmqv.c:807
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb ¿É¼ÇÀº ÆĞÅ°Áö ¼³Ä¡¿Í »èÁ¦½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:811
+#: rpmqv.c:812
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "½ºÅ©¸³Æ® ÇØÁ¦ ¿É¼ÇÀº ÆĞÅ°Áö ¼³Ä¡¿Í »èÁ¦½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:816
+#: rpmqv.c:817
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "Æ®¸®°Å ÇØÁ¦ ¿É¼ÇÀº ÆĞÅ°Áö ¼³Ä¡¿Í »èÁ¦½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:820
+#: rpmqv.c:821
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:825
+#: rpmqv.c:826
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test ¿É¼ÇÀº ÆĞÅ°Áö ¼³Ä¡, »èÁ¦, Á¦À۽ÿ¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:830
+#: rpmqv.c:831
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -354,87 +354,87 @@ msgstr ""
"--root (-r) ¿É¼ÇÀº ÆĞÅ°Áö ¼³Ä¡, »èÁ¦, ÁúÀÇ, µ¥ÀÌÅͺ£À̽º À籸Ãà½Ã¿¡¸¸ ÁöÁ¤ÇÏ"
"½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) ¿É¼ÇÀÇ Àμö´Â ¹İµå½Ã '/' ·Î ½ÃÀ۵Ǿî¾ß ÇÕ´Ï´Ù"
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr "¼­¸íÇÒ ÆÄÀÏÀÌ ¾ø½À´Ï´Ù\n"
-#: rpmqv.c:871
+#: rpmqv.c:872
#, c-format
msgid "cannot access file %s\n"
msgstr "%s ÆÄÀÏ¿¡ Á¢±ÙÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: rpmqv.c:890
+#: rpmqv.c:891
msgid "pgp not found: "
msgstr "pgp¸¦ ãÀ» ¼ö ¾øÀ½: "
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr "Æнº ±¸¹®(pass phrase) ÀÔ·Â: "
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr "Æнº ±¸¹®(pass phrase) °Ë»ç¿¡ ½ÇÆĞÇß½À´Ï´Ù\n"
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr "Æнº ±¸¹®(pass phrase)ÀÌ ¿Ã¹Ù¸¨´Ï´Ù.\n"
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ ºÎÀûÇÕÇÑ %%_signatureÀÇ ³»¿ëÀÌ ÀÖ½À´Ï´Ù.\n"
-#: rpmqv.c:913
+#: rpmqv.c:914
msgid "--sign may only be used during package building"
msgstr "--sign ¿É¼ÇÀº ÆĞÅ°Áö Á¦À۽ÿ¡¸¸ »ç¿ëÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
-#: rpmqv.c:930
+#: rpmqv.c:931
msgid "exec failed\n"
msgstr "½ÇÇà¿¡ ½ÇÆĞÇß½À´Ï´Ù\n"
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr "ÀçÁ¦ÀÛ(rebuild)ÇÒ ÆĞÅ°Áö ÆÄÀÏÀ» ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr "ÆĞÅ°Áö Á¦ÀÛ¿¡ ÇÊ¿äÇÑ spec ÆÄÀÏÀ» ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr "ÆĞÅ°Áö Á¦ÀÛ¿¡ ÇÊ¿äÇÑ tar ÆÄÀÏÀ» ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
-#: rpmqv.c:1055
+#: rpmqv.c:1056
#, fuzzy
msgid "no packages given for erase"
msgstr "¼­¸íÇÒ ÆĞÅ°Áö¸¦ ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr "¼³Ä¡ÇÒ ÆĞÅ°Áö¸¦ ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr "°ËÁõ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr "--querytags ¿É¼Ç¿¡ ºÎÀûÀıÇÑ Àμö°¡ ÁöÁ¤µÇ¾ú½À´Ï´Ù "
-#: rpmqv.c:1149
+#: rpmqv.c:1150
#, fuzzy
msgid "no arguments given"
msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
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:152
+#: build/files.c:1826 build/pack.c:154
#, 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:85
+#: build/pack.c:87
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "%s ÆÄÀÏ¿¡ ¾ÆÄ«À̺긦 »ı¼ºÇϴµ¥ ½ÇÆĞÇÔ: %s\n"
-#: build/pack.c:88
+#: build/pack.c:90
#, c-format
msgid "create archive failed: %s\n"
msgstr "¾ÆÄ«ÀÌºê »ı¼º¿¡ ½ÇÆĞÇÔ: %s\n"
-#: build/pack.c:110
+#: build/pack.c:112
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "cpio_copy ÀÛ¼º¿¡ ½ÇÆĞÇÔ: %s\n"
-#: build/pack.c:117
+#: build/pack.c:119
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "cpio_copy Àб⿡ ½ÇÆĞÇÔ: %s\n"
-#: build/pack.c:220
+#: build/pack.c:222
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "PreIn ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:227
+#: build/pack.c:229
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "PreUn ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:234
+#: build/pack.c:236
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "PostIn ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:241
+#: build/pack.c:243
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "PostUn ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:249
+#: build/pack.c:251
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "VerifyScript ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:264
+#: build/pack.c:266
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "Æ®¸®°Å ½ºÅ©¸³Æ® ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:292
+#: build/pack.c:294
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr "RPM Àбâ(readRPM): %s (À»)¸¦ ¿±´Ï´Ù: %s\n"
-#: build/pack.c:302
+#: build/pack.c:304
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr "RPM Àбâ(readRPM): %s (À»)¸¦ ÀнÀ´Ï´Ù: %s\n"
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: Fseek¿¡ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
-#: build/pack.c:339
+#: build/pack.c:341
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "RPM Àбâ(readRPM): %s (Àº)´Â RPM ÆĞÅ°Áö°¡ ¾Æ´Õ´Ï´Ù\n"
-#: build/pack.c:348
+#: build/pack.c:350
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "RPM Àбâ(readRPM): %s ¿¡¼­ Çì´õ¸¦ ÀĞ°í ÀÖ½À´Ï´Ù\n"
-#: build/pack.c:477
+#: build/pack.c:479
msgid "Unable to create immutable header region.\n"
msgstr "°íÁ¤ Çì´õ ¿µ¿ª(immutable header region)À» »ı¼ºÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
-#: build/pack.c:496
+#: build/pack.c:498
msgid "Unable to write temp header\n"
msgstr "ÀÓ½Ã(temp) Çì´õ¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: build/pack.c:506
+#: build/pack.c:508
msgid "Bad CSA data\n"
msgstr "À߸øµÈ CSA µ¥ÀÌÅÍ\n"
-#: build/pack.c:542
+#: build/pack.c:544
msgid "Unable to write final header\n"
msgstr "¸¶Áö¸·(final) Çì´õ¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: build/pack.c:562
+#: build/pack.c:564
#, c-format
msgid "Generating signature: %d\n"
msgstr "¼­¸í »ı¼º Áß: %d\n"
-#: build/pack.c:580
+#: build/pack.c:582
msgid "Unable to reload signature header.\n"
msgstr "¼­¸í(signature) Çì´õ¸¦ ´Ù½Ã Àоî¿Ã ¼ö ¾ø½À´Ï´Ù.\n"
-#: build/pack.c:588
+#: build/pack.c:590
#, c-format
msgid "Could not open %s: %s\n"
msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, c-format
msgid "Unable to write package: %s\n"
msgstr "ÆĞÅ°Áö¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:639
+#: build/pack.c:641
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "¼­¸íÇÒ ´ë»ó %s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:650
+#: build/pack.c:652
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "%s ÀÇ Çì´õ¸¦ ÀĞÀ» ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:664
+#: build/pack.c:666
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "%s ¿¡ Çì´õ¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:674
+#: build/pack.c:676
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "%s ÀÇ payload¸¦ ÀĞÀ» ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:680
+#: build/pack.c:682
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "%s ¿¡ payload¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr "ÀÛ¼º: %s\n"
-#: build/pack.c:772
+#: build/pack.c:774
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "%s ÆĞÅ°ÁöÀÇ Ãâ·Â ÆÄÀϸíÀ» »ı¼ºÇÒ ¼ö ¾øÀ½: %s\n"
-#: build/pack.c:789
+#: build/pack.c:791
#, c-format
msgid "cannot create %s: %s\n"
msgstr "%s (À»)¸¦ »ı¼ºÇÒ ¼ö ¾øÀ½: %s\n"
@@ -1425,36 +1425,36 @@ msgstr "Çì´õ¿¡ ¾ÆÄ«À̺ê ÆÄÀÏÀÌ ¾ø½À´Ï´Ù"
msgid " failed - "
msgstr " ½ÇÆĞÇÔ - "
-#: lib/depends.c:155
+#: lib/depends.c:156
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "%s ÆĞÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n"
-#: lib/depends.c:425
+#: lib/depends.c:426
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n"
-#: lib/depends.c:446
+#: lib/depends.c:447
#, fuzzy
msgid "(db files)"
msgstr "À߸øµÈ db ÆÄÀÏ %s\n"
-#: lib/depends.c:458
+#: lib/depends.c:459
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n"
-#: lib/depends.c:471
+#: lib/depends.c:472
#, fuzzy
msgid "(db package)"
msgstr "ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
@@ -1470,12 +1470,12 @@ msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n"
#. Record all relations.
-#: lib/depends.c:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1483,20 +1483,20 @@ msgid ""
msgstr ""
"========== ÆĞÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n"
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n"
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr "·çÇÁ(LOOP):\n"
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1545,47 +1545,47 @@ msgstr "%s (À»)¸¦ ¿©´Âµ¥ ½ÇÆĞÇÔ: %s\n"
msgid "file %s is on an unknown device\n"
msgstr "%s ÆÄÀÏÀÌ ¾Ë ¼ö ¾ø´Â ÀåÄ¡ »ó¿¡ Á¸ÀçÇÕ´Ï´Ù\n"
-#: lib/fsm.c:318
+#: lib/fsm.c:320
#, fuzzy
msgid "========== Directories not explictly included in package:\n"
msgstr "========= ÆĞÅ°Áö¿¡ µğ·ºÅ丮°¡ Æ÷ÇԵǾî ÀÖÁö ¾ÊÀ½:\n"
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, fuzzy, c-format
msgid "%10d %s\n"
msgstr "%9d %s\n"
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr "%04o Çã°¡±Ç(perms)ÀÇ %s µğ·ºÅ丮°¡ »ı¼ºµÇ¾ú½À´Ï´Ù.\n"
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr "Çì´õ ÆÄÀÏ ¸ñ·Ï¿¡¼­ ¾ÆÄ«À̺ê ÆÄÀÏ %s (À»)¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, c-format
msgid "%s saved as %s\n"
msgstr "%s (ÀÌ)°¡ %s (À¸)·Î ÀúÀåµÇ¾ú½À´Ï´Ù\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s %s µğ·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆĞÇÔ: ºó µğ·ºÅ丮°¡ ¾Æ´Õ´Ï´Ù\n"
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s %s µğ·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆĞÇÔ: %s\n"
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s %s ¸µÅ©¸¦ ÇØÁ¦Çϴµ¥ ½ÇÆĞÇÔ: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, c-format
msgid "%s created as %s\n"
msgstr "%s (ÀÌ)°¡ %s (À¸)·Î »ı¼ºµÇ¾ú½À´Ï´Ù\n"
@@ -1595,42 +1595,42 @@ msgstr "%s (ÀÌ)°¡ %s (À¸)·Î »ı¼ºµÇ¾ú½À´Ï´Ù\n"
msgid "error creating temporary file %s\n"
msgstr "Àӽà ÆÄÀÏ %s (À»)¸¦ »ı¼ºÇÏ´Â µµÁß ¿À·ù°¡ ¹ß»ıÇß½À´Ï´Ù\n"
-#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead¿¡ ½ÇÆĞÇß½À´Ï´Ù\n"
-#: lib/package.c:181
+#: lib/package.c:182
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "ÀÌ RPM ¹öÀü¿¡¼­´Â ÆĞŰ¡ ¹öÀü '1' ÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù\n"
-#: lib/package.c:189
+#: lib/package.c:190
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"ÀÌ RPM ¹öÀü¿¡¼­´Â ÁÖ¿ä ¹øÈ£(major number) <= 4 ÀÇ ÆĞŰ¡ ¸¸À» Áö¿øÇÕ´Ï´Ù\n"
-#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature¿¡ ½ÇÆĞÇß½À´Ï´Ù\n"
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù\n"
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead¿¡ ½ÇÆĞÇß½À´Ï´Ù\n"
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread¿¡ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
@@ -2061,396 +2061,310 @@ msgstr "ÆĞÅ°Áö¿¡ ¼­¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼­¸íÀº »èÁ¦µË´Ï´Ù)"
msgid "generate signature"
msgstr "¼­¸íÀ» ÀÛ¼ºÇÕ´Ï´Ù"
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: lib/problems.c:221
-#, fuzzy, c-format
-msgid "package %s is intended for a %s architecture"
-msgstr "%s (Àº)´Â ´Ù¸¥ ¾ÆÅ°ÅØÃĸ¦ À§ÇÑ ÆĞÅ°ÁöÀÔ´Ï´Ù"
-
-#: lib/problems.c:226
-#, fuzzy, c-format
-msgid "package %s is intended for a %s operating system"
-msgstr "%s (Àº)´Â ´Ù¸¥ ¿î¿µÃ¼Á¦¸¦ À§ÇÑ ÆĞÅ°ÁöÀÔ´Ï´Ù"
-
-#: lib/problems.c:231
-#, c-format
-msgid "package %s is already installed"
-msgstr "%s ÆĞÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
-
-#: lib/problems.c:236
-#, c-format
-msgid "path %s in package %s is not relocateable"
-msgstr "%2$s ÆĞÅ°Áö ¾ÈÀÇ %1$s °æ·Î´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù"
-
-#: 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: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:251
-#, c-format
-msgid "package %s (which is newer than %s) is already installed"
-msgstr "%s ÆĞÅ°Áö (%s º¸´Ù ÃÖ½ÅÀÇ ÆĞÅ°Áö)´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
-
-#: 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: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:271
-#, c-format
-msgid "package %s pre-transaction syscall(s): %s failed: %s"
-msgstr ""
-"%s ÆĞÅ°ÁöÀÇ ¼±(pre)-Æ®·£Àè¼Ç ½Ã½ºÅÛÄİ(syscall): %s (ÀÌ)°¡ ½ÇÆĞÇß½À´Ï´Ù: %s"
-
-#: lib/problems.c:275
-#, fuzzy, c-format
-msgid "package %s has unsatisfied Requires: %s\n"
-msgstr "%s-%s-%s ÆĞÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n"
-
-#: lib/problems.c:279
-#, fuzzy, c-format
-msgid "package %s has unsatisfied Conflicts: %s\n"
-msgstr "%s-%s-%s ÆĞÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n"
-
-#: lib/problems.c:284
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s"
-msgstr ""
-"%2$s ÆĞÅ°Áö¸¦ ó¸®ÇÏ´Â °úÁ¤¿¡¼­ ¾Ë ¼ö ¾ø´Â ¿À·ù %1$d (ÀÌ)°¡ ¹ß»ıÇß½À´Ï´Ù"
-
-#: lib/problems.c:365
-#, fuzzy
-msgid "conflicts with"
-msgstr " %s-%s-%s (¿Í)°ú Ãæµ¹ÇÕ´Ï´Ù\n"
-
-#: lib/problems.c:365
-#, fuzzy
-msgid "is needed by"
-msgstr " (Àº)´Â %s-%s-%s ¿¡¼­ ÇÊ¿ä·Î ÇÕ´Ï´Ù\n"
-
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr "%d µ¥ÀÌÅÍ À¯ÇüÀº »ç¿ëÇÏ½Ç ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/psm.c:448
+#: lib/psm.c:449
#, c-format
msgid "cannot create %%%s %s\n"
msgstr "%%%s %s (À»)¸¦ »ı¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/psm.c:454
+#: lib/psm.c:455
#, c-format
msgid "cannot write to %%%s %s\n"
msgstr "%%%s %s (À»)¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/psm.c:485
+#: lib/psm.c:486
msgid "source package expected, binary found\n"
msgstr "¼Ò½º ÆĞÅ°Áö°¡ ¿ä±¸µË´Ï´Ù, ¹ÙÀ̳ʸ®¸¦ ã¾Ò½À´Ï´Ù\n"
-#: lib/psm.c:601
+#: lib/psm.c:602
msgid "source package contains no .spec file\n"
msgstr "¼Ò½º ÆĞÅ°Áö¿¡ .spec ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n"
-#: lib/psm.c:720
+#: lib/psm.c:721
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "%s: %s ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÕ´Ï´Ù (ÀÖÀ» °æ¿ì)\n"
-#: lib/psm.c:890
+#: lib/psm.c:891
#, 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:897
+#: lib/psm.c:898
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
"%2$s-%3$s-%4$s ÀÇ %1$s ½ºÅ©¸³Æ®¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆĞÇß½À´Ï´Ù, Á¾·á »óȲ %"
"5$d\n"
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, fuzzy, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr "%s: %s-%s-%s (ÀÌ)°¡ %d ÀÇ ÆÄÀÏÀ» °®°í ÀÖ½À´Ï´Ù, Å×½ºÆ® = %d\n"
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, fuzzy, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
"%s: %s ½ºÅ©¸³Æ®¸´(scriptlet)°¡ ½ÇÆĞÇß½À´Ï´Ù (%d), %s-%s-%s (À»)¸¦ »ı·«ÇÕ´Ï"
"´Ù\n"
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, c-format
msgid "user %s does not exist - using root\n"
msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n"
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, c-format
msgid "group %s does not exist - using root\n"
msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n"
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆĞÇÔ%s%s: %s\n"
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr " ´ÙÀ½ ÆÄÀÏ¿¡ "
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%2$s ÆÄÀÏÀÇ %1$s (ÀÌ)°¡ ½ÇÆĞÇÔ: %3$s\n"
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, c-format
msgid "%s failed: %s\n"
msgstr "%s (ÀÌ)°¡ ½ÇÆĞÇÔ: %s\n"
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, c-format
msgid "incorrect format: %s\n"
msgstr "¿Ã¹Ù¸£Áö ¸øÇÑ Çü½Ä: %s\n"
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr "(ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾ÊÀ½)"
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr "Á¤»ó(normal) "
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr "±³Ã¼µÊ(replaced) "
-#: lib/query.c:289
+#: lib/query.c:290
msgid "not installed "
msgstr "¼³Ä¡µÇ¾î ÀÖÁö ¾ÊÀ½ "
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr "net °øÀ¯µÊ "
-#: lib/query.c:295
+#: lib/query.c:296
#, c-format
msgid "(unknown %3d) "
msgstr "(¾Ë ¼ö ¾ø´Â %3d) "
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr "(»óŸ¦ ¾Ë ¼ö ¾øÀ½) "
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
msgid "package has neither file owner or id lists\n"
msgstr "ÆĞÅ°Áö¿¡ ÆÄÀÏ ¼ÒÀ¯ÀÚ ¶Ç´Â id ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù\n"
-#: lib/query.c:465
+#: lib/query.c:466
#, c-format
msgid "can't query %s: %s\n"
msgstr "%s (À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n"
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s (À»)¸¦ ¿©´Âµ¥ ½ÇÆĞÇÔ: %s\n"
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr "%s (À»)¸¦ ÁúÀÇÇϴµ¥ ½ÇÆĞÇß½À´Ï´Ù\n"
-#: lib/query.c:637
+#: lib/query.c:638
msgid "old format source packages cannot be queried\n"
msgstr "ÀÌÀü Çü½ÄÀÇ ¼Ò½º ÆĞÅ°Áö´Â ÁúÀÇÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/query.c:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "%s (À»)¸¦ ¹ß»ı½ÃÅ°´Â ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
-#: lib/query.c:707
+#: lib/query.c:708
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "%s spec ÆÄÀÏÀ» ÁúÀÇÇϴµ¥ ½ÇÆĞÇß½À´Ï´Ù, ÆÄÀÏÀ» ºĞ¼®ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/query.c:728
+#: lib/query.c:729
msgid "no packages\n"
msgstr "ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "%s ±×·ìÀº ¾î¶² ÆĞÅ°Áö¿¡µµ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n"
-#: lib/query.c:758
+#: lib/query.c:759
#, c-format
msgid "no package triggers %s\n"
msgstr "%s (À»)¸¦ ¹ß»ı½ÃÅ°´Â ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "%s (À»)¸¦ Àдµ¥ ½ÇÆĞÇÔ: %s.\n"
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "%s (À»)¸¦ ¹ß»ı½ÃÅ°´Â ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr "%s (À»)¸¦ ÇÊ¿ä·Î ÇÏ´Â ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr "%s (À»)¸¦ Á¦°øÇÏ´Â ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
-#: lib/query.c:911
+#: lib/query.c:912
#, c-format
msgid "file %s: %s\n"
msgstr "%s ÆÄÀÏ: %s\n"
-#: lib/query.c:915
+#: lib/query.c:916
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "%s ÆÄÀÏÀº ¾î¶² ÆĞÅ°Áö¿¡µµ ¼ÓÇØ ÀÖÁö ¾Ê½À´Ï´Ù\n"
-#: lib/query.c:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr "ºÎÀûÇÕÇÑ ÆĞÅ°Áö ¹øÈ£: %s\n"
-#: lib/query.c:945
+#: lib/query.c:946
#, c-format
msgid "package record number: %u\n"
msgstr "ÆĞÅ°Áö ±â·Ï(record) ¹øÈ£: %u\n"
-#: lib/query.c:950
+#: lib/query.c:951
#, c-format
msgid "record %u could not be read\n"
msgstr "±â·Ï(record) ¹øÈ£ %u (Àº)´Â ÀĞÀ» ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, c-format
msgid "package %s is not installed\n"
msgstr "%s ÆĞÅ°Áö´Â ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n"
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
#, fuzzy
msgid "(added files)"
msgstr "À߸øµÈ db ÆÄÀÏ %s\n"
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
#, fuzzy
msgid "(added provide)"
msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n"
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: ¿©´Âµ¥ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
msgid "makeTempFile failed\n"
msgstr "makeTempFile¿¡ ½ÇÆĞÇß½À´Ï´Ù\n"
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite¿¡ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: v1.0 RPMÀº ¼­¸íÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/rpmchecksig.c:175
+#: lib/rpmchecksig.c:176
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: v2.0 RPMÀº Àç-¼­¸íÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/rpmchecksig.c:274
+#: lib/rpmchecksig.c:275
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead¿¡ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature¿¡ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead¿¡ ½ÇÆĞÇß½À´Ï´Ù\n"
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr "¿Ã¹Ù¸£Áö ¾ÊÀ½"
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
msgid " (MISSING KEYS:"
msgstr " (Å°¸¦ ãÀ» ¼ö ¾øÀ½:"
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr " (Å°¸¦ ½Å·ÚÇÒ ¼ö ¾øÀ½:"
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr "È®ÀÎ"
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "NO "
msgstr "¾Æ´Ï¿À"
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr "¿¹"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2459,105 +2373,105 @@ msgstr ""
"\"B\" ÀÇÁ¸¼ºÀº Áß¿ä½Ã µÇ´Â °Í(epoch)À» ÇÊ¿ä·Î ÇÕ´Ï´Ù (\"A\" ·Î °¡Á¤ÇÕ´Ï´Ù)\n"
"\tA %s\tB %s\n"
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "%s-%s-%s ÆĞÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n"
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr "Áغñ Áß..."
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
msgid "Preparing packages for installation..."
msgstr "¼³Ä¡ÇÒ ÆĞÅ°Áö¸¦ ÁغñÇÏ°í ÀÖ½À´Ï´Ù..."
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, c-format
msgid "Retrieving %s\n"
msgstr "%s (À»)¸¦ º¹±¸ÇÕ´Ï´Ù\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr " ... %s (À¸)·Î\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s (À»)¸¦ »ı·«ÇÕ´Ï´Ù - Àü¼Û(transfer)¿¡ ½ÇÆĞÇÔ - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, c-format
msgid "package %s is not relocateable\n"
msgstr "%s ÆĞÅ°Áö´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, c-format
msgid "error reading from file %s\n"
msgstr "%s ÆÄÀÏÀ» ÀĞ´Â µµÁß ¿À·ù°¡ ¹ß»ıÇß½À´Ï´Ù\n"
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "%s ÆÄÀÏÀÌ ÃֽŠ¹öÀüÀÇ RPMÀ» ÇÊ¿ä·Î ÇÕ´Ï´Ù\n"
-#: lib/rpminstall.c:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s (Àº)´Â ¼³Ä¡µÉ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%d ÀÇ ¼Ò½º¿Í %d ÀÇ ¹ÙÀ̳ʸ® ÆĞÅ°Áö¸¦ ã¾Ò½À´Ï´Ù\n"
-#: lib/rpminstall.c:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆĞÇÔ:\n"
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
msgid "installing binary packages\n"
msgstr "¹ÙÀ̳ʸ® ÆĞÅ°Áö¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n"
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "%s ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ¿©·¯°³ÀÇ ÆĞÅ°Áö¸¦ ÁöÁ¤ÇÕ´Ï´Ù\n"
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
msgid "removing these packages would break dependencies:\n"
msgstr "ÀÌ ÆĞÅ°ÁöµéÀ» Á¦°ÅÇϸé ÀÇÁ¸¼ºÀÌ ±úÁú ¼ö ÀÖÀ½:\n"
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr "%s (À»)¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n"
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2567,6 +2481,92 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "Àдµ¥ ½ÇÆĞÇÔ: %s (%d)\n"
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, fuzzy, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr "%s (Àº)´Â ´Ù¸¥ ¾ÆÅ°ÅØÃĸ¦ À§ÇÑ ÆĞÅ°ÁöÀÔ´Ï´Ù"
+
+#: lib/rpmps.c:221
+#, fuzzy, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr "%s (Àº)´Â ´Ù¸¥ ¿î¿µÃ¼Á¦¸¦ À§ÇÑ ÆĞÅ°ÁöÀÔ´Ï´Ù"
+
+#: lib/rpmps.c:226
+#, c-format
+msgid "package %s is already installed"
+msgstr "%s ÆĞÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
+
+#: lib/rpmps.c:231
+#, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "%2$s ÆĞÅ°Áö ¾ÈÀÇ %1$s °æ·Î´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: lib/rpmps.c:236
+#, c-format
+msgid "file %s conflicts between attempted installs of %s and %s"
+msgstr "%2$s (¿Í)°ú %3$s ÀÇ ¼³Ä¡ °úÁ¤¿¡¼­ %1$s ÆÄÀÏÀÌ ¼­·Î Ãæµ¹ÇÕ´Ï´Ù"
+
+#: lib/rpmps.c:241
+#, c-format
+msgid "file %s from install of %s conflicts with file from package %s"
+msgstr "%2$s ¿¡¼­ ¼³Ä¡µÇ´Â %1$s ÆÄÀÏÀº %3$s ÆĞÅ°ÁöÀÇ ÆÄÀÏ°ú Ãæµ¹ÇÕ´Ï´Ù"
+
+#: lib/rpmps.c:246
+#, c-format
+msgid "package %s (which is newer than %s) is already installed"
+msgstr "%s ÆĞÅ°Áö (%s º¸´Ù ÃÖ½ÅÀÇ ÆĞÅ°Áö)´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
+
+#: lib/rpmps.c:251
+#, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
+msgstr ""
+"%4$s ÆÄÀϽýºÅÛ »ó¿¡¼­ %1$s ÆĞÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld%3$cb (ÀÌ)°¡ ÇÊ¿äÇÕ"
+"´Ï´Ù"
+
+#: lib/rpmps.c:261
+#, c-format
+msgid "installing package %s needs %ld inodes on the %s filesystem"
+msgstr ""
+"%3$s ÆÄÀϽýºÅÛ »ó¿¡¼­ %1$s ÆĞÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld ÀÇ ¾ÆÀ̳ëµå(inode)"
+"°¡ ÇÊ¿äÇÕ´Ï´Ù"
+
+#: lib/rpmps.c:266
+#, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr ""
+"%s ÆĞÅ°ÁöÀÇ ¼±(pre)-Æ®·£Àè¼Ç ½Ã½ºÅÛÄİ(syscall): %s (ÀÌ)°¡ ½ÇÆĞÇß½À´Ï´Ù: %s"
+
+#: lib/rpmps.c:270
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Requires: %s\n"
+msgstr "%s-%s-%s ÆĞÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n"
+
+#: lib/rpmps.c:274
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Conflicts: %s\n"
+msgstr "%s-%s-%s ÆĞÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n"
+
+#: lib/rpmps.c:279
+#, c-format
+msgid "unknown error %d encountered while manipulating package %s"
+msgstr ""
+"%2$s ÆĞÅ°Áö¸¦ ó¸®ÇÏ´Â °úÁ¤¿¡¼­ ¾Ë ¼ö ¾ø´Â ¿À·ù %1$d (ÀÌ)°¡ ¹ß»ıÇß½À´Ï´Ù"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "conflicts with"
+msgstr " %s-%s-%s (¿Í)°ú Ãæµ¹ÇÕ´Ï´Ù\n"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "is needed by"
+msgstr " (Àº)´Â %s-%s-%s ¿¡¼­ ÇÊ¿ä·Î ÇÕ´Ï´Ù\n"
+
#: lib/rpmrc.c:191
#, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2662,170 +2662,171 @@ msgstr "%s (À»)¸¦ ÀĞÀ» ¼ö ¾ø½À´Ï´Ù, HOMEÀÌ ³Ê¹« Å®´Ï´Ù.\n"
msgid "Unable to open %s for reading: %s.\n"
msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s.\n"
-#: lib/rpmts.c:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "%s ¾ÈÀÇ ÆĞÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr "¸¶¿îÆ®µÈ ÆÄÀϽýºÅÛÀÇ ¸ñ·ÏÀ» ¼öÁıÇÏ°í ÀÖ½À´Ï´Ù\n"
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr "ÆÄÀÏÀÌ ¿Ã¹Ù¸£Áö(regular) ¾Ê½À´Ï´Ù -- ¿ë·® °Ë»ç¸¦ »ı·«ÇÕ´Ï´Ù\n"
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr "¿¹»ó(Expected) ¿ë·®: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
-#: lib/signature.c:147
+#: lib/signature.c:148
#, c-format
msgid " Actual size: %12d\n"
msgstr " ½ÇÁ¦ ¿ë·®: %12d\n"
-#: lib/signature.c:167
+#: lib/signature.c:168
msgid "No signature\n"
msgstr "¼­¸íÀÌ ¾ø½À´Ï´Ù\n"
-#: lib/signature.c:171
+#: lib/signature.c:172
msgid "Old PGP signature\n"
msgstr "ÀÌÀü PGP ¼­¸í\n"
-#: lib/signature.c:182
+#: lib/signature.c:183
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "ÀÌÀü (³»ºÎ-¿ë) ¼­¸í! ¾î¶»°Ô ¾òÀ¸¼Ì½À´Ï±î!?\n"
-#: lib/signature.c:232
+#: lib/signature.c:233
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "¼­¸í: size(%d)+pad(%d)\n"
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "%s (À»)¸¦ ½ÇÇàÇÒ ¼ö ¾øÀ½: %s\n"
-#: lib/signature.c:327
+#: lib/signature.c:328
msgid "pgp failed\n"
msgstr "pgp¿¡ ½ÇÆĞÇÔ\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
msgid "pgp failed to write signature\n"
msgstr "pgp ¼­¸íÀ» ÀÛ¼ºÇϴµ¥ ½ÇÆĞÇß½À´Ï´Ù\n"
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr "PGP ¼­¸í ¿ë·®: %d\n"
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
msgid "unable to read the signature\n"
msgstr "¼­¸íÀ» ÀĞÀ» ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "%d ¹ÙÀÌÆ®ÀÇ PGP ¼­¸íÀ» ¾ò¾ú½À´Ï´Ù\n"
-#: lib/signature.c:425
+#: lib/signature.c:426
msgid "gpg failed\n"
msgstr "gpg¿¡ ½ÇÆĞÇÔ\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
msgid "gpg failed to write signature\n"
msgstr "gpg ¼­¸íÀ» ÀÛ¼ºÇϴµ¥ ½ÇÆĞÇß½À´Ï´Ù\n"
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr "GPG ¼­¸í ¿ë·®: %d\n"
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "%d ¹ÙÀÌÆ®ÀÇ GPG ¼­¸íÀ» ¾ò¾ú½À´Ï´Ù\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ ºÎÀûÇÕÇÑ %%_signatureÀÇ ³»¿ëÀÌ ÀÖ½À´Ï´Ù\n"
-#: lib/signature.c:743
+#: lib/signature.c:744
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ \"%%_gpg_name\" À» ¼³Á¤ÇØ ÁÖ¼Å¾ß ÇÕ´Ï´Ù\n"
-#: lib/signature.c:756
+#: lib/signature.c:757
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ \"%%_pgp_name\" À» ¼³Á¤ÇØ ÁÖ¼Å¾ß ÇÕ´Ï´Ù\n"
-#: lib/signature.c:800
+#: lib/signature.c:801
#, fuzzy
msgid "Header+Payload size: "
msgstr "Çì´õÀÇ Å©±â°¡ ³Ê¹« Å®´Ï´Ù"
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
#, fuzzy
msgid "V3 RSA/MD5 signature: "
msgstr "MD5 ¼­¸íÀº °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
#, fuzzy
msgid "V3 DSA signature: "
msgstr "¼­¸íÀÌ ¾ø½À´Ï´Ù\n"
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, fuzzy, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "¼­¸í: size(%d)+pad(%d)\n"
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s (À»)¸¦ »ı·«ÇÕ´Ï´Ù\n"
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, c-format
msgid "excluding directory %s\n"
msgstr "%s µğ·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n"
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr "¸¶¿îÆ®µÈ ÆÄÀϽýºÅÛÀÇ ¸ñ·ÏÀ» ¼öÁıÇÏ°í ÀÖ½À´Ï´Ù\n"
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, c-format
msgid "missing %s"
msgstr "´ÙÀ½À» ãÀ» ¼ö ¾ø½À´Ï´Ù %s"
-#: lib/verify.c:379
+#: lib/verify.c:380
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "%s-%s-%s ¿¡ ÀÇÁ¸¼º ¹®Á¦ ¹ß»ı: "
diff --git a/po/no.po b/po/no.po
index 7512b3f00..d396a0b2d 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-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:39
+#: build.c:40
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "feil med avhengigheter under bygging:\n"
-#: build.c:70
+#: build.c:71
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "Kunne ikke åpne spec fil %s: %s\n"
-#: build.c:150 build.c:162
+#: build.c:151 build.c:163
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "Kunne ikke åpne tar-rør: %m\n"
#. Give up
-#: build.c:169
+#: build.c:170
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr "Feil under lesing av spec-fil fra %s\n"
-#: build.c:197
+#: build.c:198
#, 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:237
+#: build.c:238
#, c-format
msgid "failed to stat %s: %m\n"
msgstr "kunne ikke kjøre stat på %s: %m\n"
-#: build.c:242
+#: build.c:243
#, c-format
msgid "File %s is not a regular file.\n"
msgstr "Fil %s er ikke en vanlig fil.\n"
-#: build.c:251
+#: build.c:252
#, 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:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Bygger målplattformene: %s\n"
-#: build.c:321
+#: build.c:322
#, 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:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr "skriv ut hvilken versjon av rpm som brukes"
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr "gi mindre detaljert info"
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr "gi mer detaljert info"
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr "definer makro <navn> med verdi <kropp>"
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr "'<navn> <kropp>'"
-#: rpmqv.c:121
+#: rpmqv.c:122
msgid "print macro expansion of <expr>+"
msgstr "skriv ut makroutvidelsen av <uttr>+"
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr "<uttr>+"
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr "send stdout til <kmd>"
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr "<kmd>"
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr "bruk <katalog> som toppnivåkatalog"
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr "<kat>"
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr "les <fil:...> i stedet for standard makrofil(er)"
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr "<fil:...>"
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "les <fil:...> i stedet for standard rpmrc-fil(er)"
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr "vis endelig rpmrc og makrokonfigurasjon"
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr "slå av bruk av libio(3) API"
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr "feilsøking på protokoll-datastrøm"
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr "feilsøk rpmio I/U"
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr "feilsøk URL-cache håndtering"
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:183
+#: rpmqv.c:184
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr ""
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versjon %s\n"
-#: rpmqv.c:238
+#: rpmqv.c:239
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright © 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:239
+#: rpmqv.c:240
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:251
+#: rpmqv.c:252
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Bruk: %s {--help}\n"
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:605
+#: rpmqv.c:606
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Bruk -e eller --erase i stedet.\n"
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Intern feil i argumentprosesseringen (%d) :-(\n"
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr "kun ett større modi kan spesifiseres"
-#: rpmqv.c:681
+#: rpmqv.c:682
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:685
+#: rpmqv.c:686
msgid "unexpected query flags"
msgstr "uventede flagg for spørring"
-#: rpmqv.c:688
+#: rpmqv.c:689
msgid "unexpected query format"
msgstr "ventet spørringsformat"
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr "uventet spørringskilde"
-#: rpmqv.c:732
+#: rpmqv.c:733
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath oppgitt for operasjon som ikke bruker en database"
-#: rpmqv.c:738
+#: rpmqv.c:739
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "kun installasjon, oppgradering, rmsource og rmspec kan tvinges"
-#: rpmqv.c:740
+#: rpmqv.c:741
msgid "files may only be relocated during package installation"
msgstr "filer kan kun omplasseres under pakkeinstallasjon"
-#: rpmqv.c:743
+#: rpmqv.c:744
msgid "only one of --prefix or --relocate may be used"
msgstr "kune en av --prefix eller --relocate kan brukes"
-#: rpmqv.c:746
+#: rpmqv.c:747
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:749
+#: rpmqv.c:750
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix kan kun brukes ved installasjon av nye pakker"
-#: rpmqv.c:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr "argumenter til --prefix må begynne med en /"
-#: rpmqv.c:755
+#: rpmqv.c:756
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) kan kun spesifiseres under pakkeinstallasjon"
-#: rpmqv.c:759
+#: rpmqv.c:760
msgid "--percent may only be specified during package installation"
msgstr "--percent kan kun spesifiseres under pakkeinstallasjon"
-#: rpmqv.c:764
+#: rpmqv.c:765
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles kan kun spesifiseres under pakkeinstallasjon"
-#: rpmqv.c:768
+#: rpmqv.c:769
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:772
+#: rpmqv.c:773
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:776
+#: rpmqv.c:777
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:780
+#: rpmqv.c:781
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:784
+#: rpmqv.c:785
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:788
+#: rpmqv.c:789
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:793
+#: rpmqv.c:794
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:797
+#: rpmqv.c:798
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:801
+#: rpmqv.c:802
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:806
+#: rpmqv.c:807
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:811
+#: rpmqv.c:812
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:816
+#: rpmqv.c:817
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:820
+#: rpmqv.c:821
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:825
+#: rpmqv.c:826
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:830
+#: rpmqv.c:831
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr "ingen filer å signere\n"
-#: rpmqv.c:871
+#: rpmqv.c:872
#, c-format
msgid "cannot access file %s\n"
msgstr "kan ikke aksessere fil %s\n"
-#: rpmqv.c:890
+#: rpmqv.c:891
msgid "pgp not found: "
msgstr "pgp ikke funnet: "
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr "Skriv inn passord: "
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr "Passordsjekk feilet\n"
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr "Passord er ok.\n"
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:913
+#: rpmqv.c:914
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:930
+#: rpmqv.c:931
msgid "exec failed\n"
msgstr "kjøring feilet\n"
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr "ingen pakkefiler oppgitt for ombygging"
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr "ingen spec-fil oppgitt for bygging"
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr "ingen tar-fil oppgitt for bygging"
-#: rpmqv.c:1055
+#: rpmqv.c:1056
#, fuzzy
msgid "no packages given for erase"
msgstr "ingen pakker oppgitt for signering"
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr "ingen pakker oppgitt for installering"
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr "ingen argumenter oppgitt for spørring"
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr "ingen argumenter oppgitt for verifisering"
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr "uventede argumenter til --querytags "
-#: rpmqv.c:1149
+#: rpmqv.c:1150
#, fuzzy
msgid "no arguments given"
msgstr "ingen argumenter oppgitt for spørring"
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
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:152
+#: build/files.c:1826 build/pack.c:154
#, 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:85
+#: build/pack.c:87
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "klarte ikke å åpne %s: %s\n"
-#: build/pack.c:88
+#: build/pack.c:90
#, c-format
msgid "create archive failed: %s\n"
msgstr "feil under oppretting av arkiv %s\n"
-#: build/pack.c:110
+#: build/pack.c:112
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "cpio_copy skriving feilet: %s\n"
-#: build/pack.c:117
+#: build/pack.c:119
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "cpio_copy: feil under lesing: %s\n"
-#: build/pack.c:220
+#: build/pack.c:222
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "Kunne ikke åpne PreIn-fil: %s\n"
-#: build/pack.c:227
+#: build/pack.c:229
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "Kunne ikke åpne PreUn-fil: %s\n"
-#: build/pack.c:234
+#: build/pack.c:236
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "Kunne ikke åpne PostIn-fil: %s\n"
-#: build/pack.c:241
+#: build/pack.c:243
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "Kunne ikke åpne PostUn-fil: %s\n"
-#: build/pack.c:249
+#: build/pack.c:251
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "Kunne ikke åpne VerifyScript-fil: %s\n"
-#: build/pack.c:264
+#: build/pack.c:266
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr ""
-#: build/pack.c:292
+#: build/pack.c:294
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr ""
-#: build/pack.c:302
+#: build/pack.c:304
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr ""
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: Fseek feilet: %s\n"
-#: build/pack.c:339
+#: build/pack.c:341
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s er ikke en RPM-pakke\n"
-#: build/pack.c:348
+#: build/pack.c:350
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: leser header fra %s\n"
-#: build/pack.c:477
+#: build/pack.c:479
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "Kunne ikke åpne spec fil %s: %s\n"
-#: build/pack.c:496
+#: build/pack.c:498
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "Kunne ikke skrive header til %s: %s\n"
-#: build/pack.c:506
+#: build/pack.c:508
msgid "Bad CSA data\n"
msgstr "Ugyldige CSA-data\n"
-#: build/pack.c:542
+#: build/pack.c:544
#, fuzzy
msgid "Unable to write final header\n"
msgstr "Kunne ikke skrive header til %s: %s\n"
-#: build/pack.c:562
+#: build/pack.c:564
#, c-format
msgid "Generating signature: %d\n"
msgstr "Genererer signatur: %d\n"
-#: build/pack.c:580
+#: build/pack.c:582
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "Kunne ikke åpne spec fil %s: %s\n"
-#: build/pack.c:588
+#: build/pack.c:590
#, c-format
msgid "Could not open %s: %s\n"
msgstr "Kunne ikke åpne %s: %s\n"
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Kunne ikke skrive pakke: %s\n"
-#: build/pack.c:639
+#: build/pack.c:641
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Kunne ikke åpne sigmål %s: %s\n"
-#: build/pack.c:650
+#: build/pack.c:652
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "Kunne ikke åpne spec fil %s: %s\n"
-#: build/pack.c:664
+#: build/pack.c:666
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Kunne ikke skrive header til %s: %s\n"
-#: build/pack.c:674
+#: build/pack.c:676
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Kunne ikke lese \"payload\" fra %s: %s\n"
-#: build/pack.c:680
+#: build/pack.c:682
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Kunne ikke skrive \"payload\" til %s: %s\n"
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr "Skrev: %s\n"
-#: build/pack.c:772
+#: build/pack.c:774
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:789
+#: build/pack.c:791
#, c-format
msgid "cannot create %s: %s\n"
msgstr ""
@@ -1426,32 +1426,32 @@ msgstr ""
msgid " failed - "
msgstr " feilet - "
-#: lib/depends.c:155
+#: lib/depends.c:156
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "pakke %s er allerede installert"
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:425
+#: lib/depends.c:426
msgid "(rpmlib provides)"
msgstr ""
-#: lib/depends.c:446
+#: lib/depends.c:447
msgid "(db files)"
msgstr ""
-#: lib/depends.c:458
+#: lib/depends.c:459
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:471
+#: lib/depends.c:472
#, fuzzy
msgid "(db package)"
msgstr "ingen pakker\n"
@@ -1467,31 +1467,31 @@ msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1538,46 +1538,46 @@ msgstr "klarte ikke å åpne %s: %s\n"
msgid "file %s is on an unknown device\n"
msgstr "fil %s er på en ukjent enhet\n"
-#: lib/fsm.c:318
+#: lib/fsm.c:320
msgid "========== Directories not explictly included in package:\n"
msgstr ""
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, fuzzy, c-format
msgid "%10d %s\n"
msgstr "%9d %s\n"
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, c-format
msgid "%s saved as %s\n"
msgstr "%s lagret som %s\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s rmdir av %s feilet: Katalogen er ikke tom\n"
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s rmdir av %s feilet: %s\n"
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s unlink av %s feilet: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, c-format
msgid "%s created as %s\n"
msgstr "%s opprettet som %s\n"
@@ -1587,41 +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:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead feilet\n"
-#: lib/package.c:181
+#: lib/package.c:182
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:189
+#: lib/package.c:190
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature feilet\n"
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen signatur tilgjengelig\n"
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead feilet\n"
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread feilet: %s\n"
@@ -2047,487 +2047,407 @@ msgstr "signer en pakke (forkast nåværende signatur)"
msgid "generate signature"
msgstr "generer signatur"
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: 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: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:231
-#, c-format
-msgid "package %s is already installed"
-msgstr "pakke %s er allerede installert"
-
-#: 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:241
-#, c-format
-msgid "file %s conflicts between attempted installs of %s and %s"
-msgstr ""
-
-#: lib/problems.c:246
-#, c-format
-msgid "file %s from install of %s conflicts with file from package %s"
-msgstr ""
-
-#: lib/problems.c:251
-#, c-format
-msgid "package %s (which is newer than %s) is already installed"
-msgstr ""
-
-#: lib/problems.c:256
-#, c-format
-msgid "installing package %s needs %ld%cb on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:266
-#, c-format
-msgid "installing package %s needs %ld inodes on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:271
-#, c-format
-msgid "package %s pre-transaction syscall(s): %s failed: %s"
-msgstr ""
-
-#: 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:279
-#, fuzzy, c-format
-msgid "package %s has unsatisfied Conflicts: %s\n"
-msgstr "pakke %s er i konflikt: %s\n"
-
-#: lib/problems.c:284
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s"
-msgstr ""
-
-#: lib/problems.c:365
-#, fuzzy
-msgid "conflicts with"
-msgstr " er i konflikt med %s-%s-%s\n"
-
-#: lib/problems.c:365
-#, fuzzy
-msgid "is needed by"
-msgstr " kreves av %s-%s-%s\n"
-
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 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"
-#: lib/psm.c:448
+#: lib/psm.c:449
#, c-format
msgid "cannot create %%%s %s\n"
msgstr "kan ikke opprette %%%s %s\n"
-#: lib/psm.c:454
+#: lib/psm.c:455
#, c-format
msgid "cannot write to %%%s %s\n"
msgstr "kan ikke skrive til %%%s %s\n"
-#: lib/psm.c:485
+#: lib/psm.c:486
msgid "source package expected, binary found\n"
msgstr "kildepakke forventet, binær funnet\n"
-#: lib/psm.c:601
+#: lib/psm.c:602
msgid "source package contains no .spec file\n"
msgstr "kildepakke inneholder ikke en .spec-fil\n"
-#: lib/psm.c:720
+#: lib/psm.c:721
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "%s: kjører %s-skript (hvis noen)\n"
-#: lib/psm.c:890
+#: lib/psm.c:891
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:897
+#: lib/psm.c:898
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr ""
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "klarte ikke å åpne %s: %s\n"
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "%s feilet\n"
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, c-format
msgid "incorrect format: %s\n"
msgstr "ukorrekt format: %s\n"
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr "(inneholder ingen filer)"
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr "normal "
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr "erstattet "
-#: lib/query.c:289
+#: lib/query.c:290
msgid "not installed "
msgstr "ikke installert"
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr "delt via nett "
-#: lib/query.c:295
+#: lib/query.c:296
#, c-format
msgid "(unknown %3d) "
msgstr "(ukjent %3d) "
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr "(ingen tilstand)"
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
msgid "package has neither file owner or id lists\n"
msgstr "pakken har verken fileier eller id-lister\n"
-#: lib/query.c:465
+#: lib/query.c:466
#, c-format
msgid "can't query %s: %s\n"
msgstr "kan ikke spørre på %s: %s\n"
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, c-format
msgid "open of %s failed: %s\n"
msgstr "feil under åpning av %s: %s\n"
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr "spørring på %s feilet\n"
-#: lib/query.c:637
+#: lib/query.c:638
msgid "old format source packages cannot be queried\n"
msgstr "kildepakker i gammelt format kan ikke spørres\n"
-#: lib/query.c:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "ingen pakke utløser %s\n"
-#: lib/query.c:707
+#: lib/query.c:708
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:728
+#: lib/query.c:729
msgid "no packages\n"
msgstr "ingen pakker\n"
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "gruppe %s inneholder ingen pakker\n"
-#: lib/query.c:758
+#: lib/query.c:759
#, c-format
msgid "no package triggers %s\n"
msgstr "ingen pakke utløser %s\n"
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "kunne ikke opprette %s: %s\n"
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "ingen pakke utløser %s\n"
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr "ingen pakke krever %s\n"
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr "ingen pakke gir %s\n"
-#: lib/query.c:911
+#: lib/query.c:912
#, c-format
msgid "file %s: %s\n"
msgstr "fil %s: %s\n"
-#: lib/query.c:915
+#: lib/query.c:916
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "filen %s eies ikke av noen pakke\n"
-#: lib/query.c:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr "ugyldig pakkenummer: %s\n"
-#: lib/query.c:945
+#: lib/query.c:946
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:950
+#: lib/query.c:951
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, c-format
msgid "package %s is not installed\n"
msgstr "pakke %s er ikke installert\n"
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
msgid "(added files)"
msgstr ""
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
msgid "(added provide)"
msgstr ""
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: åpne feilet: %s\n"
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
msgid "makeTempFile failed\n"
msgstr "makeTempFile feilet\n"
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite feilet: %s\n"
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: kan ikke signere v1.0 RPM\n"
-#: lib/rpmchecksig.c:175
+#: lib/rpmchecksig.c:176
#, 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:274
+#: lib/rpmchecksig.c:275
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead feilet: %s\n"
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature feilet: %s\n"
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead feilet\n"
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ingen signatur tilgjengelig (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr "IKKE OK"
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr "OK"
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "NO "
msgstr "NEI"
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr "JA"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "pakke %s er i konflikt: %s\n"
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr "Forbereder..."
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
msgid "Preparing packages for installation..."
msgstr "Forbereder pakker for installasjon..."
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, c-format
msgid "Retrieving %s\n"
msgstr "Henter %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "hopper over %s - overføring feilet - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakke %s kan ikke relokeres\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, c-format
msgid "error reading from file %s\n"
msgstr "feil under lesing fra fil %s\n"
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, 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:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "fant %d kilde- og %d binærpakker\n"
-#: lib/rpminstall.c:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "feilede avhengigheter:\n"
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
msgid "installing binary packages\n"
msgstr "installerer binærpakker\n"
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" spesifiserer flere pakker\n"
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
msgid "removing these packages would break dependencies:\n"
msgstr "fjerning av disse pakkene vil ødelegge avhengigheter:\n"
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan ikke åpne %s: %s\n"
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2537,6 +2457,86 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "lesing feilet: %s (%d)\n"
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, fuzzy, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr "pakke %s er for en annen arkitektur"
+
+#: lib/rpmps.c:221
+#, fuzzy, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr "pakke %s er for et annet operativsystem"
+
+#: lib/rpmps.c:226
+#, c-format
+msgid "package %s is already installed"
+msgstr "pakke %s er allerede installert"
+
+#: lib/rpmps.c:231
+#, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "sti %s i pakke %s kan ikke relokeres"
+
+#: lib/rpmps.c:236
+#, c-format
+msgid "file %s conflicts between attempted installs of %s and %s"
+msgstr ""
+
+#: lib/rpmps.c:241
+#, c-format
+msgid "file %s from install of %s conflicts with file from package %s"
+msgstr ""
+
+#: lib/rpmps.c:246
+#, c-format
+msgid "package %s (which is newer than %s) is already installed"
+msgstr ""
+
+#: lib/rpmps.c:251
+#, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:261
+#, c-format
+msgid "installing package %s needs %ld inodes on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:266
+#, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr ""
+
+#: lib/rpmps.c:270
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Requires: %s\n"
+msgstr "pakke %s er i konflikt: %s\n"
+
+#: lib/rpmps.c:274
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Conflicts: %s\n"
+msgstr "pakke %s er i konflikt: %s\n"
+
+#: lib/rpmps.c:279
+#, c-format
+msgid "unknown error %d encountered while manipulating package %s"
+msgstr ""
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "conflicts with"
+msgstr " er i konflikt med %s-%s-%s\n"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "is needed by"
+msgstr " kreves av %s-%s-%s\n"
+
#: lib/rpmrc.c:191
#, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2632,169 +2632,170 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Kunne ikke åpne spec fil %s: %s\n"
-#: lib/rpmts.c:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "kan ikke åpne pakkedatabase i %s\n"
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr "henter liste over monterte filsystemer\n"
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:147
+#: lib/signature.c:148
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:167
+#: lib/signature.c:168
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:171
+#: lib/signature.c:172
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:182
+#: lib/signature.c:183
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:232
+#: lib/signature.c:233
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "Kunne ikke kjøre %s: %s\n"
-#: lib/signature.c:327
+#: lib/signature.c:328
msgid "pgp failed\n"
msgstr ""
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
msgid "pgp failed to write signature\n"
msgstr ""
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:425
+#: lib/signature.c:426
msgid "gpg failed\n"
msgstr ""
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:743
+#: lib/signature.c:744
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:756
+#: lib/signature.c:757
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:800
+#: lib/signature.c:801
#, fuzzy
msgid "Header+Payload size: "
msgstr "For stor header"
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
#, fuzzy
msgid "V3 RSA/MD5 signature: "
msgstr "hopp over MD5-signaturer"
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
msgid "V3 DSA signature: "
msgstr ""
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, c-format
msgid "excluding directory %s\n"
msgstr "ekskluderer katalog %s\n"
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr "henter liste over monterte filsystemer\n"
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, c-format
msgid "missing %s"
msgstr "mangler %s"
-#: lib/verify.c:379
+#: lib/verify.c:380
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "feilede avhengigheter:\n"
diff --git a/po/pl.po b/po/pl.po
index d7c033ff4..2a0c94860 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-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:39
+#: build.c:40
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "niespe³nione zale¿no¶ci:\n"
-#: build.c:70
+#: build.c:71
#, fuzzy, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "Nie mo¿na otworzyæ pliku spec: %s\n"
-#: build.c:150 build.c:162
+#: build.c:151 build.c:163
#, 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:169
+#: build.c:170
#, 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:197
+#: build.c:198
#, 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:237
+#: build.c:238
#, fuzzy, c-format
msgid "failed to stat %s: %m\n"
msgstr "stat nie powiod³o siê %s: %s"
-#: build.c:242
+#: build.c:243
#, fuzzy, c-format
msgid "File %s is not a regular file.\n"
msgstr "Plik: %s nie jest regularnym plikiem\n"
-#: build.c:251
+#: build.c:252
#, 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:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Budowanie dla platform: %s\n"
-#: build.c:321
+#: build.c:322
#, 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:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr "wy¶wietl wersjê u¿ywanego rpm-a"
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:122
#, fuzzy
msgid "print macro expansion of <expr>+"
msgstr "wy¶wietl wersjê u¿ywanego rpm-a"
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr "przeka¿ standartowe wyj¶cie do <komenda>"
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr "u¿yj <katalogu> jako katalogu najwy¿szego poziomu"
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:183
+#: rpmqv.c:184
#, fuzzy
msgid "Signature options:"
msgstr "Rozmiar sygnatury: %d\n"
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr ""
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "plik %s: %s\n"
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr "RPM wersja %s\n"
-#: rpmqv.c:238
+#: rpmqv.c:239
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998 - Red Hat Software"
-#: rpmqv.c:239
+#: rpmqv.c:240
#, 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:251
+#: rpmqv.c:252
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "U¿ycie: rpm {--help}"
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:605
+#: rpmqv.c:606
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "U¿yj -e lub --erase\n"
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "B³±d wewnêtrzny w przetwarzaniu argumentu (%d) :-(\n"
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr "tylko jeden g³ówny tryb pracy mo¿e byæ podany"
-#: rpmqv.c:681
+#: rpmqv.c:682
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:685
+#: rpmqv.c:686
msgid "unexpected query flags"
msgstr "b³êdna konstrukcja argumentów odpytywania"
-#: rpmqv.c:688
+#: rpmqv.c:689
msgid "unexpected query format"
msgstr "b³êdna konstrukcja argumentów odpytywania"
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr "b³êdna konstrukcja argumentów odpytywania"
-#: rpmqv.c:732
+#: rpmqv.c:733
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath podano dla operacji nie u¿ywaj±cej bazy"
-#: rpmqv.c:738
+#: rpmqv.c:739
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "tylko instalacjê, uaktualnienie i usuwanie ¼róde³ mo¿na wymusiæ"
-#: rpmqv.c:740
+#: rpmqv.c:741
msgid "files may only be relocated during package installation"
msgstr "przesuwania plików mo¿na dokonaæ tylko w trakcie instalacji"
-#: rpmqv.c:743
+#: rpmqv.c:744
msgid "only one of --prefix or --relocate may be used"
msgstr "nie mo¿na jednocze¶nie u¿yæ --prefix i --relocate"
-#: rpmqv.c:746
+#: rpmqv.c:747
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:749
+#: rpmqv.c:750
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:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr "argumenty dla --prefix musz± siê rozpoczynaæ od /"
-#: rpmqv.c:755
+#: rpmqv.c:756
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:759
+#: rpmqv.c:760
msgid "--percent may only be specified during package installation"
msgstr "--percent mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:764
+#: rpmqv.c:765
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:768
+#: rpmqv.c:769
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:772
+#: rpmqv.c:773
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:776
+#: rpmqv.c:777
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:780
+#: rpmqv.c:781
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "nie mo¿na jednocze¶nie u¿yæ --excludedocs i --includedocs"
-#: rpmqv.c:784
+#: rpmqv.c:785
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:788
+#: rpmqv.c:789
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:793
+#: rpmqv.c:794
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:797
+#: rpmqv.c:798
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches mo¿na u¿yæ tylko w trakcie usuwania pakietów"
-#: rpmqv.c:801
+#: rpmqv.c:802
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpmqv.c:806
+#: rpmqv.c:807
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:811
+#: rpmqv.c:812
#, 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:816
+#: rpmqv.c:817
#, 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:820
+#: rpmqv.c:821
#, 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:825
+#: rpmqv.c:826
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:830
+#: rpmqv.c:831
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:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenty dla --root (-r) musz± siê rozpoczynaæ od /"
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:871
+#: rpmqv.c:872
#, c-format
msgid "cannot access file %s\n"
msgstr "brak dostêpu do pliku %s\n"
-#: rpmqv.c:890
+#: rpmqv.c:891
msgid "pgp not found: "
msgstr "nie znaleziono pgp: "
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr "Podaj has³o: "
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr "Weryfikacja has³a nieudana\n"
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr "Has³o jest prawid³owe.\n"
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "B³êdny %%_signature spec w pliku makra.\n"
-#: rpmqv.c:913
+#: rpmqv.c:914
msgid "--sign may only be used during package building"
msgstr "--sign mo¿na u¿yæ tylko w trakcie budowania pakietu"
-#: rpmqv.c:930
+#: rpmqv.c:931
msgid "exec failed\n"
msgstr "wykonanie nie powiod³o siê\n"
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr "nie podano nazw pakietów do przebudowania"
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr "nie podano nazw plików spec do budowania"
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr "nie podano nazw plików tar do budowania"
-#: rpmqv.c:1055
+#: rpmqv.c:1056
#, fuzzy
msgid "no packages given for erase"
msgstr "nie podano nazwy pakietu do podpisania"
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr "nie podano nazw plików do zainstalowania"
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr "nie podano argumentów dla trybu zapytañ"
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr "nie podano argumentów dla sprawdzania"
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr "nieoczekiwane argumenty dla --querytags "
-#: rpmqv.c:1149
+#: rpmqv.c:1150
#, fuzzy
msgid "no arguments given"
msgstr "nie podano argumentów dla trybu zapytañ"
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
#, 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:152
+#: build/files.c:1826 build/pack.c:154
#, 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:85
+#: build/pack.c:87
#, 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:88
+#: build/pack.c:90
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "utworzenie archiwum pliku %s nie powiod³o siê: %s"
-#: build/pack.c:110
+#: build/pack.c:112
#, fuzzy, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "zapis w trybie cpio_copy nie powiód³ siê: %s"
-#: build/pack.c:117
+#: build/pack.c:119
#, fuzzy, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "odczyt w trybie cpio_copy nie powiód³ siê: %s"
-#: build/pack.c:220
+#: build/pack.c:222
#, fuzzy, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "Nie mo¿na otworzyæ pliku PreIn: %s"
-#: build/pack.c:227
+#: build/pack.c:229
#, fuzzy, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "Nie mo¿na otworzyæ pliku PreUn: %s"
-#: build/pack.c:234
+#: build/pack.c:236
#, fuzzy, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "Nie mo¿na otworzyæ pliku PostIn: %s"
-#: build/pack.c:241
+#: build/pack.c:243
#, fuzzy, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "Nie mo¿na otworzyæ pliku PostUn: %s"
-#: build/pack.c:249
+#: build/pack.c:251
#, fuzzy, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "Nie mo¿na otworzyæ pliku VerifyScript: %s"
-#: build/pack.c:264
+#: build/pack.c:266
#, fuzzy, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "Nie mo¿na otworzyæ skryptu Trigger: %s"
-#: build/pack.c:292
+#: build/pack.c:294
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr "readRPM: otwieranie %s: %s\n"
-#: build/pack.c:302
+#: build/pack.c:304
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr "readRPM: czytanie %s: %s\n"
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: build/pack.c:339
+#: build/pack.c:341
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s nie jest pakietem RPM\n"
-#: build/pack.c:348
+#: build/pack.c:350
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: czytanie nag³ówka z %s\n"
-#: build/pack.c:477
+#: build/pack.c:479
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "Nie mo¿na odczytaæ ikony: %s"
-#: build/pack.c:496
+#: build/pack.c:498
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "Nie mo¿na zapisaæ %s"
-#: build/pack.c:506
+#: build/pack.c:508
#, fuzzy
msgid "Bad CSA data\n"
msgstr "B³êdne dane CSA"
-#: build/pack.c:542
+#: build/pack.c:544
#, fuzzy
msgid "Unable to write final header\n"
msgstr "Nie mo¿na zapisaæ %s"
-#: build/pack.c:562
+#: build/pack.c:564
#, c-format
msgid "Generating signature: %d\n"
msgstr "Generowanie sygnatury: %d\n"
-#: build/pack.c:580
+#: build/pack.c:582
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "Nie mo¿na odczytaæ ikony: %s"
-#: build/pack.c:588
+#: build/pack.c:590
#, fuzzy, c-format
msgid "Could not open %s: %s\n"
msgstr "Nie mo¿na otworzyæ %s\n"
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Nie mo¿na zapisaæ pakietu: %s"
-#: build/pack.c:639
+#: build/pack.c:641
#, fuzzy, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Nie mo¿na odczytaæ sigtarget: %s"
-#: build/pack.c:650
+#: build/pack.c:652
#, fuzzy, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "Nie mo¿na odczytaæ ikony: %s"
-#: build/pack.c:664
+#: build/pack.c:666
#, fuzzy, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Nie mo¿na zapisaæ pakietu: %s"
-#: build/pack.c:674
+#: build/pack.c:676
#, fuzzy, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Nie mo¿na odczytaæ ikony: %s"
-#: build/pack.c:680
+#: build/pack.c:682
#, fuzzy, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Nie mo¿na zapisaæ pakietu: %s"
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr "Zapisano: %s\n"
-#: build/pack.c:772
+#: build/pack.c:774
#, 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:789
+#: build/pack.c:791
#, fuzzy, c-format
msgid "cannot create %s: %s\n"
msgstr "nie mo¿na utworzyæ %s"
@@ -1466,36 +1466,36 @@ msgstr ""
msgid " failed - "
msgstr " nie powiod³o siê -"
-#: lib/depends.c:155
+#: lib/depends.c:156
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany"
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
#, fuzzy
msgid "(rpmrc provides)"
msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
-#: lib/depends.c:425
+#: lib/depends.c:426
#, fuzzy
msgid "(rpmlib provides)"
msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
-#: lib/depends.c:446
+#: lib/depends.c:447
#, fuzzy
msgid "(db files)"
msgstr "b³êdny status pliku: %s"
-#: lib/depends.c:458
+#: lib/depends.c:459
#, fuzzy
msgid "(db provides)"
msgstr "Udostêpniane zasoby:"
-#: lib/depends.c:471
+#: lib/depends.c:472
#, fuzzy
msgid "(db package)"
msgstr "znaleziono %d pakietów\n"
@@ -1511,31 +1511,31 @@ msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "usuwanie indeksu grupy\n"
#. Record all relations.
-#: lib/depends.c:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1584,46 +1584,46 @@ msgstr "nie mo¿na otworzyæ %s: %s"
msgid "file %s is on an unknown device\n"
msgstr "plik %s jest na nieznanym urz±dzeniu"
-#: lib/fsm.c:318
+#: lib/fsm.c:320
msgid "========== Directories not explictly included in package:\n"
msgstr ""
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, fuzzy, c-format
msgid "%10d %s\n"
msgstr "linia %d: %s"
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "ostrze¿enie: %s zapisany jako %s"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "nie mo¿na usun±æ %s - katalog nie jest pusty"
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "skasowanie katalogu %s nie powiod³o siê"
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "otwarcie %s nie powiod³o siê\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "ostrze¿enie: %s utworzony jako %s"
@@ -1633,45 +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:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/package.c:181
+#: lib/package.c:182
#, 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:189
+#: lib/package.c:190
#, 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:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature nie powiod³o siê\n"
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Sygnatura nie jest dostêpna\n"
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead nie powiod³o siê\n"
@@ -2127,498 +2127,416 @@ msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)"
msgid "generate signature"
msgstr "generuj sygnaturê PGP/GPG"
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: 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: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:231
-#, fuzzy, c-format
-msgid "package %s is already installed"
-msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany"
-
-#: 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:241
-#, c-format
-msgid "file %s conflicts between attempted installs of %s and %s"
-msgstr ""
-
-#: 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: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: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: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:271
-#, c-format
-msgid "package %s pre-transaction syscall(s): %s failed: %s"
-msgstr ""
-
-#: 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: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: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:365
-#, fuzzy
-msgid "conflicts with"
-msgstr " jest w konflikcie z %s-%s-%s\n"
-
-#: 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:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 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"
-#: lib/psm.c:448
+#: lib/psm.c:449
#, fuzzy, c-format
msgid "cannot create %%%s %s\n"
msgstr "nie mo¿na utworzyæ %s"
-#: lib/psm.c:454
+#: lib/psm.c:455
#, fuzzy, c-format
msgid "cannot write to %%%s %s\n"
msgstr "nie mo¿na zapisaæ do %s"
-#: lib/psm.c:485
+#: lib/psm.c:486
#, fuzzy
msgid "source package expected, binary found\n"
msgstr "spodziewany pakiet ¼ród³owy a nie binarny"
-#: lib/psm.c:601
+#: lib/psm.c:602
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
-#: lib/psm.c:720
+#: lib/psm.c:721
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n"
-#: lib/psm.c:890
+#: lib/psm.c:891
#, 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:897
+#: lib/psm.c:898
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "wykonanie skryptu nie powiod³o siê"
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, fuzzy, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr "pakiet: %s-%s-%s test plików = %d\n"
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, fuzzy, c-format
msgid "user %s does not exist - using root\n"
msgstr "u¿ytkownik %s nie istnieje - u¿yto konta root"
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, fuzzy, c-format
msgid "group %s does not exist - using root\n"
msgstr "grupa %s nie istnieje - u¿yto grupy root"
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "rozpakowanie archiwum nie powiod³o siê %s%s: %s"
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr " na pliku "
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "nie mo¿na otworzyæ %s: %s"
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "%s nie powiod³o siê"
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "b³±d w formacie: %s\n"
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr "(nie zawiera plików)"
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr "normalny "
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr "zast±piony "
-#: lib/query.c:289
+#: lib/query.c:290
msgid "not installed "
msgstr "niezainstalowany"
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr "udostêpniony w sieci"
-#: lib/query.c:295
+#: lib/query.c:296
#, c-format
msgid "(unknown %3d) "
msgstr "(nieznany %3d)"
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr "(brak statusu)"
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
#, 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:465
+#: lib/query.c:466
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "nie mo¿na odwi±zaæ %s: %s\n"
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, c-format
msgid "open of %s failed: %s\n"
msgstr "otwarcie %s nie powiod³o siê\n"
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr "odpytywanie %s nie powiod³o siê\n"
-#: lib/query.c:637
+#: lib/query.c:638
msgid "old format source packages cannot be queried\n"
msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n"
-#: lib/query.c:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "¿aden pakiet nie zahacza %s\n"
-#: lib/query.c:707
+#: lib/query.c:708
#, 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:728
+#: lib/query.c:729
#, fuzzy
msgid "no packages\n"
msgstr "znaleziono %d pakietów\n"
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "grupa %s nie zawiera ¿adnych pakietów\n"
-#: lib/query.c:758
+#: lib/query.c:759
#, c-format
msgid "no package triggers %s\n"
msgstr "¿aden pakiet nie zahacza %s\n"
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "Odczytanie %s nie powiod³o siê: %s."
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "¿aden pakiet nie zahacza %s\n"
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr "¿aden pakiet nie wymaga %s\n"
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr "¿aden pakiet nie udostêpnia %s\n"
-#: lib/query.c:911
+#: lib/query.c:912
#, c-format
msgid "file %s: %s\n"
msgstr "plik %s: %s\n"
-#: lib/query.c:915
+#: lib/query.c:916
#, 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:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr "b³êdny numer pakietu: %s\n"
-#: lib/query.c:945
+#: lib/query.c:946
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "numer rekordu pakietu: %d\n"
-#: lib/query.c:950
+#: lib/query.c:951
#, fuzzy, c-format
msgid "record %u could not be read\n"
msgstr "nie mo¿na odczytaæ rekordu %d\n"
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, c-format
msgid "package %s is not installed\n"
msgstr "pakiet %s nie jest zainstalowany\n"
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
#, fuzzy
msgid "(added files)"
msgstr "b³êdny status pliku: %s"
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
#, fuzzy
msgid "(added provide)"
msgstr "Udostêpniane zasoby:"
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: Open nie powiod³o siê\n"
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "wykonanie nie powiod³o siê\n"
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: Nie mo¿na podpisaæ v1.0 RPM\n"
-#: lib/rpmchecksig.c:175
+#: lib/rpmchecksig.c:176
#, 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:274
+#: lib/rpmchecksig.c:275
#, fuzzy, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmReadSignature nie powiod³o siê\n"
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, 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:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr "NIE DOBRZE"
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
msgid " (MISSING KEYS:"
msgstr " (BRAK KLUCZY:"
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr "(NIEWIARYGODNE KLUCZE:"
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr "OK"
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
#, fuzzy
msgid "NO "
msgstr "NIE DOBRZE"
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, fuzzy, c-format
msgid " %s A %s\tB %s\n"
msgstr " rpm {--version}"
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n"
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "nie podano nazw plików do zainstalowania"
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, 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:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr "... jako %s\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s pomijany - transmisja %s nie powiod³a siê\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakiet %s nie jest przesuwalny\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, c-format
msgid "error reading from file %s\n"
msgstr "b³±d czytania z pliku %s\n"
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "plik %s wymaga nowszej wersji RPM\n"
-#: lib/rpminstall.c:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie mo¿e byæ zainstalowany\n"
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, 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:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "niespe³nione zale¿no¶ci:\n"
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
msgid "installing binary packages\n"
msgstr "instalacja pakietów binarnych\n"
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "nie mo¿na otworzyæ pliku %s: %s"
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" okre¶la wiele pakietów\n"
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
msgid "removing these packages would break dependencies:\n"
msgstr "usuniêcie tych pakietów zerwie zale¿no¶ci:\n"
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nie mo¿na otworzyæ %s\n"
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr "Instalacja %s\n"
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2628,6 +2546,88 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "odczyt nie powiód³ siê: %s (%d)"
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, fuzzy, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr "pakiet %s-%s-%s zbudowano dla innej architektury"
+
+#: lib/rpmps.c:221
+#, fuzzy, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr "pakiet %s-%s-%s zbudowano dla innego systemu operacyjnego"
+
+#: lib/rpmps.c:226
+#, fuzzy, c-format
+msgid "package %s is already installed"
+msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany"
+
+#: lib/rpmps.c:231
+#, fuzzy, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "pakiet %s nie jest przesuwalny\n"
+
+#: lib/rpmps.c:236
+#, c-format
+msgid "file %s conflicts between attempted installs of %s and %s"
+msgstr ""
+
+#: lib/rpmps.c:241
+#, 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/rpmps.c:246
+#, 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/rpmps.c:251
+#, 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/rpmps.c:261
+#, 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/rpmps.c:266
+#, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr ""
+
+#: lib/rpmps.c:270
+#, 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/rpmps.c:274
+#, 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/rpmps.c:279
+#, 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/rpmps.c:360
+#, fuzzy
+msgid "conflicts with"
+msgstr " jest w konflikcie z %s-%s-%s\n"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "is needed by"
+msgstr " jest wymagany przez %s-%s-%s\n"
+
#: lib/rpmrc.c:191
#, fuzzy, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2723,176 +2723,177 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Nie mo¿na otworzyæ %s do odczytu: %s."
-#: lib/rpmts.c:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr ""
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr "plik nieregularny -- sprawdzanie rozmiaru pominiête\n"
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:147
+#: lib/signature.c:148
#, fuzzy, c-format
msgid " Actual size: %12d\n"
msgstr "Rozmiar sygnatury: %d\n"
-#: lib/signature.c:167
+#: lib/signature.c:168
msgid "No signature\n"
msgstr "Brak sygnatury\n"
-#: lib/signature.c:171
+#: lib/signature.c:172
msgid "Old PGP signature\n"
msgstr "Stara sygnatura PGP\n"
-#: lib/signature.c:182
+#: lib/signature.c:183
#, fuzzy
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Stara (tylko wewnêtrzna) sygnatura! Sk±d Ty to wzi±³e¶!?"
-#: lib/signature.c:232
+#: lib/signature.c:233
#, fuzzy, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "Rozmiar sygnatury: %d\n"
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "Nie mo¿na uruchomiæ %s"
-#: lib/signature.c:327
+#: lib/signature.c:328
#, fuzzy
msgid "pgp failed\n"
msgstr "pgp nie powiod³o siê"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
#, fuzzy
msgid "pgp failed to write signature\n"
msgstr "zapisanie sygnatury przez pgp nie powiod³o siê"
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr "rozmiar sygnatury PGP: %d\n"
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
#, fuzzy
msgid "unable to read the signature\n"
msgstr "nie mo¿na odczytaæ sygnatury"
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "Mam %d bajtów sygnatury PGP\n"
-#: lib/signature.c:425
+#: lib/signature.c:426
#, fuzzy
msgid "gpg failed\n"
msgstr "gpg nie powiod³o siê"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "zapisanie sygnatury przez gpg nie powiod³o siê"
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr "rozmiar sygnatury GPG: %d\n"
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "Mam %d bajtów sygnatury GPG\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, fuzzy, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "B³êdny %%_signature spec w pliku makra.\n"
-#: lib/signature.c:743
+#: lib/signature.c:744
#, fuzzy, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Musisz ustawiæ \"%%_gpg_name\" w pliku swego makra"
-#: lib/signature.c:756
+#: lib/signature.c:757
#, fuzzy, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Musisz ustawiæ \"%%_pgp_name\" w pliku swego makra"
-#: lib/signature.c:800
+#: lib/signature.c:801
#, fuzzy
msgid "Header+Payload size: "
msgstr "Rozmiar nag³ówka jest zbyt du¿y"
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
#, fuzzy
msgid "V3 RSA/MD5 signature: "
msgstr "pomiñ wszelkie sygnatury MD5"
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
#, fuzzy
msgid "V3 DSA signature: "
msgstr "Brak sygnatury\n"
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, fuzzy, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Blok sygnatury: %d\n"
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s pominiêty z powodu flagi missingok\n"
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, fuzzy, c-format
msgid "excluding directory %s\n"
msgstr "tworzenie katalogu: %s\n"
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr ""
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, fuzzy, c-format
msgid "missing %s"
msgstr "brak %s\n"
-#: lib/verify.c:379
+#: lib/verify.c:380
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 41e5885f3..ac687eede 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-0400\n"
-#: build.c:39
+#: build.c:40
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "lista dependncias do pacote"
# , c-format
-#: build.c:70
+#: build.c:71
#, fuzzy, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build.c:150 build.c:162
+#: build.c:151 build.c:163
#, fuzzy, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "No consegui abrir: %s\n"
# , c-format
#. Give up
-#: build.c:169
+#: build.c:170
#, 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:197
+#: build.c:198
#, 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:237
+#: build.c:238
#, fuzzy, c-format
msgid "failed to stat %s: %m\n"
msgstr "No consegui abrir: %s\n"
-#: build.c:242
+#: build.c:243
#, fuzzy, c-format
msgid "File %s is not a regular file.\n"
msgstr "no foi passado pacote para instalao"
-#: build.c:251
+#: build.c:252
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
#. parse up the build operators
-#: build.c:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:321
+#: build.c:322
#, 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:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr "mostra a verso do programa rpm sendo usado"
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:122
#, fuzzy
msgid "print macro expansion of <expr>+"
msgstr "mostra a verso do programa rpm sendo usado"
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr "envia a saida padro para <cmd>"
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr "use <diretrio> como diretrio raiz"
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:183
+#: rpmqv.c:184
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr ""
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr ""
# , c-format
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 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:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verso %s\n"
-#: rpmqv.c:238
+#: rpmqv.c:239
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:240
#, 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:251
+#: rpmqv.c:252
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "uso: rpm {--help}"
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:605
+#: rpmqv.c:606
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Use -e ou --erase no lugar.\n"
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr "somente um modo principal pode ser especificado"
-#: rpmqv.c:681
+#: rpmqv.c:682
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:685
+#: rpmqv.c:686
#, fuzzy
msgid "unexpected query flags"
msgstr "fonte de pesquisa no esperado"
-#: rpmqv.c:688
+#: rpmqv.c:689
#, fuzzy
msgid "unexpected query format"
msgstr "fonte de pesquisa no esperado"
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr "fonte de pesquisa no esperado"
-#: rpmqv.c:732
+#: rpmqv.c:733
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:738
+#: rpmqv.c:739
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "somente instalao e atualizao podem ser foradas"
-#: rpmqv.c:740
+#: rpmqv.c:741
#, fuzzy
msgid "files may only be relocated during package installation"
msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:743
+#: rpmqv.c:744
#, fuzzy
msgid "only one of --prefix or --relocate may be used"
msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
-#: rpmqv.c:746
+#: rpmqv.c:747
#, 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:749
+#: rpmqv.c:750
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix somente pode ser usada quando se est instalando novos pacotes"
-#: rpmqv.c:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr "argumentos para --prefix devem comear com uma /"
-#: rpmqv.c:755
+#: rpmqv.c:756
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
"--hash (-h) somente podem ser especificado durante instalaes de pacotes"
-#: rpmqv.c:759
+#: rpmqv.c:760
msgid "--percent may only be specified during package installation"
msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:764
+#: rpmqv.c:765
msgid "--replacefiles may only be specified during package installation"
msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:768
+#: rpmqv.c:769
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
"--replacepkgs somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:772
+#: rpmqv.c:773
msgid "--excludedocs may only be specified during package installation"
msgstr ""
"--excludedocs somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:776
+#: rpmqv.c:777
msgid "--includedocs may only be specified during package installation"
msgstr ""
"--includedocs somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:780
+#: rpmqv.c:781
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
-#: rpmqv.c:784
+#: rpmqv.c:785
msgid "--ignorearch may only be specified during package installation"
msgstr ""
"--ignorearch somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:788
+#: rpmqv.c:789
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:793
+#: rpmqv.c:794
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:797
+#: rpmqv.c:798
msgid "--allmatches may only be specified during package erasure"
msgstr ""
"--allmatches somente pode ser especificado durante desinstalaes de pacotes"
-#: rpmqv.c:801
+#: rpmqv.c:802
#, fuzzy
msgid "--allfiles may only be specified during package installation"
msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:806
+#: rpmqv.c:807
#, 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:811
+#: rpmqv.c:812
#, 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:816
+#: rpmqv.c:817
#, 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:820
+#: rpmqv.c:821
#, 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:825
+#: rpmqv.c:826
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:830
+#: rpmqv.c:831
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:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumentos para --root (-r) devem comear com uma /"
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:871
+#: rpmqv.c:872
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:890
+#: rpmqv.c:891
#, fuzzy
msgid "pgp not found: "
msgstr "no foi passado pacote para desinstalao"
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr "Checagem de pass phrase falhou\n"
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr "Pass phrase ok.\n"
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:913
+#: rpmqv.c:914
msgid "--sign may only be used during package building"
msgstr "--sign somente pode ser usado durante a construo de pacotes"
-#: rpmqv.c:930
+#: rpmqv.c:931
#, fuzzy
msgid "exec failed\n"
msgstr "Construo falhou.\n"
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr "no foram passados pacotes para reconstruo"
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr "no foi passado arquivo spec para construo"
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr "no foram passados arquivos tar para construo"
-#: rpmqv.c:1055
+#: rpmqv.c:1056
#, fuzzy
msgid "no packages given for erase"
msgstr "no foram passados pacotes para assinatura"
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr "no foi passado pacote para instalao"
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr "no foi passado argumento para pesquisa"
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr "no foi passado argumento para verificao"
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr "argumentos no esperados em --querytags"
-#: rpmqv.c:1149
+#: rpmqv.c:1150
#, fuzzy
msgid "no arguments given"
msgstr "no foi passado argumento para pesquisa"
# , c-format
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
#, 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:152
+#: build/files.c:1826 build/pack.c:154
#, 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:85
+#: build/pack.c:87
#, fuzzy, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:88
+#: build/pack.c:90
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:110
+#: build/pack.c:112
#, fuzzy, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:117
+#: build/pack.c:119
#, fuzzy, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:220
+#: build/pack.c:222
#, fuzzy, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:227
+#: build/pack.c:229
#, fuzzy, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:234
+#: build/pack.c:236
#, fuzzy, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:241
+#: build/pack.c:243
#, fuzzy, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:249
+#: build/pack.c:251
#, fuzzy, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:264
+#: build/pack.c:266
#, fuzzy, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:292
+#: build/pack.c:294
#, fuzzy, c-format
msgid "readRPM: open %s: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:302
+#: build/pack.c:304
#, fuzzy, c-format
msgid "readRPM: read %s: %s\n"
msgstr "No consegui ler o arquivo spec de %s\n"
# , c-format
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "No consegui abrir: %s\n"
-#: build/pack.c:339
+#: build/pack.c:341
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr ""
-#: build/pack.c:348
+#: build/pack.c:350
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr ""
# , c-format
-#: build/pack.c:477
+#: build/pack.c:479
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:496
+#: build/pack.c:498
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "No consegui abrir: %s\n"
-#: build/pack.c:506
+#: build/pack.c:508
msgid "Bad CSA data\n"
msgstr ""
# , c-format
-#: build/pack.c:542
+#: build/pack.c:544
#, fuzzy
msgid "Unable to write final header\n"
msgstr "No consegui abrir: %s\n"
-#: build/pack.c:562
+#: build/pack.c:564
#, fuzzy, c-format
msgid "Generating signature: %d\n"
msgstr "gere assinatura PGP"
# , c-format
-#: build/pack.c:580
+#: build/pack.c:582
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:588
+#: build/pack.c:590
#, fuzzy, c-format
msgid "Could not open %s: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:639
+#: build/pack.c:641
#, fuzzy, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:650
+#: build/pack.c:652
#, fuzzy, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:664
+#: build/pack.c:666
#, fuzzy, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:674
+#: build/pack.c:676
#, fuzzy, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: build/pack.c:680
+#: build/pack.c:682
#, fuzzy, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr ""
-#: build/pack.c:772
+#: build/pack.c:774
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
# , c-format
-#: build/pack.c:789
+#: build/pack.c:791
#, fuzzy, c-format
msgid "cannot create %s: %s\n"
msgstr "No consegui abrir: %s\n"
@@ -1578,34 +1578,34 @@ msgstr ""
msgid " failed - "
msgstr "Construo falhou.\n"
-#: lib/depends.c:155
+#: lib/depends.c:156
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "no foi passado pacote para instalao"
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:425
+#: lib/depends.c:426
msgid "(rpmlib provides)"
msgstr ""
# , c-format
-#: lib/depends.c:446
+#: lib/depends.c:447
#, fuzzy
msgid "(db files)"
msgstr "No consegui abrir: %s\n"
-#: lib/depends.c:458
+#: lib/depends.c:459
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:471
+#: lib/depends.c:472
#, fuzzy
msgid "(db package)"
msgstr "pesquise todos os pacotes"
@@ -1622,31 +1622,31 @@ msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "No consegui abrir: %s\n"
#. Record all relations.
-#: lib/depends.c:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1696,50 +1696,50 @@ msgstr "No consegui abrir: %s\n"
msgid "file %s is on an unknown device\n"
msgstr ""
-#: lib/fsm.c:318
+#: lib/fsm.c:320
msgid "========== Directories not explictly included in package:\n"
msgstr ""
# , c-format
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, fuzzy, c-format
msgid "%10d %s\n"
msgstr "No consegui ler o arquivo spec de %s\n"
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
# , c-format
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "No consegui abrir: %s\n"
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "Construo falhou.\n"
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "Construo falhou.\n"
# , c-format
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "No consegui abrir: %s\n"
@@ -1750,43 +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:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:181
+#: lib/package.c:182
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:189
+#: lib/package.c:190
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr ""
# , c-format
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "No consegui abrir: %s\n"
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
# , c-format
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "No consegui abrir: %s\n"
@@ -2251,418 +2251,340 @@ msgstr "assine um pacote (descarte a assinatura corrente)"
msgid "generate signature"
msgstr "gere assinatura PGP"
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: 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:226
-#, fuzzy, c-format
-msgid "package %s is intended for a %s operating system"
-msgstr "no foi passado pacote para instalao"
-
-#: lib/problems.c:231
-#, fuzzy, c-format
-msgid "package %s is already installed"
-msgstr "no foi passado pacote para instalao"
-
-#: 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:241
-#, c-format
-msgid "file %s conflicts between attempted installs of %s and %s"
-msgstr ""
-
-#: lib/problems.c:246
-#, c-format
-msgid "file %s from install of %s conflicts with file from package %s"
-msgstr ""
-
-#: 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:256
-#, c-format
-msgid "installing package %s needs %ld%cb on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:266
-#, c-format
-msgid "installing package %s needs %ld inodes on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:271
-#, c-format
-msgid "package %s pre-transaction syscall(s): %s failed: %s"
-msgstr ""
-
-#: 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:279
-#, fuzzy, c-format
-msgid "package %s has unsatisfied Conflicts: %s\n"
-msgstr "no foi passado pacote para instalao"
-
-#: lib/problems.c:284
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s"
-msgstr ""
-
-#: lib/problems.c:365
-msgid "conflicts with"
-msgstr ""
-
-#: lib/problems.c:365
-msgid "is needed by"
-msgstr ""
-
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
# , c-format
-#: lib/psm.c:448
+#: lib/psm.c:449
#, fuzzy, c-format
msgid "cannot create %%%s %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: lib/psm.c:454
+#: lib/psm.c:455
#, fuzzy, c-format
msgid "cannot write to %%%s %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/psm.c:485
+#: lib/psm.c:486
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:601
+#: lib/psm.c:602
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: lib/psm.c:720
+#: lib/psm.c:721
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "no execute nenhum estgio"
-#: lib/psm.c:890
+#: lib/psm.c:891
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:897
+#: lib/psm.c:898
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, fuzzy, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr "no foi passado pacote para instalao"
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "Construo falhou.\n"
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr ""
# , c-format
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "Construo falhou.\n"
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr ""
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr ""
-#: lib/query.c:289
+#: lib/query.c:290
#, fuzzy
msgid "not installed "
msgstr "no foi passado pacote para instalao"
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr ""
-#: lib/query.c:295
+#: lib/query.c:296
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr ""
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "no foi passado pacote para instalao"
# , c-format
-#: lib/query.c:465
+#: lib/query.c:466
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "Construo falhou.\n"
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:637
+#: lib/query.c:638
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "no foram passados pacotes para assinatura"
-#: lib/query.c:707
+#: lib/query.c:708
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:728
+#: lib/query.c:729
#, fuzzy
msgid "no packages\n"
msgstr "pesquise todos os pacotes"
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:759
#, fuzzy, c-format
msgid "no package triggers %s\n"
msgstr "no foram passados pacotes para assinatura"
# , c-format
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "No consegui ler o arquivo spec de %s\n"
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "no foram passados pacotes para assinatura"
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:911
+#: lib/query.c:912
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:915
+#: lib/query.c:916
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:945
+#: lib/query.c:946
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:950
+#: lib/query.c:951
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, fuzzy, c-format
msgid "package %s is not installed\n"
msgstr "no foi passado pacote para instalao"
# , c-format
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
#, fuzzy
msgid "(added files)"
msgstr "No consegui abrir: %s\n"
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
msgid "(added provide)"
msgstr ""
# , c-format
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "Construo falhou.\n"
# , c-format
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:175
+#: lib/rpmchecksig.c:176
#, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:274
+#: lib/rpmchecksig.c:275
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
# , c-format
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "NO "
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "no foi passado pacote para instalao"
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "no foi passado pacote para instalao"
@@ -2675,90 +2597,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:307
+#: lib/rpminstall.c:308
#, 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:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "no foi passado pacote para instalao"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "no foi passado pacote para instalao"
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "lista dependncias do pacote"
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
#, fuzzy
msgid "installing binary packages\n"
msgstr "instale pacote"
# , c-format
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
#, fuzzy
msgid "removing these packages would break dependencies:\n"
msgstr "lista dependncias do pacote"
# , c-format
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "no foi passado pacote para desinstalao"
@@ -2769,6 +2691,84 @@ msgstr "no foi passado pacote para desinstalao"
msgid "read failed: %s (%d)\n"
msgstr "No consegui abrir: %s\n"
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, fuzzy, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr "no foi passado pacote para instalao"
+
+#: lib/rpmps.c:221
+#, fuzzy, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr "no foi passado pacote para instalao"
+
+#: lib/rpmps.c:226
+#, fuzzy, c-format
+msgid "package %s is already installed"
+msgstr "no foi passado pacote para instalao"
+
+#: lib/rpmps.c:231
+#, fuzzy, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "no foi passado pacote para instalao"
+
+#: lib/rpmps.c:236
+#, c-format
+msgid "file %s conflicts between attempted installs of %s and %s"
+msgstr ""
+
+#: lib/rpmps.c:241
+#, c-format
+msgid "file %s from install of %s conflicts with file from package %s"
+msgstr ""
+
+#: lib/rpmps.c:246
+#, fuzzy, c-format
+msgid "package %s (which is newer than %s) is already installed"
+msgstr "no foi passado pacote para instalao"
+
+#: lib/rpmps.c:251
+#, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:261
+#, c-format
+msgid "installing package %s needs %ld inodes on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:266
+#, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr ""
+
+#: lib/rpmps.c:270
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Requires: %s\n"
+msgstr "no foi passado pacote para instalao"
+
+#: lib/rpmps.c:274
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Conflicts: %s\n"
+msgstr "no foi passado pacote para instalao"
+
+#: lib/rpmps.c:279
+#, c-format
+msgid "unknown error %d encountered while manipulating package %s"
+msgstr ""
+
+#: lib/rpmps.c:360
+msgid "conflicts with"
+msgstr ""
+
+#: lib/rpmps.c:360
+msgid "is needed by"
+msgstr ""
+
#: lib/rpmrc.c:191
#, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2871,156 +2871,161 @@ msgid "Unable to open %s for reading: %s.\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: lib/rpmts.c:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr ""
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:147
+#: lib/signature.c:148
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:167
+#: lib/signature.c:168
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:171
+#: lib/signature.c:172
#, fuzzy
msgid "Old PGP signature\n"
msgstr "gere assinatura PGP"
-#: lib/signature.c:182
+#: lib/signature.c:183
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:232
+#: lib/signature.c:233
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
# , c-format
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "No consegui ler o arquivo spec de %s\n"
-#: lib/signature.c:327
+#: lib/signature.c:328
#, fuzzy
msgid "pgp failed\n"
msgstr "Construo falhou.\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
#, fuzzy
msgid "pgp failed to write signature\n"
msgstr "gere assinatura PGP"
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
#, fuzzy
msgid "unable to read the signature\n"
msgstr "gere assinatura PGP"
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:425
+#: lib/signature.c:426
#, fuzzy
msgid "gpg failed\n"
msgstr "Construo falhou.\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "gere assinatura PGP"
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:743
+#: lib/signature.c:744
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:756
+#: lib/signature.c:757
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:800
+#: lib/signature.c:801
msgid "Header+Payload size: "
msgstr ""
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
#, fuzzy
msgid "V3 RSA/MD5 signature: "
msgstr "desconsidere quaisquer assinaturas MD5"
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
#, fuzzy
msgid "V3 DSA signature: "
msgstr "gere assinatura PGP"
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
@@ -3034,21 +3039,17 @@ msgstr ""
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, fuzzy, c-format
msgid "excluding directory %s\n"
msgstr "RPM verso %s\n"
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr ""
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:379
+#: lib/verify.c:380
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "lista dependncias do pacote"
diff --git a/po/ro.po b/po/ro.po
index 98a39102a..fdbe37944 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-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:39
+#: build.c:40
msgid "Failed build dependencies:\n"
msgstr ""
-#: build.c:70
+#: build.c:71
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr ""
-#: build.c:150 build.c:162
+#: build.c:151 build.c:163
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr ""
#. Give up
-#: build.c:169
+#: build.c:170
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr ""
-#: build.c:197
+#: build.c:198
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr ""
-#: build.c:237
+#: build.c:238
#, c-format
msgid "failed to stat %s: %m\n"
msgstr ""
-#: build.c:242
+#: build.c:243
#, c-format
msgid "File %s is not a regular file.\n"
msgstr ""
-#: build.c:251
+#: build.c:252
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
#. parse up the build operators
-#: build.c:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:321
+#: build.c:322
#, c-format
msgid "Building for target %s\n"
msgstr ""
@@ -73,357 +73,357 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:122
msgid "print macro expansion of <expr>+"
msgstr ""
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:183
+#: rpmqv.c:184
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr ""
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:238
+#: rpmqv.c:239
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:240
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:251
+#: rpmqv.c:252
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:605
+#: rpmqv.c:606
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:681
+#: rpmqv.c:682
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:685
+#: rpmqv.c:686
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:688
+#: rpmqv.c:689
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:732
+#: rpmqv.c:733
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:739
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:740
+#: rpmqv.c:741
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:743
+#: rpmqv.c:744
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:747
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:750
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:756
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:759
+#: rpmqv.c:760
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:764
+#: rpmqv.c:765
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:768
+#: rpmqv.c:769
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:772
+#: rpmqv.c:773
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:776
+#: rpmqv.c:777
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:780
+#: rpmqv.c:781
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:784
+#: rpmqv.c:785
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:788
+#: rpmqv.c:789
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:793
+#: rpmqv.c:794
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:797
+#: rpmqv.c:798
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:801
+#: rpmqv.c:802
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:806
+#: rpmqv.c:807
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:811
+#: rpmqv.c:812
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:816
+#: rpmqv.c:817
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:820
+#: rpmqv.c:821
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:825
+#: rpmqv.c:826
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:830
+#: rpmqv.c:831
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:871
+#: rpmqv.c:872
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:890
+#: rpmqv.c:891
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:913
+#: rpmqv.c:914
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:930
+#: rpmqv.c:931
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1055
+#: rpmqv.c:1056
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1149
+#: rpmqv.c:1150
msgid "no arguments given"
msgstr ""
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
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:152
+#: build/files.c:1826 build/pack.c:154
#, c-format
msgid "line: %s\n"
msgstr ""
@@ -705,152 +705,152 @@ msgstr ""
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
-#: build/pack.c:85
+#: build/pack.c:87
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr ""
-#: build/pack.c:88
+#: build/pack.c:90
#, c-format
msgid "create archive failed: %s\n"
msgstr ""
-#: build/pack.c:110
+#: build/pack.c:112
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr ""
-#: build/pack.c:117
+#: build/pack.c:119
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr ""
-#: build/pack.c:220
+#: build/pack.c:222
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr ""
-#: build/pack.c:227
+#: build/pack.c:229
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr ""
-#: build/pack.c:234
+#: build/pack.c:236
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr ""
-#: build/pack.c:241
+#: build/pack.c:243
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr ""
-#: build/pack.c:249
+#: build/pack.c:251
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr ""
-#: build/pack.c:264
+#: build/pack.c:266
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr ""
-#: build/pack.c:292
+#: build/pack.c:294
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr ""
-#: build/pack.c:302
+#: build/pack.c:304
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr ""
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr ""
-#: build/pack.c:339
+#: build/pack.c:341
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr ""
-#: build/pack.c:348
+#: build/pack.c:350
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr ""
-#: build/pack.c:477
+#: build/pack.c:479
msgid "Unable to create immutable header region.\n"
msgstr ""
-#: build/pack.c:496
+#: build/pack.c:498
msgid "Unable to write temp header\n"
msgstr ""
-#: build/pack.c:506
+#: build/pack.c:508
msgid "Bad CSA data\n"
msgstr ""
-#: build/pack.c:542
+#: build/pack.c:544
msgid "Unable to write final header\n"
msgstr ""
-#: build/pack.c:562
+#: build/pack.c:564
#, c-format
msgid "Generating signature: %d\n"
msgstr ""
-#: build/pack.c:580
+#: build/pack.c:582
msgid "Unable to reload signature header.\n"
msgstr ""
-#: build/pack.c:588
+#: build/pack.c:590
#, c-format
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
-#: build/pack.c:639
+#: build/pack.c:641
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr ""
-#: build/pack.c:650
+#: build/pack.c:652
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr ""
-#: build/pack.c:664
+#: build/pack.c:666
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr ""
-#: build/pack.c:674
+#: build/pack.c:676
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr ""
-#: build/pack.c:680
+#: build/pack.c:682
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr ""
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr ""
-#: build/pack.c:772
+#: build/pack.c:774
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:789
+#: build/pack.c:791
#, c-format
msgid "cannot create %s: %s\n"
msgstr ""
@@ -1404,32 +1404,32 @@ msgstr ""
msgid " failed - "
msgstr ""
-#: lib/depends.c:155
+#: lib/depends.c:156
#, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr ""
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:425
+#: lib/depends.c:426
msgid "(rpmlib provides)"
msgstr ""
-#: lib/depends.c:446
+#: lib/depends.c:447
msgid "(db files)"
msgstr ""
-#: lib/depends.c:458
+#: lib/depends.c:459
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:471
+#: lib/depends.c:472
msgid "(db package)"
msgstr ""
@@ -1444,31 +1444,31 @@ msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1515,46 +1515,46 @@ msgstr ""
msgid "file %s is on an unknown device\n"
msgstr ""
-#: lib/fsm.c:318
+#: lib/fsm.c:320
msgid "========== Directories not explictly included in package:\n"
msgstr ""
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, c-format
msgid "%10d %s\n"
msgstr ""
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, c-format
msgid "%s saved as %s\n"
msgstr ""
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -1564,41 +1564,41 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:181
+#: lib/package.c:182
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:189
+#: lib/package.c:190
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2006,484 +2006,406 @@ msgstr ""
msgid "generate signature"
msgstr ""
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: lib/problems.c:221
-#, c-format
-msgid "package %s is intended for a %s architecture"
-msgstr ""
-
-#: lib/problems.c:226
-#, c-format
-msgid "package %s is intended for a %s operating system"
-msgstr ""
-
-#: lib/problems.c:231
-#, c-format
-msgid "package %s is already installed"
-msgstr ""
-
-#: lib/problems.c:236
-#, c-format
-msgid "path %s in package %s is not relocateable"
-msgstr ""
-
-#: lib/problems.c:241
-#, c-format
-msgid "file %s conflicts between attempted installs of %s and %s"
-msgstr ""
-
-#: lib/problems.c:246
-#, c-format
-msgid "file %s from install of %s conflicts with file from package %s"
-msgstr ""
-
-#: lib/problems.c:251
-#, c-format
-msgid "package %s (which is newer than %s) is already installed"
-msgstr ""
-
-#: lib/problems.c:256
-#, c-format
-msgid "installing package %s needs %ld%cb on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:266
-#, c-format
-msgid "installing package %s needs %ld inodes on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:271
-#, c-format
-msgid "package %s pre-transaction syscall(s): %s failed: %s"
-msgstr ""
-
-#: lib/problems.c:275
-#, c-format
-msgid "package %s has unsatisfied Requires: %s\n"
-msgstr ""
-
-#: lib/problems.c:279
-#, c-format
-msgid "package %s has unsatisfied Conflicts: %s\n"
-msgstr ""
-
-#: lib/problems.c:284
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s"
-msgstr ""
-
-#: lib/problems.c:365
-msgid "conflicts with"
-msgstr ""
-
-#: lib/problems.c:365
-msgid "is needed by"
-msgstr ""
-
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/psm.c:448
+#: lib/psm.c:449
#, c-format
msgid "cannot create %%%s %s\n"
msgstr ""
-#: lib/psm.c:454
+#: lib/psm.c:455
#, c-format
msgid "cannot write to %%%s %s\n"
msgstr ""
-#: lib/psm.c:485
+#: lib/psm.c:486
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:601
+#: lib/psm.c:602
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:720
+#: lib/psm.c:721
#, c-format
msgid "%s: running %s scriptlet\n"
msgstr ""
-#: lib/psm.c:890
+#: lib/psm.c:891
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:897
+#: lib/psm.c:898
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr ""
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr ""
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, c-format
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr ""
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr ""
-#: lib/query.c:289
+#: lib/query.c:290
msgid "not installed "
msgstr ""
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr ""
-#: lib/query.c:295
+#: lib/query.c:296
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr ""
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:465
+#: lib/query.c:466
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:637
+#: lib/query.c:638
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
-#: lib/query.c:707
+#: lib/query.c:708
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:728
+#: lib/query.c:729
msgid "no packages\n"
msgstr ""
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:759
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, c-format
msgid "malformed %s: %s\n"
msgstr ""
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, c-format
msgid "no package matches %s: %s\n"
msgstr ""
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:911
+#: lib/query.c:912
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:915
+#: lib/query.c:916
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:945
+#: lib/query.c:946
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:950
+#: lib/query.c:951
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, c-format
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
msgid "(added files)"
msgstr ""
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
msgid "(added provide)"
msgstr ""
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:175
+#: lib/rpmchecksig.c:176
#, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:274
+#: lib/rpmchecksig.c:275
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "NO "
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2493,6 +2415,84 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr ""
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr ""
+
+#: lib/rpmps.c:221
+#, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr ""
+
+#: lib/rpmps.c:226
+#, c-format
+msgid "package %s is already installed"
+msgstr ""
+
+#: lib/rpmps.c:231
+#, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr ""
+
+#: lib/rpmps.c:236
+#, c-format
+msgid "file %s conflicts between attempted installs of %s and %s"
+msgstr ""
+
+#: lib/rpmps.c:241
+#, c-format
+msgid "file %s from install of %s conflicts with file from package %s"
+msgstr ""
+
+#: lib/rpmps.c:246
+#, c-format
+msgid "package %s (which is newer than %s) is already installed"
+msgstr ""
+
+#: lib/rpmps.c:251
+#, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:261
+#, c-format
+msgid "installing package %s needs %ld inodes on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:266
+#, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr ""
+
+#: lib/rpmps.c:270
+#, c-format
+msgid "package %s has unsatisfied Requires: %s\n"
+msgstr ""
+
+#: lib/rpmps.c:274
+#, c-format
+msgid "package %s has unsatisfied Conflicts: %s\n"
+msgstr ""
+
+#: lib/rpmps.c:279
+#, c-format
+msgid "unknown error %d encountered while manipulating package %s"
+msgstr ""
+
+#: lib/rpmps.c:360
+msgid "conflicts with"
+msgstr ""
+
+#: lib/rpmps.c:360
+msgid "is needed by"
+msgstr ""
+
#: lib/rpmrc.c:191
#, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2588,167 +2588,168 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/rpmts.c:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr ""
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:147
+#: lib/signature.c:148
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:167
+#: lib/signature.c:168
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:171
+#: lib/signature.c:172
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:182
+#: lib/signature.c:183
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:232
+#: lib/signature.c:233
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, c-format
msgid "Could not exec %s: %s\n"
msgstr ""
-#: lib/signature.c:327
+#: lib/signature.c:328
msgid "pgp failed\n"
msgstr ""
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
msgid "pgp failed to write signature\n"
msgstr ""
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:425
+#: lib/signature.c:426
msgid "gpg failed\n"
msgstr ""
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:743
+#: lib/signature.c:744
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:756
+#: lib/signature.c:757
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:800
+#: lib/signature.c:801
msgid "Header+Payload size: "
msgstr ""
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
msgid "V3 RSA/MD5 signature: "
msgstr ""
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
msgid "V3 DSA signature: "
msgstr ""
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, c-format
msgid "excluding directory %s\n"
msgstr ""
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr ""
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:379
+#: lib/verify.c:380
#, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 621587651..7d8f2aa01 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-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:39
+#: build.c:40
msgid "Failed build dependencies:\n"
msgstr ""
-#: build.c:70
+#: build.c:71
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr ""
-#: build.c:150 build.c:162
+#: build.c:151 build.c:163
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr ""
#. Give up
-#: build.c:169
+#: build.c:170
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr ""
-#: build.c:197
+#: build.c:198
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr ""
-#: build.c:237
+#: build.c:238
#, c-format
msgid "failed to stat %s: %m\n"
msgstr ""
-#: build.c:242
+#: build.c:243
#, c-format
msgid "File %s is not a regular file.\n"
msgstr ""
-#: build.c:251
+#: build.c:252
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
#. parse up the build operators
-#: build.c:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:321
+#: build.c:322
#, c-format
msgid "Building for target %s\n"
msgstr ""
@@ -79,357 +79,357 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:122
msgid "print macro expansion of <expr>+"
msgstr ""
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:183
+#: rpmqv.c:184
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr ""
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:238
+#: rpmqv.c:239
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:240
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:251
+#: rpmqv.c:252
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:605
+#: rpmqv.c:606
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:681
+#: rpmqv.c:682
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:685
+#: rpmqv.c:686
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:688
+#: rpmqv.c:689
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:732
+#: rpmqv.c:733
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:739
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:740
+#: rpmqv.c:741
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:743
+#: rpmqv.c:744
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:747
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:750
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:756
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:759
+#: rpmqv.c:760
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:764
+#: rpmqv.c:765
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:768
+#: rpmqv.c:769
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:772
+#: rpmqv.c:773
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:776
+#: rpmqv.c:777
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:780
+#: rpmqv.c:781
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:784
+#: rpmqv.c:785
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:788
+#: rpmqv.c:789
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:793
+#: rpmqv.c:794
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:797
+#: rpmqv.c:798
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:801
+#: rpmqv.c:802
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:806
+#: rpmqv.c:807
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:811
+#: rpmqv.c:812
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:816
+#: rpmqv.c:817
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:820
+#: rpmqv.c:821
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:825
+#: rpmqv.c:826
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:830
+#: rpmqv.c:831
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:871
+#: rpmqv.c:872
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:890
+#: rpmqv.c:891
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:913
+#: rpmqv.c:914
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:930
+#: rpmqv.c:931
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1055
+#: rpmqv.c:1056
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1149
+#: rpmqv.c:1150
msgid "no arguments given"
msgstr ""
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
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:152
+#: build/files.c:1826 build/pack.c:154
#, c-format
msgid "line: %s\n"
msgstr ""
@@ -711,152 +711,152 @@ msgstr ""
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
-#: build/pack.c:85
+#: build/pack.c:87
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr ""
-#: build/pack.c:88
+#: build/pack.c:90
#, c-format
msgid "create archive failed: %s\n"
msgstr ""
-#: build/pack.c:110
+#: build/pack.c:112
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr ""
-#: build/pack.c:117
+#: build/pack.c:119
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr ""
-#: build/pack.c:220
+#: build/pack.c:222
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr ""
-#: build/pack.c:227
+#: build/pack.c:229
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr ""
-#: build/pack.c:234
+#: build/pack.c:236
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr ""
-#: build/pack.c:241
+#: build/pack.c:243
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr ""
-#: build/pack.c:249
+#: build/pack.c:251
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr ""
-#: build/pack.c:264
+#: build/pack.c:266
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr ""
-#: build/pack.c:292
+#: build/pack.c:294
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr ""
-#: build/pack.c:302
+#: build/pack.c:304
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr ""
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr ""
-#: build/pack.c:339
+#: build/pack.c:341
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr ""
-#: build/pack.c:348
+#: build/pack.c:350
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr ""
-#: build/pack.c:477
+#: build/pack.c:479
msgid "Unable to create immutable header region.\n"
msgstr ""
-#: build/pack.c:496
+#: build/pack.c:498
msgid "Unable to write temp header\n"
msgstr ""
-#: build/pack.c:506
+#: build/pack.c:508
msgid "Bad CSA data\n"
msgstr ""
-#: build/pack.c:542
+#: build/pack.c:544
msgid "Unable to write final header\n"
msgstr ""
-#: build/pack.c:562
+#: build/pack.c:564
#, c-format
msgid "Generating signature: %d\n"
msgstr ""
-#: build/pack.c:580
+#: build/pack.c:582
msgid "Unable to reload signature header.\n"
msgstr ""
-#: build/pack.c:588
+#: build/pack.c:590
#, c-format
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
-#: build/pack.c:639
+#: build/pack.c:641
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr ""
-#: build/pack.c:650
+#: build/pack.c:652
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr ""
-#: build/pack.c:664
+#: build/pack.c:666
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr ""
-#: build/pack.c:674
+#: build/pack.c:676
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr ""
-#: build/pack.c:680
+#: build/pack.c:682
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr ""
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr ""
-#: build/pack.c:772
+#: build/pack.c:774
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:789
+#: build/pack.c:791
#, c-format
msgid "cannot create %s: %s\n"
msgstr ""
@@ -1410,32 +1410,32 @@ msgstr ""
msgid " failed - "
msgstr ""
-#: lib/depends.c:155
+#: lib/depends.c:156
#, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr ""
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
msgid "(rpmrc provides)"
msgstr ""
-#: lib/depends.c:425
+#: lib/depends.c:426
msgid "(rpmlib provides)"
msgstr ""
-#: lib/depends.c:446
+#: lib/depends.c:447
msgid "(db files)"
msgstr ""
-#: lib/depends.c:458
+#: lib/depends.c:459
msgid "(db provides)"
msgstr ""
-#: lib/depends.c:471
+#: lib/depends.c:472
msgid "(db package)"
msgstr ""
@@ -1450,31 +1450,31 @@ msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1521,46 +1521,46 @@ msgstr ""
msgid "file %s is on an unknown device\n"
msgstr ""
-#: lib/fsm.c:318
+#: lib/fsm.c:320
msgid "========== Directories not explictly included in package:\n"
msgstr ""
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, c-format
msgid "%10d %s\n"
msgstr ""
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, c-format
msgid "%s saved as %s\n"
msgstr ""
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -1570,41 +1570,41 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:181
+#: lib/package.c:182
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:189
+#: lib/package.c:190
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2012,484 +2012,406 @@ msgstr ""
msgid "generate signature"
msgstr ""
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: lib/problems.c:221
-#, c-format
-msgid "package %s is intended for a %s architecture"
-msgstr ""
-
-#: lib/problems.c:226
-#, c-format
-msgid "package %s is intended for a %s operating system"
-msgstr ""
-
-#: lib/problems.c:231
-#, c-format
-msgid "package %s is already installed"
-msgstr ""
-
-#: lib/problems.c:236
-#, c-format
-msgid "path %s in package %s is not relocateable"
-msgstr ""
-
-#: lib/problems.c:241
-#, c-format
-msgid "file %s conflicts between attempted installs of %s and %s"
-msgstr ""
-
-#: lib/problems.c:246
-#, c-format
-msgid "file %s from install of %s conflicts with file from package %s"
-msgstr ""
-
-#: lib/problems.c:251
-#, c-format
-msgid "package %s (which is newer than %s) is already installed"
-msgstr ""
-
-#: lib/problems.c:256
-#, c-format
-msgid "installing package %s needs %ld%cb on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:266
-#, c-format
-msgid "installing package %s needs %ld inodes on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:271
-#, c-format
-msgid "package %s pre-transaction syscall(s): %s failed: %s"
-msgstr ""
-
-#: lib/problems.c:275
-#, c-format
-msgid "package %s has unsatisfied Requires: %s\n"
-msgstr ""
-
-#: lib/problems.c:279
-#, c-format
-msgid "package %s has unsatisfied Conflicts: %s\n"
-msgstr ""
-
-#: lib/problems.c:284
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s"
-msgstr ""
-
-#: lib/problems.c:365
-msgid "conflicts with"
-msgstr ""
-
-#: lib/problems.c:365
-msgid "is needed by"
-msgstr ""
-
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/psm.c:448
+#: lib/psm.c:449
#, c-format
msgid "cannot create %%%s %s\n"
msgstr ""
-#: lib/psm.c:454
+#: lib/psm.c:455
#, c-format
msgid "cannot write to %%%s %s\n"
msgstr ""
-#: lib/psm.c:485
+#: lib/psm.c:486
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:601
+#: lib/psm.c:602
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:720
+#: lib/psm.c:721
#, c-format
msgid "%s: running %s scriptlet\n"
msgstr ""
-#: lib/psm.c:890
+#: lib/psm.c:891
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:897
+#: lib/psm.c:898
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr ""
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr ""
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, c-format
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr ""
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr ""
-#: lib/query.c:289
+#: lib/query.c:290
msgid "not installed "
msgstr ""
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr ""
-#: lib/query.c:295
+#: lib/query.c:296
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr ""
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:465
+#: lib/query.c:466
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:637
+#: lib/query.c:638
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
-#: lib/query.c:707
+#: lib/query.c:708
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:728
+#: lib/query.c:729
msgid "no packages\n"
msgstr ""
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:759
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, c-format
msgid "malformed %s: %s\n"
msgstr ""
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, c-format
msgid "no package matches %s: %s\n"
msgstr ""
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:911
+#: lib/query.c:912
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:915
+#: lib/query.c:916
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:945
+#: lib/query.c:946
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:950
+#: lib/query.c:951
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, c-format
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
msgid "(added files)"
msgstr ""
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
msgid "(added provide)"
msgstr ""
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:175
+#: lib/rpmchecksig.c:176
#, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr ""
-#: lib/rpmchecksig.c:274
+#: lib/rpmchecksig.c:275
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "NO "
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2499,6 +2421,84 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr ""
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr ""
+
+#: lib/rpmps.c:221
+#, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr ""
+
+#: lib/rpmps.c:226
+#, c-format
+msgid "package %s is already installed"
+msgstr ""
+
+#: lib/rpmps.c:231
+#, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr ""
+
+#: lib/rpmps.c:236
+#, c-format
+msgid "file %s conflicts between attempted installs of %s and %s"
+msgstr ""
+
+#: lib/rpmps.c:241
+#, c-format
+msgid "file %s from install of %s conflicts with file from package %s"
+msgstr ""
+
+#: lib/rpmps.c:246
+#, c-format
+msgid "package %s (which is newer than %s) is already installed"
+msgstr ""
+
+#: lib/rpmps.c:251
+#, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:261
+#, c-format
+msgid "installing package %s needs %ld inodes on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:266
+#, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr ""
+
+#: lib/rpmps.c:270
+#, c-format
+msgid "package %s has unsatisfied Requires: %s\n"
+msgstr ""
+
+#: lib/rpmps.c:274
+#, c-format
+msgid "package %s has unsatisfied Conflicts: %s\n"
+msgstr ""
+
+#: lib/rpmps.c:279
+#, c-format
+msgid "unknown error %d encountered while manipulating package %s"
+msgstr ""
+
+#: lib/rpmps.c:360
+msgid "conflicts with"
+msgstr ""
+
+#: lib/rpmps.c:360
+msgid "is needed by"
+msgstr ""
+
#: lib/rpmrc.c:191
#, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2594,167 +2594,168 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/rpmts.c:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr ""
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:147
+#: lib/signature.c:148
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:167
+#: lib/signature.c:168
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:171
+#: lib/signature.c:172
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:182
+#: lib/signature.c:183
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:232
+#: lib/signature.c:233
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, c-format
msgid "Could not exec %s: %s\n"
msgstr ""
-#: lib/signature.c:327
+#: lib/signature.c:328
msgid "pgp failed\n"
msgstr ""
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
msgid "pgp failed to write signature\n"
msgstr ""
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:425
+#: lib/signature.c:426
msgid "gpg failed\n"
msgstr ""
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:743
+#: lib/signature.c:744
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:756
+#: lib/signature.c:757
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:800
+#: lib/signature.c:801
msgid "Header+Payload size: "
msgstr ""
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
msgid "V3 RSA/MD5 signature: "
msgstr ""
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
msgid "V3 DSA signature: "
msgstr ""
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, c-format
msgid "excluding directory %s\n"
msgstr ""
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr ""
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:379
+#: lib/verify.c:380
#, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index c4633b4bb..f91cd0c85 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-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:39
+#: build.c:40
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÓÂÏÒËÉ:\n"
-#: build.c:70
+#: build.c:71
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ ÓĞÅÃÉÆÉËÁÃÉÉ %s: %s\n"
-#: build.c:150 build.c:162
+#: build.c:151 build.c:163
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ËÁÎÁÌÁ tar: %m\n"
#. Give up
-#: build.c:169
+#: build.c:170
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr "ïÛÉÂËÁ ŞÔÅÎÉÑ ÆÁÊÌÁ ÓĞÅÃÉÆÉËÁÃÉÉ ÉÚ %s\n"
-#: build.c:197
+#: build.c:198
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÅÒÅÉÍÅÎÏ×ÁÔØ %s × %s: %m\n"
-#: build.c:237
+#: build.c:238
#, c-format
msgid "failed to stat %s: %m\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÏÌÕŞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï %s: %m\n"
-#: build.c:242
+#: build.c:243
#, c-format
msgid "File %s is not a regular file.\n"
msgstr "îÅ ÏÂÙŞÎÙÊ ÆÁÊÌ: %s.\n"
-#: build.c:251
+#: build.c:252
#, c-format
msgid "File %s does not appear to be a specfile.\n"
msgstr "æÁÊÌ %s ÎÅ ĞÏÈÏÖ ÎÁ ÆÁÊÌ ÓĞÅÃÉÆÉËÁÃÉÉ.\n"
#. parse up the build operators
-#: build.c:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr "ğÌÁÔÆÏÒÍÙ ÄÌÑ ÓÂÏÒËÉ: %s\n"
-#: build.c:321
+#: build.c:322
#, 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:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr "×Ù×ÅÓÔÉ ÎÏÍÅÒ ×ÅÒÓÉÉ ÜÔÏÊ ĞÒÇÒÁÍÍÙ"
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr "×Ù×ÏÄÉÔØ ÍÉÎÉÍÕÍ ÓÏÏÂİÅÎÉÊ"
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr "×Ù×ÏÄÉÔØ ÂÏÌÅÅ ÄÅÔÁÌØÎÙÅ ÓÏÏÂİÅÎÉÑ"
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr "ÏĞÒÅÄÅÌÉÔØ ÍÁËÒÏÓ <ÉÍÑ> ÓÏ ÚÎÁŞÅÎÉÅÍ <ĞÏÄÓÔÁÎÏ×ËÁ>"
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr "'<ÉÍÑ> <ĞÏÄÓÔÁÎÏ×ËÁ>'"
-#: rpmqv.c:121
+#: rpmqv.c:122
msgid "print macro expansion of <expr>+"
msgstr "×Ù×ÅÓÔÉ ÚÎÁŞÅÎÉÅ ÍÁËÒÏÓÁ <ÉÍÑ>+"
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr "<ÉÍÑ>+"
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr "ĞÏÓÌÁÔØ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ × <cmd>"
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr "<ËÏÍÁÎÄÁ>"
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr "ÉÓĞÏÌØÚÏ×ÁÔØ <ËÁÔÁÌÏÇ> ËÁË ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ"
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr "<ËÁÔÁÌÏÇ>"
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr "ÉÓĞÏÌØÚÏ×ÁÔØ <ÆÁÊÌ:...> ×ÍÅÓÔÏ ÍÁËÒÏÆÁÊÌÁ(Ï×) ĞÏ ÕÍÏÌŞÁÎÉÀ"
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr "<ÆÁÊÌ:...>"
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "ÉÓĞÏÌØÚÏ×ÁÔØ <ÆÁÊÌ:...> ×ÍÅÓÔÏ ÆÁÊÌÁ ÓĞÅÃÉÆÉËÁÃÉÉ ĞÏ ÕÍÏÌŞÁÎÉÀ"
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr "ĞÏËÁÚÁÔØ ÔÅËÕİÅÅ ÚÎÁŞÅÎÉÅ rpmrc É ÍÁËÒÏÓÏ×"
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr "ÚÁĞÒÅÔÉÔØ ÉÓĞÏÌØÚÏ×ÁÎÉÅ libio(3) API"
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr "ÏÔÌÁÄËÁ ĞÒÏÔÏËÏÌÁ ĞÏÔÏËÁ ÄÁÎÎÙÈ"
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr "ÏÔÌÁÄËÁ ĞÒÏÃÅÓÓÁ ××ÏÄÁ/×Ù×ÏÄÁ rpmio"
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr "ÏÔÌÁÄËÁ ÏÂÒÁÂÏÔËÉ URL ËÜÛ"
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr "ğÁÒÁÍÅÔÒÙ ÚÁĞÒÏÓÁ (Ó -q ÉÌÉ --query):"
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr "ğÁÒÁÍÅÔÒÙ ĞÒÏ×ÅÒËÉ (Ó -V ÉÌÉ --verify):"
-#: rpmqv.c:183
+#: rpmqv.c:184
msgid "Signature options:"
msgstr "ğÁÒÁÍÅÔÒÙ ĞÏÄĞÉÓÉ:"
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr "ğÁÒÁÍÅÔÒÙ ÂÁÚÙ ÄÁÎÎÙÈ"
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"ğÁÒÁÍÅÔÒÙ ÓÂÏÒËÉ Ó [ <ÆÁÊÌ ÓĞÅÃÉÆÉËÁÃÉÉ> | <ÔÁÒ ÁÒÈÉ×> | <ÉÓÈÏÄÎÙÊ ĞÁËÅÔ> ]:"
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr "ğÁÒÁÍÅÔÒÙ õÓÔÁÎÏ×ËÉ/ïÂÎÏ×ÌÅÎÉÑ/õÄÁÌÅÎÉÑ:"
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr "ïÂİÉÅ ĞÁÒÁÍÅÔÒÙ ÄÌÑ ×ÓÅÈ ÒÅÖÉÍÏ×:"
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr "RPM ×ÅÒÓÉÑ %s\n"
-#: rpmqv.c:238
+#: rpmqv.c:239
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:239
+#: rpmqv.c:240
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "üÔÕ ĞÒÏÇÒÁÍÍÕ ÍÏÖÎÏ Ó×ÏÂÏÄÎÏ ÒÁÓĞÒÏÓÔÒÁÎÑÔØ ÎÁ ÕÓÌÏ×ÉÑÈ GNU GPL"
-#: rpmqv.c:251
+#: rpmqv.c:252
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "éÓĞÏÌØÚÏ×ÁÎÉÅ: %s {--help}\n"
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr "×ÁÒÉÁÎÔ --rcfile ÂÏÌØÛÅ ÎÅ ÉÓĞÏÌØÚÕÅÔÓÑ.\n"
-#: rpmqv.c:605
+#: rpmqv.c:606
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "÷ÍÅÓÔÏ ÜÔÏÇÏ ÉÓĞÏÌØÚÕÊÔÅ \"--macros <ÆÁÊÌ:...>\".\n"
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ĞÒÉ ÏÂÒÁÂÏÔËÅ ÁÒÇÕÍÅÎÔÏ× (%d) :-(\n"
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr "ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÏÄÉÎ ÉÚ ÏÓÎÏ×ÎÙÈ ÒÅÖÉÍÏ×"
-#: rpmqv.c:681
+#: rpmqv.c:682
msgid "one type of query/verify may be performed at a time"
msgstr "ÚÁ ÏÄÉÎ ÒÁÚ ÍÏÖÅÔ ÂÙÔØ ÉÓĞÏÌÎÅÎ ÔÏÌØËÏ ÏÄÉÎ ÔÉĞ ĞÒÏ×ÅÒËÉ ÉÌÉ ÚÁĞÒÏÓÁ"
-#: rpmqv.c:685
+#: rpmqv.c:686
msgid "unexpected query flags"
msgstr "ÎÅÏÖÉÄÁÎÎÙÅ ÆÌÁÇÉ ÚÁĞÒÏÓÁ"
-#: rpmqv.c:688
+#: rpmqv.c:689
msgid "unexpected query format"
msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÆÏÒÍÁÔ ÚÁĞÒÏÓÁ"
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÉÓÔÏŞÎÉË ÚÁĞÒÏÓÁ"
-#: rpmqv.c:732
+#: rpmqv.c:733
msgid "--dbpath given for operation that does not use a database"
msgstr "ĞÁÒÁÍÅÔÒ --dbpath ÚÁÄÁÎ ÄÌÑ ÏĞÅÒÁÃÉÉ, ÎÅ ÉÓĞÏÌØÚÕÀİÅÊ ÂÁÚÕ ÄÁÎÎÙÈ"
-#: rpmqv.c:738
+#: rpmqv.c:739
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"ĞÒÉÎÕÄÉÔÅÌØÎÙÍÉ ÍÏÇÕÔ ÂÙÔØ ÔÏÌØËÏ ÕÓÔÁÎÏ×ËÁ, ÏÂÎÏ×ÌÅÎÉÅ, ÕÄÁÌÅÎÉÅ ÉÓÈÏÄÎÉËÏ× "
"É ÆÁÊÌÁ ÓĞÅÃÉÆÉËÁÃÉÉ"
-#: rpmqv.c:740
+#: rpmqv.c:741
msgid "files may only be relocated during package installation"
msgstr "ÆÁÊÌÙ ÍÏÇÕÔ ÂÙÔØ ĞÅÒÅÍÅİÅÎÙ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
-#: rpmqv.c:743
+#: rpmqv.c:744
msgid "only one of --prefix or --relocate may be used"
msgstr ""
"ÍÏÖÅÔ ÂÙÔØ ÉÓĞÏÌØÚÏ×ÁÎ ÔÏÌØËÏ ÏÄÉÎ ÉÚ ×ÁÒÉÁÎÔÏ× --prefix ÉÌÉ --relocate"
-#: rpmqv.c:746
+#: rpmqv.c:747
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"×ÁÒÉÁÎÔÙ --relocate É --excludepath ÍÏÖÎÏ ÉÓĞÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ "
"ÎÏ×ÙÈ ĞÁËÅÔÏ×"
-#: rpmqv.c:749
+#: rpmqv.c:750
msgid "--prefix may only be used when installing new packages"
msgstr "×ÁÒÉÁÎÔ --prefix ÍÏÖÎÏ ÉÓĞÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ÎÏ×ÙÈ ĞÁËÅÔÏ×"
-#: rpmqv.c:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr "ÁÒÇÕÍÅÎÔÙ ÄÌÑ --prefix ÄÏÌÖÎÙ ÎÁŞÉÎÁÔØÓÑ Ó /"
-#: rpmqv.c:755
+#: rpmqv.c:756
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
-#: rpmqv.c:759
+#: rpmqv.c:760
msgid "--percent may only be specified during package installation"
msgstr "--percent ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
-#: rpmqv.c:764
+#: rpmqv.c:765
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
-#: rpmqv.c:768
+#: rpmqv.c:769
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
-#: rpmqv.c:772
+#: rpmqv.c:773
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
-#: rpmqv.c:776
+#: rpmqv.c:777
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
-#: rpmqv.c:780
+#: rpmqv.c:781
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
"ÍÏÖÅÔ ÂÙÔØ ÉÓĞÏÌØÚÏ×ÁÎ ÔÏÌØËÏ ÏÄÉÎ ÉÚ ĞÁÒÁÍÅÔÒÏ× --excludedocs ÉÌÉ --"
"includedocs"
-#: rpmqv.c:784
+#: rpmqv.c:785
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
-#: rpmqv.c:788
+#: rpmqv.c:789
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
-#: rpmqv.c:793
+#: rpmqv.c:794
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
-#: rpmqv.c:797
+#: rpmqv.c:798
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ĞÒÉ ÕÄÁÌÅÎÉÉ ĞÁËÅÔÁ"
-#: rpmqv.c:801
+#: rpmqv.c:802
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
-#: rpmqv.c:806
+#: rpmqv.c:807
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ÉÌÉ ÕÄÁÌÅÎÉÉ ĞÁËÅÔÁ"
-#: rpmqv.c:811
+#: rpmqv.c:812
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -335,7 +335,7 @@ msgstr ""
"ĞÁÒÁÍÅÔÒÙ ÚÁĞÒÅÔÁ ÓÃÅÎÁÒÉÅ× ÍÏÇÕÔ ÂÙÔØ ÕËÁÚÁÎÙ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ÉÌÉ "
"ÕÄÁÌÅÎÉÉ ĞÁËÅÔÁ"
-#: rpmqv.c:816
+#: rpmqv.c:817
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -343,7 +343,7 @@ msgstr ""
"ĞÁÒÁÍÅÔÒÙ ÚÁĞÒÅÔÁ ÔÒÉÇÇÅÒÏ× ÍÏÇÕÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ÉÌÉ "
"ÕÄÁÌÅÎÉÉ ĞÁËÅÔÁ(Ï×)"
-#: rpmqv.c:820
+#: rpmqv.c:821
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -351,14 +351,14 @@ msgstr ""
"--nodeps ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ĞÒÉ ÓÂÏÒËÅ, ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ É ĞÒÏ×ÅÒËÉ "
"ĞÁËÅÔÏ×"
-#: rpmqv.c:825
+#: rpmqv.c:826
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ É ÓÂÏÒËÅ ĞÁËÅÔÁ"
-#: rpmqv.c:830
+#: rpmqv.c:831
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -366,87 +366,87 @@ msgstr ""
"--root (-r) ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ, ÚÁĞÒÏÓÁÈ "
"ĞÁËÅÔÁ É ĞÅÒÅÓÔÒÏÅÎÉÉ ÂÁÚÙ ÄÁÎÎÙÈ"
-#: rpmqv.c:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr "ÁÒÇÕÍÅÎÔÙ ÄÌÑ --root (-r) ÄÏÌÖÎÙ ÎÁŞÉÎÁÔØÓÑ Ó /"
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr "ÎÅÔ ÆÁÊÌÏ× ÄÌÑ ĞÏÄĞÉÓÉ\n"
-#: rpmqv.c:871
+#: rpmqv.c:872
#, c-format
msgid "cannot access file %s\n"
msgstr "ÎÅÔ ÄÏÓÔÕĞÁ Ë ÆÁÊÌÕ %s\n"
-#: rpmqv.c:890
+#: rpmqv.c:891
msgid "pgp not found: "
msgstr "pgp ÎÅ ÎÁÊÄÅÎ: "
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr "÷×ÅÄÉÔÅ ËÌÀŞÅ×ÕÀ ÆÒÁÚÕ: "
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr "îÅ×ÅÒÎÁÑ ËÌÀŞÅ×ÁÑ ÆÒÁÚÁ\n"
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr "ëÌÀŞÅ×ÁÑ ÆÒÁÚÁ ĞÒÉÎÑÔÁ.\n"
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "îÅ×ÅÒÎÁÑ ÓĞÅÃÉÆÉËÁÃÉÑ %%_signature × ÍÁËÒÏÆÁÊÌÅ.\n"
-#: rpmqv.c:913
+#: rpmqv.c:914
msgid "--sign may only be used during package building"
msgstr "--sign ÍÏÖÅÔ ÂÙÔØ ÉÓĞÏÌØÚÏ×ÁÎ ÔÏÌØËÏ ĞÒÉ ÓÂÏÒËÅ ĞÁËÅÔÏ×"
-#: rpmqv.c:930
+#: rpmqv.c:931
msgid "exec failed\n"
msgstr "ÚÁĞÕÓË ÎÅ ÕÄÁÌÓÑ\n"
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr "ÎÅ ÚÁÄÁÎÙ ĞÁËÅÔÙ ÄÌÑ ĞÅÒÅÓÂÏÒËÉ"
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr "ÎÅ ÚÁÄÁÎ ÆÁÊÌ ÓĞÅÃÉÆÉËÁÃÉÉ ÄÌÑ ÓÂÏÒËÉ ĞÁËÅÔÁ"
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr "ÎÅ ÚÁÄÁÎÙ tar-ÆÁÊÌÙ ÄÌÑ ÓÂÏÒËÉ ĞÁËÅÔÁ"
-#: rpmqv.c:1055
+#: rpmqv.c:1056
#, fuzzy
msgid "no packages given for erase"
msgstr "ÎÅ ÚÁÄÁÎÙ ĞÁËÅÔÙ ÄÌÑ ĞÏÄĞÉÓÉ"
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr "ÎÅ ÚÁÄÁÎÙ ĞÁËÅÔÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ"
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁĞÒÏÓÁ"
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÄÌÑ ×ÅÒÉÆÉËÁÃÉÉ"
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr "ÎÅÏÖÉÄÁÎÎÙÅ ÁÒÇÕÍÅÎÔÙ ÄÌÑ --querytags "
-#: rpmqv.c:1149
+#: rpmqv.c:1150
#, fuzzy
msgid "no arguments given"
msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁĞÒÏÓÁ"
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
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:152
+#: build/files.c:1826 build/pack.c:154
#, 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:85
+#: build/pack.c:87
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÁÒÈÉ×Á ÎÁ ÆÁÊÌÅ %s: %s\n"
-#: build/pack.c:88
+#: build/pack.c:90
#, c-format
msgid "create archive failed: %s\n"
msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÁÒÈÉ×Á: %s\n"
-#: build/pack.c:110
+#: build/pack.c:112
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "cpio_copy: ÏÛÉÂËÁ ÚÁĞÉÓÉ: %s\n"
-#: build/pack.c:117
+#: build/pack.c:119
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "cpio_copy: ÏÛÉÂËÁ ŞÔÅÎÉÑ: %s\n"
-#: build/pack.c:220
+#: build/pack.c:222
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PreIn: %s\n"
-#: build/pack.c:227
+#: build/pack.c:229
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PreUn: %s\n"
-#: build/pack.c:234
+#: build/pack.c:236
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PostIn: %s\n"
-#: build/pack.c:241
+#: build/pack.c:243
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PostUn: %s\n"
-#: build/pack.c:249
+#: build/pack.c:251
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ VerifyScript: %s\n"
-#: build/pack.c:264
+#: build/pack.c:266
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ Trigger script: %s\n"
-#: build/pack.c:292
+#: build/pack.c:294
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr "readRPM: ÏÔËÒÙÔÉÅ %s: %s\n"
-#: build/pack.c:302
+#: build/pack.c:304
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr "readRPM: ŞÔÅÎÉÅ %s: %s\n"
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ Fseek: %s\n"
-#: build/pack.c:339
+#: build/pack.c:341
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s ÎÅ Ñ×ÌÑÅÔÓÑ ĞÁËÅÔÏÍ RPM\n"
-#: build/pack.c:348
+#: build/pack.c:350
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: ŞÉÔÁÅÔÓÑ ÚÁÇÏÌÏ×ÏË ÉÚ %s\n"
-#: build/pack.c:477
+#: build/pack.c:479
msgid "Unable to create immutable header region.\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÏÍÅÓÔÉÔØ ÚÁÇÏÌÏ×ÏË × ÎÅÒĞÅÒÙ×ÎÕÀ ÏÂÌÁÓÔØ ĞÁÍÑÔÉ.\n"
-#: build/pack.c:496
+#: build/pack.c:498
msgid "Unable to write temp header\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ×ÒÅÍÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË\n"
-#: build/pack.c:506
+#: build/pack.c:508
msgid "Bad CSA data\n"
msgstr "îÅ×ÅÒÎÙÅ ÄÁÎÎÙÅ CSA\n"
-#: build/pack.c:542
+#: build/pack.c:544
msgid "Unable to write final header\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ÏËÏÎŞÁÔÅÌØÎÙÊ ÚÁÇÏÌÏ×ÏË\n"
-#: build/pack.c:562
+#: build/pack.c:564
#, c-format
msgid "Generating signature: %d\n"
msgstr "çÅÎÅÒÉÒÕÅÔÓÑ ĞÏÄĞÉÓØ: %d\n"
-#: build/pack.c:580
+#: build/pack.c:582
msgid "Unable to reload signature header.\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÅÒÅÚÁÇÒÕÚÉÔØ ÚÁÇÏÌÏ×ÏË ĞÏÄĞÉÓÉ.\n"
-#: build/pack.c:588
+#: build/pack.c:590
#, c-format
msgid "Could not open %s: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, c-format
msgid "Unable to write package: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ĞÁËÅÔ: %s\n"
-#: build/pack.c:639
+#: build/pack.c:641
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÃÅÌØ ĞÏÄĞÉÓÉ %s: %s\n"
-#: build/pack.c:650
+#: build/pack.c:652
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ÚÁÇÏÌÏ×ÏË ÉÚ %s: %s\n"
-#: build/pack.c:664
+#: build/pack.c:666
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ÚÁÇÏÌÏ×ÏË × %s: %s\n"
-#: build/pack.c:674
+#: build/pack.c:676
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ÓÏÄÅÒÖÉÍÏÅ ÉÚ %s: %s\n"
-#: build/pack.c:680
+#: build/pack.c:682
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ÓÏÄÅÒÖÉÍÏÅ × %s: %s\n"
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr "úÁĞÉÓÁÎ: %s\n"
-#: build/pack.c:772
+#: build/pack.c:774
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÉÍÑ ÆÁÊÌÁ ÄÌÑ ĞÁËÅÔÁ %s: %s\n"
-#: build/pack.c:789
+#: build/pack.c:791
#, c-format
msgid "cannot create %s: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n"
@@ -1443,36 +1443,36 @@ msgstr "æÁÊÌ ÁÒÈÉ×Á ÎÅ ÎÁÊÄÅÎ × ÚÁÇÏÌÏ×ËÅ ĞÁËÅÔÁ"
msgid " failed - "
msgstr "ÎÅ ÕÄÁÌÏÓØ - "
-#: lib/depends.c:155
+#: lib/depends.c:156
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "ĞÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s YES (rpmrc provides)\n"
-#: lib/depends.c:425
+#: lib/depends.c:426
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s YES (rpmlib provides)\n"
-#: lib/depends.c:446
+#: lib/depends.c:447
#, fuzzy
msgid "(db files)"
msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n"
-#: lib/depends.c:458
+#: lib/depends.c:459
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s YES (db provides)\n"
-#: lib/depends.c:471
+#: lib/depends.c:472
#, fuzzy
msgid "(db package)"
msgstr "ÎÅÔ ĞÁËÅÔÏ×\n"
@@ -1488,12 +1488,12 @@ msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕĞÏÒÑÄÏŞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n"
#. Record all relations.
-#: lib/depends.c:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr "========== ÚÁĞÉÓØ ÕĞÏÒÑÄÏŞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1502,20 +1502,20 @@ msgstr ""
"========== ÓÏÒÔÉÒÏ×ËÁ ĞÁËÅÔÏ× (ÏŞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, "
"ÇÌÕÂÉÎÁ)\n"
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr "========== ÔÏÌØËÏ ĞÏÓÌÅÄÏ×ÁÔÅÌÉ (× ĞÏÒÑÄËÅ ĞÒÅÄÓÔÁ×ÌÅÎÉÑ)\n"
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr "ãéëì:\n"
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr "========== ĞÒÏÄÏÌÖÅÎÉÅ ÕĞÏÒÑÄÏŞÅÎÉÑ ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1564,47 +1564,47 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
msgid "file %s is on an unknown device\n"
msgstr "ÆÁÊÌ %s - ÎÁ ÎÅÉÚ×ÅÓÔÎÏÍ ÕÓÔÒÏÊÓÔ×Å\n"
-#: lib/fsm.c:318
+#: lib/fsm.c:320
#, fuzzy
msgid "========== Directories not explictly included in package:\n"
msgstr "========= ëÁÔÁÌÏÇÉ, ËÏÔÏÒÙÅ ÎÅ ×ËÌÀŞÅÎÙ × ĞÁËÅÔ Ñ×ÎÏ:\n"
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, fuzzy, c-format
msgid "%10d %s\n"
msgstr "%9d %s\n"
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr "ËÁÔÁÌÏÇ %s ÓÏÚÄÁÎ Ó ĞÒÁ×ÁÍÉ ÄÏÓÔÕĞÁ %04o.\n"
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr "ÆÁÊÌ ÁÒÈÉ×Á %s ÎÅ ÎÁÊÄÅÎ × ÓĞÉÓËÅ ÆÁÊÌÏ× ÚÁÇÏÌÏ×ËÁ\n"
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, c-format
msgid "%s saved as %s\n"
msgstr "%s ÓÏÈÒÁÎÅÎ ËÁË %s\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ %s: ËÁÔÁÌÏÇ ÎÅ ĞÕÓÔ\n"
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n"
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ %s: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, c-format
msgid "%s created as %s\n"
msgstr "%s ÓÏÚÄÁÎ ËÁË %s\n"
@@ -1614,41 +1614,41 @@ msgstr "%s ÓÏÚÄÁÎ ËÁË %s\n"
msgid "error creating temporary file %s\n"
msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ %s\n"
-#: lib/package.c:168 lib/rpmchecksig.c:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: ÏÛÉÂËÁ readLead\n"
-#: lib/package.c:181
+#: lib/package.c:182
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "ĞÁËÅÔÙ ×ÅÒÓÉÉ 1 ÎÅ ĞÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÜÔÏÊ ×ÅÒÓÉÅÊ RPM\n"
-#: lib/package.c:189
+#: lib/package.c:190
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ĞÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ĞÁËÅÔÙ ×ÅÒÓÉÉ <= 4\n"
-#: lib/package.c:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: ÏÛÉÂËÁ rpmReadSignature\n"
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: ğÏÄĞÉÓØ ÎÅÄÏÓÔÕĞÎÁ\n"
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: ÏÛÉÂËÁ readLead\n"
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ Fread: %s\n"
@@ -2080,384 +2080,304 @@ msgstr "ĞÏÄĞÉÓÁÔØ ĞÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕİÕÀ ĞÏÄĞÉÓØ)"
msgid "generate signature"
msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ ĞÏÄĞÉÓØ"
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: lib/problems.c:221
-#, fuzzy, c-format
-msgid "package %s is intended for a %s architecture"
-msgstr "ĞÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÁÒÈÉÔÅËÔÕÒÙ"
-
-#: lib/problems.c:226
-#, fuzzy, c-format
-msgid "package %s is intended for a %s operating system"
-msgstr "ĞÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÏĞÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ"
-
-#: lib/problems.c:231
-#, c-format
-msgid "package %s is already installed"
-msgstr "ĞÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
-
-#: lib/problems.c:236
-#, c-format
-msgid "path %s in package %s is not relocateable"
-msgstr "ĞÕÔØ %s × ĞÁËÅÔÅ %s - ÎÅ ĞÅÒÅÍÅİÁÅÍÙÊ"
-
-#: lib/problems.c:241
-#, c-format
-msgid "file %s conflicts between attempted installs of %s and %s"
-msgstr "ËÏÎÆÌÉËÔ ÆÁÊÌÁ %s ĞÒÉ ĞÏĞÙÔËÁÈ ÕÓÔÁÎÏ×ËÉ %s É %s"
-
-#: 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:251
-#, c-format
-msgid "package %s (which is newer than %s) is already installed"
-msgstr "ĞÁËÅÔ %s (ËÏÔÏÒÙÊ ÎÏ×ÅÅ, ŞÅÍ %s) ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
-
-#: 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:266
-#, c-format
-msgid "installing package %s needs %ld inodes on the %s filesystem"
-msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ĞÁËÅÔÁ %s ÎÕÖÎÏ %ld inodes ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s"
-
-#: 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:275
-#, fuzzy, c-format
-msgid "package %s has unsatisfied Requires: %s\n"
-msgstr "ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
-
-#: lib/problems.c:279
-#, fuzzy, c-format
-msgid "package %s has unsatisfied Conflicts: %s\n"
-msgstr "ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
-
-#: lib/problems.c:284
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s"
-msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ %d ĞÒÉ ÒÁÂÏÔÅ Ó ĞÁËÅÔÏÍ %s"
-
-#: lib/problems.c:365
-#, fuzzy
-msgid "conflicts with"
-msgstr " ËÏÎÆÌÉËÔÕÅÔ Ó %s-%s-%s\n"
-
-#: lib/problems.c:365
-#, fuzzy
-msgid "is needed by"
-msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n"
-
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr "ôÉĞ ÄÁÎÎÙÈ %d ÎÅ ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
-#: lib/psm.c:448
+#: lib/psm.c:449
#, c-format
msgid "cannot create %%%s %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %%%s %s\n"
-#: lib/psm.c:454
+#: lib/psm.c:455
#, c-format
msgid "cannot write to %%%s %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÉÓÁÔØ × %%%s %s\n"
-#: lib/psm.c:485
+#: lib/psm.c:486
msgid "source package expected, binary found\n"
msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉŞÎÙÊ ĞÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ\n"
-#: lib/psm.c:601
+#: lib/psm.c:602
msgid "source package contains no .spec file\n"
msgstr "ÉÓÈÏÄÎÙÊ ĞÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ ÓĞÅÃÉÆÉËÁÃÉÉ\n"
-#: lib/psm.c:720
+#: lib/psm.c:721
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "%s: ×ÙĞÏÌÎÑÅÔÓÑ ÓÃÅÎÁÒÉÊ %s (ÅÓÌÉ ÅÓÔØ)\n"
-#: lib/psm.c:890
+#: lib/psm.c:891
#, 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:897
+#: lib/psm.c:898
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "ÏÛÉÂËÁ ×ÙĞÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, ËÏÄ ×ÏÚ×ÒÁÔÁ %d\n"
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, fuzzy, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr "%s: %s-%s-%s ÓÏÄÅÒÖÉÔ %d ÆÁÊÌÏ×, test = %d\n"
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, fuzzy, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s: ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ %s (%d), %s-%s-%s ĞÒÏĞÕÓËÁÅÔÓÑ\n"
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, c-format
msgid "user %s does not exist - using root\n"
msgstr "ĞÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕİÅÓÔ×ÕÅÔ - ÉÓĞÏÌØÚÕÅÔÓÑ root\n"
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, c-format
msgid "group %s does not exist - using root\n"
msgstr "ÇÒÕĞĞÁ %s ÎÅ ÓÕİÅÓÔ×ÕÅÔ - ÉÓĞÏÌØÚÕÅÔÓÑ root\n"
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "ÒÁÓĞÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n"
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr " ÎÁ ÆÁÊÌÅ "
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n"
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, c-format
msgid "%s failed: %s\n"
msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n"
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, c-format
msgid "incorrect format: %s\n"
msgstr "ÏÛÉÂËÁ × ÆÏÒÍÁÔÅ: %s\n"
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr "(ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÏ×)"
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr "ÎÏÒÍÁÌØÎÙÊ "
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr "ÚÁÍÅÎÅÎÎÙÊ "
-#: lib/query.c:289
+#: lib/query.c:290
msgid "not installed "
msgstr "ÎÅ ÕÓÔÁÎÏ×ÌÅÎ "
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr "ÓÅÔÅ×ÏÊ "
-#: lib/query.c:295
+#: lib/query.c:296
#, c-format
msgid "(unknown %3d) "
msgstr "(ÎÅÉÚ×. %3d) "
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr "(ÓÏÓÔ. ÎÅÔ) "
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
msgid "package has neither file owner or id lists\n"
msgstr "ĞÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÓĞÉÓËÏ× ÎÉ ÈÏÚÑÅ× ÆÁÊÌÏ×, ÎÉ ÉÈ ID\n"
-#: lib/query.c:465
+#: lib/query.c:466
#, c-format
msgid "can't query %s: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁĞÒÏÓÉÔØ %s: %s\n"
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, c-format
msgid "open of %s failed: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr "ÏÛÉÂËÁ ÚÁĞÒÏÓÁ %s\n"
-#: lib/query.c:637
+#: lib/query.c:638
msgid "old format source packages cannot be queried\n"
msgstr "ÚÁĞÒÏÓÙ Ë ÉÓÈÏÄÎÙÍ ĞÁËÅÔÁÍ × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ĞÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n"
-#: lib/query.c:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "ÎÉ ÏÄÉÎ ÉÚ ĞÁËÅÔÏ× ÎÅ ×Ú×ÏÄÉÔ ÔÒÉÇÇÅÒ %s\n"
-#: lib/query.c:707
+#: lib/query.c:708
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "ÚÁĞÒÏÓ ÆÁÊÌÁ ÓĞÅÃÉÆÉËÁÃÉÉ %s ÎÅ ÕÄÁÌÓÑ, ÎÅ×ÏÚÍÏÖÎÏ ÒÁÚÏÂÒÁÔØ ÆÁÊÌ\n"
-#: lib/query.c:728
+#: lib/query.c:729
msgid "no packages\n"
msgstr "ÎÅÔ ĞÁËÅÔÏ×\n"
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "ÇÒÕĞĞÁ %s ÎÅ ÓÏÄÅÒÖÉÔ ÎÉËÁËÉÈ ĞÁËÅÔÏ×\n"
-#: lib/query.c:758
+#: lib/query.c:759
#, c-format
msgid "no package triggers %s\n"
msgstr "ÎÉ ÏÄÉÎ ÉÚ ĞÁËÅÔÏ× ÎÅ ×Ú×ÏÄÉÔ ÔÒÉÇÇÅÒ %s\n"
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÅÓÔØ %s: %s.\n"
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "ÎÉ ÏÄÉÎ ÉÚ ĞÁËÅÔÏ× ÎÅ ×Ú×ÏÄÉÔ ÔÒÉÇÇÅÒ %s\n"
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr "ÎÉ ÏÄÉÎ ÉÚ ĞÁËÅÔÏ× ÎÅ ÔÒÅÂÕÅÔ %s\n"
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr "ÎÉ ÏÄÉÎ ÉÚ ĞÁËÅÔÏ× ÎÅ ĞÒÅÄÏÓÔÁ×ÌÑÅÔ %s\n"
-#: lib/query.c:911
+#: lib/query.c:912
#, c-format
msgid "file %s: %s\n"
msgstr "ÆÁÊÌ %s: %s\n"
-#: lib/query.c:915
+#: lib/query.c:916
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "ÆÁÊÌ %s ÎÅ ĞÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ĞÁËÅÔÏ×\n"
-#: lib/query.c:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr "ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ĞÁËÅÔÁ: %s\n"
-#: lib/query.c:945
+#: lib/query.c:946
#, c-format
msgid "package record number: %u\n"
msgstr "ÎÏÍÅÒ ÚÁĞÉÓÉ ĞÁËÅÔÁ: %u\n"
-#: lib/query.c:950
+#: lib/query.c:951
#, c-format
msgid "record %u could not be read\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ÚÁĞÉÓØ %u\n"
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, c-format
msgid "package %s is not installed\n"
msgstr "ĞÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
#, fuzzy
msgid "(added files)"
msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n"
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
#, fuzzy
msgid "(added provide)"
msgstr "%s: %-45s YES (db provides)\n"
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ: %s\n"
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
msgid "makeTempFile failed\n"
msgstr "ÏÛÉÂËÁ makeTempFile\n"
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ Fwrite: %s\n"
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: îÅ ÍÏÇÕ ĞÏÄĞÉÓÁÔØ RPM v1.0\n"
-#: lib/rpmchecksig.c:175
+#: lib/rpmchecksig.c:176
#, fuzzy, c-format
msgid "%s: Can't re-sign v2 packaging\n"
msgstr "%s: îÅ ÍÏÇÕ ĞÅÒÅĞÏÄĞÉÓÁÔØ RPM v2.0\n"
-#: lib/rpmchecksig.c:274
+#: lib/rpmchecksig.c:275
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ writeLead: %s\n"
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ rpmWriteSignature: %s\n"
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: ÏÛÉÂËÁ readLead\n"
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: ğÏÄĞÉÓÉ ÎÅÔ (RPM v1.0)\n"
-#: lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr "îå Oë"
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
msgid " (MISSING KEYS:"
msgstr " (ïôóõôóô÷õàô ëìàşé:"
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr " (îåô äï÷åòéñ ë ëìàşáí:"
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr "Oë"
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "NO "
msgstr "îåT"
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr "äá"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2466,105 +2386,105 @@ msgstr ""
"ÄÌÑ ÚÁ×ÉÓÉÍÏÓÔÉ \"B\" ÎÕÖÎÏ ÕËÁÚÁÔØ \"epoch\" (ÔÁË ÖÅ ËÁË ÄÌÑ \"A\")\n"
"\tA %s\tB %s\n"
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr "ğÏÄÇÏÔÏ×ËÁ..."
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
msgid "Preparing packages for installation..."
msgstr "ğÏÄÇÏÔÏ×ËÁ ĞÁËÅÔÏ× ÄÌÑ ÕÓÔÁÎÏ×ËÉ..."
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, c-format
msgid "Retrieving %s\n"
msgstr "úÁÇÒÕÖÁÅÔÓÑ %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr " ... ËÁË %s\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s ĞÒÏĞÕÓËÁÅÔÓÑ - ÏÛÉÂËÁ ĞÅÒÅÄÁŞÉ - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, c-format
msgid "package %s is not relocateable\n"
msgstr "ĞÁËÅÔ %s - ÎÅ ĞÅÒÅÍÅİÁÅÍÙÊ\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, c-format
msgid "error reading from file %s\n"
msgstr "ÏÛÉÂËÁ ŞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s\n"
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "ÄÌÑ ÆÁÊÌÁ %s ÎÅÏÂÈÏÄÉÍÁ ÂÏÌÅÅ ÎÏ×ÁÑ ×ÅÒÓÉÑ RPM\n"
-#: lib/rpminstall.c:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n"
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ĞÁËÅÔÏ×\n"
-#: lib/rpminstall.c:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n"
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
msgid "installing binary packages\n"
msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÂÉÎÁÒÎÙÅ ĞÁËÅÔÙ\n"
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s: %s\n"
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ĞÁËÅÔÏ×\n"
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
msgid "removing these packages would break dependencies:\n"
msgstr "ÕÄÁÌÅÎÉÅ ÜÔÉÈ ĞÁËÅÔÏ× ÎÁÒÕÛÉÔ ÚÁ×ÉÓÉÍÏÓÔÉ:\n"
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s\n"
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2574,6 +2494,86 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "ÏÛÉÂËÁ ŞÔÅÎÉÑ: %s (%d)\n"
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, fuzzy, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr "ĞÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÁÒÈÉÔÅËÔÕÒÙ"
+
+#: lib/rpmps.c:221
+#, fuzzy, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr "ĞÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÏĞÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ"
+
+#: lib/rpmps.c:226
+#, c-format
+msgid "package %s is already installed"
+msgstr "ĞÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
+
+#: lib/rpmps.c:231
+#, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "ĞÕÔØ %s × ĞÁËÅÔÅ %s - ÎÅ ĞÅÒÅÍÅİÁÅÍÙÊ"
+
+#: lib/rpmps.c:236
+#, c-format
+msgid "file %s conflicts between attempted installs of %s and %s"
+msgstr "ËÏÎÆÌÉËÔ ÆÁÊÌÁ %s ĞÒÉ ĞÏĞÙÔËÁÈ ÕÓÔÁÎÏ×ËÉ %s É %s"
+
+#: lib/rpmps.c:241
+#, c-format
+msgid "file %s from install of %s conflicts with file from package %s"
+msgstr "ÆÁÊÌ %s ÉÚ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ ĞÁËÅÔÁ %s ËÏÎÆÌÉËÔÕÅÔ Ó ÆÁÊÌÏÍ ÉÚ ĞÁËÅÔÁ %s"
+
+#: lib/rpmps.c:246
+#, c-format
+msgid "package %s (which is newer than %s) is already installed"
+msgstr "ĞÁËÅÔ %s (ËÏÔÏÒÙÊ ÎÏ×ÅÅ, ŞÅÍ %s) ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
+
+#: lib/rpmps.c:251
+#, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
+msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ĞÁËÅÔÁ %s ÎÕÖÎÏ %ld%cb ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s"
+
+#: lib/rpmps.c:261
+#, c-format
+msgid "installing package %s needs %ld inodes on the %s filesystem"
+msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ĞÁËÅÔÁ %s ÎÕÖÎÏ %ld inodes ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s"
+
+#: lib/rpmps.c:266
+#, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr "ĞÁËÅÔ %s pre-transaction syscall(s): %s: ÏÛÉÂËÁ: %s"
+
+#: lib/rpmps.c:270
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Requires: %s\n"
+msgstr "ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
+
+#: lib/rpmps.c:274
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Conflicts: %s\n"
+msgstr "ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
+
+#: lib/rpmps.c:279
+#, c-format
+msgid "unknown error %d encountered while manipulating package %s"
+msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ %d ĞÒÉ ÒÁÂÏÔÅ Ó ĞÁËÅÔÏÍ %s"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "conflicts with"
+msgstr " ËÏÎÆÌÉËÔÕÅÔ Ó %s-%s-%s\n"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "is needed by"
+msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n"
+
#: lib/rpmrc.c:191
#, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2669,171 +2669,172 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ %s, ÚÎÁŞÅÎÉÅ HOME ÓÌÉÛËÏÍ ×ÅÌÉËÏ.\n"
msgid "Unable to open %s for reading: %s.\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ŞÔÅÎÉÑ: %s.\n"
-#: lib/rpmts.c:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n"
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr "ĞÏÌÕŞÅÎÉÅ ÓĞÉÓËÁ ÓÍÏÎÔÉÒÏ×ÁÎÎÙÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ\n"
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr "ÎÅÏÂÙŞÎÙÊ ÆÁÊÌ -- ĞÒÏĞÕÓËÁÀ ĞÒÏ×ÅÒËÕ ÒÁÚÍÅÒÁ\n"
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr "ïÖÉÄÁÅÍÙÊ ÒÁÚÍÅÒ: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
-#: lib/signature.c:147
+#: lib/signature.c:148
#, c-format
msgid " Actual size: %12d\n"
msgstr "æÁËÔÉŞÅÓËÉÊ ÒÁÚÍÅÒ: %12d\n"
-#: lib/signature.c:167
+#: lib/signature.c:168
msgid "No signature\n"
msgstr "ğÏÄĞÉÓÉ ÎÅÔ\n"
-#: lib/signature.c:171
+#: lib/signature.c:172
msgid "Old PGP signature\n"
msgstr "óÔÁÒÁÑ ĞÏÄĞÉÓØ PGP\n"
-#: lib/signature.c:182
+#: lib/signature.c:183
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
"óÔÁÒÁÑ (ÔÏÌØËÏ ÄÌÑ ×ÎÕÔÒÅÎÎÅÇÏ ÉÓĞÏÌØÚÏ×ÁÎÉÑ) ĞÏÄĞÉÓØ! çÄÅ ×Ù üôï ×ÚÑÌÉ!?\n"
-#: lib/signature.c:232
+#: lib/signature.c:233
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "ğÏÄĞÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁĞÏÌÎÅÎÉÅ(%d)\n"
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÌÎÉÔØ %s: %s\n"
-#: lib/signature.c:327
+#: lib/signature.c:328
msgid "pgp failed\n"
msgstr "ÏÛÉÂËÁ pgp\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
msgid "pgp failed to write signature\n"
msgstr "ÏÛÉÂËÁ pgp ĞÒÉ ÚÁĞÉÓÉ ĞÏÄĞÉÓÉ\n"
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr "òÁÚÍÅÒ ĞÏÄĞÉÓÉ PGP: %d\n"
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
msgid "unable to read the signature\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÅÓÔØ ĞÏÄĞÉÓØ\n"
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "ğÏÌÕŞÅÎÏ %d ÂÁÊÔ ĞÏÄĞÉÓÉ PGP\n"
-#: lib/signature.c:425
+#: lib/signature.c:426
msgid "gpg failed\n"
msgstr "ÏÛÉÂËÁ gpg\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
msgid "gpg failed to write signature\n"
msgstr "ÏÛÉÂËÁ gpg ĞÒÉ ÚÁĞÉÓÉ ĞÏÄĞÉÓÉ\n"
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr "òÁÚÍÅÒ ĞÏÄĞÉÓÉ GPG: %d\n"
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "ğÏÌÕŞÅÎÏ %d ÂÁÊÔ ĞÏÄĞÉÓÉ GPG\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "îÅ×ÅÒÎÁÑ ÓĞÅÃÉÆÉËÁÃÉÑ %%_signature × ÍÁËÒÏÆÁÊÌÅ\n"
-#: lib/signature.c:743
+#: lib/signature.c:744
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_gpg_name\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ\n"
-#: lib/signature.c:756
+#: lib/signature.c:757
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_pgp_name\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ\n"
-#: lib/signature.c:800
+#: lib/signature.c:801
#, fuzzy
msgid "Header+Payload size: "
msgstr "úÁÇÏÌÏ×ÏË ÓÌÉÛËÏÍ ×ÅÌÉË"
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
#, fuzzy
msgid "V3 RSA/MD5 signature: "
msgstr "ĞÒÏĞÕÓÔÉÔØ ×ÓÅ MD5-ĞÏÄĞÉÓÉ"
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
#, fuzzy
msgid "V3 DSA signature: "
msgstr "ğÏÄĞÉÓÉ ÎÅÔ\n"
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, fuzzy, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "ğÏÄĞÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁĞÏÌÎÅÎÉÅ(%d)\n"
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s ĞÒÏĞÕİÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n"
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, c-format
msgid "excluding directory %s\n"
msgstr "ÉÓËÌÀŞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n"
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr "ĞÏÌÕŞÅÎÉÅ ÓĞÉÓËÁ ÓÍÏÎÔÉÒÏ×ÁÎÎÙÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ\n"
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, c-format
msgid "missing %s"
msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ %s"
-#: lib/verify.c:379
+#: lib/verify.c:380
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: "
diff --git a/po/sk.po b/po/sk.po
index b3faceba4..ffae233b6 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-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:39
+#: build.c:40
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "nevyrie¹ené závislosti:\n"
-#: build.c:70
+#: build.c:71
#, 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:150 build.c:162
+#: build.c:151 build.c:163
#, fuzzy, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "Otvorenie rúry pre tar zlyhalo: %s\n"
#. Give up
-#: build.c:169
+#: build.c:170
#, 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:197
+#: build.c:198
#, 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:237
+#: build.c:238
#, fuzzy, c-format
msgid "failed to stat %s: %m\n"
msgstr "nepodarilo sa zisti» stav %s: %s"
-#: build.c:242
+#: build.c:243
#, 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:251
+#: build.c:252
#, 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:306
+#: build.c:307
#, fuzzy, c-format
msgid "Building target platforms: %s\n"
msgstr "predefinova» cieµovú platformu"
-#: build.c:321
+#: build.c:322
#, 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:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr "vypísa» verziu pou¾ívaného rpm"
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:122
#, fuzzy
msgid "print macro expansion of <expr>+"
msgstr "vypísa» verziu pou¾ívaného rpm"
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr "posla» ¹tandardnı vıstup do <príkazu>"
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr "pou¾i» <adresár> ako adresár najvy¹¹ej úrovne"
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:183
+#: rpmqv.c:184
#, fuzzy
msgid "Signature options:"
msgstr "Veµkos» podpisu: %d\n"
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr ""
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "súbor %s: %s\n"
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verzia %s\n"
-#: rpmqv.c:238
+#: rpmqv.c:239
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998 - Red Hat Software"
-#: rpmqv.c:239
+#: rpmqv.c:240
#, 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:251
+#: rpmqv.c:252
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "pou¾itie: rpm {--help}"
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:605
+#: rpmqv.c:606
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Namiesto nich pou¾ite -e alebo --erase.\n"
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Vnútorná chyba pri spracovaní argumentu (%d) :-(\n"
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr "mô¾e by» pou¾itı iba jeden hlavnı re¾im"
-#: rpmqv.c:681
+#: rpmqv.c:682
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:685
+#: rpmqv.c:686
#, fuzzy
msgid "unexpected query flags"
msgstr "neoèakávanı zdroj pre otázku"
-#: rpmqv.c:688
+#: rpmqv.c:689
#, fuzzy
msgid "unexpected query format"
msgstr "neoèakávanı zdroj pre otázku"
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr "neoèakávanı zdroj pre otázku"
-#: rpmqv.c:732
+#: rpmqv.c:733
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath zadané pre operáciu nepou¾ívajúcu databázu"
-#: rpmqv.c:738
+#: rpmqv.c:739
#, 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:740
+#: rpmqv.c:741
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:743
+#: rpmqv.c:744
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:746
+#: rpmqv.c:747
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:749
+#: rpmqv.c:750
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:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr "argumenty pre --prefix musia zaèína» znakom /"
-#: rpmqv.c:755
+#: rpmqv.c:756
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:759
+#: rpmqv.c:760
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:764
+#: rpmqv.c:765
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:768
+#: rpmqv.c:769
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:772
+#: rpmqv.c:773
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:776
+#: rpmqv.c:777
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:780
+#: rpmqv.c:781
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:784
+#: rpmqv.c:785
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:788
+#: rpmqv.c:789
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:793
+#: rpmqv.c:794
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:797
+#: rpmqv.c:798
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:801
+#: rpmqv.c:802
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:806
+#: rpmqv.c:807
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:811
+#: rpmqv.c:812
#, 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:816
+#: rpmqv.c:817
#, 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:820
+#: rpmqv.c:821
#, 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:825
+#: rpmqv.c:826
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:830
+#: rpmqv.c:831
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:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenty pre --root (-r) musia zaèína» znakom /"
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:871
+#: rpmqv.c:872
#, c-format
msgid "cannot access file %s\n"
msgstr "nie je mo¾né pracova» so súborom %s\n"
-#: rpmqv.c:890
+#: rpmqv.c:891
msgid "pgp not found: "
msgstr "pgp nebolo nájdené: "
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr "Kontrola hesla zlyhala\n"
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr "Heslo je v poriadku.\n"
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Chybná ¹pecifikácia %%_signature v makro-súbore.\n"
-#: rpmqv.c:913
+#: rpmqv.c:914
msgid "--sign may only be used during package building"
msgstr "--sign mô¾e by» pou¾íté iba poèas zostavenia balíka"
-#: rpmqv.c:930
+#: rpmqv.c:931
msgid "exec failed\n"
msgstr "vykonanie zlyhalo\n"
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr "neboli zadané ¾iadne balíky pre znovuzostavenie"
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr "neboli zadané ¾iadne spec-súbory pre zostavenie"
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr "neboli zadané ¾iadne tar-súbory pre zostavenie"
-#: rpmqv.c:1055
+#: rpmqv.c:1056
#, fuzzy
msgid "no packages given for erase"
msgstr "neboli zadané ¾iadne balíky na podpis"
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr "neboli zadané ¾iadne balíky pre in¹taláciu"
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr "neboli zadané ¾iadne argumenty pre otázku"
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr "neboli zadané ¾iadne argumenty pre overenie"
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr "neoèakávané argumenty pre --querytags"
-#: rpmqv.c:1149
+#: rpmqv.c:1150
#, fuzzy
msgid "no arguments given"
msgstr "neboli zadané ¾iadne argumenty pre otázku"
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
#, 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:152
+#: build/files.c:1826 build/pack.c:154
#, 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:85
+#: build/pack.c:87
#, 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:88
+#: build/pack.c:90
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "vytvorenie archívu zlyhalo pri súbore %s: %s"
-#: build/pack.c:110
+#: build/pack.c:112
#, fuzzy, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "cpio_copy zápis zlyhal: %s"
-#: build/pack.c:117
+#: build/pack.c:119
#, fuzzy, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "cpio_copy èítanie zlyhalo: %s"
-#: build/pack.c:220
+#: build/pack.c:222
#, fuzzy, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "Nie je mo¾né otvori» PreIn súbor: %s"
-#: build/pack.c:227
+#: build/pack.c:229
#, fuzzy, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "Nie je mo¾né otvori» PreUn súbor: %s"
-#: build/pack.c:234
+#: build/pack.c:236
#, fuzzy, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "Nie je mo¾né otvori» PostIn súbor: %s"
-#: build/pack.c:241
+#: build/pack.c:243
#, fuzzy, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "Nie je mo¾né otvori» PostUn súbor: %s"
-#: build/pack.c:249
+#: build/pack.c:251
#, fuzzy, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "Nie je mo¾né otvori» VerifyScript súbor: %s"
-#: build/pack.c:264
+#: build/pack.c:266
#, 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:292
+#: build/pack.c:294
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr "readRPM: otvorenie %s: %s\n"
-#: build/pack.c:302
+#: build/pack.c:304
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr "readRPM: èítanie %s: %s\n"
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
-#: build/pack.c:339
+#: build/pack.c:341
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s nie je RPM balík\n"
-#: build/pack.c:348
+#: build/pack.c:350
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: èítanie hlavièky %s\n"
-#: build/pack.c:477
+#: build/pack.c:479
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "Nie je mo¾né preèíta» ikonu: %s"
-#: build/pack.c:496
+#: build/pack.c:498
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "Nie je mo¾né zapísa» %s"
-#: build/pack.c:506
+#: build/pack.c:508
#, fuzzy
msgid "Bad CSA data\n"
msgstr "Chybné CSA dáta"
-#: build/pack.c:542
+#: build/pack.c:544
#, fuzzy
msgid "Unable to write final header\n"
msgstr "Nie je mo¾né zapísa» %s"
-#: build/pack.c:562
+#: build/pack.c:564
#, c-format
msgid "Generating signature: %d\n"
msgstr "Vytvára sa PGP podpis: %d\n"
-#: build/pack.c:580
+#: build/pack.c:582
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "Nie je mo¾né preèíta» ikonu: %s"
-#: build/pack.c:588
+#: build/pack.c:590
#, fuzzy, c-format
msgid "Could not open %s: %s\n"
msgstr "Otvorenie %s zlyhalo\n"
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Nie je mo¾né zapísa» balík: %s"
-#: build/pack.c:639
+#: build/pack.c:641
#, fuzzy, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Nie je preèíta» sigtarget: %s"
-#: build/pack.c:650
+#: build/pack.c:652
#, fuzzy, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "Nie je mo¾né preèíta» ikonu: %s"
-#: build/pack.c:664
+#: build/pack.c:666
#, 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:674
+#: build/pack.c:676
#, fuzzy, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Nie je mo¾né preèíta» ikonu: %s"
-#: build/pack.c:680
+#: build/pack.c:682
#, 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:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr "Zapísané: %s\n"
-#: build/pack.c:772
+#: build/pack.c:774
#, 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:789
+#: build/pack.c:791
#, fuzzy, c-format
msgid "cannot create %s: %s\n"
msgstr "nie je mo¾né zapísa» do %s: "
@@ -1464,36 +1464,36 @@ msgstr ""
msgid " failed - "
msgstr " zlyhalo - "
-#: lib/depends.c:155
+#: lib/depends.c:156
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "balík %s nie je nain¹talovanı\n"
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
#, fuzzy
msgid "(rpmrc provides)"
msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
-#: lib/depends.c:425
+#: lib/depends.c:426
#, fuzzy
msgid "(rpmlib provides)"
msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
-#: lib/depends.c:446
+#: lib/depends.c:447
#, fuzzy
msgid "(db files)"
msgstr "chybnı stav súboru: %s"
-#: lib/depends.c:458
+#: lib/depends.c:459
#, fuzzy
msgid "(db provides)"
msgstr "Poskytuje:"
-#: lib/depends.c:471
+#: lib/depends.c:472
#, fuzzy
msgid "(db package)"
msgstr "nájdenıch %d balíkov\n"
@@ -1509,31 +1509,31 @@ msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "odstraòuje sa index skupín\n"
#. Record all relations.
-#: lib/depends.c:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1582,46 +1582,46 @@ msgstr "nepodarilo sa otvori» %s: %s"
msgid "file %s is on an unknown device\n"
msgstr "súbor %s sa nachádza na neznámom zariadení"
-#: lib/fsm.c:318
+#: lib/fsm.c:320
msgid "========== Directories not explictly included in package:\n"
msgstr ""
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, fuzzy, c-format
msgid "%10d %s\n"
msgstr "riadok %d: %s"
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "varovanie: %s uchovanı ako %s"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "nie je mo¾né odstráni» %s - adresár nie je prázdny"
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "rmdir %s zlyhalo: %s"
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "otvorenie %s zlyhalo\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "varovanie: %s vytvorené ako %s"
@@ -1631,43 +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:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/package.c:181
+#: lib/package.c:182
#, 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:189
+#: lib/package.c:190
#, 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:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature zlyhalo\n"
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Podpis nie je k dispozícii\n"
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
@@ -2125,496 +2125,416 @@ msgstr "podpísa» balík (znièi» aktuálny podpis)"
msgid "generate signature"
msgstr "vytvori» PGP/GPG podpis"
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: 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:226
-#, c-format
-msgid "package %s is intended for a %s operating system"
-msgstr ""
-
-#: 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: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:241
-#, c-format
-msgid "file %s conflicts between attempted installs of %s and %s"
-msgstr ""
-
-#: lib/problems.c:246
-#, c-format
-msgid "file %s from install of %s conflicts with file from package %s"
-msgstr ""
-
-#: 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:256
-#, c-format
-msgid "installing package %s needs %ld%cb on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:266
-#, c-format
-msgid "installing package %s needs %ld inodes on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:271
-#, c-format
-msgid "package %s pre-transaction syscall(s): %s failed: %s"
-msgstr ""
-
-#: 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: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:284
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s"
-msgstr ""
-
-#: lib/problems.c:365
-#, fuzzy
-msgid "conflicts with"
-msgstr " koliduje s %s-%s-%s\n"
-
-#: 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:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 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"
-#: lib/psm.c:448
+#: lib/psm.c:449
#, fuzzy, c-format
msgid "cannot create %%%s %s\n"
msgstr "nie je mo¾né zapísa» do %s: "
-#: lib/psm.c:454
+#: lib/psm.c:455
#, fuzzy, c-format
msgid "cannot write to %%%s %s\n"
msgstr "nie je mo¾né zapísa» do %s: "
-#: lib/psm.c:485
+#: lib/psm.c:486
#, fuzzy
msgid "source package expected, binary found\n"
msgstr "oèakávanı zdrojovı balík, nájdenı binárny"
-#: lib/psm.c:601
+#: lib/psm.c:602
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "zdrojovı balík neobsahuje ¾iadny .spec súbor"
-#: lib/psm.c:720
+#: lib/psm.c:721
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n"
-#: lib/psm.c:890
+#: lib/psm.c:891
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "vykonanie skriptu zlyhalo"
-#: lib/psm.c:897
+#: lib/psm.c:898
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "vykonanie skriptu zlyhalo"
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, fuzzy, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr "balík: %s-%s-%s test súborov = %d\n"
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, fuzzy, c-format
msgid "user %s does not exist - using root\n"
msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root"
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, fuzzy, c-format
msgid "group %s does not exist - using root\n"
msgstr "skupina %s neexistuje - pou¾ije sa root"
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "rozbalenie archívu zlyhalo%s%s: %s"
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr " pre súbor "
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "nepodarilo sa otvori» %s: %s"
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "%s zlyhalo"
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "chyba formátu: %s\n"
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr "(neobsahuje ¾iadne súbory)"
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr "normálny "
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr "nahradenı "
-#: lib/query.c:289
+#: lib/query.c:290
msgid "not installed "
msgstr "nein¹talovanı "
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr "zdieµanı "
-#: lib/query.c:295
+#: lib/query.c:296
#, c-format
msgid "(unknown %3d) "
msgstr "(neznámy %d) "
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr "(¾iadny stav) "
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
#, 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:465
+#: lib/query.c:466
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "zmazanie %s zlyhalo: %s\n"
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "otvorenie %s zlyhalo\n"
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr "otázka na %s zlyhala\n"
-#: lib/query.c:637
+#: lib/query.c:638
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:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "¾iadny z balíkov nespú¹»a %s\n"
-#: lib/query.c:707
+#: lib/query.c:708
#, 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:728
+#: lib/query.c:729
#, fuzzy
msgid "no packages\n"
msgstr "nájdenıch %d balíkov\n"
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "skupina %s neobsahuje ¾iadne balíky\n"
-#: lib/query.c:758
+#: lib/query.c:759
#, c-format
msgid "no package triggers %s\n"
msgstr "¾iadny z balíkov nespú¹»a %s\n"
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "Nie je mo¾né preèíta» %s: %s."
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "¾iadny z balíkov nespú¹»a %s\n"
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr "¾iadny z balíkov nevy¾aduje %s\n"
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr "¾iadny z balíkov neposkytuje %s\n"
-#: lib/query.c:911
+#: lib/query.c:912
#, c-format
msgid "file %s: %s\n"
msgstr "súbor %s: %s\n"
-#: lib/query.c:915
+#: lib/query.c:916
#, 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:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr "chybné èíslo balíku: %s\n"
-#: lib/query.c:945
+#: lib/query.c:946
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "po¾aduje sa záznam èíslo %d\n"
-#: lib/query.c:950
+#: lib/query.c:951
#, 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:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, c-format
msgid "package %s is not installed\n"
msgstr "balík %s nie je nain¹talovanı\n"
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
#, fuzzy
msgid "(added files)"
msgstr "chybnı stav súboru: %s"
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
#, fuzzy
msgid "(added provide)"
msgstr "Poskytuje:"
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: otvorenie zlyhalo\n"
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "vykonanie zlyhalo\n"
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, 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:175
+#: lib/rpmchecksig.c:176
#, 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:274
+#: lib/rpmchecksig.c:275
#, fuzzy, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmReadSignature zlyhalo\n"
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, 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:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr "NIE JE V PORIADKU"
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
msgid " (MISSING KEYS:"
msgstr " (CHİBAJÚCE K¥ÚÈE):"
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr " (NEDÔVERUJE SA K¥ÚÈOM: "
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr "V PORIADKU"
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
#, fuzzy
msgid "NO "
msgstr "NIE JE V PORIADKU"
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, fuzzy, c-format
msgid " %s A %s\tB %s\n"
msgstr " rpm {--version}"
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n"
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "neboli zadané ¾iadne balíky pre in¹taláciu"
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, 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:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr "... ako %s\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s vynechané - prenos zlyhal - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "balík %s nie je nain¹talovanı\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "chyba pri vytváraní doèasného súboru %s"
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie je mo¾né nain¹talova»\n"
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, 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:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "nevyrie¹ené závislosti:\n"
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
msgid "installing binary packages\n"
msgstr "in¹talujú sa binárne balíky\n"
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "nie je mo¾né otvori» súbor %s: %s"
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ¹pecifikuje viac balíkov\n"
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
msgid "removing these packages would break dependencies:\n"
msgstr "odstránenie tıchto balíkov by poru¹ilo závislosti:\n"
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nie je mo¾né otvori» %s\n"
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr "In¹taluje sa %s\n"
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2624,6 +2544,86 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "èítanie zlyhalo: %s (%d)"
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, fuzzy, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr "balík %s nie je nain¹talovanı\n"
+
+#: lib/rpmps.c:221
+#, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr ""
+
+#: lib/rpmps.c:226
+#, fuzzy, c-format
+msgid "package %s is already installed"
+msgstr "balík %s nie je nain¹talovanı\n"
+
+#: lib/rpmps.c:231
+#, fuzzy, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "balík %s nie je nain¹talovanı\n"
+
+#: lib/rpmps.c:236
+#, c-format
+msgid "file %s conflicts between attempted installs of %s and %s"
+msgstr ""
+
+#: lib/rpmps.c:241
+#, c-format
+msgid "file %s from install of %s conflicts with file from package %s"
+msgstr ""
+
+#: lib/rpmps.c:246
+#, fuzzy, c-format
+msgid "package %s (which is newer than %s) is already installed"
+msgstr "balík %s nie je nain¹talovanı\n"
+
+#: lib/rpmps.c:251
+#, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:261
+#, c-format
+msgid "installing package %s needs %ld inodes on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:266
+#, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr ""
+
+#: lib/rpmps.c:270
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Requires: %s\n"
+msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n"
+
+#: lib/rpmps.c:274
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Conflicts: %s\n"
+msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n"
+
+#: lib/rpmps.c:279
+#, c-format
+msgid "unknown error %d encountered while manipulating package %s"
+msgstr ""
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "conflicts with"
+msgstr " koliduje s %s-%s-%s\n"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "is needed by"
+msgstr " je vy¾adované %s-%s-%s\n"
+
#: lib/rpmrc.c:191
#, fuzzy, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2719,176 +2719,177 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Nie je mo¾né otvori» %s pre èítanie: %s."
-#: lib/rpmts.c:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr ""
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr "nejde o be¾nı súbor - kontrola veµkosti vynechaná\n"
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:147
+#: lib/signature.c:148
#, fuzzy, c-format
msgid " Actual size: %12d\n"
msgstr "Veµkos» podpisu: %d\n"
-#: lib/signature.c:167
+#: lib/signature.c:168
msgid "No signature\n"
msgstr "Podpis nie je k dispozícii\n"
-#: lib/signature.c:171
+#: lib/signature.c:172
msgid "Old PGP signature\n"
msgstr "Starı PGP podpis\n"
-#: lib/signature.c:182
+#: lib/signature.c:183
#, fuzzy
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Starı (iba internı) podpis! Ako ste sa k tomu dostali?!"
-#: lib/signature.c:232
+#: lib/signature.c:233
#, fuzzy, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "Veµkos» podpisu: %d\n"
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "Nie je mo¾né spusti» %s"
-#: lib/signature.c:327
+#: lib/signature.c:328
#, fuzzy
msgid "pgp failed\n"
msgstr "pgp zlyhalo"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
#, fuzzy
msgid "pgp failed to write signature\n"
msgstr "pgp sa nepodarilo zapísa» podpis"
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr "Veµkos» PGP podpisu: %d\n"
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
#, fuzzy
msgid "unable to read the signature\n"
msgstr "nie je mo¾né preèíta» podpis"
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "Preèítanı PGP podpis obsahuje %d bajtov\n"
-#: lib/signature.c:425
+#: lib/signature.c:426
#, fuzzy
msgid "gpg failed\n"
msgstr "gpg zlyhalo"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "gpg sa nepodarilo zapísa» podpis"
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr "Veµkos» GPG podpisu: %d\n"
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "Preèítanı GPG podpis obsahuje %d bajtov\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, fuzzy, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Chybná ¹pecifikácia %%_signature v makro-súbore.\n"
-#: lib/signature.c:743
+#: lib/signature.c:744
#, fuzzy, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Musíte nastavi» \"%%gpg_name\" vo va¹om makro-súbore"
-#: lib/signature.c:756
+#: lib/signature.c:757
#, fuzzy, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Musíte nastavi» \"%%pgp_name\" vo va¹om makro-súbore"
-#: lib/signature.c:800
+#: lib/signature.c:801
#, fuzzy
msgid "Header+Payload size: "
msgstr "Priveµká hlavièka"
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
#, fuzzy
msgid "V3 RSA/MD5 signature: "
msgstr "vynecha» akékoµvek MD5 podpisy"
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
#, fuzzy
msgid "V3 DSA signature: "
msgstr "Podpis nie je k dispozícii\n"
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, fuzzy, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Doplnenie podpisu: %d\n"
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s vynechané kvôli príznaku missingok\n"
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, fuzzy, c-format
msgid "excluding directory %s\n"
msgstr "vytvára sa adresár %s\n"
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr ""
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, fuzzy, c-format
msgid "missing %s"
msgstr "chıbajúce %s\n"
-#: lib/verify.c:379
+#: lib/verify.c:380
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: "
diff --git a/po/sl.po b/po/sl.po
index bdafff27a..91df19f8a 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.244 2002/05/16 16:56:07 jbj Exp $
+# $Id: sl.po,v 1.245 2002/05/19 18:43:14 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-05-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-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:39
+#: build.c:40
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "izdelava soodvisnosti je bila neuspe¹na:\n"
-#: build.c:70
+#: build.c:71
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "Datoteke s specifikacijami %s ni mo¾no odpreti: %s\n"
-#: build.c:150 build.c:162
+#: build.c:151 build.c:163
#, 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:169
+#: build.c:170
#, fuzzy, c-format
msgid "Failed to read spec file from %s\n"
msgstr "Neuspe¹no branje datoteke s specifikacijami iz %s"
-#: build.c:197
+#: build.c:198
#, fuzzy, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "Preimenovanje %s v %s je bilo neuspe¹no: %m"
-#: build.c:237
+#: build.c:238
#, fuzzy, c-format
msgid "failed to stat %s: %m\n"
msgstr "status %s ni na voljo: %s"
-#: build.c:242
+#: build.c:243
#, fuzzy, c-format
msgid "File %s is not a regular file.\n"
msgstr "Datoteka ni obièajna datoteka: %s\n"
-#: build.c:251
+#: build.c:252
#, 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:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Izgradnja za ciljna strojna okolja: %s\n"
-#: build.c:321
+#: build.c:322
#, 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:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr "razlièica rpm, ki jo uporabljate"
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr "definirajte makro <ime> z vrednostjo <telo>"
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:122
#, fuzzy
msgid "print macro expansion of <expr>+"
msgstr "uporabljana razlièica rpm"
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr "standardni izhod preusmerjen na <ukaz>"
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr "uporabi <imenik> za korenski imenik"
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr "prika¾i konèni rpmrc in nastavitev makra"
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:183
+#: rpmqv.c:184
#, fuzzy
msgid "Signature options:"
msgstr "Dol¾. podpisa : %d\n"
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr ""
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "datoteka %s: %s\n"
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr "RPM razlièica %s\n"
-#: rpmqv.c:238
+#: rpmqv.c:239
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998 - Red Hat Software"
-#: rpmqv.c:239
+#: rpmqv.c:240
#, 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:251
+#: rpmqv.c:252
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "Uporaba: %s {--help}\n"
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:605
+#: rpmqv.c:606
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Namesto njiju uporabite -e ali --erase.\n"
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Notranja napaka pri obdelavi argumentov (%d) :-\n"
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr "izbran sme biti le en glavni naèin"
-#: rpmqv.c:681
+#: rpmqv.c:682
msgid "one type of query/verify may be performed at a time"
msgstr "samo en tip poizvedbe/preverjanja je mo¾en naenkrat"
-#: rpmqv.c:685
+#: rpmqv.c:686
msgid "unexpected query flags"
msgstr "neprièakovane zastavice pri poizvedbi"
-#: rpmqv.c:688
+#: rpmqv.c:689
msgid "unexpected query format"
msgstr "neprièakovana oblika poizvedbe"
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr "neprièakovan izvor poizvedbe"
-#: rpmqv.c:732
+#: rpmqv.c:733
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath podan, vendar, èeprav nepotreben"
-#: rpmqv.c:738
+#: rpmqv.c:739
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"--force smemo podati samo pri --install --upgrade, --rmsource in --rmspec"
-#: rpmqv.c:740
+#: rpmqv.c:741
msgid "files may only be relocated during package installation"
msgstr "datoteke smemo premakniti samo med namestitvijo paketa"
-#: rpmqv.c:743
+#: rpmqv.c:744
msgid "only one of --prefix or --relocate may be used"
msgstr "izbiri --prefix in --relocate se medsebojno izkljuèujeta"
-#: rpmqv.c:746
+#: rpmqv.c:747
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:749
+#: rpmqv.c:750
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix se sme uporabiti le pri namestitvi"
-#: rpmqv.c:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr "argumenti izbire --prefix se morajo zaèeti z /"
-#: rpmqv.c:755
+#: rpmqv.c:756
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:759
+#: rpmqv.c:760
msgid "--percent may only be specified during package installation"
msgstr "--percent sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:764
+#: rpmqv.c:765
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:768
+#: rpmqv.c:769
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:772
+#: rpmqv.c:773
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs sme biti podatn le ob namestitvi paketa"
-#: rpmqv.c:776
+#: rpmqv.c:777
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:780
+#: rpmqv.c:781
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "izbiri --excludedocs in --includedocs se medsebojno izkljuèujeta"
-#: rpmqv.c:784
+#: rpmqv.c:785
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:788
+#: rpmqv.c:789
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos sme podan le ob namestitvi paketa"
-#: rpmqv.c:793
+#: rpmqv.c:794
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:797
+#: rpmqv.c:798
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches sme biti podan le ob odstranitvi paketa"
-#: rpmqv.c:801
+#: rpmqv.c:802
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles sme biti podati le ob namestitvi paketa"
-#: rpmqv.c:806
+#: rpmqv.c:807
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
-#: rpmqv.c:811
+#: rpmqv.c:812
#, 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:816
+#: rpmqv.c:817
#, 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:820
+#: rpmqv.c:821
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:825
+#: rpmqv.c:826
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:830
+#: rpmqv.c:831
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:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenti izbire --root (-r) se morajo zaèeti z /"
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr "ni datotek, ki bi jih lahko podpisal\n"
-#: rpmqv.c:871
+#: rpmqv.c:872
#, c-format
msgid "cannot access file %s\n"
msgstr "dostop do datoteke %s ni mo¾en\n"
-#: rpmqv.c:890
+#: rpmqv.c:891
msgid "pgp not found: "
msgstr "pgp manjka: "
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr "Vnesite pristopno geslo: "
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr "Preverjanje pristopnega gesla neuspe¹no\n"
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr "Pristopno geslo je pravo.\n"
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Neveljaven %%_signature v makro-datoteki.\n"
-#: rpmqv.c:913
+#: rpmqv.c:914
msgid "--sign may only be used during package building"
msgstr "--sign sme biti podan le ob izgradnji paketa"
-#: rpmqv.c:930
+#: rpmqv.c:931
msgid "exec failed\n"
msgstr "izvajanje je bilo neuspe¹no\n"
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr "paketi za vnovièno izgradnjo niso navedeni"
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr "datoteka spec za izgradnjo manjka"
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr "arhiv tar za izgradnjo manjka"
-#: rpmqv.c:1055
+#: rpmqv.c:1056
#, fuzzy
msgid "no packages given for erase"
msgstr "paketi katere bi bilo potrebno podpisati niso navedeni"
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr "argumenti za poizvedbo niso podani"
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr "argumenti za preverjanje niso podani"
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr "neprièakovani argumenti za --querytags "
-#: rpmqv.c:1149
+#: rpmqv.c:1150
#, fuzzy
msgid "no arguments given"
msgstr "argumenti za poizvedbo niso podani"
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
#, 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:152
+#: build/files.c:1826 build/pack.c:154
#, 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:85
+#: build/pack.c:87
#, 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:88
+#: build/pack.c:90
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "ustvarjanje arhiva je bilo za datoteko %s neuspe¹no: %s"
-#: build/pack.c:110
+#: build/pack.c:112
#, fuzzy, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "pisanje cpio_copy neuspe¹no: %s"
-#: build/pack.c:117
+#: build/pack.c:119
#, fuzzy, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "branje cpio_copy neuspe¹no: %s"
-#: build/pack.c:220
+#: build/pack.c:222
#, fuzzy, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "Datoteke PreIn ni mo¾no odpreti: %s"
-#: build/pack.c:227
+#: build/pack.c:229
#, fuzzy, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "Datoteke PreUn ni mo¾no odpreti: %s"
-#: build/pack.c:234
+#: build/pack.c:236
#, fuzzy, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "Datoteke PostIn ni mo¾no odpreti: %s"
-#: build/pack.c:241
+#: build/pack.c:243
#, fuzzy, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "Datoteke PostUn ni mo¾no odpreti: %s"
-#: build/pack.c:249
+#: build/pack.c:251
#, fuzzy, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "Datoteke VerifyScript ni mo¾no odpreti: %s"
-#: build/pack.c:264
+#: build/pack.c:266
#, fuzzy, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "Skriptne datoteke Trigger ni mo¾no odpreti: %s"
-#: build/pack.c:292
+#: build/pack.c:294
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr "readRPM: odpiranje %s: %s\n"
-#: build/pack.c:302
+#: build/pack.c:304
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr "readRPM: branje %s: %s\n"
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
-#: build/pack.c:339
+#: build/pack.c:341
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s ni paket tipa RPM\n"
-#: build/pack.c:348
+#: build/pack.c:350
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: branje glave %s\n"
-#: build/pack.c:477
+#: build/pack.c:479
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "Ikone %s ni mo¾no prebrati: %s"
-#: build/pack.c:496
+#: build/pack.c:498
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "Ni mo¾no zapisati paketa %s: %s"
-#: build/pack.c:506
+#: build/pack.c:508
#, fuzzy
msgid "Bad CSA data\n"
msgstr "Po¹kodovani podatki CSA"
-#: build/pack.c:542
+#: build/pack.c:544
#, fuzzy
msgid "Unable to write final header\n"
msgstr "Ni mo¾no zapisati paketa %s: %s"
-#: build/pack.c:562
+#: build/pack.c:564
#, c-format
msgid "Generating signature: %d\n"
msgstr "Izdelujemo podpis: %d\n"
-#: build/pack.c:580
+#: build/pack.c:582
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "Ikone %s ni mo¾no prebrati: %s"
-#: build/pack.c:588
+#: build/pack.c:590
#, c-format
msgid "Could not open %s: %s\n"
msgstr "Ni mo¾no odpreti %s: %s\n"
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Ni mo¾no zapisati paketa: %s"
-#: build/pack.c:639
+#: build/pack.c:641
#, fuzzy, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Ciljnega podpisa %s ni mo¾no odpreti: %s"
-#: build/pack.c:650
+#: build/pack.c:652
#, fuzzy, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "Ikone %s ni mo¾no prebrati: %s"
-#: build/pack.c:664
+#: build/pack.c:666
#, fuzzy, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Ni mo¾no zapisati paketa %s: %s"
-#: build/pack.c:674
+#: build/pack.c:676
#, fuzzy, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Ikone %s ni mo¾no prebrati: %s"
-#: build/pack.c:680
+#: build/pack.c:682
#, fuzzy, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Ni mo¾no zapisati paketa %s: %s"
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr "Zapisano: %s\n"
-#: build/pack.c:772
+#: build/pack.c:774
#, 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:789
+#: build/pack.c:791
#, c-format
msgid "cannot create %s: %s\n"
msgstr "ni mo¾no ustvariti %s: %s\n"
@@ -1466,36 +1466,36 @@ msgstr ""
msgid " failed - "
msgstr " neuspe¹no - "
-#: lib/depends.c:155
+#: lib/depends.c:156
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "paket %s-%s-%s je ¾e name¹èen"
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s DA (rpmrc ponudbe)\n"
-#: lib/depends.c:425
+#: lib/depends.c:426
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s DA (rpmlib ponudbe)\n"
-#: lib/depends.c:446
+#: lib/depends.c:447
#, fuzzy
msgid "(db files)"
msgstr "po¹kodovana zbirka podatkov %s"
-#: lib/depends.c:458
+#: lib/depends.c:459
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s DA (db ponudbe)\n"
-#: lib/depends.c:471
+#: lib/depends.c:472
#, fuzzy
msgid "(db package)"
msgstr "ni paketov\n"
@@ -1511,31 +1511,31 @@ msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "odstranjujemo seznam skupin\n"
#. Record all relations.
-#: lib/depends.c:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1584,46 +1584,46 @@ msgstr "neuspe¹no odpiranje %s: %s\n"
msgid "file %s is on an unknown device\n"
msgstr "datoteka %s se nahaja na neznani napravi"
-#: lib/fsm.c:318
+#: lib/fsm.c:320
msgid "========== Directories not explictly included in package:\n"
msgstr ""
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, fuzzy, c-format
msgid "%10d %s\n"
msgstr "vrstica %d: %s"
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "opozorilo: %s shranjen kot %s"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "ni mo¾no odstraniti %s - imenik ni prazen"
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "odstranitev imenika %s je bila neuspe¹na: %s"
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "odpiranje %s je bilo neuspe¹no: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "opozorilo: %s ustvarjen kot %s"
@@ -1633,43 +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:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead je bil neuspe¹en\n"
-#: lib/package.c:181
+#: lib/package.c:182
#, 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:189
+#: lib/package.c:190
#, 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:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature je bil neuspe¹en\n"
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Podpis ni na voljo\n"
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead je bil neuspe¹en\n"
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
@@ -2124,390 +2124,309 @@ msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)"
msgid "generate signature"
msgstr "izdelava podpisa PGP/GPG"
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: 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: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:231
-#, fuzzy, c-format
-msgid "package %s is already installed"
-msgstr "paket %s-%s-%s je ¾e name¹èen"
-
-#: 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: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: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: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: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: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:271
-#, c-format
-msgid "package %s pre-transaction syscall(s): %s failed: %s"
-msgstr ""
-
-#: 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: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: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:365
-#, fuzzy
-msgid "conflicts with"
-msgstr " je v sporu z %s-%s-%s\n"
-
-#: lib/problems.c:365
-#, fuzzy
-msgid "is needed by"
-msgstr " potrebuje %s-%s-%s\n"
-
#. @-modfilesys@
-#: lib/psm.c:250 rpmdb/header.c:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 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"
-#: lib/psm.c:448
+#: lib/psm.c:449
#, fuzzy, c-format
msgid "cannot create %%%s %s\n"
msgstr "ni mo¾no ustvariti %s: %s\n"
-#: lib/psm.c:454
+#: lib/psm.c:455
#, fuzzy, c-format
msgid "cannot write to %%%s %s\n"
msgstr "pisanje na %s ni mo¾no"
-#: lib/psm.c:485
+#: lib/psm.c:486
#, fuzzy
msgid "source package expected, binary found\n"
msgstr "prièakovan je bil izvorni paket, najden binarni"
-#: lib/psm.c:601
+#: lib/psm.c:602
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "izvorni paket ne vsebuje datoteke .spec"
-#: lib/psm.c:720
+#: lib/psm.c:721
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n"
-#: lib/psm.c:890
+#: lib/psm.c:891
#, 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:897
+#: lib/psm.c:898
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "skript se ni uspe¹no izvedel"
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, fuzzy, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr "paket: %s-%s-%s datoteke test = %d\n"
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, fuzzy, c-format
msgid "user %s does not exist - using root\n"
msgstr "uporabnik %s ne obstaja - uporabljam root"
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, fuzzy, c-format
msgid "group %s does not exist - using root\n"
msgstr "skupina %s ne obstaja - uporabljam root"
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "raz¹iritev arhiva je bilo neuspe¹no%s%s: %s"
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr " za datoteko "
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "neuspe¹no odpiranje %s: %s\n"
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "%s neuspe¹en"
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "napaka v obliki: %s\n"
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr "(ne vsebuje datotek)"
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr "normalno "
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr "nadome¹èeno "
-#: lib/query.c:289
+#: lib/query.c:290
msgid "not installed "
msgstr "ni name¹èeno "
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr "omre¾ni "
-#: lib/query.c:295
+#: lib/query.c:296
#, c-format
msgid "(unknown %3d) "
msgstr "(neznano %3d) "
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr "(brez stanja) "
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id"
-#: lib/query.c:465
+#: lib/query.c:466
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "ni mo¾no poizvedeti o %s: %s\n"
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, c-format
msgid "open of %s failed: %s\n"
msgstr "odpiranje %s je bilo neuspe¹no: %s\n"
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr "poizvedba po %s je bila neuspe¹na\n"
-#: lib/query.c:637
+#: lib/query.c:638
msgid "old format source packages cannot be queried\n"
msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n"
-#: lib/query.c:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "noben paket ne pro¾i %s\n"
-#: lib/query.c:707
+#: lib/query.c:708
#, 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:728
+#: lib/query.c:729
#, fuzzy
msgid "no packages\n"
msgstr "ni paketov\n"
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "skupina %s ne vsebuje nobenega paketa\n"
-#: lib/query.c:758
+#: lib/query.c:759
#, c-format
msgid "no package triggers %s\n"
msgstr "noben paket ne pro¾i %s\n"
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "Neuspe¹no branje %s: %s."
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "noben paket ne pro¾i %s\n"
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr "noben paket ne potrebuje %s\n"
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr "noben paket ne nudi %s\n"
-#: lib/query.c:911
+#: lib/query.c:912
#, c-format
msgid "file %s: %s\n"
msgstr "datoteka %s: %s\n"
-#: lib/query.c:915
+#: lib/query.c:916
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "datoteka %s ni del nobenega paketa\n"
-#: lib/query.c:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr "neveljavna ¹tevilka paketa: %s\n"
-#: lib/query.c:945
+#: lib/query.c:946
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "¹tevilka zapisa paketa: %d\n"
-#: lib/query.c:950
+#: lib/query.c:951
#, fuzzy, c-format
msgid "record %u could not be read\n"
msgstr "zapisa %d ni mo¾no prebrati\n"
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s ni name¹èen\n"
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
#, fuzzy
msgid "(added files)"
msgstr "po¹kodovana zbirka podatkov %s"
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
#, fuzzy
msgid "(added provide)"
msgstr "%s: %-45s DA (db ponudbe)\n"
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: odpiranje je bilo neuspe¹no: %s\n"
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
msgid "makeTempFile failed\n"
msgstr "makeTempFile je bil neuspe¹en\n"
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: pisanje Fwrite je bilo neuspe¹no: %s\n"
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: Podpis RPM v1.0 ni mo¾en\n"
-#: lib/rpmchecksig.c:175
+#: lib/rpmchecksig.c:176
#, 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:274
+#: lib/rpmchecksig.c:275
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead je bil neuspe¹en: %s\n"
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature je bilo neuspe¹no: %s\n"
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead je bil neuspe¹en\n"
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Podpis ni na voljo (RPM v1.0)\n"
-#: lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr "NI DOBRO"
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
msgid " (MISSING KEYS:"
msgstr " (MANJKAJOÈI KLJUÈI:"
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr " (NEPREVERJENI KLJUÈI:"
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr "V REDU"
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
#, fuzzy
msgid "NO "
msgstr "NI DOBRO"
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2516,106 +2435,106 @@ msgstr ""
"odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n"
"\tA %s\tB %s\n"
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "paketi za namestitev niso navedeni"
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, 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:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr " ... kot %s\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "preskoèeno - %s - prenos neuspe¹en - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, c-format
msgid "package %s is not relocateable\n"
msgstr "paketa %s ni mo¾no premakniti\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, c-format
msgid "error reading from file %s\n"
msgstr "napaka pri branju iz datoteke %s\n"
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, 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:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ni mo¾no namestiti\n"
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "najdeno %d izvornih in %d binarnih paketov\n"
-#: lib/rpminstall.c:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "neuspe¹ne soodvisnosti:\n"
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
msgid "installing binary packages\n"
msgstr "name¹èanje binarnih paketov\n"
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "ni mo¾no odpreti datoteke %s: %s\n"
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" doloèa veè paketov\n"
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
msgid "removing these packages would break dependencies:\n"
msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n"
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ni mo¾no odpreti %s: %s\n"
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr "Name¹èanje %s\n"
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2625,6 +2544,87 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "branje je bilo neuspe¹no: %s (%d)"
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, fuzzy, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr "paket %s-%s-%s je za drug tip arhitekture"
+
+#: lib/rpmps.c:221
+#, fuzzy, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr "paket %s-%s-%s je za drug operacijski sistem"
+
+#: lib/rpmps.c:226
+#, fuzzy, c-format
+msgid "package %s is already installed"
+msgstr "paket %s-%s-%s je ¾e name¹èen"
+
+#: lib/rpmps.c:231
+#, fuzzy, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "paketa %s ni mo¾no prestaviti\n"
+
+#: lib/rpmps.c:236
+#, 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/rpmps.c:241
+#, 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/rpmps.c:246
+#, 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/rpmps.c:251
+#, 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/rpmps.c:261
+#, 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/rpmps.c:266
+#, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr ""
+
+#: lib/rpmps.c:270
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Requires: %s\n"
+msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
+
+#: lib/rpmps.c:274
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Conflicts: %s\n"
+msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
+
+#: lib/rpmps.c:279
+#, fuzzy, c-format
+msgid "unknown error %d encountered while manipulating package %s"
+msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "conflicts with"
+msgstr " je v sporu z %s-%s-%s\n"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "is needed by"
+msgstr " potrebuje %s-%s-%s\n"
+
#: lib/rpmrc.c:191
#, fuzzy, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2720,176 +2720,177 @@ 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:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n"
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr "zbiranje seznama priklopljenih datoteènih sistemov.\n"
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr "datoteka ni navadna datoteka -- preskakujemo preverjanje velikosti\n"
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:147
+#: lib/signature.c:148
#, fuzzy, c-format
msgid " Actual size: %12d\n"
msgstr "Dol¾. podpisa : %d\n"
-#: lib/signature.c:167
+#: lib/signature.c:168
msgid "No signature\n"
msgstr "Podpis manjka\n"
-#: lib/signature.c:171
+#: lib/signature.c:172
msgid "Old PGP signature\n"
msgstr "Stari podpis PGP\n"
-#: lib/signature.c:182
+#: lib/signature.c:183
#, fuzzy
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Podpis v (interni) stari obliki! Kje ste ga dobili?"
-#: lib/signature.c:232
+#: lib/signature.c:233
#, fuzzy, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "Dol¾. podpisa : %d\n"
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "Ni mo¾no izvesti %s: %s"
-#: lib/signature.c:327
+#: lib/signature.c:328
#, fuzzy
msgid "pgp failed\n"
msgstr "pgp je bil neuspe¹en"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
#, fuzzy
msgid "pgp failed to write signature\n"
msgstr "pgp je bil neuspe¹en pri zapisu podpisa"
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr "Dol¾. podpisa PGP: %d\n"
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
#, fuzzy
msgid "unable to read the signature\n"
msgstr "branje podpisa je bilo neuspe¹no"
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "Prebrano %d bajtov podpisa PGP\n"
-#: lib/signature.c:425
+#: lib/signature.c:426
#, fuzzy
msgid "gpg failed\n"
msgstr "gpg je bil neuspe¹en"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "gpg je boil neuspe¹en pri zapisu podpisa"
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr "Dol¾. podpisa GnuPG: %d\n"
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "Prebrano %d bajtov podpisa GnuPG\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, fuzzy, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Neveljaven %%_signature v makro-datoteki.\n"
-#: lib/signature.c:743
+#: lib/signature.c:744
#, fuzzy, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
-#: lib/signature.c:756
+#: lib/signature.c:757
#, fuzzy, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
-#: lib/signature.c:800
+#: lib/signature.c:801
#, fuzzy
msgid "Header+Payload size: "
msgstr "Glava je predolga"
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
#, fuzzy
msgid "V3 RSA/MD5 signature: "
msgstr "preskoèi vse podpise MD5"
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
#, fuzzy
msgid "V3 DSA signature: "
msgstr "Podpis manjka\n"
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, fuzzy, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Dol¾. polnila : %d\n"
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n"
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, c-format
msgid "excluding directory %s\n"
msgstr "izkljuèevanje imenika %s\n"
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr "zbiranje seznama priklopljenih datoteènih sistemov.\n"
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, fuzzy, c-format
msgid "missing %s"
msgstr "manjka %s\n"
-#: lib/verify.c:379
+#: lib/verify.c:380
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: "
diff --git a/po/sr.po b/po/sr.po
index 6511ed641..b0eccafce 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-0400\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-05-02 21:41:47-0400\n"
-#: build.c:39
+#: build.c:40
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "lo¹e meğuzavisnosti:\n"
-#: build.c:70
+#: build.c:71
#, fuzzy, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "Ne mogu da otvorim %s za èitanje: %s"
-#: build.c:150 build.c:162
+#: build.c:151 build.c:163
#, fuzzy, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "neuspelo otvaranje %s\n"
#. Give up
-#: build.c:169
+#: build.c:170
#, fuzzy, c-format
msgid "Failed to read spec file from %s\n"
msgstr "Neuspelo èitanje %s: %s."
-#: build.c:197
+#: build.c:198
#, fuzzy, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "Neuspelo èitanje %s: %s."
-#: build.c:237
+#: build.c:238
#, fuzzy, c-format
msgid "failed to stat %s: %m\n"
msgstr "neuspelo otvaranje %s: %s"
-#: build.c:242
+#: build.c:243
#, fuzzy, c-format
msgid "File %s is not a regular file.\n"
msgstr "%s ne lièi na RPM paket\n"
-#: build.c:251
+#: build.c:252
#, 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:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:321
+#: build.c:322
#, 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:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr "napi¹i verziju rpm-a koja se koristi"
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr ""
-#: rpmqv.c:121
+#: rpmqv.c:122
#, fuzzy
msgid "print macro expansion of <expr>+"
msgstr "napi¹i verziju rpm-a koja se koristi"
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr ""
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr "po¹alji standardni izlaz u <komandu>"
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr "koristi <dir> kao direktorijum najvi¹eg nivoa"
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr ""
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:183
+#: rpmqv.c:184
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr ""
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verzija %s\n"
-#: rpmqv.c:238
+#: rpmqv.c:239
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:240
#, 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:251
+#: rpmqv.c:252
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "kori¹æenje: {rpm --help}"
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:605
+#: rpmqv.c:606
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Koristite -e ili --erase.\n"
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr "samo jedan glavni re¾im mo¾e biti naveden"
-#: rpmqv.c:681
+#: rpmqv.c:682
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:685
+#: rpmqv.c:686
#, fuzzy
msgid "unexpected query flags"
msgstr "neoèekivan izvor upita"
-#: rpmqv.c:688
+#: rpmqv.c:689
#, fuzzy
msgid "unexpected query format"
msgstr "neoèekivan izvor upita"
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr "neoèekivan izvor upita"
-#: rpmqv.c:732
+#: rpmqv.c:733
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath je naveden za operaciju koja ne koristi bazu podataka"
-#: rpmqv.c:738
+#: rpmqv.c:739
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "samo instalacija i a¾uriranje mogu biti forsirane"
-#: rpmqv.c:740
+#: rpmqv.c:741
msgid "files may only be relocated during package installation"
msgstr "datoteke mogu biti preme¹tene samo tokom instalacije paketa"
-#: rpmqv.c:743
+#: rpmqv.c:744
msgid "only one of --prefix or --relocate may be used"
msgstr "samo jedno mo¾ete koristiti: --prefix ili --relocate"
-#: rpmqv.c:746
+#: rpmqv.c:747
#, 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:749
+#: rpmqv.c:750
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix mo¾ete koristiti samo kod instalacije novog paketa"
-#: rpmqv.c:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr "argumenti za --prefix moraju poèeti znakom /"
-#: rpmqv.c:755
+#: rpmqv.c:756
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:759
+#: rpmqv.c:760
msgid "--percent may only be specified during package installation"
msgstr "--percent mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:764
+#: rpmqv.c:765
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:768
+#: rpmqv.c:769
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:772
+#: rpmqv.c:773
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludecocs mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:776
+#: rpmqv.c:777
msgid "--includedocs may only be specified during package installation"
msgstr "--includecocs mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:780
+#: rpmqv.c:781
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "samo jedno mo¾ete da navedete: --excludedocs ili --includedocs"
-#: rpmqv.c:784
+#: rpmqv.c:785
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:788
+#: rpmqv.c:789
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:793
+#: rpmqv.c:794
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:797
+#: rpmqv.c:798
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches mo¾ete koristiti samo kod brisanja paketa"
-#: rpmqv.c:801
+#: rpmqv.c:802
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles mo¾ete koristiti samo kod instalacije paketa"
-#: rpmqv.c:806
+#: rpmqv.c:807
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb mo¾ete koristiti samo kod instalacije i brisanja paketa"
-#: rpmqv.c:811
+#: rpmqv.c:812
#, 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:816
+#: rpmqv.c:817
#, 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:820
+#: rpmqv.c:821
#, 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:825
+#: rpmqv.c:826
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:830
+#: rpmqv.c:831
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:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenti za --root (-r) moraju poèeti znakom /"
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:871
+#: rpmqv.c:872
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: rpmqv.c:890
+#: rpmqv.c:891
#, fuzzy
msgid "pgp not found: "
msgstr "Datoteka nije pronağena na serveru"
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr "Neuspela provera lozinke\n"
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr "Lozinka je dobra.\n"
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:913
+#: rpmqv.c:914
msgid "--sign may only be used during package building"
msgstr "--sign se mo¾e koristiti samo kod kreiranja paketa"
-#: rpmqv.c:930
+#: rpmqv.c:931
#, fuzzy
msgid "exec failed\n"
msgstr "%s: Neuspelo otvaranje\n"
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr "nedosataje paket za rekreiranje"
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr "nedostaje specifikacije za kreiranje"
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr "nedostaju 'tar' datoteke za kreiranje"
-#: rpmqv.c:1055
+#: rpmqv.c:1056
#, fuzzy
msgid "no packages given for erase"
msgstr "nedostaje paket za potpisivanje"
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr "nedostaje paket za instalaciju"
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr "nedostaju argumenti za upit"
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr "nedostaju argumenti za proveru"
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr "neoèekivani argumenti za --querytags"
-#: rpmqv.c:1149
+#: rpmqv.c:1150
#, fuzzy
msgid "no arguments given"
msgstr "nedostaju argumenti za upit"
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
#, 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:152
+#: build/files.c:1826 build/pack.c:154
#, 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:85
+#: build/pack.c:87
#, fuzzy, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: build/pack.c:88
+#: build/pack.c:90
#, fuzzy, c-format
msgid "create archive failed: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: build/pack.c:110
+#: build/pack.c:112
#, fuzzy, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "neuspelo èitanje: %s (%d)"
-#: build/pack.c:117
+#: build/pack.c:119
#, fuzzy, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "neuspelo èitanje: %s (%d)"
-#: build/pack.c:220
+#: build/pack.c:222
#, fuzzy, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
-#: build/pack.c:227
+#: build/pack.c:229
#, fuzzy, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
-#: build/pack.c:234
+#: build/pack.c:236
#, fuzzy, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
-#: build/pack.c:241
+#: build/pack.c:243
#, fuzzy, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
-#: build/pack.c:249
+#: build/pack.c:251
#, fuzzy, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
-#: build/pack.c:264
+#: build/pack.c:266
#, 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:292
+#: build/pack.c:294
#, fuzzy, c-format
msgid "readRPM: open %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: build/pack.c:302
+#: build/pack.c:304
#, fuzzy, c-format
msgid "readRPM: read %s: %s\n"
msgstr "Neuspelo èitanje %s: %s."
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, fuzzy, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: build/pack.c:339
+#: build/pack.c:341
#, 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:348
+#: build/pack.c:350
#, fuzzy, c-format
msgid "readRPM: reading header from %s\n"
msgstr "gre¹ka kod uzimanja sloga %s iz %s"
-#: build/pack.c:477
+#: build/pack.c:479
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:496
+#: build/pack.c:498
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:506
+#: build/pack.c:508
msgid "Bad CSA data\n"
msgstr ""
-#: build/pack.c:542
+#: build/pack.c:544
#, fuzzy
msgid "Unable to write final header\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:562
+#: build/pack.c:564
#, fuzzy, c-format
msgid "Generating signature: %d\n"
msgstr "napravi PGP potpis"
-#: build/pack.c:580
+#: build/pack.c:582
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:588
+#: build/pack.c:590
#, fuzzy, c-format
msgid "Could not open %s: %s\n"
msgstr "neuspelo otvaranje %s\n"
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:639
+#: build/pack.c:641
#, fuzzy, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:650
+#: build/pack.c:652
#, fuzzy, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:664
+#: build/pack.c:666
#, fuzzy, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:674
+#: build/pack.c:676
#, fuzzy, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:680
+#: build/pack.c:682
#, fuzzy, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Ne mogu da upi¹em %s"
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr ""
-#: build/pack.c:772
+#: build/pack.c:774
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:789
+#: build/pack.c:791
#, fuzzy, c-format
msgid "cannot create %s: %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
@@ -1453,36 +1453,36 @@ msgstr ""
msgid " failed - "
msgstr "PGP omanuo"
-#: lib/depends.c:155
+#: lib/depends.c:156
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "paket %s nije instaliran\n"
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
#, fuzzy
msgid "(rpmrc provides)"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/depends.c:425
+#: lib/depends.c:426
#, fuzzy
msgid "(rpmlib provides)"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/depends.c:446
+#: lib/depends.c:447
#, fuzzy
msgid "(db files)"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/depends.c:458
+#: lib/depends.c:459
#, fuzzy
msgid "(db provides)"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/depends.c:471
+#: lib/depends.c:472
#, fuzzy
msgid "(db package)"
msgstr "upit nad svim paketima"
@@ -1498,31 +1498,31 @@ msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "gre¹ka uklanjanja sloga %s u %s"
#. Record all relations.
-#: lib/depends.c:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1571,46 +1571,46 @@ msgstr "neuspelo otvaranje %s: %s"
msgid "file %s is on an unknown device\n"
msgstr ""
-#: lib/fsm.c:318
+#: lib/fsm.c:320
msgid "========== Directories not explictly included in package:\n"
msgstr ""
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, fuzzy, c-format
msgid "%10d %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "ne mogu da uklonim %s - direktorijum nije prazan"
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "neuspela komanda rmdir %s: %s"
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "neuspelo otvaranje %s: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
@@ -1620,43 +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:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/package.c:181
+#: lib/package.c:182
#, 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:189
+#: lib/package.c:190
#, 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:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: Neuspelo 'rpmReadSignature'\n"
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Potpis nije na raspolaganju\n"
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
@@ -2119,497 +2119,417 @@ msgstr "potpi¹i paket (ukloni tekuæi potpis)"
msgid "generate signature"
msgstr "napravi PGP potpis"
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: 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: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:231
-#, fuzzy, c-format
-msgid "package %s is already installed"
-msgstr "paket %s nije instaliran\n"
-
-#: 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:241
-#, c-format
-msgid "file %s conflicts between attempted installs of %s and %s"
-msgstr ""
-
-#: 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: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:256
-#, c-format
-msgid "installing package %s needs %ld%cb on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:266
-#, c-format
-msgid "installing package %s needs %ld inodes on the %s filesystem"
-msgstr ""
-
-#: 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:275
-#, fuzzy, c-format
-msgid "package %s has unsatisfied Requires: %s\n"
-msgstr "paket %s nije naveden u %s"
-
-#: 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:284
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s"
-msgstr ""
-
-#: lib/problems.c:365
-#, fuzzy
-msgid "conflicts with"
-msgstr " se sudara sa %s-%s-%s\n"
-
-#: 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:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 rpmdb/header.c:388 rpmdb/header_internal.c:161
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/psm.c:448
+#: lib/psm.c:449
#, fuzzy, c-format
msgid "cannot create %%%s %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: lib/psm.c:454
+#: lib/psm.c:455
#, fuzzy, c-format
msgid "cannot write to %%%s %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: lib/psm.c:485
+#: lib/psm.c:486
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:601
+#: lib/psm.c:602
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "upit nad paketom koji ima <datoteku>"
-#: lib/psm.c:720
+#: lib/psm.c:721
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "nemoj izvr¹iti nijednu fazu"
-#: lib/psm.c:890
+#: lib/psm.c:891
#, 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:897
+#: lib/psm.c:898
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "neuspelo izvr¹avanje skripta"
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, fuzzy, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, fuzzy, c-format
msgid "group %s does not exist - using root\n"
msgstr "grupa %s ne sadr¾i nijedan paket\n"
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "neuspelo otvaranje %s: %s\n"
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr ""
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "PGP omanuo"
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "gre¹ka u formatu: %s\n"
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr "(nema datoteka)"
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr ""
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr ""
-#: lib/query.c:289
+#: lib/query.c:290
#, fuzzy
msgid "not installed "
msgstr "paket %s nije instaliran\n"
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr ""
-#: lib/query.c:295
+#: lib/query.c:296
#, fuzzy, c-format
msgid "(unknown %3d) "
msgstr "(nepoznat tip)"
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr ""
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "paket nema imena"
-#: lib/query.c:465
+#: lib/query.c:466
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "gre¹ka: ne mogu da otvorim %s\n"
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "neuspelo otvaranje %s: %s\n"
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr "upit nad %s neuspeo\n"
-#: lib/query.c:637
+#: lib/query.c:638
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:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "nijedan paket ne aktivira %s\n"
-#: lib/query.c:707
+#: lib/query.c:708
#, fuzzy, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "upit nad %s neuspeo\n"
-#: lib/query.c:728
+#: lib/query.c:729
#, fuzzy
msgid "no packages\n"
msgstr "upit nad svim paketima"
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "grupa %s ne sadr¾i nijedan paket\n"
-#: lib/query.c:758
+#: lib/query.c:759
#, c-format
msgid "no package triggers %s\n"
msgstr "nijedan paket ne aktivira %s\n"
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "Neuspelo èitanje %s: %s."
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "nijedan paket ne aktivira %s\n"
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr "nijedan paket ne zahteva %s\n"
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr "nijedan paket ne obezbeğuje %s\n"
-#: lib/query.c:911
+#: lib/query.c:912
#, fuzzy, c-format
msgid "file %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/query.c:915
+#: lib/query.c:916
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/query.c:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr "pogre¹an broj paketa: %s\n"
-#: lib/query.c:945
+#: lib/query.c:946
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "pogre¹an broj paketa: %s\n"
-#: lib/query.c:950
+#: lib/query.c:951
#, fuzzy, c-format
msgid "record %u could not be read\n"
msgstr "ne mogu da proèitam slog %d\n"
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s nije instaliran\n"
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
#, fuzzy
msgid "(added files)"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
#, fuzzy
msgid "(added provide)"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: Neuspelo otvaranje\n"
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "%s: Neuspelo otvaranje\n"
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, 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:175
+#: lib/rpmchecksig.c:176
#, 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:274
+#: lib/rpmchecksig.c:275
#, fuzzy, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: Neuspelo 'rpmReadSignature'\n"
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n"
-#: lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
#, fuzzy
msgid " (MISSING KEYS:"
msgstr " (NEDOSTAJUÆI KLJUÈEVI)"
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "NO "
msgstr ""
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "paket %s nije naveden u %s"
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "nedostaje paket za instalaciju"
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, c-format
msgid "Retrieving %s\n"
msgstr "Pribavljam %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "paket %s nije instaliran\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "gre¹ka: %s se ne mo¾e instalirati\n"
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "grupa %s ne sadr¾i nijedan paket\n"
-#: lib/rpminstall.c:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "lo¹e meğuzavisnosti:\n"
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
#, fuzzy
msgid "installing binary packages\n"
msgstr "instaliraj paket"
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" odreğuje vi¹e paketa\n"
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
msgid "removing these packages would break dependencies:\n"
msgstr "uklanjanje oviha paketa æe naru¹iti zavisnosti:\n"
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "gre¹ka: ne mogu da otvorim %s\n"
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr "Instaliram %s\n"
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "neodstaje paket za deinstalaciju"
@@ -2619,6 +2539,86 @@ msgstr "neodstaje paket za deinstalaciju"
msgid "read failed: %s (%d)\n"
msgstr "neuspelo èitanje: %s (%d)"
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, fuzzy, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
+
+#: lib/rpmps.c:221
+#, fuzzy, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
+
+#: lib/rpmps.c:226
+#, fuzzy, c-format
+msgid "package %s is already installed"
+msgstr "paket %s nije instaliran\n"
+
+#: lib/rpmps.c:231
+#, fuzzy, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "paket %s nije instaliran\n"
+
+#: lib/rpmps.c:236
+#, c-format
+msgid "file %s conflicts between attempted installs of %s and %s"
+msgstr ""
+
+#: lib/rpmps.c:241
+#, 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/rpmps.c:246
+#, 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/rpmps.c:251
+#, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:261
+#, c-format
+msgid "installing package %s needs %ld inodes on the %s filesystem"
+msgstr ""
+
+#: lib/rpmps.c:266
+#, fuzzy, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
+
+#: lib/rpmps.c:270
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Requires: %s\n"
+msgstr "paket %s nije naveden u %s"
+
+#: lib/rpmps.c:274
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Conflicts: %s\n"
+msgstr "paket %s nije naveden u %s"
+
+#: lib/rpmps.c:279
+#, c-format
+msgid "unknown error %d encountered while manipulating package %s"
+msgstr ""
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "conflicts with"
+msgstr " se sudara sa %s-%s-%s\n"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "is needed by"
+msgstr " je potreban paketu %s-%s-%s\n"
+
#: lib/rpmrc.c:191
#, fuzzy, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2714,177 +2714,178 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Ne mogu da otvorim %s za èitanje: %s"
-#: lib/rpmts.c:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n"
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr ""
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:147
+#: lib/signature.c:148
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:167
+#: lib/signature.c:168
#, fuzzy
msgid "No signature\n"
msgstr "%s: Potpis nije na raspolaganju\n"
-#: lib/signature.c:171
+#: lib/signature.c:172
#, fuzzy
msgid "Old PGP signature\n"
msgstr "napravi PGP potpis"
-#: lib/signature.c:182
+#: lib/signature.c:183
#, fuzzy
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Stari (interni) potpis! Odakle vam!?"
-#: lib/signature.c:232
+#: lib/signature.c:233
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "Ne mogu da izvr¹im PGP"
-#: lib/signature.c:327
+#: lib/signature.c:328
#, fuzzy
msgid "pgp failed\n"
msgstr "PGP omanuo"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
#, fuzzy
msgid "pgp failed to write signature\n"
msgstr "PGP nije uspeo da zapi¹e potpis"
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
#, fuzzy
msgid "unable to read the signature\n"
msgstr "ne mogu da proèitam potpis"
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:425
+#: lib/signature.c:426
#, fuzzy
msgid "gpg failed\n"
msgstr "PGP omanuo"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "PGP nije uspeo da zapi¹e potpis"
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:743
+#: lib/signature.c:744
#, fuzzy, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci"
-#: lib/signature.c:756
+#: lib/signature.c:757
#, fuzzy, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci"
-#: lib/signature.c:800
+#: lib/signature.c:801
msgid "Header+Payload size: "
msgstr ""
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
#, fuzzy
msgid "V3 RSA/MD5 signature: "
msgstr "preskoèi sve MD5 potpise"
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
#, fuzzy
msgid "V3 DSA signature: "
msgstr "%s: Potpis nije na raspolaganju\n"
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, fuzzy, c-format
msgid "excluding directory %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr ""
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, fuzzy, c-format
msgid "missing %s"
msgstr "nedostaje { posle %"
-#: lib/verify.c:379
+#: lib/verify.c:380
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "Nezadovoljene meğuzavisnosti za %s-%s-%s: "
diff --git a/po/sv.po b/po/sv.po
index 84bcec057..a20d5ca80 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-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:39
+#: build.c:40
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "ouppfyllda byggberoenden:\n"
-#: build.c:70
+#: build.c:71
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "Kan inte öppna specfilen %s: %s\n"
-#: build.c:150 build.c:162
+#: build.c:151 build.c:163
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "Kunde inte öppna \"tar\"-rör: %m\n"
#. Give up
-#: build.c:169
+#: build.c:170
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr "Kunde inte läsa specfil från %s\n"
-#: build.c:197
+#: build.c:198
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "Kunde inte byta namn på %s till %s: %m\n"
-#: build.c:237
+#: build.c:238
#, c-format
msgid "failed to stat %s: %m\n"
msgstr "kunde inte ta status på %s: %m\n"
-#: build.c:242
+#: build.c:243
#, c-format
msgid "File %s is not a regular file.\n"
msgstr "Filen %s är inte en vanlig fil.\n"
-#: build.c:251
+#: build.c:252
#, 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:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Bygger målplattformar: %s\n"
-#: build.c:321
+#: build.c:322
#, 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:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr "visa vilken version av rpm som används"
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr "visa mindre detaljerad utdata"
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr "visa mer detaljerad utdata"
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr "definiera makrot <namn> som <kropp>"
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr "'<namn> <kropp>'"
-#: rpmqv.c:121
+#: rpmqv.c:122
msgid "print macro expansion of <expr>+"
msgstr "skriv ut makroexpansion av <uttr>+"
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr "<uttr>+"
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr "skicka standard ut till <kommando>"
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr "<kommando>"
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr "använd <kat> som toppkatalog"
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr "<kat>"
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr "läs <fil:...> istället för standardmakrofil(er)"
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr "<fil:...>"
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "läs <fil:...> istället för standard rpmrc-fil(er)"
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr "visa slutliga rpmrc- och makrokonfigurationer"
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr "deaktivera användningen av libio(3)-API:et"
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr "felsök protokolldataström"
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr "felsök rpmio I/O"
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr "felsök cache-hanteringen av URL:ar"
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr "Frågeflaggor (med -q eller --query):"
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr "Verifieringsflaggor (med -V eller --verify):"
-#: rpmqv.c:183
+#: rpmqv.c:184
msgid "Signature options:"
msgstr "Signaturflaggor:"
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr "Databasflaggor:"
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr "Byggflaggor med [ <specfil> | <tar-arkiv> | <källpaket> ]:"
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr "Installera-/Uppdatera-/Raderaflaggor"
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr "Gemensamma flaggor för alla rpm-lägen:"
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr "RPM version %s\n"
-#: rpmqv.c:238
+#: rpmqv.c:239
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright © 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:239
+#: rpmqv.c:240
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:251
+#: rpmqv.c:252
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Användning: %s {--help}\n"
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr "Flaggan --rcfile har tagits bort.\n"
-#: rpmqv.c:605
+#: rpmqv.c:606
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Använd \"--macros <fil:...>\" istället.\n"
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Internt fel i argumenthantering (%d) :-(\n"
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr "enbart ett huvudläge kan anges"
-#: rpmqv.c:681
+#: rpmqv.c:682
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:685
+#: rpmqv.c:686
msgid "unexpected query flags"
msgstr "oväntade frågeflaggor"
-#: rpmqv.c:688
+#: rpmqv.c:689
msgid "unexpected query format"
msgstr "oväntat frågeformat"
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr "oväntad frågekälla"
-#: rpmqv.c:732
+#: rpmqv.c:733
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:738
+#: rpmqv.c:739
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"enbart installation, uppgradering, rmsource och rmspec kan tvingas fram"
-#: rpmqv.c:740
+#: rpmqv.c:741
msgid "files may only be relocated during package installation"
msgstr "filer kan relokeras endast under paketinstallation"
-#: rpmqv.c:743
+#: rpmqv.c:744
msgid "only one of --prefix or --relocate may be used"
msgstr "enbart en av --prefix eller --relocate kan användas"
-#: rpmqv.c:746
+#: rpmqv.c:747
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:749
+#: rpmqv.c:750
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix kan endast användas när nya paket installeras"
-#: rpmqv.c:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr "argument till --prefix måste börja med /"
-#: rpmqv.c:755
+#: rpmqv.c:756
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) kan enbart användas vid paketinstallation"
-#: rpmqv.c:759
+#: rpmqv.c:760
msgid "--percent may only be specified during package installation"
msgstr "--percent kan enbart användas vid paketinstallation"
-#: rpmqv.c:764
+#: rpmqv.c:765
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles kan enbart användas vid paketinstallation"
-#: rpmqv.c:768
+#: rpmqv.c:769
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs kan enbart användas vid paketinstallation"
-#: rpmqv.c:772
+#: rpmqv.c:773
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs kan enbart användas vid paketinstallation"
-#: rpmqv.c:776
+#: rpmqv.c:777
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs kan enbart användas vid paketinstallation"
-#: rpmqv.c:780
+#: rpmqv.c:781
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "enbart en av --excludedocs och --includedocs kan användas"
-#: rpmqv.c:784
+#: rpmqv.c:785
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch kan enbart användas vid paketinstallation"
-#: rpmqv.c:788
+#: rpmqv.c:789
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos kan enbart användas vid paketinstallation"
-#: rpmqv.c:793
+#: rpmqv.c:794
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize kan enbart användas vid paketinstallation"
-#: rpmqv.c:797
+#: rpmqv.c:798
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches kan enbart användas när paket raderas"
-#: rpmqv.c:801
+#: rpmqv.c:802
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles kan enbart användas vid paketinstallation"
-#: rpmqv.c:806
+#: rpmqv.c:807
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:811
+#: rpmqv.c:812
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:816
+#: rpmqv.c:817
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:820
+#: rpmqv.c:821
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:825
+#: rpmqv.c:826
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:830
+#: rpmqv.c:831
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:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr "argument till --root (-r) måste börja med /"
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr "inga filer att signera\n"
-#: rpmqv.c:871
+#: rpmqv.c:872
#, c-format
msgid "cannot access file %s\n"
msgstr "kan inte komma åt filen %s\n"
-#: rpmqv.c:890
+#: rpmqv.c:891
msgid "pgp not found: "
msgstr "pgp hittades inte: "
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr "Ange lösenfras: "
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr "Kontrollen av lösenfrasen misslyckades\n"
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr "Lösenfrasen är ok.\n"
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Felaktig %%_signature-spec i makrofil.\n"
-#: rpmqv.c:913
+#: rpmqv.c:914
msgid "--sign may only be used during package building"
msgstr "--sign kan enbart användas vid pakettillverkning"
-#: rpmqv.c:930
+#: rpmqv.c:931
msgid "exec failed\n"
msgstr "exec misslyckades\n"
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr "inga paketfiler angivna för omtillverkning"
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr "inga specfiler angivna för tillverkning"
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr "inga tar-filer angivna för tillverkning"
-#: rpmqv.c:1055
+#: rpmqv.c:1056
#, fuzzy
msgid "no packages given for erase"
msgstr "inga paket angivna för signering"
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr "inga paket angivna för installation"
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr "inga parametrar angivna för fråga"
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr "inga parametrar angivna för verifiering"
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr "oväntade argument till --querytags "
-#: rpmqv.c:1149
+#: rpmqv.c:1150
#, fuzzy
msgid "no arguments given"
msgstr "inga parametrar angivna för fråga"
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
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:152
+#: build/files.c:1826 build/pack.c:154
#, 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:85
+#: build/pack.c:87
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "skapande av arkiv misslyckades vid fil %s: %s\n"
-#: build/pack.c:88
+#: build/pack.c:90
#, c-format
msgid "create archive failed: %s\n"
msgstr "skapande av arkiv misslyckades: %s\n"
-#: build/pack.c:110
+#: build/pack.c:112
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "cpio_copy kunde inte skriva: %s\n"
-#: build/pack.c:117
+#: build/pack.c:119
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "cpio_copy kunde inte läsa: %s\n"
-#: build/pack.c:220
+#: build/pack.c:222
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "Kunde inte öppna PreIn-fil: %s\n"
-#: build/pack.c:227
+#: build/pack.c:229
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "Kunde inte öppna PreUn-fil: %s\n"
-#: build/pack.c:234
+#: build/pack.c:236
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "Kunde inte öppna PostIn-fil: %s\n"
-#: build/pack.c:241
+#: build/pack.c:243
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "Kunde inte öppna PostUn-fil: %s\n"
-#: build/pack.c:249
+#: build/pack.c:251
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "Kunde inte öppna VerifyScript-fil: %s\n"
-#: build/pack.c:264
+#: build/pack.c:266
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "Kunde inte öppna Trigger-skriptfil: %s\n"
-#: build/pack.c:292
+#: build/pack.c:294
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr "readRPM: öppna %s: %s\n"
-#: build/pack.c:302
+#: build/pack.c:304
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr "readRPM: läs %s: %s\n"
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: Fseek misslyckades: %s\n"
-#: build/pack.c:339
+#: build/pack.c:341
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s är inte ett RPM-paket\n"
-#: build/pack.c:348
+#: build/pack.c:350
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: läser huvud från %s\n"
-#: build/pack.c:477
+#: build/pack.c:479
msgid "Unable to create immutable header region.\n"
msgstr "Kan inte skapa oföränderlig huvudregion.\n"
-#: build/pack.c:496
+#: build/pack.c:498
msgid "Unable to write temp header\n"
msgstr "Kan inte skriva temporärhuvud\n"
-#: build/pack.c:506
+#: build/pack.c:508
msgid "Bad CSA data\n"
msgstr "Felaktig CSA-data\n"
-#: build/pack.c:542
+#: build/pack.c:544
msgid "Unable to write final header\n"
msgstr "Kan inte skriva slutligt huvud\n"
-#: build/pack.c:562
+#: build/pack.c:564
#, c-format
msgid "Generating signature: %d\n"
msgstr "Genererar signatur: %d\n"
-#: build/pack.c:580
+#: build/pack.c:582
msgid "Unable to reload signature header.\n"
msgstr "Kan inte läsa om signaturhuvud.\n"
-#: build/pack.c:588
+#: build/pack.c:590
#, c-format
msgid "Could not open %s: %s\n"
msgstr "Kunde inte öppna %s: %s\n"
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Kunde inte skriva paket: %s\n"
-#: build/pack.c:639
+#: build/pack.c:641
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "Kan inte läsa signaturen %s: %s\n"
-#: build/pack.c:650
+#: build/pack.c:652
#, 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:664
+#: build/pack.c:666
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "Kan inte skriva huvud till %s: %s\n"
-#: build/pack.c:674
+#: build/pack.c:676
#, 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:680
+#: build/pack.c:682
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "Kan inte skriva last till %s: %s\n"
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr "Skrev: %s\n"
-#: build/pack.c:772
+#: build/pack.c:774
#, 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:789
+#: build/pack.c:791
#, c-format
msgid "cannot create %s: %s\n"
msgstr "kan inte skapa %s: %s\n"
@@ -1428,36 +1428,36 @@ msgstr "Ingen arkivfilen i huvud"
msgid " failed - "
msgstr " misslyckades - "
-#: lib/depends.c:155
+#: lib/depends.c:156
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "paket %s är redan installerat"
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n"
-#: lib/depends.c:425
+#: lib/depends.c:426
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n"
-#: lib/depends.c:446
+#: lib/depends.c:447
#, fuzzy
msgid "(db files)"
msgstr "felaktig db-fil %s\n"
-#: lib/depends.c:458
+#: lib/depends.c:459
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s JA (db-tillhandahållande)\n"
-#: lib/depends.c:471
+#: lib/depends.c:472
#, fuzzy
msgid "(db package)"
msgstr "inga paket\n"
@@ -1473,12 +1473,12 @@ 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:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr "========== noterar alla relationer\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1486,20 +1486,20 @@ msgid ""
msgstr ""
"========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n"
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr "========== endast efterföljare (presentationsordning)\n"
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr "LOOP:\n"
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr "========== fortsätter med tsort ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1548,47 +1548,47 @@ msgstr "kunde inte öppna %s: %s\n"
msgid "file %s is on an unknown device\n"
msgstr "filen %s är på en okänd enhet\n"
-#: lib/fsm.c:318
+#: lib/fsm.c:320
#, fuzzy
msgid "========== Directories not explictly included in package:\n"
msgstr "========= Kataloger ej uttryckligen inkluderade i paketet:\n"
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, fuzzy, c-format
msgid "%10d %s\n"
msgstr "%9d %s\n"
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr "katalog %s skapad med rättigheter %04o.\n"
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr "arkivfil %s fanns inte i huvudets fillista\n"
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, c-format
msgid "%s saved as %s\n"
msgstr "%s sparades som %s\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s rmdir av %s misslyckades: Katalogen är inte tom\n"
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s rmdir av %s misslyckades: %s\n"
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s unlink av %s misslyckades: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, c-format
msgid "%s created as %s\n"
msgstr "%s skapades som %s\n"
@@ -1598,41 +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:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead misslyckades\n"
-#: lib/package.c:181
+#: lib/package.c:182
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:189
+#: lib/package.c:190
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:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature misslyckades\n"
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen signatur tillgänglig\n"
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead misslyckades\n"
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread misslyckades: %s\n"
@@ -2063,385 +2063,305 @@ msgstr "signera ett paket (släng nuvarande signatur)"
msgid "generate signature"
msgstr "generera signatur"
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: 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: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:231
-#, c-format
-msgid "package %s is already installed"
-msgstr "paket %s är redan installerat"
-
-#: 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: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: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: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: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: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: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: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: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: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:365
-#, fuzzy
-msgid "conflicts with"
-msgstr " står i konflikt med %s-%s-%s\n"
-
-#: 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:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 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"
-#: lib/psm.c:448
+#: lib/psm.c:449
#, c-format
msgid "cannot create %%%s %s\n"
msgstr "kan inte skapa %%%s %s\n"
-#: lib/psm.c:454
+#: lib/psm.c:455
#, c-format
msgid "cannot write to %%%s %s\n"
msgstr "kan inte skriva till %%%s %s\n"
-#: lib/psm.c:485
+#: lib/psm.c:486
msgid "source package expected, binary found\n"
msgstr "källpaket förväntades, fann binärpaket\n"
-#: lib/psm.c:601
+#: lib/psm.c:602
msgid "source package contains no .spec file\n"
msgstr "källpaket innehåller ingen .spec-fil\n"
-#: lib/psm.c:720
+#: lib/psm.c:721
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "%s: kör (eventuellt) %s-skript\n"
-#: lib/psm.c:890
+#: lib/psm.c:891
#, 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:897
+#: lib/psm.c:898
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "körning av %s-skript från %s-%s-%s misslyckades, slutstatus %d\n"
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, fuzzy, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr "%s: %s-%s-%s har %d filer, test = %d\n"
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, fuzzy, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s: %s-skript misslyckades (%d), hoppar över %s-%s-%s\n"
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, c-format
msgid "user %s does not exist - using root\n"
msgstr "användare %s finns inte - använder root\n"
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, c-format
msgid "group %s does not exist - using root\n"
msgstr "grupp %s finns inte - använder root\n"
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "uppackning av arkiv misslyckades%s%s: %s\n"
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr " vid fil "
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%s misslyckades på fil %s: %s\n"
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, c-format
msgid "%s failed: %s\n"
msgstr "%s misslyckades: %s\n"
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, c-format
msgid "incorrect format: %s\n"
msgstr "fel format: %s\n"
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr "(innehåller inga filer)"
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr "normal "
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr "ersatt "
-#: lib/query.c:289
+#: lib/query.c:290
msgid "not installed "
msgstr "oinstallerat "
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr "nätdelad "
-#: lib/query.c:295
+#: lib/query.c:296
#, c-format
msgid "(unknown %3d) "
msgstr "(okänd %3d) "
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr "(ej tillstnd) "
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
msgid "package has neither file owner or id lists\n"
msgstr "paketet har varken filägare eller id-listor\n"
-#: lib/query.c:465
+#: lib/query.c:466
#, c-format
msgid "can't query %s: %s\n"
msgstr "kan inte fråga %s: %s\n"
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, c-format
msgid "open of %s failed: %s\n"
msgstr "misslyckades med att öppna %s: %s\n"
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr "fråga av %s misslyckades\n"
-#: lib/query.c:637
+#: lib/query.c:638
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:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "inga paketutlösare %s\n"
-#: lib/query.c:707
+#: lib/query.c:708
#, 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:728
+#: lib/query.c:729
msgid "no packages\n"
msgstr "inga paket\n"
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "grupp %s innehåller inga paket\n"
-#: lib/query.c:758
+#: lib/query.c:759
#, c-format
msgid "no package triggers %s\n"
msgstr "inga paketutlösare %s\n"
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "Misslyckades med att läsa %s: %s.\n"
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "inga paketutlösare %s\n"
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr "inget paket behöver %s\n"
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr "inget paket tillhandahåller %s\n"
-#: lib/query.c:911
+#: lib/query.c:912
#, c-format
msgid "file %s: %s\n"
msgstr "fil %s: %s\n"
-#: lib/query.c:915
+#: lib/query.c:916
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "filen %s tillhör inget paket\n"
-#: lib/query.c:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr "felaktigt paketnummer: %s\n"
-#: lib/query.c:945
+#: lib/query.c:946
#, c-format
msgid "package record number: %u\n"
msgstr "paketpost nummer: %u\n"
-#: lib/query.c:950
+#: lib/query.c:951
#, c-format
msgid "record %u could not be read\n"
msgstr "post %u kunde inte läsas\n"
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s är inte installerat\n"
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
#, fuzzy
msgid "(added files)"
msgstr "felaktig db-fil %s\n"
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
#, fuzzy
msgid "(added provide)"
msgstr "%s: %-45s JA (db-tillhandahållande)\n"
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: open misslyckades: %s\n"
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
msgid "makeTempFile failed\n"
msgstr "makeTempFile misslyckades\n"
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite misslyckades: %s\n"
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, fuzzy, c-format
msgid "%s: Can't sign v1 packaging\n"
msgstr "%s: Kan inte signera v1.0 RPM\n"
-#: lib/rpmchecksig.c:175
+#: lib/rpmchecksig.c:176
#, 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:274
+#: lib/rpmchecksig.c:275
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead misslyckades: %s\n"
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature misslyckades: %s\n"
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead misslyckades\n"
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ingen signatur tillgänglig (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr "EJ OK"
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
msgid " (MISSING KEYS:"
msgstr " (SAKNADE NYCKLAR:"
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr " (EJ BETRODDA NYCKLAR:"
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr "OK"
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "NO "
msgstr "NEJ "
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr "JA"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2450,105 +2370,105 @@ msgstr ""
"\"B\"-beroendet behöver en epok (antar samma som \"A\")\n"
"\tA %s\tB %s\n"
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n"
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr "Förbereder..."
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
msgid "Preparing packages for installation..."
msgstr "Förbereder paket för installation ..."
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, 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:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "hoppar över %s - överföring misslyckades - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, c-format
msgid "package %s is not relocateable\n"
msgstr "paket %s är inte relokerbart\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, c-format
msgid "error reading from file %s\n"
msgstr "fel vid läsning från fil %s\n"
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, 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:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kan inte installeras\n"
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "hittade %d käll- och %d binärpaket\n"
-#: lib/rpminstall.c:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "ouppfyllda beroenden:\n"
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
msgid "installing binary packages\n"
msgstr "installerar binärpaket\n"
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "kan inte öppna filen %s: %s\n"
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" anger flera paket\n"
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
msgid "removing these packages would break dependencies:\n"
msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n"
-#: lib/rpminstall.c:733
+#: lib/rpminstall.c:724
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan inte öppna %s: %s\n"
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr "Installerar %s\n"
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2558,6 +2478,86 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "läsning misslyckades: %s (%d)\n"
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, fuzzy, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr "paket %s är för en annan arkitektur"
+
+#: lib/rpmps.c:221
+#, fuzzy, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr "paket %s är för ett annat operativsystem"
+
+#: lib/rpmps.c:226
+#, c-format
+msgid "package %s is already installed"
+msgstr "paket %s är redan installerat"
+
+#: lib/rpmps.c:231
+#, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "sökväg %s i paket %s är inte relokerbar"
+
+#: lib/rpmps.c:236
+#, 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/rpmps.c:241
+#, 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/rpmps.c:246
+#, 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/rpmps.c:251
+#, 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/rpmps.c:261
+#, 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/rpmps.c:266
+#, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr "paket %s systemanrop före transaktion: %s misslyckades: %s"
+
+#: lib/rpmps.c:270
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Requires: %s\n"
+msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n"
+
+#: lib/rpmps.c:274
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Conflicts: %s\n"
+msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n"
+
+#: lib/rpmps.c:279
+#, c-format
+msgid "unknown error %d encountered while manipulating package %s"
+msgstr "okänt fel %d uppträdde under behandling av paket %s"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "conflicts with"
+msgstr " står i konflikt med %s-%s-%s\n"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "is needed by"
+msgstr " behövs av %s-%s-%s\n"
+
#: lib/rpmrc.c:191
#, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2653,172 +2653,173 @@ 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:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "kan inte öppna paketdatabas i %s\n"
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr "hämtar lista över monterade filsystem\n"
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr "filen är inte en vanlig fil -- hoppar över storlekskontroll\n"
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
"Förväntad storlek: %12d = inledning(%d)+signaturer(%d)+utfyllnad(%d)+data(%"
"d)\n"
-#: lib/signature.c:147
+#: lib/signature.c:148
#, c-format
msgid " Actual size: %12d\n"
msgstr " Faktisk storlek: %12d\n"
-#: lib/signature.c:167
+#: lib/signature.c:168
msgid "No signature\n"
msgstr "Ingen signatur\n"
-#: lib/signature.c:171
+#: lib/signature.c:172
msgid "Old PGP signature\n"
msgstr "Gammal PGP-signatur\n"
-#: lib/signature.c:182
+#: lib/signature.c:183
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Gammal (endast intern) signatur! Hur fick du tag i den!?\n"
-#: lib/signature.c:232
+#: lib/signature.c:233
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n"
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "Kunde inte köra %s: %s\n"
-#: lib/signature.c:327
+#: lib/signature.c:328
msgid "pgp failed\n"
msgstr "pgp misslyckades\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
msgid "pgp failed to write signature\n"
msgstr "pgp misslyckades att skriva en signatur\n"
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr "PGP signaturstorlek: %d\n"
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
msgid "unable to read the signature\n"
msgstr "kan inte läsa signaturen\n"
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "Fick %d byte PGP-signatur\n"
-#: lib/signature.c:425
+#: lib/signature.c:426
msgid "gpg failed\n"
msgstr "gpg misslyckades\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
msgid "gpg failed to write signature\n"
msgstr "gpg kunde inte skriva signatur\n"
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr "GPG-signaturstorlek: %d\n"
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "Fick %d byte GPG-signatur\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Felaktig %%_signature-spec i makrofil\n"
-#: lib/signature.c:743
+#: lib/signature.c:744
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Du måste sätta \"%%_gpg_name\" i din makrofil\n"
-#: lib/signature.c:756
+#: lib/signature.c:757
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Du måste sätta \"%%_pgp_name\" i din makrofil\n"
-#: lib/signature.c:800
+#: lib/signature.c:801
#, fuzzy
msgid "Header+Payload size: "
msgstr "Huvudstorleken för stor"
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
#, fuzzy
msgid "V3 RSA/MD5 signature: "
msgstr "hoppa över eventuella MD5-signaturer"
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
#, fuzzy
msgid "V3 DSA signature: "
msgstr "Ingen signatur\n"
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, fuzzy, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n"
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s överhoppad på grund av missingok-flagga\n"
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, c-format
msgid "excluding directory %s\n"
msgstr "hoppar över katalogen %s\n"
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr "hämtar lista över monterade filsystem\n"
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, c-format
msgid "missing %s"
msgstr "saknas %s"
-#: lib/verify.c:379
+#: lib/verify.c:380
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "Ouppfyllda beroenden för %s-%s-%s: "
diff --git a/po/tr.po b/po/tr.po
index 90a55b3d5..8f010a5a6 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-16 12:53-0400\n"
+"POT-Creation-Date: 2002-05-19 14:41-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:39
+#: build.c:40
#, fuzzy
msgid "Failed build dependencies:\n"
msgstr "işlem durdu, önce bağımlı paketler kurulmalı:\n"
-#: build.c:70
+#: build.c:71
#, c-format
msgid "Unable to open spec file %s: %s\n"
msgstr "%s spec dosyası açılamadı: %s\n"
-#: build.c:150 build.c:162
+#: build.c:151 build.c:163
#, c-format
msgid "Failed to open tar pipe: %m\n"
msgstr "tar veriyolu açılamadı: %m\n"
#. Give up
-#: build.c:169
+#: build.c:170
#, c-format
msgid "Failed to read spec file from %s\n"
msgstr "%s paketinden spec dosyası okunamadı\n"
-#: build.c:197
+#: build.c:198
#, c-format
msgid "Failed to rename %s to %s: %m\n"
msgstr "%s %s olarak değiştirilemedi: %m\n"
-#: build.c:237
+#: build.c:238
#, c-format
msgid "failed to stat %s: %m\n"
msgstr "%s durum bilgileri alınamadı: %m\n"
-#: build.c:242
+#: build.c:243
#, c-format
msgid "File %s is not a regular file.\n"
msgstr "%s bir normal bir dosya değil.\n"
-#: build.c:251
+#: build.c:252
#, 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:306
+#: build.c:307
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Hedef platformlar derleniyor: %s\n"
-#: build.c:321
+#: build.c:322
#, 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:111
+#: rpmqv.c:112
msgid "print the version of rpm being used"
msgstr "Kullanılan RPM sürümünü verir"
-#: rpmqv.c:114
+#: rpmqv.c:115
msgid "provide less detailed output"
msgstr "daha az ayrıntılı çıktı sağlar"
-#: rpmqv.c:116
+#: rpmqv.c:117
msgid "provide more detailed output"
msgstr "daha ayrıntılı çıktı sağlar"
-#: rpmqv.c:118
+#: rpmqv.c:119
msgid "define macro <name> with value <body>"
msgstr "<isim> makrosunu <gövde> değeriyle tanımlar"
-#: rpmqv.c:119
+#: rpmqv.c:120
msgid "'<name> <body>'"
msgstr "'<isim> <gövde>'"
-#: rpmqv.c:121
+#: rpmqv.c:122
msgid "print macro expansion of <expr>+"
msgstr "<ifade>+ için makro açılımını gösterir"
-#: rpmqv.c:122
+#: rpmqv.c:123
msgid "<expr>+"
msgstr "<ifade>+"
-#: rpmqv.c:124
+#: rpmqv.c:125
msgid "send stdout to <cmd>"
msgstr "standart çıktıyı <KOMUT>'a gönderir"
-#: rpmqv.c:125
+#: rpmqv.c:126
msgid "<cmd>"
msgstr "<kmt>"
-#: rpmqv.c:127
+#: rpmqv.c:128
msgid "use <dir> as the top level directory"
msgstr "Üst düzey dizin olarak <dizin> kullanılır"
-#: rpmqv.c:128 lib/poptI.c:215
+#: rpmqv.c:129 lib/poptI.c:215
msgid "<dir>"
msgstr "<dizin>"
-#: rpmqv.c:130
+#: rpmqv.c:131
msgid "read <file:...> instead of default macro file(s)"
msgstr "öntanımlı makro dosyası yerine <dosya:...> okunur"
-#: rpmqv.c:131 rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
msgid "<file:...>"
msgstr "<dosya:...>"
-#: rpmqv.c:134 rpmqv.c:138
+#: rpmqv.c:135 rpmqv.c:139
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "öntanımlı rpmrc dosyası yerine <dosya:...> okunur"
-#: rpmqv.c:142
+#: rpmqv.c:143
msgid "display final rpmrc and macro configuration"
msgstr "son rpmrc ve makro yapılandırmasını gösterir"
-#: rpmqv.c:147
+#: rpmqv.c:148
msgid "disable use of libio(3) API"
msgstr "libio(3) API kullanımını iptal eder"
-#: rpmqv.c:150
+#: rpmqv.c:151
msgid "debug protocol data stream"
msgstr "protokol veri akışında hata kontrolu"
-#: rpmqv.c:152
+#: rpmqv.c:153
msgid "debug rpmio I/O"
msgstr "rpmio G/Ç hata kontrolu"
-#: rpmqv.c:154
+#: rpmqv.c:155
msgid "debug URL cache handling"
msgstr "URL arabellek kullanımı hata kontrolu"
-#: rpmqv.c:174
+#: rpmqv.c:175
msgid "Query options (with -q or --query):"
msgstr "Sorgulama seçenekleri (-q ya da --query ile)"
-#: rpmqv.c:177
+#: rpmqv.c:178
msgid "Verify options (with -V or --verify):"
msgstr "Denetleme seçenekleri (-V ya da --verify ile)"
-#: rpmqv.c:183
+#: rpmqv.c:184
msgid "Signature options:"
msgstr "İmza seçenekleri:"
-#: rpmqv.c:189
+#: rpmqv.c:190
msgid "Database options:"
msgstr "Veritabanı seçenekleri:"
-#: rpmqv.c:195
+#: rpmqv.c:196
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"[ <specDosyası> | <tarPaketi> | <kaynakPaketi> ] ile paketleme seçenekleri:"
-#: rpmqv.c:201
+#: rpmqv.c:202
msgid "Install/Upgrade/Erase options:"
msgstr "Kurma/Güncelleme/Kaldırma seçenekleri:"
-#: rpmqv.c:206
+#: rpmqv.c:207
msgid "Common options for all rpm modes:"
msgstr "Tüm rpm kipleri için ortak seçenekler:"
#. @-modfilesys -globs @
-#: rpmqv.c:223 lib/poptI.c:27
+#: rpmqv.c:224 lib/poptI.c:27
#, c-format
msgid "%s: %s\n"
msgstr "dosya %s: %s\n"
-#: rpmqv.c:231
+#: rpmqv.c:232
#, c-format
msgid "RPM version %s\n"
msgstr "RPM Sürüm %s\n"
-#: rpmqv.c:238
+#: rpmqv.c:239
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998 - 2000 - Red Hat, Inc."
-#: rpmqv.c:239
+#: rpmqv.c:240
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:251
+#: rpmqv.c:252
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Kullanımı: %s {--help}\n"
-#: rpmqv.c:604
+#: rpmqv.c:605
msgid "The --rcfile option has been eliminated.\n"
msgstr "--rcfile seçeneği kaldırılmıştı.\n"
-#: rpmqv.c:605
+#: rpmqv.c:606
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Yerine \"--macros <dosya:...>\" kullanın.\n"
-#: rpmqv.c:611
+#: rpmqv.c:612
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "(%d) argümanı işlenirken iç hata oluştu :-(\n"
-#: rpmqv.c:652 rpmqv.c:658 rpmqv.c:664 rpmqv.c:702
+#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
msgid "only one major mode may be specified"
msgstr "sadece bir ana kip belirtilebilir"
-#: rpmqv.c:681
+#: rpmqv.c:682
msgid "one type of query/verify may be performed at a time"
msgstr "bir anda sadece bir tarz sorgulama/denetleme yapılabilir"
-#: rpmqv.c:685
+#: rpmqv.c:686
msgid "unexpected query flags"
msgstr "beklenmeyen sorgulama bayrakları"
-#: rpmqv.c:688
+#: rpmqv.c:689
msgid "unexpected query format"
msgstr "beklenmeyen sorgulama biçemi"
-#: rpmqv.c:691
+#: rpmqv.c:692
msgid "unexpected query source"
msgstr "beklenmeyen sorgulama kaynağı"
-#: rpmqv.c:732
+#: rpmqv.c:733
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath bir veritabanı kullanmayan işlemler için verilmiş"
-#: rpmqv.c:738
+#: rpmqv.c:739
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:740
+#: rpmqv.c:741
msgid "files may only be relocated during package installation"
msgstr ""
"dosyalar sadece paket kurulumu sırasında yeni yerlerine yerleştirilebilir"
-#: rpmqv.c:743
+#: rpmqv.c:744
msgid "only one of --prefix or --relocate may be used"
msgstr "--prefix ve --relocate seçeneklerinden sadece biri kullanılabilir"
-#: rpmqv.c:746
+#: rpmqv.c:747
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate ve --excludepath sadece yeni paket kurulumunda kullanılabilir"
-#: rpmqv.c:749
+#: rpmqv.c:750
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix sadece yeni paketlerin kurulması sırasında kullanılabilir"
-#: rpmqv.c:752
+#: rpmqv.c:753
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix ile belirtilenler '/' ile başlamalı"
-#: rpmqv.c:755
+#: rpmqv.c:756
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) sadece paket kurulumu sırasında kullanılabilir"
-#: rpmqv.c:759
+#: rpmqv.c:760
msgid "--percent may only be specified during package installation"
msgstr "--percent sadece paket kurulumu sırasında kullanılabilir"
-#: rpmqv.c:764
+#: rpmqv.c:765
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles sadece paket kurulumu sırasında kullanılabilir"
-#: rpmqv.c:768
+#: rpmqv.c:769
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs sadece paket kurulumu sırasında kullanılabilir"
-#: rpmqv.c:772
+#: rpmqv.c:773
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs sadece paket kurulumu sırasında kullanılabilir"
-#: rpmqv.c:776
+#: rpmqv.c:777
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs sadece paket kurulumu sırasında kullanılabilir"
-#: rpmqv.c:780
+#: rpmqv.c:781
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "--excludedocs ve --includedocs bir arada kullanılamaz"
-#: rpmqv.c:784
+#: rpmqv.c:785
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch sadece paket kurulumu sırasında kullanılabilir"
-#: rpmqv.c:788
+#: rpmqv.c:789
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos sadece paket kurulumu sırasında kullanılabilir"
-#: rpmqv.c:793
+#: rpmqv.c:794
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize sadece paket kurulumu sırasında kullanılabilir"
-#: rpmqv.c:797
+#: rpmqv.c:798
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches sadece paket kurulumu sırasında kullanılabilir"
-#: rpmqv.c:801
+#: rpmqv.c:802
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles sadece paket kurulumu sırasında kullanılabilir"
-#: rpmqv.c:806
+#: rpmqv.c:807
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:811
+#: rpmqv.c:812
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:816
+#: rpmqv.c:817
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:820
+#: rpmqv.c:821
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:825
+#: rpmqv.c:826
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:830
+#: rpmqv.c:831
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:842
+#: rpmqv.c:843
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) ile verilenler '/' ile başlamalı"
-#: rpmqv.c:866
+#: rpmqv.c:867
msgid "no files to sign\n"
msgstr "imzalanacak dosya yok\n"
-#: rpmqv.c:871
+#: rpmqv.c:872
#, c-format
msgid "cannot access file %s\n"
msgstr "%s dosyası bulunamıyor\n"
-#: rpmqv.c:890
+#: rpmqv.c:891
msgid "pgp not found: "
msgstr "pgp bulunamadı: "
-#: rpmqv.c:895
+#: rpmqv.c:896
msgid "Enter pass phrase: "
msgstr "Anahtar parolasını girin: "
-#: rpmqv.c:897
+#: rpmqv.c:898
msgid "Pass phrase check failed\n"
msgstr "Anahtar parolası kontrolü başarısız\n"
-#: rpmqv.c:901
+#: rpmqv.c:902
msgid "Pass phrase is good.\n"
msgstr "Anahtar parolası doğru.\n"
-#: rpmqv.c:906
+#: rpmqv.c:907
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Makro dosyasındaki %%_signature spec geçersiz.\n"
-#: rpmqv.c:913
+#: rpmqv.c:914
msgid "--sign may only be used during package building"
msgstr "--sign sadece paket oluşturulurken kullanılabilir"
-#: rpmqv.c:930
+#: rpmqv.c:931
msgid "exec failed\n"
msgstr "icra başarısız\n"
-#: rpmqv.c:963
+#: rpmqv.c:964
msgid "no packages files given for rebuild"
msgstr "yeniden oluşturmak için paket dosyaları belirtilmemiş"
-#: rpmqv.c:1031
+#: rpmqv.c:1032
msgid "no spec files given for build"
msgstr "oluşturma için gerekli spec dosyası belirtilmemiş"
-#: rpmqv.c:1033
+#: rpmqv.c:1034
msgid "no tar files given for build"
msgstr "oluşturma için gereken tar dosyaları belirtilmemiş"
-#: rpmqv.c:1055
+#: rpmqv.c:1056
#, fuzzy
msgid "no packages given for erase"
msgstr "imzalanacak paket(ler) belirtilmedi"
-#: rpmqv.c:1096
+#: rpmqv.c:1097
msgid "no packages given for install"
msgstr "yüklenecek paket(ler) belirtilmedi"
-#: rpmqv.c:1112
+#: rpmqv.c:1113
msgid "no arguments given for query"
msgstr "sorgulama için hiç argüman belirtilmedi"
-#: rpmqv.c:1125
+#: rpmqv.c:1126
msgid "no arguments given for verify"
msgstr "denetleme için hiç argüman belirtilmedi"
-#: rpmqv.c:1133
+#: rpmqv.c:1134
msgid "unexpected arguments to --querytags "
msgstr "--querytags ile beklenmeyen girdiler"
-#: rpmqv.c:1149
+#: rpmqv.c:1150
#, fuzzy
msgid "no arguments given"
msgstr "sorgulama için hiç argüman belirtilmedi"
-#: build/build.c:125 build/pack.c:489
+#: build/build.c:125 build/pack.c:491
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:152
+#: build/files.c:1826 build/pack.c:154
#, 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:85
+#: build/pack.c:87
#, c-format
msgid "create archive failed on file %s: %s\n"
msgstr "%s dosyasında arşiv oluşturulamadı: %s\n"
-#: build/pack.c:88
+#: build/pack.c:90
#, c-format
msgid "create archive failed: %s\n"
msgstr "arşiv oluşturulamadı: %s\n"
-#: build/pack.c:110
+#: build/pack.c:112
#, c-format
msgid "cpio_copy write failed: %s\n"
msgstr "cpio_copy yazma hatası:%s\n"
-#: build/pack.c:117
+#: build/pack.c:119
#, c-format
msgid "cpio_copy read failed: %s\n"
msgstr "cpio_copy okuma hatası: %s\n"
-#: build/pack.c:220
+#: build/pack.c:222
#, c-format
msgid "Could not open PreIn file: %s\n"
msgstr "PreIn dosyası açılamadı: %s\n"
-#: build/pack.c:227
+#: build/pack.c:229
#, c-format
msgid "Could not open PreUn file: %s\n"
msgstr "PreUn dosyası açılamadı: %s\n"
-#: build/pack.c:234
+#: build/pack.c:236
#, c-format
msgid "Could not open PostIn file: %s\n"
msgstr "PostIn dosyası açılamadı: %s\n"
-#: build/pack.c:241
+#: build/pack.c:243
#, c-format
msgid "Could not open PostUn file: %s\n"
msgstr "PostUn dosyası açılamadı: %s\n"
-#: build/pack.c:249
+#: build/pack.c:251
#, c-format
msgid "Could not open VerifyScript file: %s\n"
msgstr "VerifyScript dosyası açılamadı: %s\n"
-#: build/pack.c:264
+#: build/pack.c:266
#, c-format
msgid "Could not open Trigger script file: %s\n"
msgstr "Trigger betik dosyası açılamadı: %s\n"
-#: build/pack.c:292
+#: build/pack.c:294
#, c-format
msgid "readRPM: open %s: %s\n"
msgstr "readRPM: %s açılırken: %s\n"
-#: build/pack.c:302
+#: build/pack.c:304
#, c-format
msgid "readRPM: read %s: %s\n"
msgstr "readRPM: %s okunurken: %s\n"
-#: build/pack.c:311 build/pack.c:535
+#: build/pack.c:313 build/pack.c:537
#, c-format
msgid "%s: Fseek failed: %s\n"
msgstr "%s: Fseek başarısız: %s\n"
-#: build/pack.c:339
+#: build/pack.c:341
#, c-format
msgid "readRPM: %s is not an RPM package\n"
msgstr "readRPM: %s bir RPM paketi değil\n"
-#: build/pack.c:348
+#: build/pack.c:350
#, c-format
msgid "readRPM: reading header from %s\n"
msgstr "readRPM: %s başlığı okunuyor\n"
-#: build/pack.c:477
+#: build/pack.c:479
#, fuzzy
msgid "Unable to create immutable header region.\n"
msgstr "%s'den başlık okunamadı: %s\n"
-#: build/pack.c:496
+#: build/pack.c:498
#, fuzzy
msgid "Unable to write temp header\n"
msgstr "%s'e başlık yazılamadı: %s\n"
-#: build/pack.c:506
+#: build/pack.c:508
msgid "Bad CSA data\n"
msgstr "CSA verisi geçersiz\n"
-#: build/pack.c:542
+#: build/pack.c:544
#, fuzzy
msgid "Unable to write final header\n"
msgstr "%s'e başlık yazılamadı: %s\n"
-#: build/pack.c:562
+#: build/pack.c:564
#, c-format
msgid "Generating signature: %d\n"
msgstr "İmza üretiliyor: %d\n"
-#: build/pack.c:580
+#: build/pack.c:582
#, fuzzy
msgid "Unable to reload signature header.\n"
msgstr "%s'den başlık okunamadı: %s\n"
-#: build/pack.c:588
+#: build/pack.c:590
#, c-format
msgid "Could not open %s: %s\n"
msgstr "%s açılamadı: %s\n"
-#: build/pack.c:624 lib/psm.c:1450
+#: build/pack.c:626 lib/psm.c:1451
#, c-format
msgid "Unable to write package: %s\n"
msgstr "paket yazılamadı: %s\n"
-#: build/pack.c:639
+#: build/pack.c:641
#, c-format
msgid "Unable to open sigtarget %s: %s\n"
msgstr "sigtarget %s açılamadı: %s\n"
-#: build/pack.c:650
+#: build/pack.c:652
#, c-format
msgid "Unable to read header from %s: %s\n"
msgstr "%s'den başlık okunamadı: %s\n"
-#: build/pack.c:664
+#: build/pack.c:666
#, c-format
msgid "Unable to write header to %s: %s\n"
msgstr "%s'e başlık yazılamadı: %s\n"
-#: build/pack.c:674
+#: build/pack.c:676
#, c-format
msgid "Unable to read payload from %s: %s\n"
msgstr "%s'den payload okunamadı: %s\n"
-#: build/pack.c:680
+#: build/pack.c:682
#, c-format
msgid "Unable to write payload to %s: %s\n"
msgstr "%s'e payload yazılamadı: %s\n"
-#: build/pack.c:705 lib/psm.c:1738
+#: build/pack.c:707 lib/psm.c:1739
#, c-format
msgid "Wrote: %s\n"
msgstr "Yazıldı: %s\n"
-#: build/pack.c:772
+#: build/pack.c:774
#, 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:789
+#: build/pack.c:791
#, c-format
msgid "cannot create %s: %s\n"
msgstr "%s dosyası oluşturulamıyor: %s\n"
@@ -1448,36 +1448,36 @@ msgstr ""
msgid " failed - "
msgstr " başarısız - "
-#: lib/depends.c:155
+#: lib/depends.c:156
#, fuzzy, c-format
msgid "package %s was already added, replacing with %s\n"
msgstr "%s zaten kurulu"
-#: lib/depends.c:384
+#: lib/depends.c:385
msgid "(cached)"
msgstr ""
-#: lib/depends.c:409
+#: lib/depends.c:410
#, fuzzy
msgid "(rpmrc provides)"
msgstr "%s: %-45s EVET (rpmrc sağlar)\n"
-#: lib/depends.c:425
+#: lib/depends.c:426
#, fuzzy
msgid "(rpmlib provides)"
msgstr "%s: %-45s EVET (rpmlib sağlar)\n"
-#: lib/depends.c:446
+#: lib/depends.c:447
#, fuzzy
msgid "(db files)"
msgstr "db dosyası %s hatalı\n"
-#: lib/depends.c:458
+#: lib/depends.c:459
#, fuzzy
msgid "(db provides)"
msgstr "%s: %-45s EVET (db sağlar)\n"
-#: lib/depends.c:471
+#: lib/depends.c:472
#, fuzzy
msgid "(db package)"
msgstr "paket yok\n"
@@ -1493,12 +1493,12 @@ 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:1199
+#: lib/depends.c:1201
msgid "========== recording tsort relations\n"
msgstr "========== tsort bağıntıları kaydediliyor\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1305
+#: lib/depends.c:1307
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1506,20 +1506,20 @@ msgid ""
msgstr ""
"========== paketler tsort'lanıyor (sıra, #öncüller, #ardıllar, derinlik)\n"
-#: lib/depends.c:1398
+#: lib/depends.c:1400
msgid "========== successors only (presentation order)\n"
msgstr "========== sadece ardıllar (sunum sırası)\n"
-#: lib/depends.c:1468
+#: lib/depends.c:1470
msgid "LOOP:\n"
msgstr "ÇEVRİM:\n"
-#: lib/depends.c:1503
+#: lib/depends.c:1505
msgid "========== continuing tsort ...\n"
msgstr "========== tsort sürüyor ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1508
+#: lib/depends.c:1510
#, c-format
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
@@ -1568,47 +1568,47 @@ msgstr "%s açılamadı: %s\n"
msgid "file %s is on an unknown device\n"
msgstr "%s dosyasının bulunduğu aygıt anlaşılamadı\n"
-#: lib/fsm.c:318
+#: lib/fsm.c:320
#, fuzzy
msgid "========== Directories not explictly included in package:\n"
msgstr "========= Pakette bulunmayan dizinler:\n"
-#: lib/fsm.c:320
+#: lib/fsm.c:322
#, fuzzy, c-format
msgid "%10d %s\n"
msgstr "%9d %s\n"
-#: lib/fsm.c:1206
+#: lib/fsm.c:1208
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr "%s dizin %04o izinleriyle oluşturuldu.\n"
-#: lib/fsm.c:1497
+#: lib/fsm.c:1499
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1620 lib/fsm.c:1752
+#: lib/fsm.c:1622 lib/fsm.c:1754
#, c-format
msgid "%s saved as %s\n"
msgstr "%s %s olarak kaydedildi\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1780
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s / %s dizin silinemedi - Dizin boş değil\n"
-#: lib/fsm.c:1784
+#: lib/fsm.c:1786
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s / %s dizinin silinmesi başarısız: %s\n"
-#: lib/fsm.c:1794
+#: lib/fsm.c:1796
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s / %s bağ kaldırılamadı: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1816
#, c-format
msgid "%s created as %s\n"
msgstr "%s %s olarak oluşturuldu\n"
@@ -1618,43 +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:166 lib/rpmchecksig.c:574
+#: lib/package.c:169 lib/rpmchecksig.c:167 lib/rpmchecksig.c:575
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead başarısız\n"
-#: lib/package.c:181
+#: lib/package.c:182
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:189
+#: lib/package.c:190
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:198 lib/rpmchecksig.c:184 lib/rpmchecksig.c:590
+#: lib/package.c:199 lib/rpmchecksig.c:185 lib/rpmchecksig.c:591
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature başarısız\n"
-#: lib/package.c:202 lib/rpmchecksig.c:188 lib/rpmchecksig.c:595
+#: lib/package.c:203 lib/rpmchecksig.c:189 lib/rpmchecksig.c:596
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: İmza bulundurmuyor\n"
-#: lib/package.c:248 lib/rpmchecksig.c:495
+#: lib/package.c:249 lib/rpmchecksig.c:496
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead başarısız\n"
-#: lib/package.c:283 lib/package.c:308 lib/package.c:338 lib/rpmchecksig.c:666
+#: lib/package.c:284 lib/package.c:309 lib/package.c:339 lib/rpmchecksig.c:667
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:350 lib/rpmchecksig.c:114 lib/rpmchecksig.c:524
+#: lib/package.c:351 lib/rpmchecksig.c:115 lib/rpmchecksig.c:525
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread başarısız: %s\n"
@@ -2087,384 +2087,304 @@ msgstr "paketi imzalar (mevcut imza kaldırılır)"
msgid "generate signature"
msgstr "imza üretir"
-#. @observer@
-#: lib/problems.c:213
-msgid "different"
-msgstr ""
-
-#: 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: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:231
-#, c-format
-msgid "package %s is already installed"
-msgstr "%s zaten kurulu"
-
-#: 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: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: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: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: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: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: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: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: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: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:365
-#, fuzzy
-msgid "conflicts with"
-msgstr " %s-%s-%s ile çelişiyor\n"
-
-#: 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:388 rpmdb/header_internal.c:161
+#: lib/psm.c:251 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"
-#: lib/psm.c:448
+#: lib/psm.c:449
#, c-format
msgid "cannot create %%%s %s\n"
msgstr "%%%s dosyası oluşturulamıyor: %s\n"
-#: lib/psm.c:454
+#: lib/psm.c:455
#, c-format
msgid "cannot write to %%%s %s\n"
msgstr "%%%s dosyasına yazılamaz %s\n"
-#: lib/psm.c:485
+#: lib/psm.c:486
msgid "source package expected, binary found\n"
msgstr "kaynak paketi gerekirken çalıştırılabilir paketi bulundu\n"
-#: lib/psm.c:601
+#: lib/psm.c:602
msgid "source package contains no .spec file\n"
msgstr "kaynak paketi .spec dosyası içermiyor\n"
-#: lib/psm.c:720
+#: lib/psm.c:721
#, fuzzy, c-format
msgid "%s: running %s scriptlet\n"
msgstr "%s: %s betiği çalıştırılıyor (varsa)\n"
-#: lib/psm.c:890
+#: lib/psm.c:891
#, 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:897
+#: lib/psm.c:898
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "%s betiğinin %s-%s-%s'den icrası başarısız, çıkışta durum %d\n"
-#: lib/psm.c:1237
+#: lib/psm.c:1238
#, fuzzy, c-format
msgid "%s: %s has %d files, test = %d\n"
msgstr "%s: %s-%s-%s %d dosya içeriyor, test = %d\n"
-#: lib/psm.c:1357
+#: lib/psm.c:1358
#, fuzzy, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s: %s betiği başarısız (%d), %s-%s-%s atlanıyor\n"
-#: lib/psm.c:1499
+#: lib/psm.c:1500
#, c-format
msgid "user %s does not exist - using root\n"
msgstr "kullanıcı %s yok - root kullanılacak\n"
-#: lib/psm.c:1508
+#: lib/psm.c:1509
#, c-format
msgid "group %s does not exist - using root\n"
msgstr "grup %s yok - root kullanılacak\n"
-#: lib/psm.c:1550
+#: lib/psm.c:1551
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "arşiv paketi açılırken başarısız%s%s: %s\n"
-#: lib/psm.c:1551
+#: lib/psm.c:1552
msgid " on file "
msgstr " dosyada "
-#: lib/psm.c:1746
+#: lib/psm.c:1747
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%s açılamadı: %s\n"
-#: lib/psm.c:1749
+#: lib/psm.c:1750
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "%s başarısız\n"
-#: lib/query.c:126 lib/rpmts.c:227
+#: lib/query.c:127 lib/rpmts.c:258
#, c-format
msgid "incorrect format: %s\n"
msgstr "biçem yanlış: %s\n"
-#: lib/query.c:222
+#: lib/query.c:223
msgid "(contains no files)"
msgstr "(hiç dosya içermiyor)"
-#: lib/query.c:283
+#: lib/query.c:284
msgid "normal "
msgstr "normal "
-#: lib/query.c:286
+#: lib/query.c:287
msgid "replaced "
msgstr "yerine "
-#: lib/query.c:289
+#: lib/query.c:290
msgid "not installed "
msgstr "yüklenmedi "
-#: lib/query.c:292
+#: lib/query.c:293
msgid "net shared "
msgstr "ağ paylaşımlı "
-#: lib/query.c:295
+#: lib/query.c:296
#, c-format
msgid "(unknown %3d) "
msgstr "(bilinmeyen %3d)"
-#: lib/query.c:300
+#: lib/query.c:301
msgid "(no state) "
msgstr "(durumsuz) "
-#: lib/query.c:319 lib/query.c:375
+#: lib/query.c:320 lib/query.c:376
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:465
+#: lib/query.c:466
#, c-format
msgid "can't query %s: %s\n"
msgstr "%s sorgulanamıyor: %s\n"
-#: lib/query.c:619 lib/query.c:653 lib/rpminstall.c:359 lib/rpminstall.c:501
-#: lib/rpminstall.c:890
+#: lib/query.c:620 lib/query.c:654 lib/rpminstall.c:361 lib/rpminstall.c:498
+#: lib/rpminstall.c:881
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s açılamadı: %s\n"
-#: lib/query.c:631
+#: lib/query.c:632
#, c-format
msgid "query of %s failed\n"
msgstr "%s 'nin sorgulaması başarısızlıkla sonuçlandı\n"
-#: lib/query.c:637
+#: lib/query.c:638
msgid "old format source packages cannot be queried\n"
msgstr "eski biçem kaynak paketleri sorgulanamaz\n"
-#: lib/query.c:663 lib/rpminstall.c:514
+#: lib/query.c:664 lib/rpminstall.c:511
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "%s tetikleyen paket yok\n"
-#: lib/query.c:707
+#: lib/query.c:708
#, 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:728
+#: lib/query.c:729
msgid "no packages\n"
msgstr "paket yok\n"
-#: lib/query.c:748
+#: lib/query.c:749
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "%s grubu hiç paket içermiyor\n"
-#: lib/query.c:758
+#: lib/query.c:759
#, c-format
msgid "no package triggers %s\n"
msgstr "%s tetikleyen paket yok\n"
-#: lib/query.c:772 lib/query.c:794 lib/query.c:815 lib/query.c:850
+#: lib/query.c:773 lib/query.c:795 lib/query.c:816 lib/query.c:851
#, fuzzy, c-format
msgid "malformed %s: %s\n"
msgstr "%s okunamadı: %s.\n"
-#: lib/query.c:782 lib/query.c:800 lib/query.c:825 lib/query.c:855
+#: lib/query.c:783 lib/query.c:801 lib/query.c:826 lib/query.c:856
#, fuzzy, c-format
msgid "no package matches %s: %s\n"
msgstr "%s tetikleyen paket yok\n"
-#: lib/query.c:866
+#: lib/query.c:867
#, c-format
msgid "no package requires %s\n"
msgstr "%s gerektiren paket yok\n"
-#: lib/query.c:877
+#: lib/query.c:878
#, c-format
msgid "no package provides %s\n"
msgstr "%s sağlayan paket yok\n"
-#: lib/query.c:911
+#: lib/query.c:912
#, c-format
msgid "file %s: %s\n"
msgstr "dosya %s: %s\n"
-#: lib/query.c:915
+#: lib/query.c:916
#, 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:942
+#: lib/query.c:943
#, c-format
msgid "invalid package number: %s\n"
msgstr "geçersiz paket numarası: %s\n"
-#: lib/query.c:945
+#: lib/query.c:946
#, c-format
msgid "package record number: %u\n"
msgstr "paket kayıt numarası: %u\n"
-#: lib/query.c:950
+#: lib/query.c:951
#, c-format
msgid "record %u could not be read\n"
msgstr "%u. kayıt okunamadı\n"
-#: lib/query.c:961 lib/rpminstall.c:678
+#: lib/query.c:962 lib/rpminstall.c:669
#, c-format
msgid "package %s is not installed\n"
msgstr "%s paketi kurulu değil\n"
-#: lib/rpmal.c:686
+#: lib/rpmal.c:688
#, fuzzy
msgid "(added files)"
msgstr "db dosyası %s hatalı\n"
-#: lib/rpmal.c:763
+#: lib/rpmal.c:765
#, fuzzy
msgid "(added provide)"
msgstr "%s: %-45s EVET (db sağlar)\n"
-#: lib/rpmchecksig.c:55
+#: lib/rpmchecksig.c:56
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: açılamadı: %s\n"
-#: lib/rpmchecksig.c:67
+#: lib/rpmchecksig.c:68
msgid "makeTempFile failed\n"
msgstr "makeTempFile başarısız\n"
-#: lib/rpmchecksig.c:108
+#: lib/rpmchecksig.c:109
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite başarısız: %s\n"
-#: lib/rpmchecksig.c:171
+#: lib/rpmchecksig.c:172
#, 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:175
+#: lib/rpmchecksig.c:176
#, 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:274
+#: lib/rpmchecksig.c:275
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead başarısız: %s\n"
-#: lib/rpmchecksig.c:280
+#: lib/rpmchecksig.c:281
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature başarısız: %s\n"
-#: lib/rpmchecksig.c:509
+#: lib/rpmchecksig.c:510
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead başarısız\n"
-#: lib/rpmchecksig.c:580
+#: lib/rpmchecksig.c:581
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: İmza bulundurmuyor (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:826
msgid "NOT OK"
msgstr "TAMAM DEĞİL"
-#: lib/rpmchecksig.c:826 lib/rpmchecksig.c:840
+#: lib/rpmchecksig.c:827 lib/rpmchecksig.c:841
msgid " (MISSING KEYS:"
msgstr " (EKSİK ANAHTARLAR:"
-#: lib/rpmchecksig.c:828 lib/rpmchecksig.c:842
+#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:829 lib/rpmchecksig.c:843
+#: lib/rpmchecksig.c:830 lib/rpmchecksig.c:844
msgid " (UNTRUSTED KEYS:"
msgstr " (GÜVENCESİZ ANAHTARLAR:"
-#: lib/rpmchecksig.c:831 lib/rpmchecksig.c:845
+#: lib/rpmchecksig.c:832 lib/rpmchecksig.c:846
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:839
+#: lib/rpmchecksig.c:840
msgid "OK"
msgstr "Tamam"
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "NO "
msgstr "HAYIR "
-#: lib/rpmds.c:420 lib/rpmds.c:579
+#: lib/rpmds.c:421 lib/rpmds.c:580
msgid "YES"
msgstr "EVET"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:548
+#: lib/rpmds.c:549
#, fuzzy, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2473,105 +2393,105 @@ msgstr ""
"\"B\" bağımlılığı bir dönemsellik gerektirir (tabii ki \"A\" da)\n"
"\tA %s\tB %s\n"
-#: lib/rpmds.c:578
+#: lib/rpmds.c:579
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
#. @=branchstate@
-#: lib/rpmds.c:602
+#: lib/rpmds.c:603
#, fuzzy, c-format
msgid "package %s has unsatisfied %s: %s\n"
msgstr "paket %s-%s-%s gereksinimi tatmin edici değil: %s\n"
-#: lib/rpminstall.c:162
+#: lib/rpminstall.c:163
msgid "Preparing..."
msgstr "Hazırlanıyor..."
-#: lib/rpminstall.c:164
+#: lib/rpminstall.c:165
msgid "Preparing packages for installation..."
msgstr "Kurulacak paketler hazırlanıyor..."
-#: lib/rpminstall.c:307
+#: lib/rpminstall.c:308
#, 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:319
+#: lib/rpminstall.c:321
#, c-format
msgid " ... as %s\n"
msgstr "... %s olarak\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:325
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s atlanıyor - aktarım başarısız - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, c-format
msgid "package %s is not relocateable\n"
msgstr "%s paketi yeniden konumlandırılamaz\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:472
#, c-format
msgid "error reading from file %s\n"
msgstr "%s dosyasından okuma hatalı\n"
-#: lib/rpminstall.c:481
+#: lib/rpminstall.c:478
#, 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:493 lib/rpminstall.c:746
+#: lib/rpminstall.c:490 lib/rpminstall.c:737
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s yüklenemedi\n"
-#: lib/rpminstall.c:529
+#: lib/rpminstall.c:526
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n"
-#: lib/rpminstall.c:545 lib/rpminstall.c:1077
+#: lib/rpminstall.c:540 lib/rpminstall.c:1068
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "bağımlılıklarda hata; gerekli paketler:\n"
-#: lib/rpminstall.c:552
+#: lib/rpminstall.c:547
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:584
+#: lib/rpminstall.c:577
msgid "installing binary packages\n"
msgstr "icra edilebilir paketleri kuruluyor\n"
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:597
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "%s dosyası açılamadı: %s\n"
-#: lib/rpminstall.c:681
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" birden fazla paketi tanımlıyor\n"
-#: lib/rpminstall.c:706
+#: lib/rpminstall.c:697
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:733
+#: lib/rpminstall.c:724
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s açılamadı: %s\n"
-#: lib/rpminstall.c:739
+#: lib/rpminstall.c:730
#, c-format
msgid "Installing %s\n"
msgstr "%s kuruluyor\n"
-#: lib/rpminstall.c:1071
+#: lib/rpminstall.c:1062
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2581,6 +2501,86 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "okuma başarısız: %s (%d)\n"
+#. @observer@
+#: lib/rpmps.c:208
+msgid "different"
+msgstr ""
+
+#: lib/rpmps.c:216
+#, fuzzy, c-format
+msgid "package %s is intended for a %s architecture"
+msgstr "%s farklı bir mimari için"
+
+#: lib/rpmps.c:221
+#, fuzzy, c-format
+msgid "package %s is intended for a %s operating system"
+msgstr "%s farklı bir işletim sistemi için"
+
+#: lib/rpmps.c:226
+#, c-format
+msgid "package %s is already installed"
+msgstr "%s zaten kurulu"
+
+#: lib/rpmps.c:231
+#, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "%s dosya yolu %s paketinde yeniden konumlandırılamaz"
+
+#: lib/rpmps.c:236
+#, 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/rpmps.c:241
+#, 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/rpmps.c:246
+#, 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/rpmps.c:251
+#, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
+msgstr "%s kurulumu %ld%cb gerektiriyor (%s dosya sisteminde)"
+
+#: lib/rpmps.c:261
+#, 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/rpmps.c:266
+#, 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/rpmps.c:270
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Requires: %s\n"
+msgstr "paket %s-%s-%s gereksinimi tatmin edici değil: %s\n"
+
+#: lib/rpmps.c:274
+#, fuzzy, c-format
+msgid "package %s has unsatisfied Conflicts: %s\n"
+msgstr "paket %s-%s-%s gereksinimi tatmin edici değil: %s\n"
+
+#: lib/rpmps.c:279
+#, c-format
+msgid "unknown error %d encountered while manipulating package %s"
+msgstr "anlaşılamayan %d hatası, %s paketi işlenirken saptandı"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "conflicts with"
+msgstr " %s-%s-%s ile çelişiyor\n"
+
+#: lib/rpmps.c:360
+#, fuzzy
+msgid "is needed by"
+msgstr " %s-%s-%s için gerekli\n"
+
#: lib/rpmrc.c:191
#, c-format
msgid "missing second ':' at %s:%d\n"
@@ -2676,170 +2676,171 @@ 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:96 lib/rpmts.c:138
+#: lib/rpmts.c:127 lib/rpmts.c:169
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "%s de Paket veritabanı açılamadı\n"
-#: lib/signature.c:124
+#. Get available space on mounted file systems.
+#: lib/rpmts.c:560
+msgid "getting list of mounted filesystems\n"
+msgstr "bağlı dosya sistemlerinin listesi alınıyor\n"
+
+#: lib/signature.c:125
msgid "file is not regular -- skipping size check\n"
msgstr "dosya normal değil -- uzunluk denetimi atlanıyor\n"
-#: lib/signature.c:142
+#: lib/signature.c:143
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr "gereken boyut: %12d = (%d)uç+(%d)imza+(%d)iz+(%d)veri\n"
-#: lib/signature.c:147
+#: lib/signature.c:148
#, c-format
msgid " Actual size: %12d\n"
msgstr " Gerçek boyut: %12d\n"
-#: lib/signature.c:167
+#: lib/signature.c:168
msgid "No signature\n"
msgstr "İmza yok\n"
-#: lib/signature.c:171
+#: lib/signature.c:172
msgid "Old PGP signature\n"
msgstr "Eski PGP imzası\n"
-#: lib/signature.c:182
+#: lib/signature.c:183
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Eski imza !!! Bunu nasıl aldın!?\n"
-#: lib/signature.c:232
+#: lib/signature.c:233
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "İmza: boyut(%d)+iz(%d)\n"
-#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:312 lib/signature.c:409 lib/signature.c:676
+#: lib/signature.c:709
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "%s icra edilemedi: %s\n"
-#: lib/signature.c:327
+#: lib/signature.c:328
msgid "pgp failed\n"
msgstr "pgp hata verdi\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:334
+#: lib/signature.c:335
msgid "pgp failed to write signature\n"
msgstr "pgp imzasının yazılması başarısız\n"
-#: lib/signature.c:339
+#: lib/signature.c:340
#, c-format
msgid "PGP sig size: %d\n"
msgstr "PGP imza uzunluğu: %d\n"
-#: lib/signature.c:353 lib/signature.c:451
+#: lib/signature.c:354 lib/signature.c:452
msgid "unable to read the signature\n"
msgstr "imza okunamadı\n"
-#: lib/signature.c:358
+#: lib/signature.c:359
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "GPG imzasının %d baytı alındı\n"
-#: lib/signature.c:425
+#: lib/signature.c:426
msgid "gpg failed\n"
msgstr "gpg hata verdi\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:432
+#: lib/signature.c:433
msgid "gpg failed to write signature\n"
msgstr "imzanın yazılması sırasında gpg hata verdi\n"
-#: lib/signature.c:437
+#: lib/signature.c:438
#, c-format
msgid "GPG sig size: %d\n"
msgstr "GPG imza uzunluğu: %d\n"
-#: lib/signature.c:456
+#: lib/signature.c:457
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "GPG imzasının %d baytı alındı\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:764
+#: lib/signature.c:714 lib/signature.c:765
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Makro dosyasında %%_signature spec geçersiz\n"
-#: lib/signature.c:743
+#: lib/signature.c:744
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Makro dosyanızda \"%%_pgp_name\" tanımlanmış olmalı\n"
-#: lib/signature.c:756
+#: lib/signature.c:757
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Makro dosyanızda \"%%_pgp_name\" belirtmelisiniz\n"
-#: lib/signature.c:800
+#: lib/signature.c:801
#, fuzzy
msgid "Header+Payload size: "
msgstr "Başlık çok uzun"
-#: lib/signature.c:836
+#: lib/signature.c:837
msgid "MD5 digest: "
msgstr ""
-#: lib/signature.c:885
+#: lib/signature.c:886
msgid "Header SHA1 digest: "
msgstr ""
-#: lib/signature.c:1071
+#: lib/signature.c:1072
#, fuzzy
msgid "V3 RSA/MD5 signature: "
msgstr "tüm MD5 imzalarını atlar"
-#: lib/signature.c:1181
+#: lib/signature.c:1182
msgid "Header "
msgstr ""
-#: lib/signature.c:1182
+#: lib/signature.c:1183
#, fuzzy
msgid "V3 DSA signature: "
msgstr "İmza yok\n"
-#: lib/signature.c:1257
+#: lib/signature.c:1258
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:1284
+#: lib/signature.c:1285
msgid "Broken MD5 digest: UNSUPPORTED\n"
msgstr ""
-#: lib/signature.c:1288
+#: lib/signature.c:1289
#, fuzzy, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "İmza: boyut(%d)+iz(%d)\n"
-#: lib/transaction.c:180
+#: lib/transaction.c:98
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "missingok flamasından dolayı %s atlandı\n"
#. @innercontinue@
-#: lib/transaction.c:1004
+#: lib/transaction.c:887
#, c-format
msgid "excluding directory %s\n"
msgstr "%s dizini dışlanıyor\n"
-#: lib/transaction.c:1093
-msgid "getting list of mounted filesystems\n"
-msgstr "bağlı dosya sistemlerinin listesi alınıyor\n"
-
-#: lib/verify.c:283
+#: lib/verify.c:284
#, c-format
msgid "missing %s"
msgstr "eksik %s"
-#: lib/verify.c:379
+#: lib/verify.c:380
#, fuzzy, c-format
msgid "Unsatisifed dependencies for %s: "
msgstr "%s-%s-%s için tatmin edici olmayan bağımlılıklar: "
diff --git a/python/header-py.c b/python/header-py.c
index 9126789d7..aeec2fe6b 100644
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -8,6 +8,7 @@
#include "rpmio_internal.h"
#include "rpmcli.h" /* XXX for rpmCheckSig */
+#include "rpmps.h"
#include "rpmfi.h"
#include "rpmts.h" /* XXX for ts->rpmdb */
@@ -178,21 +179,21 @@ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) {
fileNumber = (int) PyInt_AsLong(args);
- { rpmTransactionSet ts;
+ { rpmts ts;
int scareMem = 1;
- TFI_t fi;
+ rpmfi fi;
int rc;
ts = rpmtsCreate();
- fi = fiNew(ts, NULL, s->h, RPMTAG_BASENAMES, scareMem);
- fi = tfiInit(fi, fileNumber);
- if (fi != NULL && tfiNext(fi) >= 0) {
+ fi = rpmfiNew(ts, NULL, s->h, RPMTAG_BASENAMES, scareMem);
+ fi = rpmfiInit(fi, fileNumber);
+ if (fi != NULL && rpmfiNext(fi) >= 0) {
/* XXX this routine might use callbacks intelligently. */
rc = rpmVerifyFile(ts, fi, &verifyResult, RPMVERIFY_NONE);
} else
rc = 1;
- fi = fiFree(fi, 1);
+ fi = rpmfiFree(fi, 1);
rpmtsFree(ts);
if (rc) {
@@ -781,7 +782,7 @@ PyObject * rpmHeaderFromPackage(PyObject * self, PyObject * args) {
if (!PyArg_ParseTuple(args, "i", &rawFd)) return NULL;
fd = fdDup(rawFd);
- { rpmTransactionSet ts;
+ { rpmts ts;
ts = rpmtsCreate();
rc = rpmReadPackageFile(ts, fd, "rpmHeaderFromPackage", &header);
rpmtsFree(ts);
diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 56579dad6..395fb39dd 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -19,6 +19,7 @@
#include "rpmcli.h" /* XXX for rpmCheckSig */
#include "rpmdb.h"
+#include "rpmps.h"
#include "rpmts.h" /* XXX for ts->rpmdb */
#include "legacy.h"
@@ -159,7 +160,7 @@ typedef struct rpmtsObject_s rpmtsObject;
struct rpmtsObject_s {
PyObject_HEAD;
rpmdbObject * dbo;
- rpmTransactionSet ts;
+ rpmts ts;
PyObject * keyList; /* keeps reference counts correct */
FD_t scriptFd;
} ;
@@ -235,7 +236,7 @@ static PyObject * py_rpmtsRemove(rpmtsObject * s, PyObject * args) {
/** \ingroup python
*/
static PyObject * py_rpmtsDepCheck(rpmtsObject * s, PyObject * args) {
- rpmProblemSet ps;
+ rpmps ps;
rpmProblem p;
PyObject * list, * cf;
int i;
@@ -306,7 +307,7 @@ static PyObject * py_rpmtsDepCheck(rpmtsObject * s, PyObject * args) {
Py_DECREF(cf);
}
- ps = rpmProblemSetFree(ps);
+ ps = rpmpsFree(ps);
return list;
}
@@ -420,7 +421,7 @@ static PyObject * py_rpmtsRun(rpmtsObject * s, PyObject * args)
int flags, ignoreSet;
int rc, i;
PyObject * list;
- rpmProblemSet ps;
+ rpmps ps;
struct tsCallbackType cbInfo;
if (!PyArg_ParseTuple(args, "iiOO", &flags, &ignoreSet, &cbInfo.cb,
@@ -436,7 +437,7 @@ static PyObject * py_rpmtsRun(rpmtsObject * s, PyObject * args)
ps = rpmtsGetProblems(s->ts);
if (cbInfo.pythonError) {
- ps = rpmProblemSetFree(ps);
+ ps = rpmpsFree(ps);
return NULL;
}
@@ -459,7 +460,7 @@ static PyObject * py_rpmtsRun(rpmtsObject * s, PyObject * args)
Py_DECREF(prob);
}
- ps = rpmProblemSetFree(ps);
+ ps = rpmpsFree(ps);
return list;
}
@@ -837,7 +838,7 @@ static PyObject * checkSig (PyObject * self, PyObject * args) {
int rc = 255;
if (PyArg_ParseTuple(args, "si", &filename, &flags)) {
- rpmTransactionSet ts;
+ rpmts ts;
const char * av[2];
QVA_t ka = memset(alloca(sizeof(*ka)), 0, sizeof(*ka));
diff --git a/rpm.spec.in b/rpm.spec.in
index 54483dc14..3b4ada28c 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.14
+Release: 0.15
Group: System Environment/Base
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
Copyright: GPL
@@ -521,6 +521,9 @@ fi
%{__prefix}/include/popt.h
%changelog
+* Sun May 19 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.15
+- Grand Renaming of rpm data types.
+
* Thu May 16 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.14
- opaque (well mostly) rpmTransactionSet using methods.
diff --git a/rpm2cpio.c b/rpm2cpio.c
index 2767f4db9..6c5a25583 100644
--- a/rpm2cpio.c
+++ b/rpm2cpio.c
@@ -30,7 +30,7 @@ int main(int argc, char **argv)
}
fdo = fdDup(STDOUT_FILENO);
- { rpmTransactionSet ts = rpmtsCreate();
+ { rpmts ts = rpmtsCreate();
/*@-mustmod@*/ /* LCL: segfault */
rc = rpmReadPackageFile(ts, fdi, "rpm2cpio", &h);
diff --git a/rpmdb/header.h b/rpmdb/header.h
index 77c4f5768..2aab89967 100644
--- a/rpmdb/header.h
+++ b/rpmdb/header.h
@@ -58,7 +58,7 @@
* will be added to headers.
*
* - Private header methods.
- * - Private methods for the transaction element file info TFI_t may
+ * - Private methods for the transaction element file info rpmfi may
* be used as proof-of-concept, binary XML may be implemented
* as a header format representation soon thereafter.
* - DSA signature for header metadata.
diff --git a/rpmqv.c b/rpmqv.c
index 48a19be29..838baa640 100755
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -14,6 +14,7 @@
#include <rpmbuild.h>
#include "rpmdb.h"
+#include "rpmps.h"
#include "rpmts.h"
#define POPT_NODEPS 1025
@@ -292,7 +293,7 @@ int main(int argc, const char ** argv)
/*@modifies __assert_program_name,
fileSystem, internalState@*/
{
- rpmTransactionSet ts = NULL;
+ rpmts ts = NULL;
enum modes bigMode = MODE_UNKNOWN;
#ifdef IAM_RPMQV
diff --git a/tools/rpmsort.c b/tools/rpmsort.c
index 5b8acea5a..bee037f0f 100644
--- a/tools/rpmsort.c
+++ b/tools/rpmsort.c
@@ -5,6 +5,7 @@
#include <rpmurl.h>
#include "rpmdb.h"
+#include "rpmps.h"
#include "rpmte.h"
#include "rpmts.h"
@@ -45,7 +46,7 @@ static int
do_tsort(const char *fileArgv[])
{
const char * rootdir = "/";
- rpmTransactionSet ts = NULL;
+ rpmts ts = NULL;
const char ** pkgURL = NULL;
char * pkgState = NULL;
const char ** fnp;
@@ -210,7 +211,7 @@ restart:
if (numFailed) goto exit;
if (!noDeps) {
- rpmProblemSet ps;
+ rpmps ps;
rc = rpmtsCheck(ts);
@@ -218,20 +219,20 @@ restart:
if (ps) {
rpmMessage(RPMMESS_ERROR, _("Failed dependencies:\n"));
printDepProblems(stderr, ps);
- ps = rpmProblemSetFree(ps);
+ ps = rpmpsFree(ps);
rc = -1;
goto exit;
}
- ps = rpmProblemSetFree(ps);
+ ps = rpmpsFree(ps);
}
rc = rpmtsOrder(ts);
if (rc)
goto exit;
- { rpmDepSet requires;
- teIterator pi; transactionElement p;
- teIterator qi; transactionElement q;
+ { rpmds requires;
+ rpmtei pi; rpmte p;
+ rpmtei qi; rpmte q;
unsigned char * selected =
alloca(sizeof(*selected) * (ts->orderCount + 1));
int oType = TR_ADDED;
@@ -241,43 +242,43 @@ fprintf(stdout, "digraph XXX {\n");
fprintf(stdout, " rankdir=LR\n");
fprintf(stdout, "//===== Packages:\n");
- pi = teInitIterator(ts);
- while ((p = teNext(pi, oType)) != NULL) {
-fprintf(stdout, "//%5d%5d %s\n", teGetTree(p), teGetDepth(p), teGetN(p));
- q = teGetParent(p);
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, oType)) != NULL) {
+fprintf(stdout, "//%5d%5d %s\n", rpmteTree(p), rpmteDepth(p), rpmteN(p));
+ q = rpmteParent(p);
if (q != NULL)
-fprintf(stdout, " \"%s\" -> \"%s\"\n", teGetN(p), teGetN(q));
+fprintf(stdout, " \"%s\" -> \"%s\"\n", rpmteN(p), rpmteN(q));
else {
-fprintf(stdout, " \"%s\"\n", teGetN(p));
-fprintf(stdout, " { rank=max ; \"%s\" }\n", teGetN(p));
+fprintf(stdout, " \"%s\"\n", rpmteN(p));
+fprintf(stdout, " { rank=max ; \"%s\" }\n", rpmteN(p));
}
}
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
#ifdef NOTNOW
fprintf(stdout, "//===== Relations:\n");
- pi = teInitIterator(ts);
- while ((p = teNext(pi, oType)) != NULL) {
+ pi = rpmteiInit(ts);
+ while ((p = rpmteiNext(pi, oType)) != NULL) {
int printed;
- if ((requires = teGetDS(p, RPMTAG_REQUIRENAME)) == NULL)
+ if ((requires = rpmteDS(p, RPMTAG_REQUIRENAME)) == NULL)
continue;
memset(selected, 0, sizeof(*selected) * ts->orderCount);
- selected[teiGetOc(pi)] = 1;
+ selected[rpmteiGetOc(pi)] = 1;
printed = 0;
- requires = dsiInit(requires);
- while (dsiNext(requires) >= 0) {
+ requires = rpmdsInit(requires);
+ while (rpmdsNext(requires) >= 0) {
int_32 Flags;
const char * qName;
fnpyKey key;
alKey pkgKey;
int i;
- Flags = dsiGetFlags(requires);
+ Flags = rpmdsFlags(requires);
- switch (teGetType(p)) {
+ switch (rpmteType(p)) {
case TR_REMOVED:
/* Skip if not %preun/%postun requires or legacy prereq. */
if (isInstallPreReq(Flags)
@@ -300,7 +301,7 @@ fprintf(stdout, "//===== Relations:\n");
/*@switchbreak@*/ break;
}
- if ((qName = dsiGetN(requires)) == NULL)
+ if ((qName = rpmdsN(requires)) == NULL)
continue; /* XXX can't happen */
if (!strncmp(qName, "rpmlib(", sizeof("rpmlib(")-1))
continue;
@@ -310,15 +311,15 @@ fprintf(stdout, "//===== Relations:\n");
if (pkgKey == RPMAL_NOMATCH)
continue;
- for (qi = teInitIterator(ts), i = 0;
- (q = teNextIterator(qi)) != NULL; i++)
+ for (qi = rpmteiInit(ts), i = 0;
+ (q = rpmteiNext(qi, 0)) != NULL; i++)
{
- if (teGetType(q) == TR_REMOVED)
+ if (rpmteType(q) == TR_REMOVED)
continue;
- if (pkgKey == teGetAddedKey(q))
+ if (pkgKey == rpmteAddedKey(q))
break;
}
- qi = teFreeIterator(qi);
+ qi = rpmteiFree(qi);
if (q == NULL || i == ts->orderCount)
continue;
@@ -326,38 +327,38 @@ fprintf(stdout, "//===== Relations:\n");
continue;
selected[i] = 1;
- if (teGetTree(p) == teGetTree(q)) {
- int pdepth = teGetDepth(p);
- int qdepth = teGetDepth(q);
+ if (rpmteTree(p) == rpmteTree(q)) {
+ int pdepth = rpmteDepth(p);
+ int qdepth = rpmteDepth(q);
#if 0
if (pdepth == qdepth)
continue;
if (pdepth < qdepth) {
if ((qdepth - pdepth) > 1) continue;
- if (!strcmp(teGetN(q), "glibc")) continue;
- if (!strcmp(teGetN(q), "bash")) continue;
+ if (!strcmp(rpmteN(q), "glibc")) continue;
+ if (!strcmp(rpmteN(q), "bash")) continue;
}
#endif
if (pdepth > qdepth) {
- if (!strcmp(teGetN(q), "glibc")) continue;
- if (!strcmp(teGetN(q), "bash")) continue;
- if (!strcmp(teGetN(q), "info")) continue;
- if (!strcmp(teGetN(q), "mktemp")) continue;
+ if (!strcmp(rpmteN(q), "glibc")) continue;
+ if (!strcmp(rpmteN(q), "bash")) continue;
+ if (!strcmp(rpmteN(q), "info")) continue;
+ if (!strcmp(rpmteN(q), "mktemp")) continue;
}
}
if (!printed) {
-fprintf(stdout, "// %s\n", teGetN(p));
+fprintf(stdout, "// %s\n", rpmteN(p));
printed = 1;
}
-fprintf(stdout, "//\t%s (0x%x)\n", dsDNEVR(identifyDepend(Flags), requires), Flags);
-fprintf(stdout, "\t\"%s\" -> \"%s\"\n", teGetN(p), teGetN(q));
+fprintf(stdout, "//\t%s (0x%x)\n", rpmdsNewDNEVR(identifyDepend(Flags), requires), Flags);
+fprintf(stdout, "\t\"%s\" -> \"%s\"\n", rpmteN(p), rpmteN(q));
}
}
- pi = teFreeIterator(pi);
+ pi = rpmteiFree(pi);
#endif /* NOTNOW */
fprintf(stdout, "}\n");
diff --git a/tools/tpkgid.c b/tools/tpkgid.c
index 246a569fc..3f4b2bd37 100644
--- a/tools/tpkgid.c
+++ b/tools/tpkgid.c
@@ -40,7 +40,7 @@ static int indent = 2;
typedef struct Item_s {
const char * path;
- rpmDepSet this;
+ rpmds this;
Header h;
} * Item;
@@ -50,7 +50,7 @@ static int nitems = 0;
static inline Item freeItem(Item item) {
if (item != NULL) {
item->path = _free(item->path);
- item->this = dsFree(item->this);
+ item->this = rpmdsFree(item->this);
item->h = headerFree(item->h, NULL);
item = _free(item);
}
@@ -65,7 +65,7 @@ static inline Item newItem(void) {
static int cmpItem(const void * a, const void * b) {
Item aitem = *(Item *)a;
Item bitem = *(Item *)b;
- int rc = strcmp(dsiGetN(aitem->this), dsiGetN(bitem->this));
+ int rc = strcmp(rpmdsN(aitem->this), rpmdsN(bitem->this));
return rc;
}
@@ -83,10 +83,10 @@ static void ftsPrintPaths(FILE * fp) {
fprintf(fp, "%s\n", items[i]->path);
}
-static int ftsStashLatest(FTSENT * fts, rpmTransactionSet ts)
+static int ftsStashLatest(FTSENT * fts, rpmts ts)
{
Header h = NULL;
- rpmDepSet add;
+ rpmds add;
int ec = -1; /* assume not found */
int i = 0;
@@ -108,7 +108,7 @@ static int ftsStashLatest(FTSENT * fts, rpmTransactionSet ts)
return ec; /* XXX -1 */
}
- add = dsThis(h, RPMTAG_REQUIRENAME, (RPMSENSE_EQUAL|RPMSENSE_LESS));
+ add = rpmdsThis(h, RPMTAG_REQUIRENAME, (RPMSENSE_EQUAL|RPMSENSE_LESS));
if (items != NULL && nitems > 0) {
Item needle = memset(alloca(sizeof(*needle)), 0, sizeof(*needle));
@@ -126,7 +126,7 @@ static int ftsStashLatest(FTSENT * fts, rpmTransactionSet ts)
/* Check that all saved items are newer than this item. */
if (found != NULL)
while (found < (items + nitems) && cmpItem(found, fneedle) == 0) {
- ec = dsCompare(needle->this, (*found)->this);
+ ec = rpmdsCompare(needle->this, (*found)->this);
if (ec == 0) {
found++;
continue;
@@ -153,7 +153,7 @@ static int ftsStashLatest(FTSENT * fts, rpmTransactionSet ts)
items[i] = newItem();
items[i]->path = xstrdup(fts->fts_path);
- items[i]->this = dsThis(h, RPMTAG_PROVIDENAME, RPMSENSE_EQUAL);
+ items[i]->this = rpmdsThis(h, RPMTAG_PROVIDENAME, RPMSENSE_EQUAL);
items[i]->h = headerLink(h, NULL);
if (nitems > 1)
@@ -167,7 +167,7 @@ static int ftsStashLatest(FTSENT * fts, rpmTransactionSet ts)
exit:
h = headerFree(h, NULL);
- add = dsFree(add);
+ add = rpmdsFree(add);
return ec;
}
@@ -195,7 +195,7 @@ static const char * ftsInfoStr(int fts_info) {
return ftsInfoStrings[ fts_info ];
}
-static int ftsPrint(FTS * ftsp, FTSENT * fts, rpmTransactionSet ts)
+static int ftsPrint(FTS * ftsp, FTSENT * fts, rpmts ts)
{
struct ftsglob_s * bhg;
const char ** patterns;
@@ -419,7 +419,7 @@ main(int argc, const char *argv[])
{
poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
const char * rootDir = "";
- rpmTransactionSet ts = NULL;
+ rpmts ts = NULL;
FTS * ftsp;
FTSENT * fts;
const char ** av;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 23:34:47 +0000