59 files changed, 5865 insertions, 4995 deletions
diff --git a/CHANGES b/CHANGES
index bcb396c5e..79b2ebacb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,7 +21,11 @@
 	- wire transactions through rpmcli signature modes.
 	- wire transactions through rpmcli query/verify modes.
 	- wire transactions through rpmcli install/erase modes.
-	- legacy signatures always checked on package read.
+	- legacy signatures always checked (where possible) on package read.
+	- wire transactions through rpmcli build modes.
+	- lazy rpmdb open/close through transaction methods (mostly anyways).
+	- no-brainer refcounts for rpmdb object.
+	- check added header against transaction set, replace if newer.
 
 4.0.3 -> 4.0.4:
 
diff --git a/build.c b/build.c
index 6b603f540..dd03ac620 100644
--- a/build.c
+++ b/build.c
@@ -16,30 +16,18 @@
 
 /**
  */
-static int checkSpec(Header h)
-	/*@globals rpmGlobalMacroContext, fileSystem @*/
-	/*@modifies h, rpmGlobalMacroContext, fileSystem @*/
+static int checkSpec(rpmTransactionSet ts, Header h)
+	/*@globals fileSystem @*/
+	/*@modifies ts, h, fileSystem @*/
 {
-    const char * rootdir = NULL;
-    rpmdb db = NULL;
-    int mode = O_RDONLY;
-    rpmTransactionSet ts;
     rpmDependencyConflict conflicts;
     int numConflicts;
     int rc;
 
-    if (!headerIsEntry(h, RPMTAG_REQUIREFLAGS))
+    if (!headerIsEntry(h, RPMTAG_REQUIRENAME)
+     && !headerIsEntry(h, RPMTAG_CONFLICTNAME))
 	return 0;
 
-    if (rpmdbOpen(rootdir, &db, mode, 0644)) {
-	const char * dn;
-	dn = rpmGetPath( (rootdir ? rootdir : ""), "%{_dbpath}", NULL);
-	rpmError(RPMERR_OPEN, _("cannot open rpm database in %s\n"), dn);
-	dn = _free(dn);
-	exit(EXIT_FAILURE);
-    }
-    ts = rpmtransCreateSet(db, rootdir);
-
     rc = rpmtransAddPackage(ts, h, NULL, NULL, 0, NULL);
 
     rc = rpmdepCheck(ts, &conflicts, &numConflicts);
@@ -52,10 +40,6 @@ static int checkSpec(Header h)
     }
     /*@=branchstate@*/
 
-    ts = rpmtransFree(ts);
-    if (db != NULL)
-	(void) rpmdbClose(db);
-
     return rc;
 }
 
@@ -105,10 +89,10 @@ static int isSpecFile(const char * specfile)
 
 /**
  */
-static int buildForTarget(const char * arg, BTA_t ba)
+static int buildForTarget(rpmTransactionSet ts, const char * arg, BTA_t ba)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem, internalState @*/
-	/*@modifies rpmGlobalMacroContext, fileSystem, internalState @*/
+	/*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/
 {
     const char * passPhrase = ba->passPhrase;
     const char * cookie = ba->cookie;
@@ -276,7 +260,7 @@ static int buildForTarget(const char * arg, BTA_t ba)
     initSourceHeader(spec);
 
     /* Check build prerequisites */
-    if (!ba->noDeps && checkSpec(spec->sourceHeader)) {
+    if (!ba->noDeps && checkSpec(ts, spec->sourceHeader)) {
 	rc = 1;
 	goto exit;
     }
@@ -298,14 +282,17 @@ exit:
 
 int build(const char * arg, BTA_t ba, const char * rcfile)
 {
+    rpmTransactionSet ts;
     char *t, *te;
     int rc = 0;
     char * targets = ba->targets;
 #define	buildCleanMask	(RPMBUILD_RMSOURCE|RPMBUILD_RMSPEC)
     int cleanFlags = ba->buildAmount & buildCleanMask;
 
+    ts = rpmtransCreateSet(NULL, NULL);
+
     if (targets == NULL) {
-	rc =  buildForTarget(arg, ba);
+	rc =  buildForTarget(ts, arg, ba);
 	goto exit;
     }
 
@@ -331,7 +318,7 @@ int build(const char * arg, BTA_t ba, const char * rcfile)
 	/* Read in configuration for target. */
 	rpmFreeMacros(NULL);
 	(void) rpmReadConfigFiles(rcfile, target);
-	rc = buildForTarget(arg, ba);
+	rc = buildForTarget(ts, arg, ba);
 	if (rc)
 	    break;
     }
@@ -340,5 +327,8 @@ exit:
     /* Restore original configuration. */
     rpmFreeMacros(NULL);
     (void) rpmReadConfigFiles(rcfile, NULL);
+
+    ts = rpmtransFree(ts);
+
     return rc;
 }
diff --git a/build/pack.c b/build/pack.c
index 285d1ba93..a06dc4006 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -50,9 +50,7 @@ static int cpio_doio(FD_t fdo, /*@unused@*/ Header h, CSA_t csa,
 		fileSystem@*/
 	/*@modifies fdo, csa, rpmGlobalMacroContext, fileSystem @*/
 {
-    const char * rootDir = "/";
-    rpmdb rpmdb = NULL;
-    rpmTransactionSet ts = rpmtransCreateSet(rpmdb, rootDir);
+    rpmTransactionSet ts = rpmtransCreateSet(NULL, NULL);
     TFI_t fi = csa->cpioList;
     const char *failedFile = NULL;
     FD_t cfd;
@@ -317,19 +315,13 @@ int readRPM(const char *fileName, Spec *specp, struct rpmlead *lead,
     spec->packages->header = headerFree(spec->packages->header);
 
     /* Read the rpm lead, signatures, and header */
-    {	const char * rootDir = "";
-	rpmdb db = NULL;
-	rpmTransactionSet ts = rpmtransCreateSet(db, rootDir);
-	int xx;
+    {	rpmTransactionSet ts = rpmtransCreateSet(NULL, NULL);
 
-	ts->need_payload = 1;
 	/* XXX W2DO? pass fileName? */
 	/*@-mustmod@*/      /* LCL: segfault */
-	xx = rpmReadPackageFile(ts, fdi, "readRPM",
+	rc = rpmReadPackageFile(ts, fdi, "readRPM",
 			 &spec->packages->header);
 	/*@=mustmod@*/
-	ts->need_payload = 0;
-	rc = (xx ? RPMRC_FAIL : RPMRC_OK);	/* XXX HACK */
 
 	ts = rpmtransFree(ts);
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a5c4d61d9..b0fa3a0c8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -93,5 +93,8 @@ th: th.c librpm.la
 trb: trb.o librpm.la
 	$(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ trb.o $(mylibs) $(LIBS)
 
+ts: ts.o librpm.la
+	$(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ ts.o $(mylibs) $(LIBS)
+
 trhn: trhn.o librpm.la
 	$(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ trhn.o $(mylibs) $(LIBS)
diff --git a/lib/depends.c b/lib/depends.c
index 635287c31..bc7508724 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -5,6 +5,7 @@
 #include "system.h"
 
 #include <rpmlib.h>
+#include <rpmmacro.h>		/* XXX rpmGetPath */
 #include <rpmpgp.h>		/* XXX pgpFreeDig */
 
 #include "depends.h"
@@ -23,6 +24,9 @@
 /*@access availableList@*/
 
 /*@unchecked@*/
+static int _debug = 0;
+
+/*@unchecked@*/
 static int _cacheDependsRC = 1;
 
 /**
@@ -205,8 +209,109 @@ static int dirInfoCompare(const void * one, const void * two)	/*@*/
 }
 
 /**
+ * Delete package from available list.
+ * @param al		available list
+ * @param pkgNnum	package index
+ */
+static void
+alDelPackage(availableList al, int pkgNum)
+	/*@modifies al @*/
+{
+    HGE_t hge = (HGE_t)headerGetEntryMinMemory;
+    HFD_t hfd = headerFreeData;
+    struct availablePackage * p;
+
+    /*@-nullptrarith@*/ /* FIX: al->list might be NULL */
+    p = al->list + pkgNum;
+    /*@=nullptrarith@*/
+
+/*@-modfilesys@*/
+if (_debug)
+fprintf(stderr, "*** del %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->version, p->release);
+/*@=modfilesys@*/
+
+    if (p->relocs) {
+	rpmRelocation * r;
+	for (r = p->relocs; r->oldPath || r->newPath; r++) {
+	    r->oldPath = _free(r->oldPath);
+	    r->newPath = _free(r->newPath);
+	}
+	p->relocs = _free(p->relocs);
+    }
+    if (p->fd) {
+	/*@-type@*/ /* FIX: cast? */
+	(void) fdFree(p->fd, "alDelPackage");
+	/*@=type@*/
+	p->fd = NULL;
+    }
+
+    if (p->baseNames != NULL && p->filesCount > 0) {
+	int origNumDirs = al->numDirs;
+	const char ** dirNames;
+	int_32 numDirs;
+	rpmTagType dnt;
+	int dirNum;
+	struct dirInfo_s dirNeedle;
+	dirInfo dirMatch;
+	int last;
+	int i, xx;
+
+	xx = hge(p->h, RPMTAG_DIRNAMES, &dnt, (void **) &dirNames, &numDirs);
+
+	/* XXX FIXME: We ought to relocate the directory list here */
+
+	if (al->dirs != NULL)
+	for (dirNum = al->numDirs - 1; dirNum >= 0; dirNum--) {
+	    dirNeedle.dirName = (char *) dirNames[dirNum];
+	    dirNeedle.dirNameLen = strlen(dirNames[dirNum]);
+	    dirMatch = bsearch(&dirNeedle, al->dirs, al->numDirs,
+			       sizeof(dirNeedle), dirInfoCompare);
+	    if (dirMatch == NULL)
+		continue;
+	    last = dirMatch->numFiles;
+	    for (i = dirMatch->numFiles - 1; i >= 0; i--) {
+		if (dirMatch->files[i].pkgNum != pkgNum)
+		    /*@innercontinue@*/ continue;
+		dirMatch->numFiles--;
+		if (i > dirMatch->numFiles)
+		    /*@innercontinue@*/ continue;
+		memmove(dirMatch->files, dirMatch->files+1,
+			(dirMatch->numFiles - i));
+	    }
+	    if (dirMatch->numFiles > 0) {
+		if (last > i)
+		    dirMatch->files = xrealloc(dirMatch->files,
+			dirMatch->numFiles * sizeof(*dirMatch->files));
+		continue;
+	    }
+	    dirMatch->files = _free(dirMatch->files);
+	    dirMatch->dirName = _free(dirMatch->dirName);
+	    al->numDirs--;
+	    if (dirNum > al->numDirs)
+		continue;
+	    memmove(dirMatch, dirMatch+1, (al->numDirs - dirNum));
+	}
+
+	if (origNumDirs > al->numDirs) {
+	    if (al->numDirs > 0)
+		al->dirs = xrealloc(al->dirs, al->numDirs * sizeof(*al->dirs));
+	    else
+		al->dirs = _free(al->dirs);
+	}
+
+	dirNames = hfd(dirNames, dnt);
+    }
+    p->h = headerFree(p->h);
+    memset(p, 0, sizeof(*p));
+    /*@-nullstate@*/ /* FIX: al->list->h may be NULL */
+    return;
+    /*@=nullstate@*/
+}
+
+/**
  * Add package to available list.
  * @param al		available list
+ * @param pkgNnum	package index, < 0 to force an append
  * @param h		package header
  * @param key		package private data
  * @param fd		package file handle
@@ -214,7 +319,7 @@ static int dirInfoCompare(const void * one, const void * two)	/*@*/
  * @return		available package pointer
  */
 static /*@exposed@*/ struct availablePackage *
-alAddPackage(availableList al,
+alAddPackage(availableList al, int pkgNum,
 		Header h, /*@null@*/ /*@dependent@*/ const void * key,
 		/*@null@*/ FD_t fd, /*@null@*/ rpmRelocation * relocs)
 	/*@modifies al, h @*/
@@ -223,28 +328,22 @@ alAddPackage(availableList al,
     HFD_t hfd = headerFreeData;
     rpmTagType dnt, bnt;
     struct availablePackage * p;
-    rpmRelocation * r;
     int i, xx;
-    int_32 * dirIndexes;
-    const char ** dirNames;
-    int numDirs, dirNum;
-    int * dirMapping;
-    struct dirInfo_s dirNeedle;
-    dirInfo dirMatch;
-    int first, last, fileNum;
-    int origNumDirs;
-    int pkgNum;
     uint_32 multiLibMask = 0;
-    uint_32 * fileFlags = NULL;
     uint_32 * pp = NULL;
 
-    if (al->size == al->alloced) {
-	al->alloced += al->delta;
-	al->list = xrealloc(al->list, sizeof(*al->list) * al->alloced);
+    if (pkgNum >= 0 && pkgNum < al->size) {
+	alDelPackage(al, pkgNum);
+    } else {
+	if (al->size == al->alloced) {
+	    al->alloced += al->delta;
+	    al->list = xrealloc(al->list, sizeof(*al->list) * al->alloced);
+	}
+	pkgNum = al->size++;
     }
 
-    pkgNum = al->size++;
     p = al->list + pkgNum;
+
     p->h = headerLink(h);	/* XXX reference held by transaction set */
     p->depth = p->npreds = 0;
     memset(&p->tsi, 0, sizeof(p->tsi));
@@ -252,6 +351,11 @@ alAddPackage(availableList al,
 
     xx = headerNVR(p->h, &p->name, &p->version, &p->release);
 
+/*@-modfilesys@*/
+if (_debug)
+fprintf(stderr, "*** add %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->version, p->release);
+/*@=modfilesys@*/
+
     /* XXX This should be added always so that packages look alike.
      * XXX However, there is logic in files.c/depends.c that checks for
      * XXX existence (rather than value) that will need to change as well.
@@ -274,7 +378,8 @@ alAddPackage(availableList al,
 	p->epoch = NULL;
 
     if (!hge(h, RPMTAG_PROVIDENAME, NULL, (void **) &p->provides,
-	&p->providesCount)) {
+		&p->providesCount))
+    {
 	p->providesCount = 0;
 	p->provides = NULL;
 	p->providesEVR = NULL;
@@ -308,6 +413,16 @@ alAddPackage(availableList al,
 	p->filesCount = 0;
 	p->baseNames = NULL;
     } else {
+	int_32 * dirIndexes;
+	const char ** dirNames;
+	int_32 numDirs;
+	uint_32 * fileFlags = NULL;
+	int * dirMapping;
+	struct dirInfo_s dirNeedle;
+	dirInfo dirMatch;
+	int first, last, fileNum, dirNum;
+	int origNumDirs;
+
 	xx = hge(h, RPMTAG_DIRNAMES, &dnt, (void **) &dirNames, &numDirs);
 	xx = hge(h, RPMTAG_DIRINDEXES, NULL, (void **) &dirIndexes, NULL);
 	xx = hge(h, RPMTAG_FILEFLAGS, NULL, (void **) &fileFlags, NULL);
@@ -318,8 +433,8 @@ alAddPackage(availableList al,
 
 	/* allocated enough space for all the directories we could possible
 	   need to add */
-	al->dirs = xrealloc(al->dirs, 
-			    sizeof(*al->dirs) * (al->numDirs + numDirs));
+	al->dirs = xrealloc(al->dirs,
+			(al->numDirs + numDirs) * sizeof(*al->dirs));
 	origNumDirs = al->numDirs;
 
 	for (dirNum = 0; dirNum < numDirs; dirNum++) {
@@ -331,29 +446,27 @@ alAddPackage(availableList al,
 		dirMapping[dirNum] = dirMatch - al->dirs;
 	    } else {
 		dirMapping[dirNum] = al->numDirs;
-		al->dirs[al->numDirs].dirName = xstrdup(dirNames[dirNum]);
-		al->dirs[al->numDirs].dirNameLen = strlen(dirNames[dirNum]);
-		al->dirs[al->numDirs].files = NULL;
-		al->dirs[al->numDirs].numFiles = 0;
+		dirMatch = al->dirs + al->numDirs;
+		dirMatch->dirName = xstrdup(dirNames[dirNum]);
+		dirMatch->dirNameLen = strlen(dirNames[dirNum]);
+		dirMatch->files = NULL;
+		dirMatch->numFiles = 0;
 		al->numDirs++;
 	    }
 	}
 
 	dirNames = hfd(dirNames, dnt);
 
-	first = 0;
-	while (first < p->filesCount) {
-	    last = first;
-	    while ((last + 1) < p->filesCount) {
+	for (first = 0; first < p->filesCount; first = last + 1) {
+	    for (last = first; (last + 1) < p->filesCount; last++) {
 		if (dirIndexes[first] != dirIndexes[last + 1])
 		    /*@innerbreak@*/ break;
-		last++;
 	    }
 
 	    dirMatch = al->dirs + dirMapping[dirIndexes[first]];
 	    dirMatch->files = xrealloc(dirMatch->files,
-		sizeof(*dirMatch->files) * 
-		    (dirMatch->numFiles + last - first + 1));
+		    (dirMatch->numFiles + last - first + 1) *
+			sizeof(*dirMatch->files));
 	    if (p->baseNames != NULL)	/* XXX can't happen */
 	    for (fileNum = first; fileNum <= last; fileNum++) {
 		dirMatch->files[dirMatch->numFiles].baseName =
@@ -363,8 +476,6 @@ alAddPackage(availableList al,
 				fileFlags[fileNum];
 		dirMatch->numFiles++;
 	    }
-
-	    first = last + 1;
 	}
 
 	if (origNumDirs + al->numDirs)
@@ -378,6 +489,8 @@ alAddPackage(availableList al,
     /*@=type@*/
 
     if (relocs) {
+	rpmRelocation * r;
+
 	for (i = 0, r = relocs; r->oldPath || r->newPath; i++, r++)
 	    {};
 	p->relocs = xmalloc((i + 1) * sizeof(*p->relocs));
@@ -427,7 +540,7 @@ static void alMakeIndex(availableList al)
 
     if (ai->size || al->list == NULL) return;
 
-    for (i = 0; i < al->size; i++) 
+    for (i = 0; i < al->size; i++)
 	ai->size += al->list[i].providesCount;
 
     if (ai->size) {
@@ -670,6 +783,48 @@ int headerMatchesDepFlags(Header h,
 
     return rpmRangesOverlap(name, pkgEVR, pkgFlags, reqName, reqEVR, reqFlags);
 }
+/*@-modfilesystem@*/
+int rpmtsCloseDB(rpmTransactionSet ts)
+{
+    int rc = 0;
+
+    if (ts->rpmdb != NULL) {
+	rc = rpmdbClose(ts->rpmdb);
+	ts->rpmdb = NULL;
+    }
+    return rc;
+}
+
+int rpmtsOpenDB(rpmTransactionSet ts, int dbmode)
+{
+    int rc = 0;
+
+    if (ts->rpmdb != NULL) {
+	if ((rc = rpmtsCloseDB(ts)) != 0)
+	    return rc;
+    }
+
+    ts->dbmode = dbmode;
+    rc = rpmdbOpen(ts->rootDir, &ts->rpmdb, ts->dbmode, 0644);
+    if (rc) {
+	const char * dn;
+	/*@-globs -mods@*/ /* FIX: rpmGlobalMacroContext */
+	dn = rpmGetPath(ts->rootDir, "%{_dbpath}", NULL);
+	/*@=globs =mods@*/
+	rpmMessage(RPMMESS_ERROR,
+			_("cannot open Packages database in %s\n"), dn);
+	dn = _free(dn);
+    }
+    return rc;
+}
+
+rpmdbMatchIterator rpmtsInitIterator(const rpmTransactionSet ts, int rpmtag,
+			const void * keyp, size_t keylen)
+{
+    /*@-mods -onlytrans -type@*/ /* FIX: rpmdb excision */
+    return rpmdbInitIterator(ts->rpmdb, rpmtag, keyp, keylen);
+    /*@=mods =onlytrans =type@*/
+}
 
 rpmTransactionSet rpmtransCreateSet(rpmdb db, const char * rootDir)
 {
@@ -684,9 +839,15 @@ rpmTransactionSet rpmtransCreateSet(rpmdb db, const char * rootDir)
     ts->filesystemCount = 0;
     ts->filesystems = NULL;
     ts->di = NULL;
-    /*@-assignexpose@*/
-    ts->rpmdb = db;
-    /*@=assignexpose@*/
+    if (db != NULL) {
+	/*@-assignexpose@*/
+	ts->rpmdb = rpmdbLink(db);
+	/*@=assignexpose@*/
+	ts->dbmode = db->db_mode;
+    } else {
+	ts->rpmdb = NULL;
+	ts->dbmode = O_RDONLY;
+    }
     ts->scriptFd = NULL;
     ts->id = (int_32) time(NULL);
     ts->delta = 5;
@@ -707,7 +868,7 @@ rpmTransactionSet rpmtransCreateSet(rpmdb db, const char * rootDir)
 	rootDir = t;
     }
 
-    ts->rootDir = xstrdup(rootDir);
+    ts->rootDir = (rootDir != NULL ? xstrdup(rootDir) : xstrdup(""));
     ts->currDir = NULL;
     ts->chrootDone = 0;
 
@@ -782,63 +943,116 @@ static int removePackage(rpmTransactionSet ts, int dboffset, int depends)
     return 0;
 }
 
+static /*@only@*/ const char * hNVRstr(Header h, /*@out@*/ const char ** np )
+	/*@modifies *np @*/
+{
+    const char * NVR, * n, * v, * r;
+    char * t;
+
+    (void) headerNVR(h, &n, &v, &r);
+    NVR = t = xcalloc(1, strlen(n) + strlen(v) + strlen(r) + sizeof("--"));
+    t = stpcpy(t, n);
+    t = stpcpy(t, "-");
+    t = stpcpy(t, v);
+    t = stpcpy(t, "-");
+    t = stpcpy(t, r);
+    if (np)
+	*np = n;
+    return NVR;
+}
+
 int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd,
 			const void * key, int upgrade, rpmRelocation * relocs)
 {
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
     HFD_t hfd = headerFreeData;
+    const char * name = NULL;
+    const char * addNVR = hNVRstr(h, &name);
+    const char * pkgNVR = NULL;
     rpmTagType ont, ovt;
-    /* this is an install followed by uninstalls */
-    const char * name;
+    struct availablePackage * p;
     int count;
     const char ** obsoletes;
     int alNum;
     int xx;
+    int ec = 0;
+    int rc;
+    int i = ts->orderCount;
 
     /*
-     * FIXME: handling upgrades like this is *almost* okay. It doesn't
-     * check to make sure we're upgrading to a newer version, and it
-     * makes it difficult to generate a return code based on the number of
-     * packages which failed.
+     * Check for previously added versions with the same name.
      */
-    if (ts->orderCount == ts->orderAlloced) {
+    i = ts->orderCount;
+    if (ts->addedPackages.list != NULL)
+    for (i = 0; i < ts->orderCount; i++) {
+	p = ts->addedPackages.list + i;
+	if (strcmp(p->name, name))
+	    continue;
+	rc = rpmVersionCompare(p->h, h);
+	pkgNVR = hNVRstr(p->h, NULL);
+	if (rc > 0) {
+	    rpmMessage(RPMMESS_WARNING,
+		_("newer package %s already added, skipping %s\n"),
+		pkgNVR, addNVR);
+	    goto exit;
+	} else if (rc == 0) {
+	    rpmMessage(RPMMESS_WARNING,
+		_("package %s already added, ignoring\n"),
+		pkgNVR);
+	    goto exit;
+	} else {
+	    rpmMessage(RPMMESS_WARNING,
+		_("older package %s already added, replacing with %s\n"),
+		pkgNVR, addNVR);
+	}
+	break;
+    }
+
+    /* XXX i == ts->orderCount most of the time. */
+
+    if (i == ts->orderAlloced) {
 	ts->orderAlloced += ts->delta;
-	ts->order = xrealloc(ts->order, sizeof(*ts->order) * ts->orderAlloced);
+	ts->order = xrealloc(ts->order, ts->orderAlloced * sizeof(*ts->order));
     }
-    ts->order[ts->orderCount].type = TR_ADDED;
+    ts->order[i].type = TR_ADDED;
     if (ts->addedPackages.list == NULL)
-	return 0;
+	goto exit;
 
-    alNum = alAddPackage(&ts->addedPackages, h, key, fd, relocs) -
+    alNum = alAddPackage(&ts->addedPackages, i, h, key, fd, relocs) -
     		ts->addedPackages.list;
-    ts->order[ts->orderCount++].u.addedIndex = alNum;
+    ts->order[i].u.addedIndex = alNum;
 
-    /*@-branchstate@*/
-    if (!upgrade || ts->rpmdb == NULL)
-	return 0;
-    /*@=branchstate@*/
+    if (i == ts->orderCount)
+	ts->orderCount++;
+
+    if (!upgrade)
+	goto exit;
 
     /* XXX binary rpms always have RPMTAG_SOURCERPM, source rpms do not */
     if (headerIsEntry(h, RPMTAG_SOURCEPACKAGE))
-	return 0;
+	goto exit;
 
-    xx = headerNVR(h, &name, NULL, NULL);
+    /* Do lazy, readonly, open of rpm database. */
+    if (ts->rpmdb == NULL) {
+	if ((ec = rpmtsOpenDB(ts, ts->dbmode)) != 0)
+	    goto exit;
+    }
 
     {	rpmdbMatchIterator mi;
 	Header h2;
 
-	mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_NAME, name, 0);
+	mi = rpmtsInitIterator(ts, RPMTAG_NAME, name, 0);
 	while((h2 = rpmdbNextIterator(mi)) != NULL) {
 	    /*@-branchstate@*/
 	    if (rpmVersionCompare(h, h2))
 		xx = removePackage(ts, rpmdbGetIteratorOffset(mi), alNum);
 	    else {
-		uint_32 *p, multiLibMask = 0, oldmultiLibMask = 0;
+		uint_32 *pp, multiLibMask = 0, oldmultiLibMask = 0;
 
-		if (hge(h2, RPMTAG_MULTILIBS, NULL, (void **) &p, NULL))
-		    oldmultiLibMask = *p;
-		if (hge(h, RPMTAG_MULTILIBS, NULL, (void **) &p, NULL))
-		    multiLibMask = *p;
+		if (hge(h2, RPMTAG_MULTILIBS, NULL, (void **) &pp, NULL))
+		    oldmultiLibMask = *pp;
+		if (hge(h, RPMTAG_MULTILIBS, NULL, (void **) &pp, NULL))
+		    multiLibMask = *pp;
 		if (oldmultiLibMask && multiLibMask
 		    && !(oldmultiLibMask & multiLibMask)) {
 		    ts->addedPackages.list[alNum].multiLib = multiLibMask;
@@ -868,7 +1082,7 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd,
 	  { rpmdbMatchIterator mi;
 	    Header h2;
 
-	    mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_NAME, obsoletes[j], 0);
+	    mi = rpmtsInitIterator(ts, RPMTAG_NAME, obsoletes[j], 0);
 
 	    xx = rpmdbPruneIterator(mi,
 		ts->removedPackages, ts->numRemovedPackages, 1);
@@ -894,14 +1108,18 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd,
 	obsoletesEVR = hfd(obsoletesEVR, ovt);
 	obsoletes = hfd(obsoletes, ont);
     }
+    ec = 0;
 
-    return 0;
+exit:
+    pkgNVR = _free(pkgNVR);
+    addNVR = _free(addNVR);
+    return ec;
 }
 
 void rpmtransAvailablePackage(rpmTransactionSet ts, Header h, const void * key)
 {
     struct availablePackage * al;
-    al = alAddPackage(&ts->availablePackages, h, key, NULL, NULL);
+    al = alAddPackage(&ts->availablePackages, -1, h, key, NULL, NULL);
 }
 
 int rpmtransRemovePackage(rpmTransactionSet ts, int dboffset)
@@ -942,13 +1160,7 @@ rpmTransactionSet rpmtransFree(rpmTransactionSet ts)
 
 	rpmtransClean(ts);
 
-	if (ts->rpmdb) {
-	    int xx;
-	    /*@-kepttrans@*/
-	    xx = rpmdbClose(ts->rpmdb);
-	    ts->rpmdb = NULL;
-	    /*@=kepttrans@*/
-	}
+	(void) rpmtsCloseDB(ts);
 
 	ts = _free(ts);
     }
@@ -1310,7 +1522,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
 	if (*keyName == '/') {
 	    /* keyFlags better be 0! */
 
-	    mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_BASENAMES, keyName, 0);
+	    mi = rpmtsInitIterator(ts, RPMTAG_BASENAMES, keyName, 0);
 
 	    (void) rpmdbPruneIterator(mi,
 			ts->removedPackages, ts->numRemovedPackages, 1);
@@ -1324,7 +1536,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
 	    mi = rpmdbFreeIterator(mi);
 	}
 
-	mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_PROVIDENAME, keyName, 0);
+	mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, keyName, 0);
 	(void) rpmdbPruneIterator(mi,
 			ts->removedPackages, ts->numRemovedPackages, 1);
 	while ((h = rpmdbNextIterator(mi)) != NULL) {
@@ -1338,7 +1550,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
 	mi = rpmdbFreeIterator(mi);
 
 #if defined(DYING) || defined(__LCLINT__)
-	mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_NAME, keyName, 0);
+	mi = rpmtsInitIterator(ts, RPMTAG_NAME, keyName, 0);
 	(void) rpmdbPruneIterator(mi,
 			ts->removedPackages, ts->numRemovedPackages, 1);
 	while ((h = rpmdbNextIterator(mi)) != NULL) {
@@ -1617,7 +1829,7 @@ static int checkDependentPackages(rpmTransactionSet ts,
 	/*@modifies ts, psp, fileSystem @*/
 {
     rpmdbMatchIterator mi;
-    mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_REQUIRENAME, key, 0);
+    mi = rpmtsInitIterator(ts, RPMTAG_REQUIRENAME, key, 0);
     return checkPackageSet(ts, psp, key, mi);
 }
 
@@ -1637,7 +1849,7 @@ static int checkDependentConflicts(rpmTransactionSet ts,
 
     if (ts->rpmdb) {	/* XXX is this necessary? */
 	rpmdbMatchIterator mi;
-	mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_CONFLICTNAME, key, 0);
+	mi = rpmtsInitIterator(ts, RPMTAG_CONFLICTNAME, key, 0);
 	rc = checkPackageSet(ts, psp, key, mi);
     }
 
@@ -1680,7 +1892,7 @@ static struct badDeps_s {
     { "pam", "pamconfig" },
     { NULL, NULL }
 };
-    
+
 static int ignoreDep(const struct availablePackage * p,
 		const struct availablePackage * q)
 	/*@*/
@@ -2227,11 +2439,19 @@ int rpmdepCheck(rpmTransactionSet ts,
     rpmdbMatchIterator mi = NULL;
     Header h = NULL;
     struct availablePackage * p;
-    problemsSet ps;
+    problemsSet ps = NULL;
     int npkgs;
+    int closeatexit = 0;
     int i, j, xx;
     int rc;
 
+    /* Do lazy, readonly, open of rpm database. */
+    if (ts->rpmdb == NULL) {
+	if ((rc = rpmtsOpenDB(ts, ts->dbmode)) != 0)
+	    goto exit;
+	closeatexit = 1;
+    }
+
     npkgs = ts->addedPackages.size;
 
     ps = xcalloc(1, sizeof(*ps));
@@ -2284,7 +2504,7 @@ int rpmdepCheck(rpmTransactionSet ts,
      */
     /*@-branchstate@*/
     if (ts->numRemovedPackages > 0) {
-      mi = rpmdbInitIterator(ts->rpmdb, RPMDBI_PACKAGES, NULL, 0);
+      mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, NULL, 0);
       xx = rpmdbAppendIterator(mi,
 			ts->removedPackages, ts->numRemovedPackages);
       while ((h = rpmdbNextIterator(mi)) != NULL) {
@@ -2336,7 +2556,7 @@ int rpmdepCheck(rpmTransactionSet ts,
 				NULL);
 		rc = 0;
 		for (j = 0; j < fileCount; j++) {
-		    len = strlen(baseNames[j]) + 1 + 
+		    len = strlen(baseNames[j]) + 1 +
 			  strlen(dirNames[dirIndexes[j]]);
 		    if (len > fileAlloced) {
 			fileAlloced = len * 2;
@@ -2373,10 +2593,14 @@ int rpmdepCheck(rpmTransactionSet ts,
 
 exit:
     mi = rpmdbFreeIterator(mi);
-    ps->problems = _free(ps->problems);
-    ps = _free(ps);
+    if (ps) {
+	ps->problems = _free(ps->problems);
+	ps = _free(ps);
+    }
     /*@-branchstate@*/
-    if (_cacheDependsRC)
+    if (closeatexit)
+	xx = rpmtsCloseDB(ts);
+    else if (_cacheDependsRC)
 	xx = rpmdbCloseDBI(ts->rpmdb, RPMDBI_DEPENDS);
     /*@=branchstate@*/
     return rc;
diff --git a/lib/depends.h b/lib/depends.h
index 0547b10dc..58d728771 100644
--- a/lib/depends.h
+++ b/lib/depends.h
@@ -130,20 +130,28 @@ struct transactionElement {
  * The set of packages to be installed/removed atomically.
  */
 struct rpmTransactionSet_s {
-    rpmtransFlags transFlags;		/*!< Bit(s) to control operation. */
-/*@null@*/ rpmCallbackFunction notify;	/*!< Callback function. */
+    rpmtransFlags transFlags;	/*!< Bit(s) to control operation. */
 /*@observer@*/ /*@null@*/
-    rpmCallbackData notifyData;		/*!< Callback private data. */
-/*@dependent@*/ rpmProblemSet probs;	/*!< Current problems in transaction. */
-    rpmprobFilterFlags ignoreSet;	/*!< Bits to filter current problems. */
-    int filesystemCount;		/*!< No. of mounted filesystems. */
-/*@dependent@*/ const char ** filesystems; /*!< Mounted filesystem names. */
-/*@only@*/ struct diskspaceInfo * di;	/*!< Per filesystem disk/inode usage. */
-/*@kept@*/ /*@null@*/ rpmdb rpmdb;	/*!< Database handle. */
-/*@only@*/ hashTable ht;		/*!< Fingerprint hash table. */
-/*@only@*/ int * removedPackages;	/*!< Set of packages being removed. */
-    int numRemovedPackages;		/*!< No. removed rpmdb instances. */
-    int allocedRemovedPackages;		/*!< Size of removed packages array. */
+    rpmCallbackFunction notify;	/*!< Callback function. */
+/*@observer@*/ /*@null@*/
+    rpmCallbackData notifyData;	/*!< Callback private data. */
+/*@dependent@*/
+    rpmProblemSet probs;	/*!< Current problems in transaction. */
+    rpmprobFilterFlags ignoreSet;
+				/*!< Bits to filter current problems. */
+    int filesystemCount;	/*!< No. of mounted filesystems. */
+/*@dependent@*/
+    const char ** filesystems;	/*!< Mounted filesystem names. */
+/*@only@*/
+    struct diskspaceInfo * di;	/*!< Per filesystem disk/inode usage. */
+    int dbmode;			/*!< Database open mode. */
+/*@refcounted@*/ /*@null@*/
+    rpmdb rpmdb;		/*!< Database handle. */
+/*@only@*/ hashTable ht;	/*!< Fingerprint hash table. */
+/*@only@*/
+    int * removedPackages;	/*!< Set of packages being removed. */
+    int numRemovedPackages;	/*!< No. removed rpmdb instances. */
+    int allocedRemovedPackages;	/*!< Size of removed packages array. */
     struct availableList_s addedPackages;
 				/*!< Set of packages being installed. */
     struct availableList_s availablePackages;
@@ -161,7 +169,7 @@ struct rpmTransactionSet_s {
     int delta;			/*!< Delta for reallocation. */
     int_32 id;			/*!< Transaction id. */
 
-    int need_payload;		/*!< Leave fd positioned at payload? */
+    int verify_legacy;		/*!< Verify legacy signatures? */
 
 /*@observer@*/ /*@dependent@*/ /*@null@*/
     const char * fn;		/*!< Current package fn. */
@@ -169,7 +177,8 @@ struct rpmTransactionSet_s {
     int_32  sigtype;		/*!< Current package signature data type. */
 /*@null@*/ const void * sig;	/*!< Current package signature. */
     int_32 siglen;		/*!< Current package signature length. */
-/*@null@*/ struct pgpDig_s * dig;/*!< Current signature/pubkey parametrs. */
+/*@null@*/
+    struct pgpDig_s * dig;	/*!< Current signature/pubkey parametrs. */
 
 } ;
 
diff --git a/lib/header_internal.h b/lib/header_internal.h
index 913b8730a..c6878f831 100644
--- a/lib/header_internal.h
+++ b/lib/header_internal.h
@@ -61,7 +61,7 @@ struct headerToken {
 #define	HEADERFLAG_SORTED	(1 << 0) /*!< Are header entries sorted? */
 #define	HEADERFLAG_ALLOCATED	(1 << 1) /*!< Is 1st header region allocated? */
 #define	HEADERFLAG_LEGACY	(1 << 2) /*!< Header came from legacy source? */
-/*@refs@*/ int nrefs;	/*!< Reference count. */
+/*@refs@*/ int nrefs;		/*!< Reference count. */
 };
 
 /** \ingroup header
diff --git a/lib/package.c b/lib/package.c
index 0dc889972..5706bb195 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -260,7 +260,7 @@ int rpmReadPackageFile(rpmTransactionSet ts, FD_t fd,
 	goto exit;
     }
 
-    if (ts->need_payload)	/* leave fd ready to install payload */
+    if (!ts->verify_legacy)	/* leave fd ready to install payload */
 	ts->sigtag = 0;
     else if (headerIsEntry(sig, RPMSIGTAG_GPG))
 	ts->sigtag = RPMSIGTAG_GPG;
diff --git a/lib/psm.c b/lib/psm.c
index 128ebcd42..ec2fdc37c 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -1064,9 +1064,9 @@ static int mergeFiles(TFI_t fi, Header h, Header newH)
  * @param psm		package state machine data
  * @return		0 always
  */
-static int markReplacedFiles(PSM_t psm)
+static int markReplacedFiles(const PSM_t psm)
 	/*@globals fileSystem@*/
-	/*@modifies psm, fileSystem @*/
+	/*@modifies fileSystem @*/
 {
     const rpmTransactionSet ts = psm->ts;
     TFI_t fi = psm->fi;
@@ -1101,7 +1101,7 @@ static int markReplacedFiles(PSM_t psm)
 	offsets[num++] = sfi->otherPkg;
     }
 
-    mi = rpmdbInitIterator(ts->rpmdb, RPMDBI_PACKAGES, NULL, 0);
+    mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, NULL, 0);
     xx = rpmdbAppendIterator(mi, offsets, num);
     xx = rpmdbSetIteratorRewrite(mi, 1);
 
@@ -1196,7 +1196,7 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts,
     PSM_t psm = &psmbuf;
     int isSource;
     rpmRC rc;
-    int i, xx;
+    int i;
 
     /*@-mods -temptrans -assignexpose@*/
     ts->notify = notify;
@@ -1204,10 +1204,9 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts,
     /*@=mods =temptrans =assignexpose@*/
 
     /*@-mustmod@*/	/* LCL: segfault */
-    xx = rpmReadPackageFile(ts, fd, "InstallSourcePackage", &h);
+    rc = rpmReadPackageFile(ts, fd, "InstallSourcePackage", &h);
     /*@=mustmod@*/
-    if (xx || h == NULL) {
-	rc = RPMRC_FAIL;			/* XXX HACK */
+    if (!(rc == RPMRC_OK || rc == RPMRC_BADSIZE) || h == NULL) {
 	goto exit;
     }
     rc = RPMRC_OK;				/* XXX HACK */
@@ -1823,7 +1822,7 @@ static int runTriggers(PSM_t psm)
 	int countCorrection = psm->countCorrection;
 
 	psm->countCorrection = 0;
-	mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_TRIGGERNAME, fi->name, 0);
+	mi = rpmtsInitIterator(ts, RPMTAG_TRIGGERNAME, fi->name, 0);
 	while((triggeredH = rpmdbNextIterator(mi)) != NULL) {
 	    rc |= handleOneTrigger(psm, fi->h, triggeredH, numPackage, NULL);
 	}
@@ -1878,7 +1877,7 @@ static int runImmedTriggers(PSM_t psm)
 
 	    if (triggersRun[triggerIndices[i]] != 0) continue;
 	
-	    mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_NAME, triggerNames[i], 0);
+	    mi = rpmtsInitIterator(ts, RPMTAG_NAME, triggerNames[i], 0);
 
 	    while((sourceH = rpmdbNextIterator(mi)) != NULL) {
 		rc |= handleOneTrigger(psm, sourceH, fi->h, 
@@ -1974,7 +1973,7 @@ int psmStage(PSM_t psm, pkgStage stage)
 	    psm->scriptArg = psm->npkgs_installed + 1;
 
 assert(psm->mi == NULL);
-	    psm->mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_NAME, fi->name, 0);
+	    psm->mi = rpmtsInitIterator(ts, RPMTAG_NAME, fi->name, 0);
 	    xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_VERSION,
 			RPMMIRE_DEFAULT, fi->version);
 	    xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_RELEASE,
@@ -2556,7 +2555,7 @@ assert(psm->mi == NULL);
 
     case PSM_RPMDB_LOAD:
 assert(psm->mi == NULL);
-	psm->mi = rpmdbInitIterator(ts->rpmdb, RPMDBI_PACKAGES,
+	psm->mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES,
 				&fi->record, sizeof(fi->record));
 
 	fi->h = rpmdbNextIterator(psm->mi);
diff --git a/lib/query.c b/lib/query.c
index 58e745390..0ff13886d 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -604,11 +604,11 @@ restart:
 		/*@loopbreak@*/ break;
 	    }
 
+	    ts->verify_legacy = 1;
 	    /*@-mustmod@*/	/* LCL: something fishy here, was segfault */
-    	    rc = rpmReadPackageFile(ts, fd, fileURL, &h);
+    	    rpmrc = rpmReadPackageFile(ts, fd, fileURL, &h);
 	    /*@=mustmod@*/
-	    rpmrc = (rc == 0 ? RPMRC_OK : RPMRC_BADMAGIC);
-	    /* XXX rpmrc tests below need work */
+	    ts->verify_legacy = 0;
 
 	    (void) Fclose(fd);
 
@@ -711,7 +711,7 @@ restart:
       }	break;
 
     case RPMQV_ALL:
-	qva->qva_mi = rpmdbInitIterator(ts->rpmdb, RPMDBI_PACKAGES, NULL, 0);
+	qva->qva_mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, NULL, 0);
 	if (qva->qva_mi == NULL) {
 	    rpmError(RPMERR_QUERYINFO, _("no packages\n"));
 	    res = 1;
@@ -730,7 +730,7 @@ restart:
 	break;
 
     case RPMQV_GROUP:
-	qva->qva_mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_GROUP, arg, 0);
+	qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_GROUP, arg, 0);
 	if (qva->qva_mi == NULL) {
 	    rpmError(RPMERR_QUERYINFO,
 		_("group %s does not contain any packages\n"), arg);
@@ -741,7 +741,7 @@ restart:
 	break;
 
     case RPMQV_TRIGGEREDBY:
-	qva->qva_mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_TRIGGERNAME, arg, 0);
+	qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_TRIGGERNAME, arg, 0);
 	if (qva->qva_mi == NULL) {
 	    rpmError(RPMERR_QUERYINFO, _("no package triggers %s\n"), arg);
 	    res = 1;
@@ -751,7 +751,7 @@ restart:
 	break;
 
     case RPMQV_WHATREQUIRES:
-	qva->qva_mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_REQUIRENAME, arg, 0);
+	qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_REQUIRENAME, arg, 0);
 	if (qva->qva_mi == NULL) {
 	    rpmError(RPMERR_QUERYINFO, _("no package requires %s\n"), arg);
 	    res = 1;
@@ -762,7 +762,7 @@ restart:
 
     case RPMQV_WHATPROVIDES:
 	if (arg[0] != '/') {
-	    qva->qva_mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_PROVIDENAME, arg, 0);
+	    qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, arg, 0);
 	    if (qva->qva_mi == NULL) {
 		rpmError(RPMERR_QUERYINFO, _("no package provides %s\n"), arg);
 		res = 1;
@@ -793,7 +793,7 @@ restart:
 	    fn = xstrdup(arg);
 	(void) rpmCleanPath(fn);
 
-	qva->qva_mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_BASENAMES, fn, 0);
+	qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_BASENAMES, fn, 0);
 	if (qva->qva_mi == NULL) {
 	    int myerrno = 0;
 	    if (access(fn, F_OK) != 0)
@@ -837,7 +837,7 @@ restart:
 	}
 	rpmMessage(RPMMESS_DEBUG, _("package record number: %u\n"), recOffset);
 	/* RPMDBI_PACKAGES */
-	qva->qva_mi = rpmdbInitIterator(ts->rpmdb, RPMDBI_PACKAGES, &recOffset, sizeof(recOffset));
+	qva->qva_mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, &recOffset, sizeof(recOffset));
 	if (qva->qva_mi == NULL) {
 	    rpmError(RPMERR_QUERY,
 		_("record %u could not be read\n"), recOffset);
@@ -849,7 +849,7 @@ restart:
 
     case RPMQV_PACKAGE:
 	/* XXX HACK to get rpmdbFindByLabel out of the API */
-	qva->qva_mi = rpmdbInitIterator(ts->rpmdb, RPMDBI_LABEL, arg, 0);
+	qva->qva_mi = rpmtsInitIterator(ts, RPMDBI_LABEL, arg, 0);
 	if (qva->qva_mi == NULL) {
 	    rpmError(RPMERR_QUERYINFO, _("package %s is not installed\n"), arg);
 	    res = 1;
@@ -865,27 +865,25 @@ restart:
 
 int rpmcliQuery(QVA_t qva, const char ** argv)
 {
-    const char * rootDir = qva->qva_prefix;
-    rpmdb db = NULL;
-    rpmTransactionSet ts = NULL;
+    rpmTransactionSet ts;
     const char * arg;
     int ec = 0;
 
+    ts = rpmtransCreateSet(NULL, qva->qva_prefix);
+
+    if (qva->qva_showPackage == NULL)
+	qva->qva_showPackage = showQueryPackage;
+
     switch (qva->qva_source) {
     case RPMQV_RPM:
     case RPMQV_SPECFILE:
 	break;
     default:
-	if (rpmdbOpen(rootDir, &db, O_RDONLY, 0644))
+	if (rpmtsOpenDB(ts, O_RDONLY))
 	    return 1;	/* XXX W2DO? */
 	break;
     }
 
-    if (qva->qva_showPackage == NULL)
-	qva->qva_showPackage = showQueryPackage;
-
-    ts = rpmtransCreateSet(db, rootDir);
-
     if (qva->qva_source == RPMQV_ALL) {
 	/*@-nullpass@*/ /* FIX: argv can be NULL, cast to pass argv array */
 	ec = rpmQueryVerify(qva, ts, (const char *) argv);
@@ -898,10 +896,10 @@ int rpmcliQuery(QVA_t qva, const char ** argv)
 	}
     }
 
-    ts = rpmtransFree(ts);
-
     if (qva->qva_showPackage == showQueryPackage)
 	qva->qva_showPackage = NULL;
 
+    ts = rpmtransFree(ts);
+
     return ec;
 }
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index 57b2e4930..3d5c34061 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -737,21 +737,19 @@ fprintf(stderr, "========================= Package DSA Signature\n");
 
 int rpmcliSign(QVA_t qva, const char ** argv)
 {
-    const char * rootDir = "/";
-    rpmdb db = NULL;
     rpmTransactionSet ts;
     const char * arg;
+    int dbmode = (qva->qva_mode != RPMSIGN_IMPORT_PUBKEY)
+		? O_RDONLY : (O_RDWR | O_CREAT);
     int res = 0;
     int xx;
 
     if (argv == NULL) return res;
 
-    db = NULL;
-    xx = rpmdbOpen(rootDir, &db,
-	((qva->qva_mode == RPMSIGN_IMPORT_PUBKEY) ? O_RDWR : O_RDONLY), 0644);
+    ts = rpmtransCreateSet(NULL, NULL);
+    xx = rpmtsOpenDB(ts, dbmode);
     if (xx != 0)
 	return -1;
-    ts = rpmtransCreateSet(db, rootDir);
 
     switch (qva->qva_mode) {
     case RPMSIGN_CHK_SIGNATURE:
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 6fa5a48f5..daa078de2 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -202,8 +202,6 @@ int rpmInstall(const char * rootDir, const char ** fileArgv,
 		rpmprobFilterFlags probFilter,
 		rpmRelocation * relocations)
 {
-    int mode = (transFlags & RPMTRANS_FLAG_TEST) ? O_RDONLY : (O_RDWR|O_CREAT);
-    rpmdb db = NULL;
     rpmTransactionSet ts = NULL;
 
     struct rpmEIU * eiu = memset(alloca(sizeof(*eiu)), 0, sizeof(*eiu));
@@ -221,16 +219,12 @@ int rpmInstall(const char * rootDir, const char ** fileArgv,
     if (rootDir == NULL) rootDir = "";
     /*@=branchstate@*/
 
-    if (rpmdbOpen(rootDir, &db, mode, 0644)) {
-	const char *dn;
-	dn = rpmGetPath(rootDir, "%{_dbpath}", NULL);
-	rpmMessage(RPMMESS_ERROR,
-				_("cannot open Packages database in %s\n"), dn);
-	dn = _free(dn);
-	eiu->numFailed++;
-	goto exit;
-    }
-    ts = rpmtransCreateSet(db, rootDir);
+    ts = rpmtransCreateSet(NULL, rootDir);
+    ts->transFlags = transFlags;
+    ts->dbmode = (transFlags & RPMTRANS_FLAG_TEST)
+		? O_RDONLY : (O_RDWR|O_CREAT);
+    ts->notify = rpmShowProgress;
+    ts->notifyData = (void *) ((long)notifyFlags);
 
     if ((eiu->relocations = relocations) != NULL) {
 	while (eiu->relocations->oldPath)
@@ -342,10 +336,11 @@ restart:
 	    continue;
 	}
 
+	ts->verify_legacy = 1;
 	/*@-mustmod@*/	/* LCL: segfault */
-	xx = rpmReadPackageFile(ts, eiu->fd, *eiu->fnp, &eiu->h);
+	eiu->rpmrc = rpmReadPackageFile(ts, eiu->fd, *eiu->fnp, &eiu->h);
 	/*@=mustmod@*/
-	eiu->rpmrc = (xx ? RPMRC_FAIL : RPMRC_OK);	/* XXX HACK */
+	ts->verify_legacy = 0;
 	eiu->isSource = headerIsEntry(eiu->h, RPMTAG_SOURCEPACKAGE);
 
 	xx = Fclose(eiu->fd);
@@ -372,6 +367,12 @@ restart:
 
 	if (eiu->rpmrc == RPMRC_OK || eiu->rpmrc == RPMRC_BADSIZE) {
 
+	    /* Open database RDWR for binary packages. */
+	    if (rpmtsOpenDB(ts, ts->dbmode)) {
+		eiu->numFailed++;
+		goto exit;
+	    }
+
 	    if (eiu->relocations) {
 		const char ** paths;
 		int pft;
@@ -401,7 +402,7 @@ restart:
 
 		xx = headerNVR(eiu->h, &name, NULL, NULL);
 		/*@-onlytrans@*/
-		mi = rpmdbInitIterator(db, RPMTAG_NAME, name, 0);
+		mi = rpmtsInitIterator(ts, RPMTAG_NAME, name, 0);
 		/*@=onlytrans@*/
 		count = rpmdbGetIteratorCount(mi);
 		while ((oldH = rpmdbNextIterator(mi)) != NULL) {
@@ -526,8 +527,7 @@ restart:
 	packagesTotal = eiu->numRPMS + eiu->numSRPMS;
 
 	rpmMessage(RPMMESS_DEBUG, _("installing binary packages\n"));
-	rc = rpmRunTransactions(ts, rpmShowProgress,
-			(void *) ((long)notifyFlags),
+	rc = rpmRunTransactions(ts, ts->notify, ts->notifyData,
 		 	NULL, &probs, transFlags, probFilter);
 
 	if (rc < 0) {
@@ -558,7 +558,7 @@ restart:
 	    if (!(transFlags & RPMTRANS_FLAG_TEST)) {
 #if !defined(__LCLINT__) /* LCL: segfault */
 		eiu->rpmrc = rpmInstallSourcePackage(ts, eiu->fd, NULL,
-			rpmShowProgress, (void *) ((long)notifyFlags), NULL);
+			ts->notify, ts->notifyData, NULL);
 #endif
 		if (eiu->rpmrc != RPMRC_OK) eiu->numFailed++;
 	    }
@@ -589,10 +589,7 @@ int rpmErase(const char * rootDir, const char ** argv,
 		rpmtransFlags transFlags,
 		rpmEraseInterfaceFlags interfaceFlags)
 {
-    /* XXX W2DO? O_EXCL??? */
-    int mode = (transFlags & RPMTRANS_FLAG_TEST) ? O_RDONLY : (O_RDWR|O_EXCL);
-    rpmdb db = NULL;
-    rpmTransactionSet ts = NULL;
+    rpmTransactionSet ts;
 
     int count;
     const char ** arg;
@@ -605,20 +602,19 @@ int rpmErase(const char * rootDir, const char ** argv,
 
     if (argv == NULL) return 0;
 
-    if (rpmdbOpen(rootDir, &db, mode, 0644)) {
-	const char *dn;
-	dn = rpmGetPath( (rootDir ? rootDir : ""), "%{_dbpath}", NULL);
-	rpmMessage(RPMMESS_ERROR, _("cannot open %s/packages.rpm\n"), dn);
-	dn = _free(dn);
-	return -1;
-    }
-    ts = rpmtransCreateSet(db, rootDir);
+    ts = rpmtransCreateSet(NULL, rootDir);
+    ts->transFlags = transFlags;
+    /* XXX W2DO? O_EXCL??? */
+    ts->dbmode = (transFlags & RPMTRANS_FLAG_TEST)
+		? O_RDONLY : (O_RDWR|O_EXCL);
+
+    (void) rpmtsOpenDB(ts, ts->dbmode);
 
     for (arg = argv; *arg; arg++) {
 	rpmdbMatchIterator mi;
 
 	/* XXX HACK to get rpmdbFindByLabel out of the API */
-	mi = rpmdbInitIterator(db, RPMDBI_LABEL, *arg, 0);
+	mi = rpmtsInitIterator(ts, RPMDBI_LABEL, *arg, 0);
 	count = rpmdbGetIteratorCount(mi);
 	if (count <= 0) {
 	    rpmMessage(RPMMESS_ERROR, _("package %s is not installed\n"), *arg);
@@ -774,7 +770,7 @@ IDTX IDTXload(rpmTransactionSet ts, rpmTag tag)
     Header h;
 
     /*@-branchstate@*/
-    mi = rpmdbInitIterator(ts->rpmdb, tag, NULL, 0);
+    mi = rpmtsInitIterator(ts, tag, NULL, 0);
     while ((h = rpmdbNextIterator(mi)) != NULL) {
 	rpmTagType type = RPM_NULL_TYPE;
 	int_32 count = 0;
@@ -888,25 +884,22 @@ IDTX IDTXglob(rpmTransactionSet ts, const char * globstr, rpmTag tag)
 int rpmRollback(/*@unused@*/ struct rpmInstallArguments_s * ia,
 		/*@unused@*/ const char ** argv)
 {
-    rpmdb db = NULL;
-    rpmTransactionSet ts = NULL;
+    rpmTransactionSet ts;
     IDTX itids = NULL;
     const char * globstr = rpmExpand("%{_repackage_dir}/*.rpm", NULL);
     IDTX rtids = NULL;
-    int rc;
 
-    rc = rpmdbOpen(ia->rootdir, &db, O_RDWR, 0644);
-
-    ts = rpmtransCreateSet(db, ia->rootdir);
+    ts = rpmtransCreateSet(NULL, ia->rootdir);
 
     itids = IDTXload(ts, RPMTAG_INSTALLTID);
+
     rtids = IDTXglob(ts, globstr, RPMTAG_REMOVETID);
 
     globstr = _free(globstr);
     rtids = IDTXfree(rtids);
     itids = IDTXfree(itids);
 
-    ts =  rpmtransFree(ts);
+    ts = rpmtransFree(ts);
 
     return 0;
 }
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 9aec7c59f..b69f39d2e 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -597,7 +597,7 @@ void rpmFreeRpmrc(void)
 
 /** \ingroup rpmdb
  */
-typedef /*@abstract@*/ struct rpmdb_s * rpmdb;
+typedef /*@abstract@*/ /*@refcounted@*/ struct rpmdb_s * rpmdb;
 
 /** \ingroup rpmdb
  */
@@ -612,6 +612,22 @@ typedef /*@abstract@*/ struct _dbiIndexSet * dbiIndexSet;
 extern int dbiTagsMax;
 
 /** \ingroup rpmdb
+ * Unreference a database instance.
+ * @retval db		rpm database
+ * @return		NULL always
+ */
+/*@null@*/ rpmdb rpmdbUnlink (/*@killref@*/ /*@only@*/ rpmdb db)
+	/*@modifies db @*/;
+
+/** \ingroup rpmdb
+ * Reference a database instance.
+ * @param db		rpm database
+ * @return		new rpm database reference
+ */
+rpmdb rpmdbLink (rpmdb db)
+	/*@modifies db @*/;
+
+/** \ingroup rpmdb
  * Open rpm database.
  * @param prefix	path to top of install tree
  * @retval dbp		address of rpm database
@@ -648,9 +664,9 @@ int rpmdbVerify(/*@null@*/ const char * prefix)
  * @param db		rpm database
  * @return		0 on success
  */
-int rpmdbClose (/*@only@*/ /*@null@*/ rpmdb db)
+int rpmdbClose (/*@killref@*/ /*@only@*/ /*@null@*/ rpmdb db)
 	/*@globals fileSystem@*/
-	/*@modifies fileSystem @*/;
+	/*@modifies db, fileSystem @*/;
 
 /** \ingroup rpmdb
  * Sync all database indices.
@@ -694,17 +710,6 @@ typedef /*@abstract@*/ struct _rpmdbMatchIterator * rpmdbMatchIterator;
 	/*@modifies mi, fileSystem @*/;
 
 /** \ingroup rpmdb
- * Return rpm database used by iterator.
- * @todo Remove?
- * @param mi		rpm database iterator
- * @return		rpm database handle
- */
-/*@unused@*/
-/*@kept@*/ /*@null@*/ rpmdb rpmdbGetIteratorRpmDB(
-		/*@null@*/ rpmdbMatchIterator mi)
-	/*@*/;
-
-/** \ingroup rpmdb
  * Return join key for current position of rpm database iterator.
  * @param mi		rpm database iterator
  * @return		current join key
@@ -840,7 +845,7 @@ int rpmdbSetIteratorModified(/*@null@*/ rpmdbMatchIterator mi, int modified)
  * @return		NULL on failure
  */
 /*@only@*/ /*@null@*/ rpmdbMatchIterator rpmdbInitIterator(
-			/*@kept@*/ /*@null@*/ rpmdb db, int rpmtag,
+			/*@null@*/ rpmdb db, int rpmtag,
 			/*@null@*/ const void * keyp, size_t keylen)
 	/*@globals fileSystem@*/
 	/*@modifies db, fileSystem @*/;
@@ -1192,15 +1197,46 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, FD_t fd,
 		fileSystem, internalState @*/;
 
 /** \ingroup rpmtrans
+ * Close the database used by the transaction.
+ * @param ts		transaction set
+ * @return		0 on success
+ */
+int rpmtsCloseDB(rpmTransactionSet ts)
+	/*@modifies ts @*/;
+
+/** \ingroup rpmtrans
+ * Open the database used by the transaction.
+ * @param ts		transaction set
+ * @param dbmode	O_RDONLY or O_RDWR
+ * @return		0 on success
+ */
+int rpmtsOpenDB(rpmTransactionSet ts, int dbmode)
+	/*@modifies ts @*/;
+
+/** \ingroup rpmtrans
+ * Return transaction database iterator.
+ * @param ts		transaction set
+ * @param rpmtag	rpm tag
+ * @param keyp		key data (NULL for sequential access)
+ * @param keylen	key data length (0 will use strlen(keyp))
+ * @return		NULL on failure
+ */
+/*@only@*/ /*@null@*/
+rpmdbMatchIterator rpmtsInitIterator(const rpmTransactionSet ts, int rpmtag,
+			/*@null@*/ const void * keyp, size_t keylen)
+	/*@globals fileSystem @*/
+	/*@modifies fileSystem @*/;
+
+/** \ingroup rpmtrans
  * Create an empty transaction set.
  * @param db		rpm database (may be NULL if database is not accessed)
  * @param rootdir	path to top of install tree
  * @return		transaction set
  */
 /*@only@*/ rpmTransactionSet rpmtransCreateSet(
-		/*@null@*/ /*@kept@*/ rpmdb db,
+		/*@null@*/ rpmdb db,
 		/*@null@*/ const char * rootDir)
-	/*@*/;
+	/*@modifies db @*/;
 
 /** \ingroup rpmtrans
  * Add package to be installed to unordered transaction set.
@@ -1258,8 +1294,7 @@ void rpmtransClean(rpmTransactionSet ts)
  */
 /*@null@*/ rpmTransactionSet
 rpmtransFree(/*@only@*//*@null@*/ rpmTransactionSet ts)
-	/*@globals fileSystem @*/
-	/*@modifies ts, fileSystem @*/;
+	/*@modifies ts @*/;
 
 /** \ingroup rpmtrans
  * Save file handle to be used as stderr when running package scripts.
@@ -1473,8 +1508,8 @@ typedef enum rpmprobFilterFlags_e {
  * @return		0 on success, -1 on error, >0 with newProbs set
  */
 int rpmRunTransactions(rpmTransactionSet ts,
-			rpmCallbackFunction notify,
-			/*@owned@*/ rpmCallbackData notifyData,
+	/*@observer@*/	rpmCallbackFunction notify,
+	/*@observer@*/	rpmCallbackData notifyData,
 			rpmProblemSet okProbs,
 			/*@out@*/ rpmProblemSet * newProbs,
 			rpmtransFlags transFlags,
diff --git a/lib/transaction.c b/lib/transaction.c
index 4b9d2563e..f0b60005d 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -406,7 +406,6 @@ static int handleInstInstalledFiles(const rpmTransactionSet ts, TFI_t fi,
 {
     HGE_t hge = fi->hge;
     HFD_t hfd = (fi->hfd ? fi->hfd : headerFreeData);
-    rpmdb db = ts->rpmdb;
     rpmProblemSet probs = ts->probs;
     rpmtransFlags transFlags = ts->transFlags;
     rpmTagType oltype, omtype;
@@ -423,7 +422,7 @@ static int handleInstInstalledFiles(const rpmTransactionSet ts, TFI_t fi,
 
     rpmdbMatchIterator mi;
 
-    mi = rpmdbInitIterator(db, RPMDBI_PACKAGES, &shared->otherPkg, sizeof(shared->otherPkg));
+    mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, &shared->otherPkg, sizeof(shared->otherPkg));
     h = rpmdbNextIterator(mi);
     if (h == NULL) {
 	mi = rpmdbFreeIterator(mi);
@@ -503,17 +502,16 @@ static int handleInstInstalledFiles(const rpmTransactionSet ts, TFI_t fi,
 static int handleRmvdInstalledFiles(const rpmTransactionSet ts, TFI_t fi,
 		struct sharedFileInfo * shared, int sharedCount)
 	/*@globals fileSystem @*/
-	/*@modifies ts, fi, fileSystem @*/
+	/*@modifies fi, fileSystem @*/
 {
     HGE_t hge = fi->hge;
-    rpmdb db = ts->rpmdb;
     Header h;
     const char * otherStates;
     int i, xx;
    
     rpmdbMatchIterator mi;
 
-    mi = rpmdbInitIterator(db, RPMDBI_PACKAGES,
+    mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES,
 			&shared->otherPkg, sizeof(shared->otherPkg));
     h = rpmdbNextIterator(mi);
     if (h == NULL) {
@@ -1178,7 +1176,7 @@ int rpmRunTransactions(	rpmTransactionSet ts,
 	if (!(ts->ignoreSet & RPMPROB_FILTER_OLDPACKAGE)) {
 	    rpmdbMatchIterator mi;
 	    Header oldH;
-	    mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_NAME, alp->name, 0);
+	    mi = rpmtsInitIterator(ts, RPMTAG_NAME, alp->name, 0);
 	    while ((oldH = rpmdbNextIterator(mi)) != NULL)
 		xx = ensureOlder(alp, oldH, ts->probs);
 	    mi = rpmdbFreeIterator(mi);
@@ -1187,7 +1185,7 @@ int rpmRunTransactions(	rpmTransactionSet ts,
 	/* XXX multilib should not display "already installed" problems */
 	if (!(ts->ignoreSet & RPMPROB_FILTER_REPLACEPKG) && !alp->multiLib) {
 	    rpmdbMatchIterator mi;
-	    mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_NAME, alp->name, 0);
+	    mi = rpmtsInitIterator(ts, RPMTAG_NAME, alp->name, 0);
 	    xx = rpmdbSetIteratorRE(mi, RPMTAG_VERSION,
 			RPMMIRE_DEFAULT, alp->version);
 	    xx = rpmdbSetIteratorRE(mi, RPMTAG_RELEASE,
@@ -1212,7 +1210,7 @@ int rpmRunTransactions(	rpmTransactionSet ts,
 	Header h;
 	int fileCount;
 
-	mi = rpmdbInitIterator(ts->rpmdb, RPMDBI_PACKAGES, NULL, 0);
+	mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, NULL, 0);
 	xx = rpmdbAppendIterator(mi, ts->removedPackages, ts->numRemovedPackages);
 	while ((h = rpmdbNextIterator(mi)) != NULL) {
 	    if (headerGetEntry(h, RPMTAG_BASENAMES, NULL, NULL, &fileCount))
@@ -1259,7 +1257,7 @@ int rpmRunTransactions(	rpmTransactionSet ts,
 	    /* Retrieve erased package header from the database. */
 	    {	rpmdbMatchIterator mi;
 
-		mi = rpmdbInitIterator(ts->rpmdb, RPMDBI_PACKAGES,
+		mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES,
 				&fi->record, sizeof(fi->record));
 		if ((fi->h = rpmdbNextIterator(mi)) != NULL)
 		    fi->h = headerLink(fi->h);
@@ -1546,19 +1544,11 @@ assert(alp == fi->ap);
 
 		    h = headerFree(h);
 
-#ifdef	DYING
-		    /*@-mustmod@*/	/* LCL: segfault */
-		    rpmrc = rpmReadPackageHeader(alp->fd, &h, NULL, NULL, NULL);
-		    /*@=mustmod@*/
-#else
-		    /* XXX Leave fd positioned at payload. */
-		    ts->need_payload = 1;
 		    /*@-mustmod@*/	/* LCL: segfault */
-		    xx = rpmReadPackageFile(ts, alp->fd, "rpmRunTransactions", &h);
+		    rpmrc = rpmReadPackageFile(ts, alp->fd,
+				"rpmRunTransactions", &h);
 		    /*@=mustmod@*/
-		    ts->need_payload = 0;
-		    rpmrc = (xx ? RPMRC_FAIL : RPMRC_OK);      /* XXX HACK */
-#endif
+
 		    if (!(rpmrc == RPMRC_OK || rpmrc == RPMRC_BADSIZE)) {
 			/*@-noeffectuncon @*/ /* FIX: check rc */
 			(void)ts->notify(fi->h, RPMCALLBACK_INST_CLOSE_FILE,
diff --git a/lib/ts.c b/lib/ts.c
new file mode 100644
index 000000000..a8798d4f6
--- /dev/null
+++ b/lib/ts.c
@@ -0,0 +1,372 @@
+#include "system.h"
+#include <fnmatch.h>
+#include <fts.h>
+
+#include <rpmlib.h>
+#include <rpmpgp.h>
+
+#include "depends.h"
+
+#include "debug.h"
+
+static int _debug = 0;
+
+#define	BHPATH	"/mnt/redhat/beehive/comps/dist"
+#define	BHCOLL	"7.2"
+
+#if 0
+#define	BHN	"{basesystem,bash,filesystem,glibc-common,glibc,ldconfig,libtermcap,mktemp,setup,termcap}"
+#else
+#define	BHN	"setup"
+#endif
+
+#define	BHVR	"*"
+#define	BHA	"*"
+
+const char * bhpath = BHPATH;
+int bhpathlen = sizeof(BHPATH)-1;
+const char * bhcoll = BHCOLL;
+const char * bhn = BHN;
+const char * bhvr = BHVR;
+const char * bha = BHA;
+
+int bhlvl = -1;
+
+struct ftsglob_s {
+    const char ** patterns;
+    int fnflags;
+};
+
+const char * lvl0[] = {
+    NULL, NULL
+};
+
+const char * lvl1[] = {
+    NULL, NULL
+};
+
+const char * lvl2[] = {
+    NULL, NULL
+};
+
+const char * lvl3[] = {
+    NULL, NULL
+};
+
+const char * lvl4[] = {
+    NULL, NULL
+};
+
+const char * lvl5[] = {
+    NULL, NULL
+};
+
+const char * lvl6[] = {
+    NULL, NULL
+};
+
+const char * lvl7[] = {
+    NULL, NULL
+};
+
+static struct ftsglob_s bhglobs[] = {
+#if	0
+    { BHPATH "/" BHCOLL "/" BHN "/" BHVR "/" BHA "/*",	0 },
+    { BHCOLL,	FNM_PERIOD },
+    { BHN,	FNM_PERIOD },
+    { BHVR,	FNM_PERIOD },
+    { BHA,	FNM_PERIOD },
+#else
+    { lvl0, 	FNM_PERIOD },
+    { lvl1, 	FNM_PERIOD },
+    { lvl2, 	FNM_PERIOD },
+    { lvl3, 	FNM_PERIOD },
+    { lvl4, 	FNM_PERIOD },
+    { lvl5, 	FNM_PERIOD },
+    { lvl6, 	FNM_PERIOD },
+    { lvl7, 	FNM_PERIOD },
+#endif
+};
+static int nbhglobs = sizeof(bhglobs)/sizeof(bhglobs[0]);
+
+static const char * ftsInfoStrings[] = {
+    "UNKNOWN",
+    "D",
+    "DC",
+    "DEFAULT",
+    "DNR",
+    "DOT",
+    "DP",
+    "ERR",
+    "F",
+    "INIT",
+    "NS",
+    "NSOK",
+    "SL",
+    "SLNONE",
+    "W",
+};
+
+static const char * ftsInfoStr(int fts_info) {
+    if (!(fts_info >= 1 && fts_info <= 14))
+	fts_info = 0;
+    return ftsInfoStrings[ fts_info ];
+}
+
+static int ftsPrint(FTS * ftsp, FTSENT * fts, rpmTransactionSet ts)
+{
+    struct ftsglob_s * bhg;
+    const char ** patterns;
+    const char * pattern;
+    const char * n, * v, * r;
+    const char * s;
+    FD_t fd = NULL;
+    Header h = NULL;
+    rpmRC rc;
+    int indent = 2;
+    int lvl;
+    int xx;
+
+    switch (fts->fts_info) {
+    case FTS_D:		/* preorder directory */
+	if (fts->fts_pathlen < bhpathlen)
+	    break;
+
+	/* Grab the level of the beehive top directory. */
+	if (bhlvl < 0) {
+	    if (fts->fts_pathlen == bhpathlen && !strcmp(fts->fts_path, bhpath))
+		bhlvl = fts->fts_level;
+	    else
+		break;
+	}
+	lvl = fts->fts_level - bhlvl;
+#ifdef DYING
+	if (lvl <= 0) {
+	    break;
+	} else if (lvl == 1) {
+	    /* Skip collections we're not interested in. */
+	    if (!strcmp(fts->fts_name, bhcoll))
+		break;
+	    xx = fts_set(ftsp, fts, FTS_SKIP);
+	    break;
+	} else if (lvl == 2) {
+	    /* Skip names we're not interested in. */
+	    if (!strcmp(fts->fts_name, bhn))
+		break;
+	    xx = fts_set(ftsp, fts, FTS_SKIP);
+	    break;
+	} else if (lvl == 3) {
+	    /* Skip version-release we're not interested in. */
+	    if (!strcmp(fts->fts_name, bhvr))
+		break;
+	    xx = fts_set(ftsp, fts, FTS_SKIP);
+	    break;
+	} else if (lvl == 4) {
+	    /* Skip arch we're not interested in. */
+	    if (!strcmp(fts->fts_name, bha))
+		break;
+	    xx = fts_set(ftsp, fts, FTS_SKIP);
+	    break;
+	}
+#else
+	if (lvl < 0 || lvl >= nbhglobs)
+	    break;
+
+#if 0
+	fprintf(stderr, "FTS_%s\t%*s %s\n", ftsInfoStr(fts->fts_info),
+		indent * (fts->fts_level < 0 ? 0 : fts->fts_level), "",
+		fts->fts_name);
+#endif
+
+	/* Full path glob expression check. */
+	bhg = bhglobs;
+
+	if ((patterns = bhg->patterns) != NULL)
+	while ((pattern = *patterns++) != NULL) {
+	    if (*pattern == '/')
+		xx = fnmatch(pattern, fts->fts_path, bhg->fnflags);
+	    else
+		xx = fnmatch(pattern, fts->fts_name, bhg->fnflags);
+	    if (xx == 0)
+		break;
+	}
+
+	/* Level specific glob expression check(s). */
+	if (lvl == 0)
+	    break;
+	bhg += lvl;
+
+	if ((patterns = bhg->patterns) != NULL)
+	while ((pattern = *patterns++) != NULL) {
+	    if (*pattern == '/')
+		xx = fnmatch(pattern, fts->fts_path, bhg->fnflags);
+	    else
+		xx = fnmatch(pattern, fts->fts_name, bhg->fnflags);
+	    if (xx == 0)
+		break;
+	    else
+		xx = fts_set(ftsp, fts, FTS_SKIP);
+	}
+#endif
+	break;
+    case FTS_DP:	/* postorder directory */
+#if 0
+	fprintf(stderr, "FTS_%s\t%*s %s\n", ftsInfoStr(fts->fts_info),
+		indent * (fts->fts_level < 0 ? 0 : fts->fts_level), "",
+		fts->fts_name);
+#endif
+	break;
+    case FTS_F:		/* regular file */
+	if (fts->fts_level >= 0) {
+	    if (strcmp(fts->fts_parent->fts_name, "SRPMS")) {
+		xx = fts_set(ftsp, fts->fts_parent, FTS_SKIP);
+		break;
+	    }
+	}
+	s = fts->fts_name + fts->fts_namelen + 1 - sizeof(".rpm");
+	if (strcmp(s, ".rpm"))
+	    break;
+	rpmMessage(RPMMESS_DEBUG, "============== %s\n", fts->fts_accpath);
+	fd = Fopen(fts->fts_accpath, "r");
+	if (fd == NULL || Ferror(fd))
+	    break;
+	rc = rpmReadPackageFile(ts, fd, fts->fts_path, &h);
+	xx = Fclose(fd);
+	fd = NULL;
+	if (rc != RPMRC_OK)
+	    break;
+	xx = headerNVR(h, &n, &v, &r);
+	fprintf(stderr, "\t%*s %s-%s-%s\n",
+		indent * (fts->fts_level < 0 ? 0 : fts->fts_level), "",
+		n, v, r);
+	xx = rpmtransAddPackage(ts, h, NULL, fts->fts_path, 1, NULL);
+	break;
+    case FTS_NS:	/* stat(2) failed */
+    case FTS_DNR:	/* unreadable directory */
+    case FTS_ERR:	/* error; errno is set */
+	fprintf(stderr, "FTS_%s\t%*s %s\n", ftsInfoStr(fts->fts_info),
+		indent * (fts->fts_level < 0 ? 0 : fts->fts_level), "",
+		fts->fts_name);
+	break;
+    case FTS_DC:	/* directory that causes cycles */
+    case FTS_DEFAULT:	/* none of the above */
+    case FTS_DOT:	/* dot or dot-dot */
+    case FTS_INIT:	/* initialized only */
+    case FTS_NSOK:	/* no stat(2) requested */
+    case FTS_SL:	/* symbolic link */
+    case FTS_SLNONE:	/* symbolic link without target */
+    case FTS_W:		/* whiteout object */
+    default:
+	fprintf(stderr, "FTS_%s\t%*s %s\n", ftsInfoStr(fts->fts_info),
+		indent * (fts->fts_level < 0 ? 0 : fts->fts_level), "",
+		fts->fts_name);
+	break;
+    }
+
+    h = headerFree(h);
+    if (fd)
+	xx = Fclose(fd);
+    return 0;
+}
+
+static char * const ftsSet[] = {
+    BHPATH, NULL,
+};
+
+
+static struct poptOption optionsTable[] = {
+ { "verbose", 'v', 0, 0, 'v',				NULL, NULL },
+ { "debug", 'd', POPT_ARG_VAL,	&_debug, -1,		NULL, NULL },
+  POPT_AUTOHELP
+  POPT_TABLEEND
+};
+
+
+int
+main(int argc, const char *argv[])
+{
+    poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
+    const char * rootDir = "";
+    rpmdb db = NULL;
+    rpmTransactionSet ts = NULL;
+    FTS * ftsp;
+    int ftsOpts = (FTS_COMFOLLOW | FTS_LOGICAL | FTS_NOSTAT);
+    FTSENT * fts;
+    char buf[BUFSIZ];
+    const char ** args;
+    const char * arg;
+    char * t;
+    int rc;
+    int ec = 1;
+    int xx;
+
+    while ((rc = poptGetNextOpt(optCon)) > 0) {
+	switch (rc) {
+	case 'v':
+	    rpmIncreaseVerbosity();
+	    /*@switchbreak@*/ break;
+	default:
+            /*@switchbreak@*/ break;
+	}
+    }
+
+    rpmReadConfigFiles(NULL, NULL);
+
+    ts = rpmtransCreateSet(db, rootDir);
+    (void) rpmtsOpenDB(ts, O_RDONLY);
+
+    args = poptGetArgs(optCon);
+    if (args)
+    while ((arg = *args++) != NULL) {
+    
+	t = buf;
+	*t = '\0';
+	t = stpcpy(t, BHPATH);
+	*t++ = '/';
+	t = stpcpy(t, BHCOLL);
+	*t++ = '/';
+	t = stpcpy(t, arg);
+	*t++ = '/';
+	t = stpcpy(t, "*");
+	*t++ = '/';
+	t = stpcpy(t, "i386");
+	*t++ = '/';
+	t = stpcpy(t, "*.rpm");
+
+fprintf(stderr, "*** \"%s\"\n", buf);
+	lvl0[0] = buf;
+	lvl1[0] = BHCOLL;
+	lvl2[0] = arg;
+
+if (!_debug) {
+	ftsp = fts_open(ftsSet, ftsOpts, NULL);
+	while((fts = fts_read(ftsp)) != NULL)
+	    xx = ftsPrint(ftsp, fts, ts);
+	xx = fts_close(ftsp);
+}
+
+    }
+
+if (!_debug) {
+    {	rpmDependencyConflict conflicts = NULL;
+	int numConflicts = 0;
+
+	(void) rpmdepCheck(ts, &conflicts, &numConflicts);
+
+	/*@-branchstate@*/
+	if (conflicts) {
+	    rpmMessage(RPMMESS_ERROR, _("failed dependencies:\n"));
+	    printDepProblems(stderr, conflicts, numConflicts);
+	    conflicts = rpmdepFreeConflicts(conflicts, numConflicts);
+	}
+	/*@=branchstate@*/
+    }
+
+    (void) rpmdepOrder(ts);
+}
+
+exit:
+    ts = rpmtransFree(ts);
+
+    return ec;
+}
diff --git a/lib/verify.c b/lib/verify.c
index 7f0142a1b..c9cbf471e 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -581,28 +581,27 @@ int showVerifyPackage(QVA_t qva, rpmTransactionSet ts, Header h)
 
 int rpmcliVerify(QVA_t qva, const char ** argv)
 {
-    const char * rootDir = qva->qva_prefix;
-    const char * arg;
-    rpmdb db = NULL;
     rpmTransactionSet ts;
+    const char * arg;
     int ec = 0;
 
+    ts = rpmtransCreateSet(NULL, qva->qva_prefix);
+
+    if (qva->qva_showPackage == NULL)
+        qva->qva_showPackage = showVerifyPackage;
+
+
     switch (qva->qva_source) {
     case RPMQV_RPM:
 	if (!(qva->qva_flags & VERIFY_DEPS))
 	    break;
 	/*@fallthrough@*/
     default:
-	if (rpmdbOpen(rootDir, &db, O_RDONLY, 0644))
+	if (rpmtsOpenDB(ts, O_RDONLY))
 	    return 1;	/* XXX W2DO? */
 	break;
     }
 
-    if (qva->qva_showPackage == NULL)
-        qva->qva_showPackage = showVerifyPackage;
-
-    ts = rpmtransCreateSet(db, rootDir);
-
     if (qva->qva_source == RPMQV_ALL) {
 	/*@-nullpass@*/ /* FIX: argv can be NULL, cast to pass argv array */
 	ec = rpmQueryVerify(qva, ts, (const char *) argv);
@@ -615,10 +614,10 @@ int rpmcliVerify(QVA_t qva, const char ** argv)
 	}
     }
 
-    ts = rpmtransFree(ts);
-
     if (qva->qva_showPackage == showVerifyPackage)
         qva->qva_showPackage = NULL;
 
+    ts = rpmtransFree(ts);
+
     return ec;
 }
diff --git a/po/cs.po b/po/cs.po
index 4fd5f5f82..518dcc59f 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: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +9,66 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr "nemohu otev��t RPM datab�zi v %s\n"
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr "chybn� z�vislosti p�i sestavov�n�:\n"
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Nelze otev��t spec soubor %s: %s\n"
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Nelze otev��t rouru pro tar: %m\n"
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Nelze ��st spec soubor z %s\n"
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Nelze p�ejmenovat %s na %s: %m\n"
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "nemohu zjistit stav %s: %m\n"
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "Soubor %s nen� oby�ejn� soubor.\n"
 
-#: build.c:259
+#: build.c:243
 #, 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:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Sestavuji c�lov� platformy: %s\n"
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Sestavuji pro c�l %s\n"
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr "parametr nen� RPM bal��ek\n"
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr "chyba p�i p�i �ten� hlavi�ky bal��ku\n"
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "nemohu znovu otev��t payload: %s\n"
@@ -404,44 +399,44 @@ msgstr "--sign m��e b�t pou�it jen p�i sestavov�n� bal��k�"
 msgid "exec failed\n"
 msgstr "spu�t�n� selhalo\n"
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr "ke znovusestaven� nezad�ny ��dn� bal��ky"
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr "pro sestaven� nezad�ny ��dn� spec soubory"
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr "pro sestaven� nezad�ny ��dn� tar soubory"
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr "nezad�ny ��dn� bal��ky pro odstran�n�"
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr "nezad�ny ��dn� bal��ky pro instalaci"
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr "k dotazu nezad�ny ��dn� parametry"
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr "pro kontrolu nezad�ny ��dn� bal��ky"
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr "neo�ek�van� parametry pro --querytags "
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 #, fuzzy
 msgid "no arguments given"
 msgstr "k dotazu nezad�ny ��dn� parametry"
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr "Nelze otev��t do�asn� soubor.\n"
 
@@ -652,7 +647,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:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr "��dek: %s\n"
@@ -727,156 +722,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:81
+#: build/pack.c:79
 #, 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:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "vytv��en� arch�vu selhalo: %s\n"
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "z�pis cpio_copy selhal: %s\n"
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "�ten� cpio_copy selhalo: %s\n"
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Nemohu otev��t PreIn soubor: %s\n"
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Nemohu otev��t PreUn soubor: %s\n"
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Nemohu otev��t PostIn soubor: %s\n"
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Nemohu otev��t PostUn soubor: %s\n"
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Nemohu otev��t VerifyScript soubor: %s\n"
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, 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:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: otev�en� %s: %s\n"
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: �ten� %s: %s\n"
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek selhal: %s\n"
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s nen� RPM bal��ek\n"
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: �ten� hlavi�ky z %s\n"
 
-#: build/pack.c:475
+#: build/pack.c:467
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Nemohu p�e��st hlavi�ku z %s: %s\n"
 
-#: build/pack.c:493
+#: build/pack.c:485
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Nemohu zapsat hlavi�ku do %s: %s\n"
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr "�patn� CSA data\n"
 
-#: build/pack.c:536
+#: build/pack.c:528
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Nemohu zapsat hlavi�ku do %s: %s\n"
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Generuji podpis: %d\n"
 
-#: build/pack.c:567
+#: build/pack.c:559
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Nemohu p�e��st hlavi�ku z %s: %s\n"
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Nemohu otev��t %s: %s\n"
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nemohu zapsat bal��ek: %s\n"
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, 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:636
+#: build/pack.c:628
 #, 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:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Nemohu zapsat hlavi�ku do %s: %s\n"
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Nemohu p�e��st payload z %s: %s\n"
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nemohu zapsat payload do %s: %s\n"
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zaps�no: %s\n"
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, 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:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nemohu vytvo�it %s: %s\n"
@@ -1438,7 +1433,7 @@ msgid " failed - "
 msgstr "selhal - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1447,65 +1442,85 @@ msgstr ""
 "Z�vislost \"B\" pot�ebuje obdob� (p�edpokl�d�no stejn� jako \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr "ANO"
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr "NE "
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "nemohu otev��t datab�zi bal��k� v %s\n"
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, fuzzy, c-format
+msgid "package %s already added, ignoring\n"
+msgstr "bal��ek %s je ji� nainstalov�n"
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s ANO (p�id�ny soubory)\n"
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s ANO (p�id�no poskytuje)\n"
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (ke�ov�no)\n"
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s ANO (rpmrc poskytuje)\n"
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s ANO (rpmlib poskytuje)\n"
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s ANO (db soubory)\n"
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s ANO (db poskytuje)\n"
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s ANO (db bal��ek)\n"
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NE\n"
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) p�id�no do ke�e z�vislost�.\n"
@@ -1513,43 +1528,43 @@ msgstr "%s: (%s, %s) p�id�no do ke�e z�vislost�.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "bal��ek %s-%s-%s m� nespln�n� po�adavky: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "bal��ek %s koliduje: %s\n"
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "odstra�uji %s-%s-%s \"%s\" z tsort relac�.\n"
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr "========== ukl�d�n� tsort relac�\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== tsorting bal��k� (po�ad�, #p�edch�dce, #n�sledovn�k, hloubka)\n"
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr "========== pouze �sp�n� (po�ad� dle prezentace)\n"
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr "SMY�KA:\n"
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr "========== pokra�uje tsort ...\n"
 
@@ -2283,64 +2298,64 @@ msgstr "nemohu vytvo�it %s: %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "nemohu zapsat do %%%s %s\n"
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 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:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr "zdrojov� bal��ek neobsahuje .spec soubor\n"
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: spou�t�m %s skript(y) (pokud existuj�)\n"
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, 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:1611
+#: lib/psm.c:1610
 #, 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:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s obsahuje %d soubor�, test = %d\n"
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr "%s: scriptlet %s selhal (%d), p�eskakuji %s-%s-%s\n"
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, 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:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s neexistuje - pou�ita skupina root\n"
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalov�n� arch�vu selhalo %s%s: %s\n"
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr " na souboru "
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nemohu otev��t %s: %s\n"
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s selhalo\n"
@@ -2388,8 +2403,8 @@ msgstr "bal��ek nem� vlastn�ka souboru ani seznamy id\n"
 msgid "can't query %s: %s\n"
 msgstr "nemohu prov�st dotaz %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otev�en� %s selhalo: %s\n"
@@ -2403,7 +2418,7 @@ msgstr "dotaz na %s se nezda�il\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "nelze prov�st dotaz na zdrojov� bal��ky star�ho form�tu\n"
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
@@ -2462,7 +2477,7 @@ msgstr "z�znam bal��ku ��slo: %u\n"
 msgid "record %u could not be read\n"
 msgstr "z�znam %d nelze p�e��st\n"
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "bal��ek %s nen� nainstalov�n\n"
@@ -2538,58 +2553,53 @@ msgstr "P�ipravuji..."
 msgid "Preparing packages for installation..."
 msgstr "P�ipravuji bal��ky pro instalaci..."
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "nemohu otev��t datab�zi bal��k� v %s\n"
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Stahuji %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... jako %s\n"
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "p�eskakuji %s - p�enos selhal - %s\n"
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "bal��ek %s nen� p�em�stiteln�\n"
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "chyba p�i �ten� ze souboru %s\n"
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, 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:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nem��e b�t nainstalov�n\n"
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, 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:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr "nevy�e�en� z�vislosti:\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr "instaluji bin�rn� bal��ky\n"
 
@@ -2598,26 +2608,21 @@ msgstr "instaluji bin�rn� bal��ky\n"
 msgid "cannot open file %s: %s\n"
 msgstr "nemohu otev��t soubor %s: %s\n"
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "chyba: nemohu otev��t %s/packages.rpm\n"
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ur�uje v�ce bal��k�\n"
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr "odstran�n� t�chto bal��k� by poru�ilo z�vislosti:\n"
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nemohu otev��t %s: %s\n"
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instaluji %s\n"
@@ -2874,7 +2879,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "%s p�esko�eno, proto�e chyb� p��znak\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "vynech�v�m adres�� %s\n"
@@ -3083,11 +3088,11 @@ msgstr "chyba(%d) p�i ukl�d�n� z�znamu %s do %s\n"
 msgid "error(%d) removing record %s from %s\n"
 msgstr "chyba(%d) p�i odstra�ov�n� z�znamu %s z %s\n"
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr "nebyla nastavena dbpath\n"
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
@@ -3095,115 +3100,115 @@ msgstr ""
 "datab�ze je ve star�m form�tu; pou�ijte --rebuilddb pro p�evod do nov�ho\n"
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr "chyba(%d) p�i po��t�n� bal��k�\n"
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "z�znam ��slo %d v datab�zi je chybn� -- vynech�v�m.\n"
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr "rpmdb: poru�en� polo�ka hlavi�ky #%u, p�eskakuji.\n"
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: nemohu ��st hlavi�ku na adrese 0x%x\n"
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstra�uji \"%s\" z indexu %s.\n"
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstra�uji %d polo�ek z indexu %s.\n"
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "chyba(%d) p�i alokaci nov� instance bal��ku\n"
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "p�id�v�m \"%s\" do indexu %s\n"
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "p�id�v�m %d polo�ek do indexu %s.\n"
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "odstra�uji %s po �sp�n�m znovusestaven� db3.\n"
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr "nebyla nastavena dbpath"
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "datab�zi %s p�ev�d�m do %s\n"
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "do�asn� datab�ze %s ji� existuje\n"
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr "vytv���m adres�� %s\n"
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "vytv���m adres�� %s: %s\n"
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otev�r�m starou datab�zi s dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otev�r�m novou datab�zi s dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "nemohu p�idat z�znam - p�vodn� u %d\n"
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "datab�zi nelze zvovu vytvo�it; p�vodn� datab�ze z�st�v� na sv�m m�st�\n"
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr "starou datab�zi nelze nahradit novou datab�z�!\n"
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "pro obnoven� nahra�te soubory v %s soubory z %s"
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr "ma�u adres�� %s\n"
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nemohu odstranit adres�� %s: %s\n"
@@ -3415,6 +3420,12 @@ msgstr "url port mus� b�t ��slo\n"
 msgid "failed to create %s: %s\n"
 msgstr "nemohu vytvo�it %s: %s\n"
 
+#~ msgid "cannot open rpm database in %s\n"
+#~ msgstr "nemohu otev��t RPM datab�zi v %s\n"
+
+#~ msgid "cannot open %s/packages.rpm\n"
+#~ msgstr "chyba: nemohu otev��t %s/packages.rpm\n"
+
 #~ msgid "add a signature to a package"
 #~ msgstr "p�idat do bal��ku podpis"
 
diff --git a/po/da.po b/po/da.po
index 832998d0b..4f2a17eb5 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: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +10,66 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9alpha\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr "kan ikke �bne rpm-database i %s\n"
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr "afh�ngighedskrav for pakkeopbygning kunne ikke im�dekommes:\n"
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Kan ikke �bne spec-fil %s: %s\n"
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Kunne ikke �bne tar-videref�rsel: %m\n"
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Kunne ikke l�se spec-fil fra %s\n"
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Kunne ikke omd�be %s til %s: %m\n"
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "kunne ikke finde %s: %m\n"
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "Filen %s er ikke en regul�r fil.\n"
 
-#: build.c:259
+#: build.c:243
 #, 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:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Opbygger m�l-platforme: %s\n"
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Opbygger for m�l %s\n"
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr "parameter er ikke en RPM-pakke\n"
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr "fejl ved l�sning af hovedet p� pakke\n"
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "kan ikke gen�bne pakkeindhold: %s\n"
@@ -399,44 +394,44 @@ msgstr "--sign kan kun bruges ved pakkeopbygning"
 msgid "exec failed\n"
 msgstr "eksekvering mislykkedes\n"
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr "ingen pakkefiler angivet til genopbygning"
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr "ingen spec-fil angivet til opbygning"
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr "ingen tar-arkiver angivet til opbygning"
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr "ingen pakker angivet ved afinstallation"
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr "ingen pakker angivet ved installation"
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr "ingen parametre angivet ved foresp�rgsel"
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr "ingen parametre angivet ved verifikation"
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr "uventede parametre til --querytags "
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 #, fuzzy
 msgid "no arguments given"
 msgstr "ingen parametre angivet ved foresp�rgsel"
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr "Kunne ikke �bne midlertidig fil.\n"
 
@@ -647,7 +642,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:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr "linie: %s\n"
@@ -724,156 +719,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:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "arkivoprettelse mislykkedes ved fil %s: %s\n"
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "arkivoprettelse mislykkedes ved fil %s: %s\n"
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy-skrivning mislykkedes: %s\n"
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy-l�sning mislykkedes: %s\n"
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Kunne ikke �bne 'PreIn'-fil: %s\n"
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Kunne ikke �bne 'PreUn'-fil: %s\n"
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Kunne ikke �bne 'PostIn'-fil: %s\n"
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Kunne ikke �bne 'PostUn'-fil: %s\n"
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Kunne ikke �bne 'VerifyScript'-fil: %s\n"
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Kunne ikke �bne skriptfilen Trigger: %s\n"
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: �bn %s: %s\n"
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: l�s %s: %s\n"
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fread mislykkedes: %s\n"
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s er ikke nogen RPM-pakke\n"
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: l�ser hoved fra %s\n"
 
-#: build/pack.c:475
+#: build/pack.c:467
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Kunne ikke l�se hoved fra %s: %s\n"
 
-#: build/pack.c:493
+#: build/pack.c:485
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Kunne ikke skrive hoved til %s: %s\n"
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr "Ugyldige CSA-data\n"
 
-#: build/pack.c:536
+#: build/pack.c:528
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Kunne ikke skrive hoved til %s: %s\n"
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Genererer signatur: %d\n"
 
-#: build/pack.c:567
+#: build/pack.c:559
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Kunne ikke l�se hoved fra %s: %s\n"
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kunne ikke �bne %s: %s\n"
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke skrive pakke: %s\n"
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Kunne ikke �bne sigtarget %s: %s\n"
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Kunne ikke l�se hoved fra %s: %s\n"
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Kunne ikke skrive hoved til %s: %s\n"
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Kunne ikke l�se pakkeindhold fra %s: %s\n"
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n"
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, 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:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
@@ -1439,7 +1434,7 @@ msgid " failed - "
 msgstr " mislykkedes - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1448,66 +1443,86 @@ msgstr ""
 "\"B\"-afh�ngighed kr�ver en epoke (antager samme som \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 #, fuzzy
 msgid "NO "
 msgstr "IKKE O.K."
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "kunne ikke �bne Packages-database i %s\n"
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, fuzzy, c-format
+msgid "package %s already added, ignoring\n"
+msgstr "pakken %s er allerede installeret"
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s JA (tilf�jede filer)\n"
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s JA (tilf�jede 'provide')\n"
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-3s (husket)\n"
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s JA (rpmrc tilf�rer)\n"
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s JA (rpmlib tilf�rer)\n"
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s JA (db-filer)\n"
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s JA (db tilf�rer)\n"
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s JA (db-pakke)\n"
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NEJ\n"
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tilf�jet til afh�ngigheds-buffer.\n"
@@ -1515,42 +1530,42 @@ msgstr "%s: (%s, %s) tilf�jet til afh�ngigheds-buffer.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakke %s skaber konflikt: %s\n"
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n"
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr "========== gemmer tsort-relationer\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr "========== kun efterf�lgere (pr�sentationsr�kkef�lge)\n"
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr "L�KKE:\n"
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr "========== forts�tter tsort ...\n"
 
@@ -2302,66 +2317,66 @@ msgstr "kan ikke oprette %s: %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "kunne ikke skrive til %s\n"
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr "kildepakke forventet, bin�r fundet\n"
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr "kildepakke indeholder ingen .spec-fil\n"
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "k�rer postinstallations-skript (hvis det findes)\n"
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, 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:1611
+#: lib/psm.c:1610
 #, 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:1958
+#: lib/psm.c:1957
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "pakke: %s-%s-%s filer test = %d\n"
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "bruger %s eksisterer ikke - bruger root\n"
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "gruppe %s eksisterer ikke - bruger root\n"
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "udpakning af arkiv mislykkedes%s%s: %s\n"
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr " for fil "
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "kunne ikke �bne %s: %s\n"
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s mislykkedes\n"
@@ -2409,8 +2424,8 @@ msgstr "pakke har hverken filejerskabs- eller id-lister\n"
 msgid "can't query %s: %s\n"
 msgstr "kunne ikke foresp�rge %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "�bning af %s mislykkedes %s\n"
@@ -2424,7 +2439,7 @@ msgstr "foresp�rgsel af %s mislykkedes\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "pakke med gammelt kildeformat kan ikke foresp�rges\n"
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: l�s manifest mislykkedes: %s\n"
@@ -2483,7 +2498,7 @@ msgstr "pakkens post-nummer: %u\n"
 msgid "record %u could not be read\n"
 msgstr "post %d kunne ikke l�ses\n"
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakken %s er ikke installeret\n"
@@ -2559,58 +2574,53 @@ msgstr "Forbereder..."
 msgid "Preparing packages for installation..."
 msgstr "Forbereder pakker til installation..."
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "kunne ikke �bne Packages-database i %s\n"
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Modtager %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "overspringer %s - overf�rsel mislykkedes - %s\n"
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "pakke %s kan ikke omrokeres\n"
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "fejl ved l�sning fra filen %s\n"
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, 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:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s kunne ikke installeres\n"
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "fandt %d kilde- og %d bin�rpakker\n"
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr "afh�ngighedskrav, der ikke kunne im�dekommes:\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr "installerer bin�rpakker\n"
 
@@ -2619,26 +2629,21 @@ msgstr "installerer bin�rpakker\n"
 msgid "cannot open file %s: %s\n"
 msgstr "kunne ikke �bne fil %s: %s\n"
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "kunne ikke �bne %s/packages.rpm\n"
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" angiver flere pakker\n"
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr "fjernelse af disse pakker ville bryde afh�ngighederne:\n"
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kunne ikke �bne %s: %s\n"
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerer %s\n"
@@ -2896,7 +2901,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "%s oversprunget grundet manglende ok-flag\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ekskluderer kataloget %s\n"
@@ -3108,11 +3113,11 @@ msgstr "fejl(%d) ved gemning af post %s i %s\n"
 msgid "error(%d) removing record %s from %s\n"
 msgstr "fejl(%d) ved fjernelse af post %s fra %s\n"
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr "der er ikke sat nogen dbpath\n"
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
@@ -3121,118 +3126,118 @@ msgstr ""
 "database med det nye format\n"
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr "fejl(%d) ved opt�lling af pakker\n"
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, fuzzy, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "post nummer %d i databasen er fejlbeh�ftet -- overspringer.\n"
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: kan ikke l�se hoved ved 0x%x\n"
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "fjerner \"%s\" fra %s-indekset.\n"
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "fjerne %d indgange fra %s-indekset.\n"
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "fejl(%d) under allokering af ny pakkeinstans\n"
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 "tilf�jer \"%s\" til '%s'-indekset.\n"
 "\n"
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "tilf�jer %d indgange til '%s'-indekset.\n"
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "fjerner %s efter vellykket genopbygning af db3.\n"
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr "der ikke sat nogen dbpath"
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "genopbygger database %s over i %s\n"
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "den midlertidige database %s eksisterer allerede\n"
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 "opretter kataloget %s\n"
 "\n"
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "opretter kataloget %s: %s\n"
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "�bner gammel database med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "�bner ny database med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kunne ikke tilf�je posten, der tidligere var ved %d\n"
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "kunne ikke genopbygge database: original-databasen beholdes\n"
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr "kunne ikke erstatte gammel database med ny database!\n"
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "erstat filer i %s med filer fra %s for at genoprette"
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr "fjerner kataloget %s\n"
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunne ikke fjerne katalog %s: %s\n"
@@ -3444,6 +3449,12 @@ msgstr "url-port skal v�re et tal\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunne ikke oprette %s: %s\n"
 
+#~ msgid "cannot open rpm database in %s\n"
+#~ msgstr "kan ikke �bne rpm-database i %s\n"
+
+#~ msgid "cannot open %s/packages.rpm\n"
+#~ msgstr "kunne ikke �bne %s/packages.rpm\n"
+
 #~ msgid "add a signature to a package"
 #~ msgstr "tilf�j signatur til pakke"
 
diff --git a/po/de.po b/po/de.po
index 031bf9838..70f4d92a1 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: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,78 +45,73 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:37
-#, fuzzy, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr "Fehler: kann nicht �ffnen %s%s/packages.rpm\n"
-
-#: build.c:48
+#: build.c:36
 #, fuzzy
 msgid "failed build dependencies:\n"
 msgstr "fehlgeschlagene Paket-Abh�ngigkeiten:\n"
 
 # , c-format
-#: build.c:81
+#: build.c:65
 #, 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:159 build.c:171
+#: build.c:143 build.c:155
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "�ffnen von %s fehlgeschlagen\n"
 
 # , c-format
 #. Give up
-#: build.c:178
+#: build.c:162
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
 # , c-format
-#: build.c:206
+#: build.c:190
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
 # , c-format
-#: build.c:245
+#: build.c:229
 #, fuzzy, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "�ffnen von %s fehlgeschlagen: %s"
 
-#: build.c:250
+#: build.c:234
 #, fuzzy, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "%s scheint kein RPM-Paket zu sein\n"
 
-#: build.c:259
+#: build.c:243
 #, 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:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 #, fuzzy
 msgid "error reading header from package\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "kann Datei %s nicht �ffnen: "
@@ -466,45 +461,45 @@ msgstr "--sign darf nur w�hrend der Paketerstellung benutzt werden"
 msgid "exec failed\n"
 msgstr "%s: �ffnen fehlgeschlagen\n"
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr "Es wurden keine Paketdateien f�r die Neuerstellung angegeben"
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr "Es wurde kein spec-Datei f�r die Erstellung angegeben"
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr "Es wurde keine tar-Datei f�r die Erstellung angegeben"
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr "Es wurden keine Pakete f�r die Deinstallation angegeben"
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr "Es wurden keine Pakete f�r die Installation angegeben"
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr "Es wurden keine Argumente f�r die Anfrage angegeben"
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr "Es wurden keine Argumente f�r die �berpr�fung angegeben"
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr "Unerwartete Argumente zu --querytags "
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 #, fuzzy
 msgid "no arguments given"
 msgstr "Es wurden keine Argumente f�r die Anfrage angegeben"
 
 # , c-format
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Datei %s kann nicht zum Lesen ge�ffnet werden: %s."
@@ -728,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:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "�ffnen von %s fehlgeschlagen: %s"
@@ -808,170 +803,170 @@ msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:81
+#: build/pack.c:79
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "�ffnen von %s fehlgeschlagen: %s"
 
 # , c-format
-#: build/pack.c:84
+#: build/pack.c:82
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "�ffnen von %s fehlgeschlagen: %s"
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "lesen fehlgeschlagen: %s (%d)"
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "lesen fehlgeschlagen: %s (%d)"
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Fehler: kann Datei %s nicht �ffnen\n"
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Fehler: kann Datei %s nicht �ffnen\n"
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Fehler: kann Datei %s nicht �ffnen\n"
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Fehler: kann Datei %s nicht �ffnen\n"
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Fehler: kann Datei %s nicht �ffnen\n"
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, 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:288
+#: build/pack.c:286
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "�ffnen von %s fehlgeschlagen: %s"
 
 # , c-format
-#: build/pack.c:298
+#: build/pack.c:296
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: �readLead� fehlgeschlagen\n"
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, 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:350
+#: build/pack.c:342
 #, fuzzy, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "Fehler beim Eintrag %s von %s"
 
 # , c-format
-#: build/pack.c:475
+#: build/pack.c:467
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Nicht m�glich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:493
+#: build/pack.c:485
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Nicht m�glich %s zu schreiben"
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:536
+#: build/pack.c:528
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Nicht m�glich %s zu schreiben"
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "PGP-Signatur generieren"
 
 # , c-format
-#: build/pack.c:567
+#: build/pack.c:559
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Nicht m�glich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:575
+#: build/pack.c:567
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "�ffnen von %s fehlgeschlagen\n"
 
 # , c-format
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nicht m�glich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:626
+#: build/pack.c:618
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Nicht m�glich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:636
+#: build/pack.c:628
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Nicht m�glich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:650
+#: build/pack.c:642
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Nicht m�glich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:660
+#: build/pack.c:652
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Nicht m�glich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:666
+#: build/pack.c:658
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nicht m�glich %s zu schreiben"
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kann Datei %s nicht �ffnen: "
@@ -1574,72 +1569,92 @@ msgid " failed - "
 msgstr "pgp fehlgeschlagen"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "Fehler: kann nicht �ffnen %s%s/packages.rpm\n"
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, fuzzy, c-format
+msgid "package %s already added, ignoring\n"
+msgstr "Paket %s ist nicht installiert\n"
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "die Datei �%s� geh�rt zu keinem Paket\n"
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "die Datei �%s� geh�rt zu keinem Paket\n"
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "die Datei �%s� geh�rt zu keinem Paket\n"
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "die Datei �%s� geh�rt zu keinem Paket\n"
@@ -1647,43 +1662,43 @@ msgstr "die Datei �%s� geh�rt zu keinem Paket\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "Paket %s wird nicht in %s aufgef�hrt"
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "Paket %s wird nicht in %s aufgef�hrt"
 
 # FIXME
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "Fehler beim L�schen des Eintrags %s nach %s"
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2474,67 +2489,67 @@ msgstr "kann Datei %s nicht �ffnen: "
 msgid "cannot write to %%%s %s\n"
 msgstr "kann Datei %s nicht �ffnen: "
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "Keine Stufen ausf�hren"
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, 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:1611
+#: lib/psm.c:1610
 #, 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:1958
+#: lib/psm.c:1957
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "�ffnen von %s fehlgeschlagen: %s\n"
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
 # , c-format
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "�ffnen von %s fehlgeschlagen: %s"
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "pgp fehlgeschlagen"
@@ -2584,8 +2599,8 @@ msgstr "Paket hat keinen Namen"
 msgid "can't query %s: %s\n"
 msgstr "Fehler: kann %s nicht �ffnen\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "�ffnen von %s fehlgeschlagen: %s\n"
@@ -2599,7 +2614,7 @@ msgstr "Anfrage von %s fehlgeschlagen\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n"
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: �readLead� fehlgeschlagen\n"
@@ -2661,7 +2676,7 @@ msgstr "ung�ltige Paket-Nummer: %s\n"
 msgid "record %u could not be read\n"
 msgstr "Eintrag %d konnte nicht gelesen werden\n"
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "Paket %s ist nicht installiert\n"
@@ -2740,59 +2755,54 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr "Es wurden keine Pakete f�r die Installation angegeben"
 
-#: lib/rpminstall.c:228
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "Fehler: kann nicht �ffnen %s%s/packages.rpm\n"
-
 # , c-format
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, 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:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "Fehler: �berspringe %s - �bertragung fehlgeschlagen - %s\n"
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "Fehler: %s kann nicht installiert werden\n"
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr "fehlgeschlagene Paket-Abh�ngigkeiten:\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "Paket installieren"
@@ -2802,27 +2812,22 @@ msgstr "Paket installieren"
 msgid "cannot open file %s: %s\n"
 msgstr "kann Datei %s nicht �ffnen: "
 
-#: lib/rpminstall.c:611
-#, fuzzy, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "Fehler: kann nicht �ffnen %s%s/packages.rpm\n"
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" bezeichnet mehrere Pakete\n"
 
 # oder besser: "... verletzen" ?
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr "Das Enfernen dieser Pakete w�rde Paket-Abh�ngigkeiten missachten:\n"
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "Fehler: kann %s nicht �ffnen\n"
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installiere %s\n"
@@ -3092,7 +3097,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
@@ -3297,131 +3302,131 @@ msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
 msgid "error(%d) removing record %s from %s\n"
 msgstr "Fehler beim L�schen des Eintrags %s nach %s"
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "�dbpath� ist nicht gesetzt"
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, fuzzy, c-format
 msgid "error(%d) counting packages\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, fuzzy, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 "Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird �bersprungen"
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen"
 
 # FIXME
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "Fehler beim L�schen des Eintrags %s nach %s"
 
 # FIXME
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "Fehler beim L�schen des Eintrags %s nach %s"
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
 # FIXME
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "Fehler beim L�schen des Eintrags %s nach %s"
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr "�dbpath� ist nicht gesetzt"
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "die tempor�re Datenbank %s existiert schon"
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kann einen Eintrag hinzuf�gen, urspr�nglich bei %d"
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
 # , c-format
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "�ffnen von %s fehlgeschlagen: %s"
@@ -3646,6 +3651,14 @@ msgstr "Fehler: der FTP-Port muss eine Zahl sein\n"
 msgid "failed to create %s: %s\n"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
+#, fuzzy
+#~ msgid "cannot open rpm database in %s\n"
+#~ msgstr "Fehler: kann nicht �ffnen %s%s/packages.rpm\n"
+
+#, fuzzy
+#~ msgid "cannot open %s/packages.rpm\n"
+#~ msgstr "Fehler: kann nicht �ffnen %s%s/packages.rpm\n"
+
 #~ msgid "add a signature to a package"
 #~ msgstr "Signatur einem Paket hinzuf�gen"
 
diff --git a/po/en_RN.po b/po/en_RN.po
index 285b4d05b..9935eb869 100644
--- a/po/en_RN.po
+++ b/po/en_RN.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +14,66 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr ""
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr ""
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr ""
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr ""
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr ""
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr ""
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +392,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +636,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +711,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:475
+#: build/pack.c:467
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:493
+#: build/pack.c:485
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:528
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:567
+#: build/pack.c:559
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1416,72 +1411,92 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, c-format
+msgid "package %s already added, ignoring\n"
+msgstr ""
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1504,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2241,64 +2256,64 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2346,8 +2361,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2361,7 +2376,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2420,7 +2435,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2496,58 +2511,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr ""
 
@@ -2556,26 +2566,21 @@ msgstr ""
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr ""
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3029,125 +3034,125 @@ msgstr ""
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 285b4d05b..9935eb869 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +14,66 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr ""
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr ""
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr ""
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr ""
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr ""
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr ""
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +392,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +636,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +711,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:475
+#: build/pack.c:467
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:493
+#: build/pack.c:485
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:528
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:567
+#: build/pack.c:559
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1416,72 +1411,92 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, c-format
+msgid "package %s already added, ignoring\n"
+msgstr ""
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1504,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2241,64 +2256,64 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2346,8 +2361,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2361,7 +2376,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2420,7 +2435,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2496,58 +2511,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr ""
 
@@ -2556,26 +2566,21 @@ msgstr ""
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr ""
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3029,125 +3034,125 @@ msgstr ""
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 285b4d05b..9935eb869 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +14,66 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr ""
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr ""
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr ""
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr ""
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr ""
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr ""
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +392,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +636,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +711,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:475
+#: build/pack.c:467
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:493
+#: build/pack.c:485
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:528
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:567
+#: build/pack.c:559
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1416,72 +1411,92 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, c-format
+msgid "package %s already added, ignoring\n"
+msgstr ""
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1504,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2241,64 +2256,64 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2346,8 +2361,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2361,7 +2376,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2420,7 +2435,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2496,58 +2511,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr ""
 
@@ -2556,26 +2566,21 @@ msgstr ""
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr ""
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3029,125 +3034,125 @@ msgstr ""
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 38c4a3f7b..9a1235675 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,79 +1,74 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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:37
-#, fuzzy, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr "virhe: en voi avata %s%s/packages.rpm\n"
-
-#: build.c:48
+#: build.c:36
 #, fuzzy
 msgid "failed build dependencies:\n"
 msgstr "puuttuvat riippuvuudet:\n"
 
-#: build.c:81
+#: build.c:65
 #, fuzzy, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "En voi avata %s luettavaksi: %s."
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "%s:n avaus ep�onnistui\n"
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "En voi lukea %s: %s."
 
-#: build.c:206
+#: build.c:190
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "En voi lukea %s: %s."
 
-#: build.c:245
+#: build.c:229
 #, fuzzy, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "en voinut avata %s: %s"
 
-#: build.c:250
+#: build.c:234
 #, fuzzy, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "%s ei vaikuta RPM-paketilta\n"
 
-#: build.c:259
+#: build.c:243
 #, 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:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "virhe etsitt�ess� pakettia %s\n"
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 #, fuzzy
 msgid "error reading header from package\n"
 msgstr "virhe etsitt�ess� pakettia %s\n"
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
@@ -405,44 +400,44 @@ msgstr "--sign: voidaan k�ytt�� vain paketteja k��nnett�ess�"
 msgid "exec failed\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr "uudelleenk��nnolle ei m��ritelty paketteja"
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr "k��nn�kselle ei annettu m��rittelytiedostoja"
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr "k��nn�kselle ei m��ritelty tar-tiedostoja"
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr "poistolle ei m��ritelty paketteja"
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr "asennukselle ei m��ritelty paketteja"
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr "kyselylle ei annettu parametrej�"
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr "tarkistukselle ei annettu parametrej�"
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags: odottamattomia parametrej�"
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 #, fuzzy
 msgid "no arguments given"
 msgstr "kyselylle ei annettu parametrej�"
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "En voi avata %s luettavaksi: %s."
@@ -656,7 +651,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:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "en voinut avata %s: %s"
@@ -731,156 +726,156 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "luku ep�onnistui: %s (%d)"
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "luku ep�onnistui: %s (%d)"
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "En voi lukea %s: %s."
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: readLead  ep�onnistui\n"
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, fuzzy, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "virhe: %s ei vaikuta RPM paketilta\n"
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, fuzzy, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "virhe luettaessa tietuetta %s %s:st�"
 
-#: build/pack.c:475
+#: build/pack.c:467
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:493
+#: build/pack.c:485
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:528
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "generoi PGP-allekirjoitus"
 
-#: build/pack.c:567
+#: build/pack.c:559
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s:n avaus ep�onnistui\n"
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
@@ -1457,72 +1452,92 @@ msgid " failed - "
 msgstr "pgp ep�onnistui"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "virhe: en voi avata %s%s/packages.rpm\n"
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, fuzzy, c-format
+msgid "package %s already added, ignoring\n"
+msgstr "paketti %s ei ole asennettu\n"
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "tiedostoa %s ei omista mik��n paketti\n"
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "tiedostoa %s ei omista mik��n paketti\n"
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "tiedostoa %s ei omista mik��n paketti\n"
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "tiedostoa %s ei omista mik��n paketti\n"
@@ -1530,42 +1545,42 @@ msgstr "tiedostoa %s ei omista mik��n paketti\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paketti %s ei ole %s:ss�"
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paketti %s ei ole %s:ss�"
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:st�"
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2334,65 +2349,65 @@ msgstr "en voinut avata tiedostoa %s: "
 msgid "cannot write to %%%s %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "�l� suorita mit��n vaiheita"
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, 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:1611
+#: lib/psm.c:1610
 #, 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:1958
+#: lib/psm.c:1957
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "paketti %s-%s-%s  sis�lt�� jaettuja tiedostoja\n"
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "ryhm�ss� %s ei ole paketteja\n"
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "pgp ep�onnistui"
@@ -2442,8 +2457,8 @@ msgstr "paketilla ei ole nime�"
 msgid "can't query %s: %s\n"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
@@ -2457,7 +2472,7 @@ msgstr "%s:n kysely ei onnistunut\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "vanhan formaatin l�hdekoodipaketteja ei voi kysell�\n"
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead  ep�onnistui\n"
@@ -2517,7 +2532,7 @@ msgstr "virheellinen paketin numero: %s\n"
 msgid "record %u could not be read\n"
 msgstr "tietuetta %d ei voitu lukea\n"
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paketti %s ei ole asennettu\n"
@@ -2596,58 +2611,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr "asennukselle ei m��ritelty paketteja"
 
-#: lib/rpminstall.c:228
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "virhe: en voi avata %s%s/packages.rpm\n"
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Haen: %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "virhe: ohitan %s:n, siirto ep�onnistui - %s\n"
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "virhe: %s ei voida asentaa\n"
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "ryhm�ss� %s ei ole paketteja\n"
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr "puuttuvat riippuvuudet:\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "asenna paketti"
@@ -2657,26 +2667,21 @@ msgstr "asenna paketti"
 msgid "cannot open file %s: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/rpminstall.c:611
-#, fuzzy, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "virhe: en voi avata %s%s/packages.rpm\n"
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" m��ritt�� useita paketteja\n"
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr "n�iden pakettien poisto rikkoisi riippuvuuksia:\n"
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr "Asennan: %s\n"
@@ -2943,7 +2948,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
@@ -3146,126 +3151,126 @@ msgstr "virhe talletettaessa tietuetta %s %s:��n"
 msgid "error(%d) removing record %s from %s\n"
 msgstr "virhe poistettaessa tietuetta %s %s:st�"
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "dbpath ei ole asetettu"
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, fuzzy, c-format
 msgid "error(%d) counting packages\n"
 msgstr "virhe etsitt�ess� pakettia %s\n"
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, fuzzy, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen"
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "en voi lukea headeria %d:st� p�ivitt�ess�"
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:st�"
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:st�"
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "virhe etsitt�ess� pakettia %s\n"
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:st�"
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr "dbpath ei ole asetettu"
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "v�liaikainen tietokanta %s on jo olemassa"
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "en voi lis�t� tietuetta %d:st�"
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "en voinut avata %s: %s"
@@ -3488,6 +3493,14 @@ msgstr "virhe: ftpport pit�� olla luku\n"
 msgid "failed to create %s: %s\n"
 msgstr "%s:n luonti ep�onnistui\n"
 
+#, fuzzy
+#~ msgid "cannot open rpm database in %s\n"
+#~ msgstr "virhe: en voi avata %s%s/packages.rpm\n"
+
+#, fuzzy
+#~ msgid "cannot open %s/packages.rpm\n"
+#~ msgstr "virhe: en voi avata %s%s/packages.rpm\n"
+
 #~ msgid "add a signature to a package"
 #~ msgstr "lis�� allekirjoitus pakettiin"
 
diff --git a/po/fr.po b/po/fr.po
index 58c06c4e3..61a674165 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: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,72 +14,67 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:37
-#, fuzzy, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr "impossible d'ouvrir: %s\n"
-
-#: build.c:48
+#: build.c:36
 #, fuzzy
 msgid "failed build dependencies:\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build.c:81
+#: build.c:65
 #, fuzzy, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build.c:206
+#: build.c:190
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build.c:245
+#: build.c:229
 #, fuzzy, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build.c:250
+#: build.c:234
 #, fuzzy, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -444,45 +439,45 @@ msgstr "--sign ne peut tre spcifi que lors de la construction d'un package"
 msgid "exec failed\n"
 msgstr "La construction a chou.\n"
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr "aucun package n'a t spcifi pour la reconstruction"
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr "aucun package n'a t spcifi pour la construction"
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 #, fuzzy
 msgid "no tar files given for build"
 msgstr "aucun package n'a t spcifi pour la construction"
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr "aucun argument n'a t fourni pour la requte"
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr "aucun argument n'a t fourni pour la vrification"
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 #, fuzzy
 msgid "no arguments given"
 msgstr "aucun argument n'a t fourni pour la requte"
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -691,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:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -766,156 +761,156 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:475
+#: build/pack.c:467
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:493
+#: build/pack.c:485
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:528
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "      --sign            - genre une signature PGP"
 
-#: build/pack.c:567
+#: build/pack.c:559
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -1497,72 +1492,92 @@ msgid " failed - "
 msgstr "La construction a chou.\n"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, fuzzy, c-format
+msgid "package %s already added, ignoring\n"
+msgstr "aucun package n'a t spcifi pour l'installation"
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1570,42 +1585,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2387,66 +2402,66 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr ""
 "        -f <file>+        - interroge le package  qui appartient <file>"
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "La construction a chou.\n"
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "La construction a chou.\n"
@@ -2496,8 +2511,8 @@ msgstr "aucun package n'a t spcifi pour l'installation"
 msgid "can't query %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "La construction a chou.\n"
@@ -2511,7 +2526,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -2571,7 +2586,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
@@ -2649,58 +2664,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/rpminstall.c:228
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "impossible d'ouvrir: %s\n"
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr ""
 
@@ -2709,26 +2719,21 @@ msgstr ""
 msgid "cannot open file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr ""
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2992,7 +2997,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3195,125 +3200,125 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "error(%d) removing record %s from %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, fuzzy, c-format
 msgid "error(%d) counting packages\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -3526,6 +3531,10 @@ msgid "failed to create %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #, fuzzy
+#~ msgid "cannot open rpm database in %s\n"
+#~ msgstr "impossible d'ouvrir: %s\n"
+
+#, fuzzy
 #~ msgid "skip any GPG signatures"
 #~ msgstr "      --sign            - genre une signature PGP"
 
diff --git a/po/gl.po b/po/gl.po
index ac55b704b..1c19f7f73 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: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +9,66 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr ""
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr ""
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr ""
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr ""
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr ""
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr ""
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -392,43 +387,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -636,7 +631,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -711,152 +706,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:475
+#: build/pack.c:467
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:493
+#: build/pack.c:485
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:528
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:567
+#: build/pack.c:559
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1411,72 +1406,92 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, c-format
+msgid "package %s already added, ignoring\n"
+msgstr ""
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1484,42 +1499,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2236,64 +2251,64 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2341,8 +2356,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2356,7 +2371,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2415,7 +2430,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2491,58 +2506,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr ""
 
@@ -2551,26 +2561,21 @@ msgstr ""
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr ""
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2823,7 +2828,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3024,125 +3029,125 @@ msgstr ""
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 285b4d05b..9935eb869 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +14,66 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr ""
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr ""
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr ""
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr ""
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr ""
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr ""
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +392,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +636,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +711,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:475
+#: build/pack.c:467
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:493
+#: build/pack.c:485
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:528
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:567
+#: build/pack.c:559
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1416,72 +1411,92 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, c-format
+msgid "package %s already added, ignoring\n"
+msgstr ""
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1504,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2241,64 +2256,64 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2346,8 +2361,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2361,7 +2376,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2420,7 +2435,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2496,58 +2511,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr ""
 
@@ -2556,26 +2566,21 @@ msgstr ""
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr ""
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3029,125 +3034,125 @@ msgstr ""
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 285b4d05b..9935eb869 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +14,66 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr ""
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr ""
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr ""
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr ""
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr ""
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr ""
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +392,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +636,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +711,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:475
+#: build/pack.c:467
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:493
+#: build/pack.c:485
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:528
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:567
+#: build/pack.c:559
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1416,72 +1411,92 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, c-format
+msgid "package %s already added, ignoring\n"
+msgstr ""
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1504,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2241,64 +2256,64 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2346,8 +2361,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2361,7 +2376,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2420,7 +2435,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2496,58 +2511,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr ""
 
@@ -2556,26 +2566,21 @@ msgstr ""
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr ""
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3029,125 +3034,125 @@ msgstr ""
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 80a9a58d2..864778fbc 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: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +9,66 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr "get ekki opna� pakka gagnagrunn � %s\n"
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr "gat ekki �tb�i� pakkaskilyr�i:\n"
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Get ekki opna� spec skr�na %s: %s\n"
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Gat ekki opna� p�pu � tar: %m\n"
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Gat ekki lesi� spec skr� fr� %s\n"
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Gat ekki endurnefnt %s sem %s: %m\n"
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "gat ekki sko�a� %s: %m\n"
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "Skr�in %s er ekki venjuleg skr�.\n"
 
-#: build.c:259
+#: build.c:243
 #, 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:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "���i fyrir markkerfi: %s\n"
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr "���i fyrir markkerfi %s\n"
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -392,43 +387,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr "Get ekki opna� tempi skr�.\n"
 
@@ -636,7 +631,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:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr "l�na: %s\n"
@@ -711,156 +706,156 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "safnskr�arsm�� br�st � skr� %s: %s\n"
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "safnskr�arsm�� br�st: %s\n"
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Gat ekki opna� PreIn skr�: %s\n"
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Gat ekki opna� PreUn skr�: %s\n"
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Gat ekki opna� PostIn skr�: %s\n"
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Gat ekki opna� PostUn skr�: %s\n"
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Get ekki opna� VerifyScript skr�: %s\n"
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek br�st: %s\n"
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:475
+#: build/pack.c:467
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Get ekki lesi� haus �r %s: %s\n"
 
-#: build/pack.c:493
+#: build/pack.c:485
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Gat ekki rita� haus � %s: %s\n"
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:528
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Gat ekki rita� haus � %s: %s\n"
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:567
+#: build/pack.c:559
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Get ekki lesi� haus �r %s: %s\n"
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Get ekki rita� � pakka: %s\n"
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Get ekki opna� sigtarget %s: %s\n"
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Get ekki lesi� haus �r %s: %s\n"
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Gat ekki rita� haus � %s: %s\n"
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Get ekki lesi� innihald %s: %s\n"
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Get ekki rita� innihald � %s: %s\n"
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrifa�i: %s\n"
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1416,72 +1411,92 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "get ekki opna� pakka gagnagrunn �\n"
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, c-format
+msgid "package %s already added, ignoring\n"
+msgstr ""
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1504,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2246,64 +2261,64 @@ msgstr "gat ekki b�i� til %%%s %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "get ekki rita� � %%%s %s\n"
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr "pakkinn inniheldur enga .spec skr�\n"
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "gat ekki opna� %s: %s\n"
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s br�st\n"
@@ -2351,8 +2366,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2366,7 +2381,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: gat ekki lesi� manifest: %s\n"
@@ -2425,7 +2440,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2501,58 +2516,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "get ekki opna� pakka gagnagrunn �\n"
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr ""
 
@@ -2561,26 +2571,21 @@ msgstr ""
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "get ekki opna� %s/packages.rpm\n"
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2833,7 +2838,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3034,125 +3039,125 @@ msgstr ""
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
@@ -3364,6 +3369,12 @@ msgstr "g�tt sl��ar ver�ur a� vera tala\n"
 msgid "failed to create %s: %s\n"
 msgstr "gat ekki b�i� til %s: %s\n"
 
+#~ msgid "cannot open rpm database in %s\n"
+#~ msgstr "get ekki opna� pakka gagnagrunn � %s\n"
+
+#~ msgid "cannot open %s/packages.rpm\n"
+#~ msgstr "get ekki opna� %s/packages.rpm\n"
+
 #~ msgid "rpm: %s\n"
 #~ msgstr "rpm: %s\n"
 
diff --git a/po/it.po b/po/it.po
index 285b4d05b..9935eb869 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +14,66 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr ""
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr ""
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr ""
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr ""
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr ""
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr ""
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +392,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +636,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +711,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:475
+#: build/pack.c:467
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:493
+#: build/pack.c:485
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:528
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:567
+#: build/pack.c:559
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1416,72 +1411,92 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, c-format
+msgid "package %s already added, ignoring\n"
+msgstr ""
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1504,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2241,64 +2256,64 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2346,8 +2361,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2361,7 +2376,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2420,7 +2435,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2496,58 +2511,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr ""
 
@@ -2556,26 +2566,21 @@ msgstr ""
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr ""
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3029,125 +3034,125 @@ msgstr ""
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index f93ca964a..f07506b34 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: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,74 +14,69 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: EUC-JP\n"
 
-#: build.c:37
-#, fuzzy, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr "%s/packages.rpm �򥪡��ץ�Ǥ��ޤ���\n"
-
-#: build.c:48
+#: build.c:36
 #, fuzzy
 msgid "failed build dependencies:\n"
 msgstr "��¸���η�ǡ:\n"
 
-#: build.c:81
+#: build.c:65
 #, fuzzy, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "spec �ե�����򥪡��ץ�Ǥ��ޤ���: %s\n"
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "tar �ѥ��פΥ����ץ�˼���: %s\n"
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "%s ���� spec �ե�������ɤ߹��ߤ˼��Ԥ��ޤ���\n"
 
-#: build.c:206
+#: build.c:190
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "%s �� %s �ˤ���̾�����ѹ��˼��Ԥ��ޤ���: %s\n"
 
-#: build.c:245
+#: build.c:229
 #, fuzzy, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "stat %s �˼���: %s"
 
-#: build.c:250
+#: build.c:234
 #, fuzzy, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "���̤Υե�����ǤϤ���ޤ���: %s\n"
 
-#: build.c:259
+#: build.c:243
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "�ե����� %s �� ���ڥå��ե�����ǤϤʤ��褦�Ǥ���\n"
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "�����楿�����åȥץ�åȥե�����: %s\n"
 
-#: build.c:329
+#: build.c:316
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "�������å� %s �Ѥ˺�����\n"
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 #, fuzzy
 msgid "argument is not an RPM package\n"
 msgstr "������ RPM �ѥå������ǤϤ���ޤ���\n"
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 #, fuzzy
 msgid "error reading header from package\n"
 msgstr "�ѥå���������إå����ɤ߹��ߤΥ��顼\n"
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "�ե����� %s �򥪡��ץ�Ǥ��ޤ���"
@@ -424,44 +419,44 @@ msgstr "--sign �ϥѥå������������Τ߻��ѤǤ��ޤ�"
 msgid "exec failed\n"
 msgstr "�¹Լ���\n"
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr "�ƺ������뤿��Υѥå������ե����뤬����ޤ���"
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr "�����Τ���� spec �ե����뤬����ޤ���"
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr "����(build)�Τ���� tar �ե����뤬����ޤ���"
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr "���󥤥󥹥ȡ���Τ���Υѥå�����������ޤ���"
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr "���󥹥ȡ���Τ���Υѥå�����������ޤ���"
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr "�䤤��碌�Τ���ΰ���������ޤ���"
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr "���ڤΤ���ΰ���������ޤ���"
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags �ΰ������ְ�äƤ��ޤ�"
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 #, fuzzy
 msgid "no arguments given"
 msgstr "�䤤��碌�Τ���ΰ���������ޤ���"
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "����ե�����򥪡��ץ�Ǥ��ޤ���"
@@ -682,7 +677,7 @@ msgstr "�ե����뤬���Ĥ���ޤ���(by glob): %s"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "%%files �򥪡��ץ�Ǥ��ޤ���: %s"
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "����: %s"
@@ -757,157 +752,157 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "�ۥ���̾�������ʤ�ΤˤǤ��ޤ���: %s\n"
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "�ե����� %s �ǥ��������֤κ����˼���: %s"
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "�ե����� %s �ǥ��������֤κ����˼���: %s"
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy �ǽ񤭹��߼���: %s"
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy ���ɤ߹��߼���: %s"
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "PreIn �ե�����򥪡��ץ�Ǥ��ޤ���Ǥ���: %s"
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "PreUn �ե�����򥪡��ץ�Ǥ��ޤ���Ǥ���: %s"
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "PostIn �ե�����򥪡��ץ�Ǥ��ޤ���Ǥ���: %s"
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "PostUn �ե�����򥪡��ץ�Ǥ��ޤ���Ǥ���: %s"
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "VerifyScript �ե�����򥪡��ץ�Ǥ��ޤ���Ǥ���: %s"
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "�ȥꥬ��������ץȥե�����򥪡��ץ�Ǥ��ޤ���Ǥ���: %s"
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: %s �Υ����ץ�: %s\n"
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: %s ���ɤ߹���: %s\n"
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fread �˼��Ԥ��ޤ���: %s\n"
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, fuzzy, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s �� RPM �ѥå������ǤϤ���ޤ���\n"
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, fuzzy, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: %s ����Υإå����ɤ߹���\n"
 
-#: build/pack.c:475
+#: build/pack.c:467
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "����������ɤळ�Ȥ��Ǥ��ޤ���: %s"
 
-#: build/pack.c:493
+#: build/pack.c:485
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "�ѥå������ν񤭹��ߤ˼��Ԥ��ޤ���: %s"
 
-#: build/pack.c:501
+#: build/pack.c:493
 #, fuzzy
 msgid "Bad CSA data\n"
 msgstr "������ CSA �ǡ���"
 
-#: build/pack.c:536
+#: build/pack.c:528
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "�ѥå������ν񤭹��ߤ˼��Ԥ��ޤ���: %s"
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "��̾��������: %d\n"
 
-#: build/pack.c:567
+#: build/pack.c:559
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "����������ɤळ�Ȥ��Ǥ��ޤ���: %s"
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s �Υ����ץ�˼��Ԥ��ޤ���\n"
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "�ѥå������ν񤭹��ߤ˼��Ԥ��ޤ���: %s"
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "sigtarget ���ɤ߹��ߤ��Ǥ��ޤ���Ǥ���: %s"
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "����������ɤळ�Ȥ��Ǥ��ޤ���: %s"
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "�ѥå������ν񤭹��ߤ˼��Ԥ��ޤ���: %s"
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "����������ɤळ�Ȥ��Ǥ��ޤ���: %s"
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "�ѥå������ν񤭹��ߤ˼��Ԥ��ޤ���: %s"
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "�񤭹�����: %s\n"
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "�ѥå����� %s �� ���ϥե�����̾�������Ǥ��ޤ���Ǥ���: %s\n"
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s ������Ǥ��ޤ���: %s\n"
@@ -1489,7 +1484,7 @@ msgid " failed - "
 msgstr "���� - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1498,65 +1493,85 @@ msgstr ""
 "\"B\" �ΰ�¸���� epoch ��ɬ�פȤ��ޤ�(\"A\"��Ʊ���Ǥ���Ȳ��ꤷ��)\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "%s/packages.rpm �򥪡��ץ�Ǥ��ޤ���\n"
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, fuzzy, c-format
+msgid "package %s already added, ignoring\n"
+msgstr "�ѥå����� %s-%s-%s �Ϥ��Ǥ˥��󥹥ȡ��뤵��Ƥ��ޤ�"
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %s �ϥե�����ꥹ�Ȥ˲ä��뤳�Ȥˤ�ä�������ޤ���\n"
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %s �� provide �˲ä��뤳�Ȥˤ�ä�������ޤ���\n"
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %s �� db �ѥå������ˤ�ä�������Ƥ��ޤ���\n"
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %s �� rpmrc ���󶡤��뤳�Ȥˤ�ä�������ޤ���\n"
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %s �� rpmrc ���󶡤��뤳�Ȥˤ�ä�������ޤ���\n"
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %s �� db ���󶡤��뤳�Ȥˤ�ä�������ޤ���\n"
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %s �� db �ѥå������ˤ�ä�������Ƥ��ޤ���\n"
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: %s �ϥѥå������˲ä��뤳�Ȥˤ�ä�������ޤ���\n"
@@ -1564,42 +1579,42 @@ msgstr "%s: %s �ϥѥå������˲ä��뤳�Ȥˤ�ä�������ޤ���\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "�ѥå����� %s �� require ����������Ƥ��ޤ���: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s �ȶ��礹��ѥå�����������ޤ�: %s\n"
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "group ����ǥå����������ޤ�\n"
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2394,67 +2409,67 @@ msgstr "%s ������Ǥ��ޤ���: %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "%s �ؽ񤭹���ޤ���"
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "�������ѥå����������Ԥ���ޤ����Х��ʥ�ϸ��Ĥ���ޤ���"
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "�������ѥå������� .spec �ե������ޤ�Ǥ��ޤ���"
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "�ݥ��ȥ��󥹥ȡ��륹����ץ�(��ͭ���)��¹Ԥ��ޤ�\n"
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "������ץȤμ¹Ԥ˼���"
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "������ץȤμ¹Ԥ˼���"
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "�ѥå�����: %s-%s-%s �ե�����ƥ��� = %d\n"
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "�桼�� %s ��¸�ߤ��ޤ��� - root ����Ѥ��ޤ�"
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "���롼�� %s ��¸�ߤ��ޤ��� - root ����Ѥ��ޤ�"
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "�ե����� %s �Υ��������֤ο�Ĺ�˼��� %s%s: %s"
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 #, fuzzy
 msgid " on file "
 msgstr "�ե������"
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s �Υ����ץ�˼���: %s"
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s ����"
@@ -2503,8 +2518,8 @@ msgstr "�ѥå������ϥե������ͭ�Ԥ� id �ꥹ�Ȥ�ɤ������äƤ��ޤ���"
 msgid "can't query %s: %s\n"
 msgstr "%s ����(unlink)�Ǥ��ޤ���: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s �Υ����ץ�˼���: %s\n"
@@ -2518,7 +2533,7 @@ msgstr "%s �ؤ��䤤��碌�˼��Ԥ��ޤ���\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "������Υ������ѥå��������䤤��碌�뤳�ȤϤǤ��ޤ���\n"
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Fread �˼��Ԥ��ޤ���: %s\n"
@@ -2578,7 +2593,7 @@ msgstr "�ѥå������쥳�����ֹ� %d\n"
 msgid "record %u could not be read\n"
 msgstr "�쥳���� %d ���ɤळ�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "�ѥå����� %s �ϥ��󥹥ȡ��뤵��Ƥ��ޤ���\n"
@@ -2657,58 +2672,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr "���󥹥ȡ���Τ���Υѥå�����������ޤ���"
 
-#: lib/rpminstall.c:228
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "%s/packages.rpm �򥪡��ץ�Ǥ��ޤ���\n"
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "%s ��������Ƥ��ޤ�\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr "%s �Ȥ���...\n"
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s �򥹥��åפ��ޤ� - ž������ - %s\n"
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "�ѥå����� %s �Ϻ����֤Ǥ��ޤ���"
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "�ե����� %s ������ɤ߹��ߥ��顼 "
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "�ե����� %s �ˤϤ�꿷���� RPM �ΥС������ɬ�פǤ�\n"
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s �򥤥󥹥ȡ���Ǥ��ޤ���\n"
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%d �ĤΥ������� %d �ĤΥХ��ʥ�ѥå����������Ĥ���ޤ���\n"
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr "��¸���η�ǡ:\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr "�Х��ʥ�ѥå������򥤥󥹥ȡ�����\n"
 
@@ -2717,26 +2727,21 @@ msgstr "�Х��ʥ�ѥå������򥤥󥹥ȡ�����\n"
 msgid "cannot open file %s: %s\n"
 msgstr "�ե����� %s �򥪡��ץ�Ǥ��ޤ���: %s"
 
-#: lib/rpminstall.c:611
-#, fuzzy, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "%s/packages.rpm �򥪡��ץ�Ǥ��ޤ���\n"
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ��ʣ���Υѥå���������ꤷ�Ƥ��ޤ�\n"
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr "�����Υѥå�������������Ȱ�¸�����˲����ޤ�:\n"
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "%s �򥪡��ץ�Ǥ��ޤ���\n"
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s �򥤥󥹥ȡ�����\n"
@@ -3003,7 +3008,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "%s �� missingok �ե饰�Τ��᥹���åפ��ޤ�\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "�ǥ��쥯�ȥ�ν���: %s\n"
@@ -3217,128 +3222,128 @@ msgstr "�쥳���� %s �� %s �˥��ȥ��ǥ��顼 "
 msgid "error(%d) removing record %s from %s\n"
 msgstr "�쥳���� %s �� %s �˺���ǥ��顼"
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "dbpath �����ꤵ��Ƥ��ޤ���"
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, fuzzy, c-format
 msgid "error(%d) counting packages\n"
 msgstr "�ѥå����� %s ��õ�����顼\n"
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, fuzzy, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "�ǡ����١�����Υ쥳�����ֹ� %d �������Ǥ� -- �����åפ��ޤ�"
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "�����Τ���� %d �� �إå����ɤळ�Ȥ��Ǥ��ޤ���"
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "group ����ǥå����������ޤ�\n"
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "name ����ǥå���������ޤ�\n"
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "�ѥå����� %s ��õ�����顼\n"
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "%s �� %s ��̾�����ѹ����ޤ�\n"
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%s �� %s ��̾�����ѹ����ޤ�\n"
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr "dbpath �����ꤵ��Ƥ��ޤ���"
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rootdir %s ��ǥǡ����١�����ƹ��ۤ��ޤ�\n"
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "���Ū�ʥǡ����١��� %s �Ϥ��Ǥ�¸�ߤ��Ƥ��ޤ�"
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "�ǥ��쥯�ȥ�κ���: %s\n"
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "�ǥ��쥯�ȥ�κ���: %s\n"
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "�Ť��ǡ����١����Υ����ץ�\n"
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "�������ǡ����١����Υ����ץ�\n"
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "%d �� ���ꥸ�ʥ�Υ쥳���ɤ��ղäǤ��ޤ���"
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "�ǡ����١����κƹ��ۤ˼���; ���ꥸ�ʥ�ǡ����١������ޤ������˻ĤäƤ��ޤ�\n"
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr "�Ť��ǡ����١����򿷤����ǡ����١������֤�������Τ˼���!\n"
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "%s ��Υե������ꥫ�С����뤿��� %s ����ե�������֤������ޤ�"
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "�ǥ��쥯�ȥ�κ���: %s\n"
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "�ǥ��쥯�ȥ� %s �κ������: %s\n"
@@ -3562,6 +3567,14 @@ msgstr "url �ݡ��ȤϿ����Ǥʤ���Фʤ�ޤ���\n"
 msgid "failed to create %s: %s\n"
 msgstr "%s �κ����˼��Ԥ��ޤ���\n"
 
+#, fuzzy
+#~ msgid "cannot open rpm database in %s\n"
+#~ msgstr "%s/packages.rpm �򥪡��ץ�Ǥ��ޤ���\n"
+
+#, fuzzy
+#~ msgid "cannot open %s/packages.rpm\n"
+#~ msgstr "%s/packages.rpm �򥪡��ץ�Ǥ��ޤ���\n"
+
 #~ msgid "add a signature to a package"
 #~ msgstr "�ѥå������˽�̾���ɲä��ޤ�"
 
diff --git a/po/ko.po b/po/ko.po
index 9bafa2462..f9ec46f80 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: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +9,66 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr "%s ���� rpm �����ͺ��̽��� �� �� �����ϴ�\n"
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr "������ ������ ���ۿ� ������:\n"
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "%s spec ������ �� �� ����: %s\n"
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "tar �������� ���µ� ������: %m\n"
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "%s ���� spec ������ �дµ� �����߽��ϴ�\n"
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "%s ���� %s (��)�� �̸� �����ϴµ� ������: %m\n"
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "%s �� ����(stat)�� ǥ���ϴµ� ������: %m\n"
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "%s ������ ����(regular) ������ �ƴմϴ�.\n"
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "%s ������ spec ������ �ƴ� �� �����ϴ�.\n"
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "��ǥ���(target) �÷������� ���� ��: %s\n"
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr "%s (��)�� �����ϰ� �ֽ��ϴ�\n"
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr "�μ��� RPM ��Ű���� �����Ǿ�� �մϴ�\n"
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr "��Ű���� ����� �д� ���� ������ �߻��߽��ϴ�\n"
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "payload�� �ٽ� �� �� ����: %s\n"
@@ -399,44 +394,44 @@ msgstr "--sign �ɼ��� ��Ű�� ���۽ÿ��� ����Ͻ� �� �ֽ��ϴ�"
 msgid "exec failed\n"
 msgstr "���࿡ �����߽��ϴ�\n"
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr "������(rebuild)�� ��Ű�� ������ �������� �����̽��ϴ�"
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr "��Ű�� ���ۿ� �ʿ��� spec ������ �������� �����̽��ϴ�"
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr "��Ű�� ���ۿ� �ʿ��� tar ������ �������� �����̽��ϴ�"
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr "����(uninstall)�� ��Ű���� �������� �����̽��ϴ�"
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr "��ġ�� ��Ű���� �������� �����̽��ϴ�"
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr "���ǿ� �ʿ��� �μ��� �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr "������ �ʿ��� �μ��� �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags �ɼǿ� �������� �μ��� �����Ǿ����ϴ� "
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 #, fuzzy
 msgid "no arguments given"
 msgstr "���ǿ� �ʿ��� �μ��� �������� �ʾҽ��ϴ�"
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr "�ӽ� ������ �� �� �����ϴ�.\n"
 
@@ -647,7 +642,7 @@ msgstr "glob���� ������ ã�� �� ����: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "%s ������ %%files�� �� �� ����: %s\n"
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr "��(line): %s\n"
@@ -722,152 +717,152 @@ msgstr "�׷� id ����[getGidS]: gid�� �ʹ� �����ϴ�\n"
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "ȣ��Ʈ ���� ����ȭ(canonicalize) �� �� ����: %s\n"
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "%s ���Ͽ� ��ī�̺긦 �����ϴµ� ������: %s\n"
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "��ī�̺� ������ ������: %s\n"
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy �ۼ��� ������: %s\n"
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy �б⿡ ������: %s\n"
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "PreIn ������ �� �� ����: %s\n"
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "PreUn ������ �� �� ����: %s\n"
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "PostIn ������ �� �� ����: %s\n"
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "PostUn ������ �� �� ����: %s\n"
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "VerifyScript ������ �� �� ����: %s\n"
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Ʈ���� ��ũ��Ʈ ������ �� �� ����: %s\n"
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "RPM �б�(readRPM): %s (��)�� ���ϴ�: %s\n"
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "RPM �б�(readRPM): %s (��)�� �н��ϴ�: %s\n"
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek�� �����߽��ϴ�: %s\n"
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "RPM �б�(readRPM): %s (��)�� RPM ��Ű���� �ƴմϴ�\n"
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "RPM �б�(readRPM): %s ���� ����� �а� �ֽ��ϴ�\n"
 
-#: build/pack.c:475
+#: build/pack.c:467
 msgid "Unable to create immutable header region.\n"
 msgstr "���� ��� ����(immutable header region)�� ������ �� �����ϴ�.\n"
 
-#: build/pack.c:493
+#: build/pack.c:485
 msgid "Unable to write temp header\n"
 msgstr "�ӽ�(temp) ����� �ۼ��� �� �����ϴ�\n"
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr "�߸��� CSA ������\n"
 
-#: build/pack.c:536
+#: build/pack.c:528
 msgid "Unable to write final header\n"
 msgstr "������(final) ����� �ۼ��� �� �����ϴ�\n"
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "���� ���� ��: %d\n"
 
-#: build/pack.c:567
+#: build/pack.c:559
 msgid "Unable to reload signature header.\n"
 msgstr "����(signature) ����� �ٽ� �о�� �� �����ϴ�.\n"
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s (��)�� �� �� ����: %s\n"
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "��Ű���� �ۼ��� �� ����: %s\n"
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "������ ��� %s (��)�� �� �� ����: %s\n"
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "%s �� ����� ���� �� ����: %s\n"
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "%s �� ����� �ۼ��� �� ����: %s\n"
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "%s �� payload�� ���� �� ����: %s\n"
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s �� payload�� �ۼ��� �� ����: %s\n"
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "�ۼ�: %s\n"
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "%s ��Ű���� ��� ���ϸ��� ������ �� ����: %s\n"
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s (��)�� ������ �� ����: %s\n"
@@ -1429,7 +1424,7 @@ msgid " failed - "
 msgstr " ������ - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1438,65 +1433,85 @@ msgstr ""
 "\"B\" �������� �߿�� �Ǵ� ��(epoch)�� �ʿ�� �մϴ� (\"A\" �� �����մϴ�)\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr "��"
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr "�ƴϿ�"
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "%s ���� ��Ű�� �����ͺ��̽��� �� �� �����ϴ�\n"
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, fuzzy, c-format
+msgid "package %s already added, ignoring\n"
+msgstr "%s ��Ű���� �̹� ��ġ�Ǿ� �ֽ��ϴ�"
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s �� (������ �߰���)\n"
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s �� (������ �߰���)\n"
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (ĳ�õ�)\n"
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s �� (rpmrc�� ������)\n"
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s �� (rpmlib�� ������)\n"
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s �� (db ����)\n"
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s �� (db�� ������)\n"
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s �� (db ��Ű��)\n"
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s �ƴϿ�\n"
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) ����(Depends) ĳ�ÿ� �߰��Ǿ����ϴ�.\n"
@@ -1504,43 +1519,43 @@ msgstr "%s: (%s, %s) ����(Depends) ĳ�ÿ� �߰��Ǿ����ϴ�.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "%s-%s-%s ��Ű���� �ʿ� ������ �������� ����: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "��Ű�� %s (��)�� �浹��: %s\n"
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "tsort ���迡�� %s-%s-%s \"%s\" (��)�� �����մϴ�.\n"
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort ���踦 ���(record)�մϴ�\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== ��Ű���� tsort �մϴ� (����, #������, #������, ����[depth])\n"
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr "========== ������ [successors only] (ǥ�� ��)\n"
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr "����(LOOP):\n"
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort�� �����մϴ�...\n"
 
@@ -2283,70 +2298,70 @@ msgstr "%%%s %s (��)�� ������ �� �����ϴ�\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s %s (��)�� �ۼ��� �� �����ϴ�\n"
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr "�ҽ� ��Ű���� �䱸�˴ϴ�, ���̳ʸ��� ã�ҽ��ϴ�\n"
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr "�ҽ� ��Ű���� .spec ������ ���ԵǾ� ���� �ʽ��ϴ�\n"
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: %s ��ũ��Ʈ�� �����մϴ� (���� ���)\n"
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, 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:1611
+#: lib/psm.c:1610
 #, 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:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s (��)�� %d �� ������ ���� �ֽ��ϴ�, �׽�Ʈ = %d\n"
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 "%s: %s ��ũ��Ʈ��(scriptlet)�� �����߽��ϴ� (%d), %s-%s-%s (��)�� �����մ�"
 "��\n"
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "%s ����ڰ� �������� �ʽ��ϴ� - root�� �̿��մϴ�\n"
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "%s �׷��� �������� �ʽ��ϴ� - root�� �̿��մϴ�\n"
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "��ī�̺긦 Ǫ�µ� ������%s%s: %s\n"
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr " ���� ���Ͽ� "
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%2$s ������ %1$s (��)�� ������: %3$s\n"
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s (��)�� ������: %s\n"
@@ -2394,8 +2409,8 @@ msgstr "��Ű���� ���� ������ �Ǵ� id ����� �����ϴ�\n"
 msgid "can't query %s: %s\n"
 msgstr "%s (��)�� ������ �� ����: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s (��)�� ���µ� ������: %s\n"
@@ -2409,7 +2424,7 @@ msgstr "%s (��)�� �����ϴµ� �����߽��ϴ�\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "���� ������ �ҽ� ��Ű���� ������ �� �����ϴ�\n"
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: �дµ� �����߽��ϴ�: %s\n"
@@ -2468,7 +2483,7 @@ msgstr "��Ű�� ���(record) ��ȣ: %u\n"
 msgid "record %u could not be read\n"
 msgstr "���(record) ��ȣ %u (��)�� ���� �� �����ϴ�\n"
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s ��Ű���� ��ġ�Ǿ� ���� �ʽ��ϴ�\n"
@@ -2544,58 +2559,53 @@ msgstr "�غ� ��..."
 msgid "Preparing packages for installation..."
 msgstr "��ġ�� ��Ű���� �غ��ϰ� �ֽ��ϴ�..."
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "%s ���� ��Ű�� �����ͺ��̽��� �� �� �����ϴ�\n"
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "%s (��)�� �����մϴ�\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... %s (��)��\n"
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s (��)�� �����մϴ� - ����(transfer)�� ������ - %s\n"
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "%s ��Ű���� ���ġ�� �� �����ϴ�\n"
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "%s ������ �д� ���� ������ �߻��߽��ϴ�\n"
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "%s ������ �ֽ� ������ RPM�� �ʿ�� �մϴ�\n"
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s (��)�� ��ġ�� �� �����ϴ�\n"
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%d �� �ҽ��� %d �� ���̳ʸ� ��Ű���� ã�ҽ��ϴ�\n"
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr "������ ������ ���� ������:\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr "���̳ʸ� ��Ű���� ��ġ�մϴ�\n"
 
@@ -2604,26 +2614,21 @@ msgstr "���̳ʸ� ��Ű���� ��ġ�մϴ�\n"
 msgid "cannot open file %s: %s\n"
 msgstr "%s ������ �� �� ����: %s\n"
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "%s/packages.rpm �� �� �� �����ϴ�\n"
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" �������� ��Ű���� �����մϴ�\n"
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr "�� ��Ű������ �����ϸ� �������� ���� �� ����:\n"
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "%s (��)�� �� �� ����: %s\n"
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s (��)�� ��ġ�մϴ�\n"
@@ -2879,7 +2884,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "missingok �÷��׷� ���� %s (��)�� �����մϴ�\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "%s ���丮�� ���ܽ�ŵ�ϴ�\n"
@@ -3094,11 +3099,11 @@ msgstr "%3$s (��)�� %2$s ���ڵ带 �����ϴ� ���� ����(%1$d)�� �߻��߽��ϴ�\n"
 msgid "error(%d) removing record %s from %s\n"
 msgstr "%3$s ���� %2$s ���ڵ带 �����ϴ� ���� ����(%1$d)�� �߻��߽��ϴ�\n"
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr "db��ΰ� �����Ǿ� ���� �ʽ��ϴ�\n"
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
@@ -3107,115 +3112,115 @@ msgstr ""
 "���� --rebuilddb �ɼ��� �̿��Ͻʽÿ�\n"
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr "��Ű���� ���� ���� ���� ����(%d)�� �߻��߽��ϴ�\n"
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "�����ͺ��̽��� ���ڵ� ��ȣ %u (��)�� �߸��Ǿ����ϴ� -- �����մϴ�.\n"
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr "rpmdb: �ջ�� ��� #%u (��)�� ����(retrieved)�Ǿ����ϴ�, �����մϴ�.\n"
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: 0x%x �� ����� ���� �� �����ϴ�\n"
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "%2$s �ε������� \"%1$s\" (��)�� �����մϴ�.\n"
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "%2$s �ε������� %1$d �׸��(entries)�� �����մϴ�.\n"
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "���ο� ��Ű���� ��ġ�ϴ� ���� ����(%d)�� �߻��߽��ϴ�\n"
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "%2$s �ε����� \"%1$s\" (��)�� �߰��մϴ�.\n"
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%2$s �ε����� %1$d �׸��(entries)�� �߰��մϴ�.\n"
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "db3�� �籸�� �� �Ŀ� %s (��)�� �����մϴ�.\n"
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr "db��ΰ� �����Ǿ� ���� �ʽ��ϴ�"
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "%2$s �� �����ͺ��̽� %1$s (��)�� �籸�� �մϴ�\n"
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "�ӽ� �����ͺ��̽� %s (��)�� �̹� �����մϴ�\n"
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr "%s ���丮�� �����մϴ�\n"
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "%s ���丮�� ������: %s\n"
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "dbapi %d (��)�� ���� ���� �����ͺ��̽��� ���ϴ�\n"
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "dbapi %d (��)�� ���� ���ο� �����ͺ��̽��� ���ϴ�\n"
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "%u �� ���ڵ带 �߰��� �� �����ϴ�\n"
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "�����ͺ��̽��� �籸���ϴµ� ������: ���� �����ͺ��̽��� �״�� �����˴ϴ�\n"
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr "���� �����ͺ��̽��� ���ο� �����ͺ��̽��� ��ü�ϴµ� �����߽��ϴ�!\n"
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "�����ϱ� ���� $2$s �� ������ $1$s �� ���Ϸ� ��ü�մϴ�"
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr "%s ���丮�� �����մϴ�\n"
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s ���丮�� �����ϴµ� ������: %s\n"
@@ -3428,6 +3433,12 @@ msgstr "URL ��Ʈ�� �ݵ�� �����̾�� �մϴ�\n"
 msgid "failed to create %s: %s\n"
 msgstr "%s (��)�� �����ϴµ� ������: %s\n"
 
+#~ msgid "cannot open rpm database in %s\n"
+#~ msgstr "%s ���� rpm �����ͺ��̽��� �� �� �����ϴ�\n"
+
+#~ msgid "cannot open %s/packages.rpm\n"
+#~ msgstr "%s/packages.rpm �� �� �� �����ϴ�\n"
+
 #~ msgid "add a signature to a package"
 #~ msgstr "��Ű���� ������ �߰��մϴ�"
 
diff --git a/po/no.po b/po/no.po
index a7fb61b0f..12ca396c1 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: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +9,66 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr "kan ikke �pne database i %s\n"
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr "feil med avhengigheter under bygging:\n"
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Kunne ikke �pne spec fil %s: %s\n"
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Kunne ikke �pne tar-r�r: %m\n"
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Feil under lesing av spec-fil fra %s\n"
 
-#: build.c:206
+#: build.c:190
 #, 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:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "kunne ikke kj�re stat p� %s: %m\n"
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "Fil %s er ikke en vanlig fil.\n"
 
-#: build.c:259
+#: build.c:243
 #, 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:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Bygger m�lplattformene: %s\n"
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Bygger for m�l %s\n"
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr "argumentet er ikke en RPM-pakke\n"
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr "feil under lesing av header fra pakke\n"
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "kan ikke gjen�pne \"payload\": %s\n"
@@ -398,44 +393,44 @@ msgstr ""
 msgid "exec failed\n"
 msgstr "kj�ring feilet\n"
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr "ingen pakkefiler oppgitt for ombygging"
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr "ingen spec-fil oppgitt for bygging"
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr "ingen tar-fil oppgitt for bygging"
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr "ingen pakker oppgitt for avinstallering"
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr "ingen pakker oppgitt for installering"
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr "ingen argumenter oppgitt for sp�rring"
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr "ingen argumenter oppgitt for verifisering"
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr "uventede argumenter til --querytags "
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 #, fuzzy
 msgid "no arguments given"
 msgstr "ingen argumenter oppgitt for sp�rring"
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr "Kunne ikke �pne spec fil %s: %s\n"
 
@@ -646,7 +641,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Kunne ikke �pne spec fil %s: %s\n"
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr "Installerer %s\n"
@@ -721,156 +716,156 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "klarte ikke � �pne %s: %s\n"
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "feil under oppretting av arkiv %s\n"
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy skriving feilet: %s\n"
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy: feil under lesing: %s\n"
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Kunne ikke �pne PreIn-fil: %s\n"
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Kunne ikke �pne PreUn-fil: %s\n"
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Kunne ikke �pne PostIn-fil: %s\n"
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Kunne ikke �pne PostUn-fil: %s\n"
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Kunne ikke �pne VerifyScript-fil: %s\n"
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek feilet: %s\n"
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s er ikke en RPM-pakke\n"
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: leser header fra %s\n"
 
-#: build/pack.c:475
+#: build/pack.c:467
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Kunne ikke �pne spec fil %s: %s\n"
 
-#: build/pack.c:493
+#: build/pack.c:485
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Kunne ikke skrive header til %s: %s\n"
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr "Ugyldige CSA-data\n"
 
-#: build/pack.c:536
+#: build/pack.c:528
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Kunne ikke skrive header til %s: %s\n"
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Genererer signatur: %d\n"
 
-#: build/pack.c:567
+#: build/pack.c:559
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Kunne ikke �pne spec fil %s: %s\n"
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kunne ikke �pne %s: %s\n"
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke skrive pakke: %s\n"
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Kunne ikke �pne sigm�l %s: %s\n"
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Kunne ikke �pne spec fil %s: %s\n"
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Kunne ikke skrive header til %s: %s\n"
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Kunne ikke lese \"payload\" fra %s: %s\n"
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke skrive \"payload\" til %s: %s\n"
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1430,72 +1425,92 @@ msgid " failed - "
 msgstr " feilet - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr "JA"
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr "NEI"
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "kan ikke �pne pakkedatabase i %s\n"
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, fuzzy, c-format
+msgid "package %s already added, ignoring\n"
+msgstr "pakke %s er allerede installert"
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1503,42 +1518,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakke %s er i konflikt: %s\n"
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2268,64 +2283,64 @@ msgstr "kan ikke opprette %%%s %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "kan ikke skrive til %%%s %s\n"
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr "kildepakke forventet, bin�r funnet\n"
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr "kildepakke inneholder ikke en .spec-fil\n"
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: kj�rer %s-skript (hvis noen)\n"
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "klarte ikke � �pne %s: %s\n"
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s feilet\n"
@@ -2373,8 +2388,8 @@ msgstr "pakken har verken fileier eller id-lister\n"
 msgid "can't query %s: %s\n"
 msgstr "kan ikke sp�rre p� %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "feil under �pning av %s: %s\n"
@@ -2388,7 +2403,7 @@ msgstr "sp�rring p� %s feilet\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "kildepakker i gammelt format kan ikke sp�rres\n"
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: lesing av manifest feilet: %s\n"
@@ -2447,7 +2462,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakke %s er ikke installert\n"
@@ -2523,58 +2538,53 @@ msgstr "Forbereder..."
 msgid "Preparing packages for installation..."
 msgstr "Forbereder pakker for installasjon..."
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "kan ikke �pne pakkedatabase i %s\n"
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Henter %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "hopper over %s - overf�ring feilet - %s\n"
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "pakke %s kan ikke relokeres\n"
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "feil under lesing fra fil %s\n"
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, 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:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "fant %d kilde- og %d bin�rpakker\n"
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr "feilede avhengigheter:\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr "installerer bin�rpakker\n"
 
@@ -2583,26 +2593,21 @@ msgstr "installerer bin�rpakker\n"
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "kan ikke �pne %s/packages.rpm\n"
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" spesifiserer flere pakker\n"
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr "fjerning av disse pakkene vil �delegge avhengigheter:\n"
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kan ikke �pne %s: %s\n"
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerer %s\n"
@@ -2857,7 +2862,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ekskluderer katalog %s\n"
@@ -3058,125 +3063,125 @@ msgstr "feil(%d) under lagring av post %s til %s\n"
 msgid "error(%d) removing record %s from %s\n"
 msgstr "feil(%d) under fjerning av post %s fra %s\n"
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
@@ -3388,6 +3393,12 @@ msgstr "url-port m� v�re et tall\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
+#~ msgid "cannot open rpm database in %s\n"
+#~ msgstr "kan ikke �pne database i %s\n"
+
+#~ msgid "cannot open %s/packages.rpm\n"
+#~ msgstr "kan ikke �pne %s/packages.rpm\n"
+
 #~ msgid "add a signature to a package"
 #~ msgstr "legg til signatur til en pakke"
 
diff --git a/po/pl.po b/po/pl.po
index 8237d9c37..05a89beea 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: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +16,66 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:37
-#, fuzzy, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr "nie mo�na otworzy� %s/packages.rpm\n"
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr "niespe�nione zale�no�ci:\n"
 
-#: build.c:81
+#: build.c:65
 #, fuzzy, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Nie mo�na otworzy� pliku spec: %s\n"
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, 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:178
+#: build.c:162
 #, 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:206
+#: build.c:190
 #, 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:245
+#: build.c:229
 #, fuzzy, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "stat nie powiod�o si� %s: %s"
 
-#: build.c:250
+#: build.c:234
 #, fuzzy, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "Plik: %s nie jest regularnym plikiem\n"
 
-#: build.c:259
+#: build.c:243
 #, 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:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Budowanie dla platform: %s\n"
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Budowanie dla %s\n"
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr "argument nie jest pakietem RPM\n"
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr "b��d odczytu nag��wka z pakietu\n"
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "nie mo�na otworzy� pliku %s\n"
@@ -414,44 +409,44 @@ msgstr "--sign mo�na u�y� tylko w trakcie budowania pakietu"
 msgid "exec failed\n"
 msgstr "wykonanie nie powiod�o si�\n"
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr "nie podano nazw pakiet�w do przebudowania"
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr "nie podano nazw plik�w spec do budowania"
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr "nie podano nazw plik�w tar do budowania"
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr "nie podano nazw plik�w do usuni�cia"
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr "nie podano nazw plik�w do zainstalowania"
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr "nie podano argument�w dla trybu zapyta�"
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr "nie podano argument�w dla sprawdzania"
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr "nieoczekiwane argumenty dla --querytags "
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 #, fuzzy
 msgid "no arguments given"
 msgstr "nie podano argument�w dla trybu zapyta�"
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Nie mo�na otworzy� pliku tymczasowego"
@@ -672,7 +667,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:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "linia: %s"
@@ -747,157 +742,157 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Nie mo�na rozwi�za� nazwy systemu: %s\n"
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, 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:84
+#: build/pack.c:82
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "utworzenie archiwum pliku %s nie powiod�o si�: %s"
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "zapis w trybie cpio_copy nie powi�d� si�: %s"
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "odczyt w trybie cpio_copy nie powi�d� si�: %s"
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Nie mo�na otworzy� pliku PreIn: %s"
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Nie mo�na otworzy� pliku PreUn: %s"
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Nie mo�na otworzy� pliku PostIn: %s"
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Nie mo�na otworzy� pliku PostUn: %s"
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Nie mo�na otworzy� pliku VerifyScript: %s"
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Nie mo�na otworzy� skryptu Trigger: %s"
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: otwieranie %s: %s\n"
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: czytanie %s: %s\n"
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: readLead nie powiod�o si�\n"
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s nie jest pakietem RPM\n"
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: czytanie nag��wka z %s\n"
 
-#: build/pack.c:475
+#: build/pack.c:467
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Nie mo�na odczyta� ikony: %s"
 
-#: build/pack.c:493
+#: build/pack.c:485
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Nie mo�na zapisa� %s"
 
-#: build/pack.c:501
+#: build/pack.c:493
 #, fuzzy
 msgid "Bad CSA data\n"
 msgstr "B��dne dane CSA"
 
-#: build/pack.c:536
+#: build/pack.c:528
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Nie mo�na zapisa� %s"
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Generowanie sygnatury: %d\n"
 
-#: build/pack.c:567
+#: build/pack.c:559
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Nie mo�na odczyta� ikony: %s"
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Nie mo�na otworzy� %s\n"
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nie mo�na zapisa� pakietu: %s"
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Nie mo�na odczyta� sigtarget: %s"
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Nie mo�na odczyta� ikony: %s"
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Nie mo�na zapisa� pakietu: %s"
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Nie mo�na odczyta� ikony: %s"
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie mo�na zapisa� pakietu: %s"
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, 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:775
+#: build/pack.c:767
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nie mo�na utworzy� %s"
@@ -1471,73 +1466,93 @@ msgid " failed - "
 msgstr " nie powiod�o si� -"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 #, fuzzy
 msgid "NO "
 msgstr "NIE DOBRZE"
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "nie mo�na otworzy� %s/packages.rpm\n"
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, fuzzy, c-format
+msgid "package %s already added, ignoring\n"
+msgstr "pakiet %s-%s-%s jest ju� zainstalowany"
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "plik %s nie nale�y do �adnego pakietu\n"
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "plik %s nie nale�y do �adnego pakietu\n"
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "plik %s nie nale�y do �adnego pakietu\n"
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "plik %s nie nale�y do �adnego pakietu\n"
@@ -1545,42 +1560,42 @@ msgstr "plik %s nie nale�y do �adnego pakietu\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "zale�no�ci pakietu %s nie zosta�y spe�nione: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakiet %s jest w konflikcie: %s\n"
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "usuwanie indeksu grupy\n"
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2350,66 +2365,66 @@ msgstr "nie mo�na utworzy� %s"
 msgid "cannot write to %%%s %s\n"
 msgstr "nie mo�na zapisa� do %s"
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "spodziewany pakiet �r�d�owy a nie binarny"
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "pakiet �r�d�owy nie zawiera pliku .spec"
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "uruchamianie skryptu postinstall (je�li istnieje)\n"
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, 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:1611
+#: lib/psm.c:1610
 #, 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:1958
+#: lib/psm.c:1957
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "pakiet: %s-%s-%s test plik�w = %d\n"
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, 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:2199
+#: lib/psm.c:2198
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupa %s nie istnieje - u�yto grupy root"
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, 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:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr " na pliku "
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nie mo�na otworzy� %s: %s"
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s nie powiod�o si�"
@@ -2458,8 +2473,8 @@ msgstr "pakiet nie ma ani w�a�ciciela pliku ani list id"
 msgid "can't query %s: %s\n"
 msgstr "nie mo�na odwi�za� %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otwarcie %s nie powiod�o si�\n"
@@ -2473,7 +2488,7 @@ msgstr "odpytywanie %s nie powiod�o si�\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "pakiety w starym formacie nie mog� by� odpytywane\n"
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead nie powiod�o si�\n"
@@ -2533,7 +2548,7 @@ msgstr "numer rekordu pakietu: %d\n"
 msgid "record %u could not be read\n"
 msgstr "nie mo�na odczyta� rekordu %d\n"
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakiet %s nie jest zainstalowany\n"
@@ -2611,58 +2626,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr "nie podano nazw plik�w do zainstalowania"
 
-#: lib/rpminstall.c:228
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "nie mo�na otworzy� %s/packages.rpm\n"
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, 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:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr "... jako %s\n"
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s pomijany - transmisja %s nie powiod�a si�\n"
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "pakiet %s nie jest przesuwalny\n"
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "b��d czytania z pliku %s\n"
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "plik %s wymaga nowszej wersji RPM\n"
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nie mo�e by� zainstalowany\n"
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, 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:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr "niespe�nione zale�no�ci:\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr "instalacja pakiet�w binarnych\n"
 
@@ -2671,26 +2681,21 @@ msgstr "instalacja pakiet�w binarnych\n"
 msgid "cannot open file %s: %s\n"
 msgstr "nie mo�na otworzy� pliku %s: %s"
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "nie mo�na otworzy� %s/packages.rpm\n"
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" okre�la wiele pakiet�w\n"
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr "usuni�cie tych pakiet�w zerwie zale�no�ci:\n"
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nie mo�na otworzy� %s\n"
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instalacja %s\n"
@@ -2956,7 +2961,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "%s pomini�ty z powodu flagi missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
@@ -3165,12 +3170,12 @@ msgstr "b��d zapisywania rekordu %s do %s"
 msgid "error(%d) removing record %s from %s\n"
 msgstr "b��d usuwania rekordu %s z %s"
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "�cie�ka bazy danych nie zosta�a podana"
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 #, fuzzy
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
@@ -3180,115 +3185,115 @@ msgstr ""
 "nowym formacie"
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, fuzzy, c-format
 msgid "error(%d) counting packages\n"
 msgstr "b��d szukania pakietu %s\n"
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, fuzzy, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "rekord numer %d w bazie danych jest b��dny -- rekord pomini�to"
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "nie mo�na odczyta� nag��wka przy %d dla poszukiwania"
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "usuwanie indeksu grupy\n"
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "usuwanie indeksu nazw\n"
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "b��d szukania pakietu %s\n"
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr "�cie�ka bazy danych nie zosta�a podana"
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "odbudowywuj� baz� danych w rootdir %s\n"
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "tymczasowa baza danych %s ju� istnieje"
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otwieranie starej bazy danych\n"
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otwieranie nowej bazy danych\n"
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "nie mo�na doda� rekordu oryginalnie przy %d"
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "przebudowanie bazy nie powiod�o si�; stara pozosta�a na miejscu\n"
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr "zamiana starej bazy na now� nie powiod�a si�!\n"
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "naprawcze zast�powanie plik�w w %s plikami z %s"
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "usuni�cie katalogu %s nie powiod�o si�: %s\n"
@@ -3504,6 +3509,13 @@ msgstr "port musi by� liczb�\n"
 msgid "failed to create %s: %s\n"
 msgstr "utworzenie %s nie powiod�o si�\n"
 
+#, fuzzy
+#~ msgid "cannot open rpm database in %s\n"
+#~ msgstr "nie mo�na otworzy� %s/packages.rpm\n"
+
+#~ msgid "cannot open %s/packages.rpm\n"
+#~ msgstr "nie mo�na otworzy� %s/packages.rpm\n"
+
 #~ msgid "add a signature to a package"
 #~ msgstr "dodaj sygnatur� do pakietu"
 
diff --git a/po/pt.po b/po/pt.po
index be8549faa..96c8126b2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-0400\n"
 "PO-Revision-Date: 2000-06-22 01:13+01:00\n"
 "Last-Translator: Jos� Nuno Coelho Sanarra Pires\n"
 "Language-Team: pt <kde@poli.org>\n"
@@ -9,71 +9,66 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-latin1\n"
 "Content-Transfer-Encoding: none\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr "n�o consigo a base de dados do RPM em %s\n"
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr "n�o consegui construir depend�ncias:\n"
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "N�o consegui abrir ficheiro spec %s: %s\n"
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "N�o consegui abrir o 'pipe' para o tar: %m\n"
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "N�o consegui ler o ficheiro spec do %s\n"
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "N�o consegui mudar o nome de %s para %s: %m\n"
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "N�o consegui analisar o %s: %m\n"
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "O ficheiro %s n�o � um ficheiro normal.\n"
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "O ficheiro %s n�o parece ser um ficheiro spec.\n"
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "A construir plataformas alvo: %s\n"
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr "A construir para o alvo %s\n"
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr "o argumento n�o � um pacote RPM\n"
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr "erro ao ler o cabe�alho do pacote\n"
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "n�o consigo aceder de novo ao conte�do: %s\n"
@@ -394,44 +389,44 @@ msgstr "o --sign s� pode ser usado na cria��o do pacote"
 msgid "exec failed\n"
 msgstr "o exec falhou\n"
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr "n�o foram indicados pacotes para a reconstru��o"
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr "n�o foram indicados ficheiros spec para a cria��o"
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr "n�o foram indicados ficheiros tar para a cria��o"
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr "n�o foram indicados pacote para desinstalar"
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr "n�o foram indicados pacotes para instalar"
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr "n�o foram indicados argumentos para a pesquisa"
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr "n�o foram indicados argumentos para a verifica��o"
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr "argumentos inesperados no --querytags "
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 #, fuzzy
 msgid "no arguments given"
 msgstr "n�o foram indicados argumentos para a pesquisa"
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr "N�o consegui abrir um ficheiro tempor�rio.\n"
 
@@ -642,7 +637,7 @@ msgstr "Ficheiro n�o encontrado pelo glob: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "N�o consegui abrir o ficheiro do %%files %s: %s\n"
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr "linha: %s\n"
@@ -719,156 +714,156 @@ msgstr "getGnameS: demasiados gid's\n"
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "N�o consegui canonizar o nome da m�quina: %s\n"
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "a cria��o do pacote falhou no ficheiro %s: %s\n"
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "a cria��o do pacote falhou no ficheiro %s: %s\n"
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "a escrita do cpio_copy falhou: %s\n"
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "a leitura do cpio_copy falhou: %s\n"
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "N�o consegui abrir o ficheiro PreIn: %s\n"
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "N�o consegui abrir o ficheiro PreUn: %s\n"
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "N�o consegui abrir o ficheiro PostIn: %s\n"
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "N�o consegui abrir o ficheiro PostUn: %s\n"
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "N�o consegui abrir o ficheiro VerifyScript: %s\n"
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "N�o consegui aceder ao 'script' Trigger: %s\n"
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: aceder ao %s: %s\n"
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: ler o %s: %s\n"
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: O fread falhou: %s\n"
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: o %s n�o � um pacote RPM\n"
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: a ler o cabe�alho do %s\n"
 
-#: build/pack.c:475
+#: build/pack.c:467
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "N�o consegui ler o cabe�alho de %s: %s\n"
 
-#: build/pack.c:493
+#: build/pack.c:485
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "N�o consegui gravar o cabe�alho de %s: %s\n"
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr "Dados de CSA inv�lidos\n"
 
-#: build/pack.c:536
+#: build/pack.c:528
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "N�o consegui gravar o cabe�alho de %s: %s\n"
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "A gerar a assinatura: %d\n"
 
-#: build/pack.c:567
+#: build/pack.c:559
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "N�o consegui ler o cabe�alho de %s: %s\n"
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "N�o consigo aceder ao %s: %s\n"
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "N�o consegui gravar o pacote: %s\n"
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "N�o consegui abrir o sigtarget %s: %s\n"
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "N�o consegui ler o cabe�alho de %s: %s\n"
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "N�o consegui gravar o cabe�alho de %s: %s\n"
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "N�o consegui ler o conte�do de %s: %s\n"
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "N�o consegui escrever o conte�do de %s: %s\n"
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Gravei: %s\n"
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "N�o consigo gerar o ficheiro de sa�da para o pacote %s: %s\n"
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "n�o consigo criar o %s: %s\n"
@@ -1426,7 +1421,7 @@ msgid " failed - "
 msgstr " falhou - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1435,66 +1430,86 @@ msgstr ""
 "A depend�ncia \"B\" precisa duma �poca (assumindo a mesma que \"A\")\n"
 "\t %s\tB %s\n"
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s     A %s\tB %s\n"
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 #, fuzzy
 msgid "NO "
 msgstr "N�O-OK"
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "n�o consigo abrir a base de dados Packages em %s\n"
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, fuzzy, c-format
+msgid "package %s already added, ignoring\n"
+msgstr "o pacote %s j� est� instalado"
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s SIM (ficheiros adicionados)\n"
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s SIM (oferecidos para adi��o)\n"
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-3s (em cache)\n"
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n"
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n"
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s SIM (ficheiros db)\n"
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s SI (oferecidos pelo db)\n"
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s SIM (pacote db)\n"
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s N�O\n"
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) adicionado � cache de depend�ncias.\n"
@@ -1502,42 +1517,42 @@ msgstr "%s: (%s, %s) adicionado � cache de depend�ncias.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "requisito %s-%s-%s do pacote n�o satisfeito: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "o pacote %s est� em conflito: %s\n"
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "a remover o %s-%s-%s \"%s\" das rela��es do tsort.\n"
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr "=========== a guardar as rela��es do tsort\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr "========== s� os sucessores (ordem de apresenta��o)\n"
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr "CICLO:\n"
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr "========== a prosseguir o tsort ...\n"
 
@@ -2280,64 +2295,64 @@ msgstr "n�o consigo criar o %s: %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "n�o consigo escrever em %s\n"
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr "esperava-se um pacote com c�digo-fonte, foi encontrado um pacote bin�rio\n"
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr "o pacote de c�digo-fonte n�o contem um ficheiro .spec\n"
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "a correr os programas de p�s-instala��o (se existirem)\n"
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "a execu��o do 'scriptlet' %s do %s-%s-%s falhou com c�digo de erro %d\n"
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "a execu��o do 'scriptlet' %s do %s-%s-%s falhou com c�digo de erro %d\n"
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "pacote: teste dos ficheiros do %s-%s-%s = %d\n"
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "o utilizador %s n�o existe - a usar o root\n"
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "o grupo %s n�o existe - a usar o root\n"
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "a abertura do pacote falhou%s%s: %s\n"
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr " no ficheiro "
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "falhei ao aceder ao %s: %s\n"
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "O %s falhou\n"
@@ -2385,8 +2400,8 @@ msgstr "o pacote nem tem um dono do ficheiro ou as listas de IDs\n"
 msgid "can't query %s: %s\n"
 msgstr "n�o consigo pesquisar o %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "o acesso ao %s falhou: %s\n"
@@ -2400,7 +2415,7 @@ msgstr "a pesquisa do %s falhou\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "os pacotes com c�digo-fonte no formato antigo n�o podem ser pesquisados\n"
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: O fread falhou: %s\n"
@@ -2459,7 +2474,7 @@ msgstr "n�mero de registo do pacote: %u\n"
 msgid "record %u could not be read\n"
 msgstr "o registo %d n�o p�de ser lido\n"
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "o pacote %s n�o est� instalado\n"
@@ -2535,58 +2550,53 @@ msgstr "A preparar..."
 msgid "Preparing packages for installation..."
 msgstr "A preparar os pacotes para a instala��o..."
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "n�o consigo abrir a base de dados Packages em %s\n"
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "A obter o %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... como %s\n"
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "a ignorar o %s - a transfer�ncia falhou - %s\n"
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "o pacote %s n�o pode ser mudado de s�tio\n"
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "erro ao ler do ficheiros %s\n"
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "o %s precisa duma vers�o mais recente do RPM\n"
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "o %s n�o pode ser instalado\n"
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "encontrados %d pacotes com c�digo-fonte e %d bin�rios\n"
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr "depend�ncias falhadas:\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr "a instalar os pacotes bin�rios\n"
 
@@ -2595,26 +2605,21 @@ msgstr "a instalar os pacotes bin�rios\n"
 msgid "cannot open file %s: %s\n"
 msgstr "n�o consigo aceder ao ficheiro %s: %s\n"
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "n�o consigo abrir %s/packages.rpm\n"
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "o \"%s\" especifica v�rios pacotes\n"
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr "a remo��o destes pacotes ir� quebrar depend�ncias:\n"
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "n�o consigo aceder ao %s: %s\n"
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr "A instalar o %s\n"
@@ -2870,7 +2875,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "%s ignorado devido � op��o missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "a excluir a directoria %s\n"
@@ -3077,125 +3082,125 @@ msgstr "erro(%d) ao guardar o registo %s em %s\n"
 msgid "error(%d) removing record %s from %s\n"
 msgstr "erro(%d) ao remover o registo %s do %s\n"
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr "n�o foi definido o dbpath\n"
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr "est� presente uma base de dados antiga; use o --rebuildb para gerar uma base de dados no novo formato\n"
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr "erro(%d) ao contar os pacotes\n"
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, fuzzy, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "o n�mero do registo %d na base de dados est� errado -- a ignorar.\n"
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: n�o consigo ler o cabe�alho em 0x%x\n"
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "a remover o \"%s\" do �ndice %s.\n"
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "a remover %d registos do �ndice %s.\n"
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "erro(%d) ao criar uma nova inst�ncia do pacote\n"
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "a adicionar o \"%s\" ao �ndice %s.\n"
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "a adicionar %d registos ao �ndice %s.\n"
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "a remover o %s depois duma reconstru��o bem sucedida do db3.\n"
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr "n�o foi definido o dbpath"
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "a reconstruir a base de dados %s em %s\n"
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "A base de dados tempor�ria %s j� existe\n"
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr "a criar a directoria %s\n"
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "a criar a directoria %s: %s\n"
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "a abrir a base de dados antiga com a dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "a abrir a base de dados nova com a dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "n�o consigo adicionar o registo originalmente em %d\n"
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "falhou a reconstru��o da base de dados: a base de dados original mant�m-se\n"
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr "falhou a substitui��o da base de dados antiga pela nova!\n"
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "substituir os ficheiros em %s por ficheiros de %s a recuperar"
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr "a remover a directoria %s\n"
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "falhou a remo��o da directoria %s: %s\n"
@@ -3407,6 +3412,12 @@ msgstr "o porto do URL tem de ser um n�mero\n"
 msgid "failed to create %s: %s\n"
 msgstr "n�o consegui criar o %s: %s\n"
 
+#~ msgid "cannot open rpm database in %s\n"
+#~ msgstr "n�o consigo a base de dados do RPM em %s\n"
+
+#~ msgid "cannot open %s/packages.rpm\n"
+#~ msgstr "n�o consigo abrir %s/packages.rpm\n"
+
 #~ msgid "add a signature to a package"
 #~ msgstr "adicionar uma assinatura a um pacote"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 16d723121..db4638c92 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,81 +4,75 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-0400\n"
 
-# , c-format
-#: build.c:37
-#, fuzzy, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr "No consegui abrir: %s\n"
-
-#: build.c:48
+#: build.c:36
 #, fuzzy
 msgid "failed build dependencies:\n"
 msgstr "lista dependncias do pacote"
 
 # , c-format
-#: build.c:81
+#: build.c:65
 #, fuzzy, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
 #. Give up
-#: build.c:178
+#: build.c:162
 #, 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:206
+#: build.c:190
 #, 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:245
+#: build.c:229
 #, fuzzy, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build.c:250
+#: build.c:234
 #, fuzzy, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "no foi passado pacote para instalao"
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "instale pacote"
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr ""
 
 # , c-format
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -443,45 +437,45 @@ msgstr "--sign somente pode ser usado durante a construo de pacotes"
 msgid "exec failed\n"
 msgstr "Construo falhou.\n"
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr "no foram passados pacotes para reconstruo"
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr "no foi passado arquivo spec para construo"
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr "no foram passados arquivos tar para construo"
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr "no foi passado pacote para desinstalao"
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr "no foi passado pacote para instalao"
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr "no foi passado argumento para pesquisa"
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr "no foi passado argumento para verificao"
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr "argumentos no esperados em --querytags"
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 #, fuzzy
 msgid "no arguments given"
 msgstr "no foi passado argumento para pesquisa"
 
 # , c-format
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "No consegui abrir: %s\n"
@@ -709,7 +703,7 @@ msgid "Could not open %%files file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
@@ -790,180 +784,180 @@ msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:81
+#: build/pack.c:79
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:84
+#: build/pack.c:82
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:106
+#: build/pack.c:104
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:113
+#: build/pack.c:111
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:216
+#: build/pack.c:214
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:223
+#: build/pack.c:221
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:230
+#: build/pack.c:228
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:237
+#: build/pack.c:235
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:245
+#: build/pack.c:243
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:260
+#: build/pack.c:258
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:288
+#: build/pack.c:286
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:298
+#: build/pack.c:296
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
 # , c-format
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:475
+#: build/pack.c:467
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:493
+#: build/pack.c:485
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:536
+#: build/pack.c:528
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "gere assinatura PGP"
 
 # , c-format
-#: build/pack.c:567
+#: build/pack.c:559
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:575
+#: build/pack.c:567
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:626
+#: build/pack.c:618
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:636
+#: build/pack.c:628
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:650
+#: build/pack.c:642
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:660
+#: build/pack.c:652
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:666
+#: build/pack.c:658
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:775
+#: build/pack.c:767
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -1584,72 +1578,93 @@ msgid " failed - "
 msgstr "Construo falhou.\n"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+# , c-format
+#: lib/depends.c:815
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "No consegui abrir: %s\n"
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, fuzzy, c-format
+msgid "package %s already added, ignoring\n"
+msgstr "no foi passado pacote para instalao"
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1657,42 +1672,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "no foi passado pacote para instalao"
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "no foi passado pacote para desinstalao"
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2502,66 +2517,66 @@ msgstr "No consegui abrir: %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "no execute nenhum estgio"
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "Construo falhou.\n"
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
 # , c-format
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "Construo falhou.\n"
@@ -2612,8 +2627,8 @@ msgstr "no foi passado pacote para instalao"
 msgid "can't query %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "Construo falhou.\n"
@@ -2628,7 +2643,7 @@ msgid "old format source packages cannot be queried\n"
 msgstr ""
 
 # , c-format
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -2688,7 +2703,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "no foi passado pacote para instalao"
@@ -2769,12 +2784,6 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr "no foi passado pacote para instalao"
 
-# , c-format
-#: lib/rpminstall.c:228
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "No consegui abrir: %s\n"
-
 # "Project-Id-Version: rpm-2.5.3\n"
 # "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
 # "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
@@ -2783,54 +2792,54 @@ msgstr "No consegui abrir: %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, 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:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 #, fuzzy
 msgid "failed dependencies:\n"
 msgstr "lista dependncias do pacote"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "instale pacote"
@@ -2841,28 +2850,23 @@ msgstr "instale pacote"
 msgid "cannot open file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr ""
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 #, fuzzy
 msgid "removing these packages would break dependencies:\n"
 msgstr "lista dependncias do pacote"
 
 # , c-format
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -3145,7 +3149,7 @@ msgstr ""
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "RPM verso %s\n"
@@ -3354,119 +3358,119 @@ msgstr "No consegui abrir: %s\n"
 msgid "error(%d) removing record %s from %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, fuzzy, c-format
 msgid "error(%d) counting packages\n"
 msgstr "no foi passado pacote para instalao"
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "no foi passado pacote para desinstalao"
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
 # , c-format
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "no foi passado pacote para instalao"
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
 # , c-format
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
 # , c-format
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
@@ -3479,13 +3483,13 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "RPM verso %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -3700,6 +3704,11 @@ msgstr ""
 msgid "failed to create %s: %s\n"
 msgstr "No consegui abrir o pipe tar: %s\n"
 
+# , c-format
+#, fuzzy
+#~ msgid "cannot open rpm database in %s\n"
+#~ msgstr "No consegui abrir: %s\n"
+
 #~ msgid "add a signature to a package"
 #~ msgstr "adicione uma assinatura a um pacote"
 
diff --git a/po/ro.po b/po/ro.po
index e3407a52c..0eb09c144 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: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +9,66 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr ""
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr ""
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr ""
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr ""
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr ""
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr ""
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -392,43 +387,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -636,7 +631,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -711,152 +706,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:475
+#: build/pack.c:467
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:493
+#: build/pack.c:485
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:528
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:567
+#: build/pack.c:559
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1411,72 +1406,92 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, c-format
+msgid "package %s already added, ignoring\n"
+msgstr ""
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1484,42 +1499,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2236,64 +2251,64 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2341,8 +2356,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2356,7 +2371,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2415,7 +2430,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2491,58 +2506,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr ""
 
@@ -2551,26 +2561,21 @@ msgstr ""
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr ""
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2823,7 +2828,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3024,125 +3029,125 @@ msgstr ""
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index d56aaa22e..5ebf63dab 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +14,66 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr ""
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr ""
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr ""
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr ""
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr ""
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr ""
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +392,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +636,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +711,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:475
+#: build/pack.c:467
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:493
+#: build/pack.c:485
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:528
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:567
+#: build/pack.c:559
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1416,72 +1411,92 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, c-format
+msgid "package %s already added, ignoring\n"
+msgstr ""
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1504,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2241,64 +2256,64 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2346,8 +2361,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2361,7 +2376,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2420,7 +2435,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2496,58 +2511,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr ""
 
@@ -2556,26 +2566,21 @@ msgstr ""
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr ""
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3029,125 +3034,125 @@ msgstr ""
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 609ce70ff..e698870a9 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: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +11,66 @@ msgstr ""
 "Date: 1999-04-03 12:20+0200\n"
 "X-Generator: KBabel 0.8\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr "���������� ������� ���� ������ RPM � %s\n"
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr "����������������� ����������� ������:\n"
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "������ �������� ����� ������������ %s: %s\n"
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "������ �������� ������ tar: %m\n"
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "������ ������ ����� ������������ �� %s\n"
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "���������� ������������� %s � %s: %m\n"
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "���������� �������� ���������� � %s: %m\n"
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "�� ������� ����: %s.\n"
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "���� %s �� ����� �� ���� ������������.\n"
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "��������� ��� ������: %s\n"
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr "������ ��� ��������� %s\n"
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr "�������� �������� �� �������� ������� RPM\n"
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr "������ ������ ��������� �� ������\n"
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "���������� �������� ������� payload: %s\n"
@@ -411,44 +406,44 @@ msgstr "--sign ����� ���� ����������� ������ ��� ������ �������"
 msgid "exec failed\n"
 msgstr "������ �� ������\n"
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr "�� ������ ������ ��� ����������"
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr "�� ����� ���� ������������ ��� ������ ������"
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr "�� ������ tar-����� ��� ������ ������"
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr "�� ������ ������ ��� ��������"
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr "�� ������ ������ ��� ���������"
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr "�� ������ ��������� �������"
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr "�� ������ ��������� ��� �����������"
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr "����������� ��������� ��� --querytags "
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 #, fuzzy
 msgid "no arguments given"
 msgstr "�� ������ ��������� �������"
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr "���������� ������� ��������� ����.\n"
 
@@ -659,7 +654,7 @@ msgstr "���� �� ������: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "���������� ������� ���� %%files %s: %s\n"
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr "������: %s\n"
@@ -734,152 +729,152 @@ msgstr "getGidS: ������� ����� ��������������� �����.\n"
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "���������� �������������� ��� ����������: %s\n"
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "������ �������� ������ �� ����� %s: %s\n"
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "������ �������� ������: %s\n"
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy: ������ ������: %s\n"
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy: ������ ������: %s\n"
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "���������� ������� ���� PreIn: %s\n"
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "���������� ������� ���� PreUn: %s\n"
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "���������� ������� ���� PostIn: %s\n"
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "���������� ������� ���� PostUn: %s\n"
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "���������� ������� ���� VerifyScript: %s\n"
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "���������� ������� ���� Trigger script: %s\n"
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: �������� %s: %s\n"
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: ������ %s: %s\n"
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: ������ Fseek: %s\n"
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s  �� �������� ������� RPM\n"
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: �������� ��������� �� %s\n"
 
-#: build/pack.c:475
+#: build/pack.c:467
 msgid "Unable to create immutable header region.\n"
 msgstr "���������� ��������� ��������� � ����������� ������� ������.\n"
 
-#: build/pack.c:493
+#: build/pack.c:485
 msgid "Unable to write temp header\n"
 msgstr "���������� �������� ��������� ���������\n"
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr "�������� ������ CSA\n"
 
-#: build/pack.c:536
+#: build/pack.c:528
 msgid "Unable to write final header\n"
 msgstr "���������� �������� ������������� ���������\n"
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "������������ �������: %d\n"
 
-#: build/pack.c:567
+#: build/pack.c:559
 msgid "Unable to reload signature header.\n"
 msgstr "���������� ������������� ��������� �������.\n"
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "���������� ������� %s: %s\n"
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "���������� �������� �����: %s\n"
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "���������� ������� ���� ������� %s: %s\n"
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "���������� ��������� ��������� �� %s: %s\n"
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "���������� �������� ��������� � %s: %s\n"
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "���������� ��������� ���������� �� %s: %s\n"
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "���������� �������� ���������� � %s: %s\n"
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "�������: %s\n"
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "���������� ������� ��� ����� ��� ������ %s: %s\n"
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "���������� ������� %s: %s\n"
@@ -1447,7 +1442,7 @@ msgid " failed - "
 msgstr "�� ������� - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1456,65 +1451,85 @@ msgstr ""
 "��� ����������� \"B\" ����� ������� \"epoch\" (��� �� ��� ��� \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr "��"
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr "��T"
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "�� ���� ������� ���� ������ Packages � %s\n"
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, fuzzy, c-format
+msgid "package %s already added, ignoring\n"
+msgstr "����� %s ��� ����������"
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s YES (added files)\n"
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s YES (added provide)\n"
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (cached)\n"
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s YES (rpmrc provides)\n"
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s YES (rpmlib provides)\n"
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s YES (db files)\n"
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s YES (db provides)\n"
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s YES (db package)\n"
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NO\n"
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) ��������� � ��� ������������\n"
@@ -1522,44 +1537,44 @@ msgstr "%s: (%s, %s) ��������� � ��� ������������\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "���������� ������ %s-%s-%s �� �������������: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "����� %s ����������� �: %s\n"
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "��������� %s-%s-%s \"%s\" �� ������������� ������������.\n"
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr "========== ������ ������������� ������������\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== ���������� ������� (�����������, #predecessors, #succesors, "
 "�������)\n"
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr "========== ������ ������������� (� ������� �������������)\n"
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr "����:\n"
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr "========== ����������� ������������ ...\n"
 
@@ -2296,64 +2311,64 @@ msgstr "���������� ������� %%%s %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "���������� ������ � %%%s %s\n"
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr "��������� �������� ����� ������ ���������� ���������\n"
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr "�������� ����� �� �������� ����� ������������\n"
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: ����������� �������� %s (���� ����)\n"
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, 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:1611
+#: lib/psm.c:1610
 #, 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:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s �������� %d ������, test = %d\n"
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr "%s: ������ �������� %s (%d), %s-%s-%s ������������\n"
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "������������ %s �� ���������� - ������������ root\n"
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "������ %s �� ���������� - ������������ root\n"
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "���������� ������ �� �������%s%s: %s\n"
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr " �� ����� "
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s ������ �� ����� %s: %s\n"
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s �� �������: %s\n"
@@ -2401,8 +2416,8 @@ msgstr "����� �� �������� ������� �� ������ ������, �� �� ID\n"
 msgid "can't query %s: %s\n"
 msgstr "���������� ��������� %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "���������� ������� %s: %s\n"
@@ -2416,7 +2431,7 @@ msgstr "������ ������� %s\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "������� � �������� ������� � ������ ������� �� ��������������\n"
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: ������ ������ ������ ������: %s\n"
@@ -2475,7 +2490,7 @@ msgstr "����� ������ ������: %u\n"
 msgid "record %u could not be read\n"
 msgstr "���������� ��������� ������ %u\n"
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "����� %s �� ����������\n"
@@ -2551,58 +2566,53 @@ msgstr "����������..."
 msgid "Preparing packages for installation..."
 msgstr "���������� ������� ��� ���������..."
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "�� ���� ������� ���� ������ Packages � %s\n"
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "����������� %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... ��� %s\n"
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s ������������ - ������ �������� - %s\n"
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "����� %s - �� ������������\n"
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "������ ������ �� ����� %s\n"
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "��� ����� %s ���������� ����� ����� ������ RPM\n"
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s �� ����� ���� ����������\n"
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "������� %d �������� � %d �������� �������\n"
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr "����������������� �����������:\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr "������������ �������� ������\n"
 
@@ -2611,26 +2621,21 @@ msgstr "������������ �������� ������\n"
 msgid "cannot open file %s: %s\n"
 msgstr "���������� ������� ���� %s: %s\n"
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "������ �������� %s/packages.rpm\n"
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ������ ��������� �������\n"
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr "�������� ���� ������� ������� �����������:\n"
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "���������� ������� %s: %s\n"
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr "��������������� %s\n"
@@ -2887,7 +2892,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "%s �������� ��-�� ����� missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "����������� ������� %s\n"
@@ -3100,11 +3105,11 @@ msgstr "������(%d) ������ ������ %s � %s\n"
 msgid "error(%d) removing record %s from %s\n"
 msgstr "������(%d) �������� ������ %s �� %s\n"
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr "��������� dbpath �� ����������\n"
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
@@ -3113,115 +3118,115 @@ msgstr ""
 "���� ������ ������ �������\n"
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr "������(%d) ��� ����ޣ�� �������\n"
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "������ ����� %u � ���� ������ �������, ������������.\n"
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr "rpmdb: ������� ������������ ��������� #%u, ������������.\n"
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: ���������� �������� ��������� � 0x%x\n"
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "��������� \"%s\" �� ������� %s.\n"
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "��������� %d ������� �� ������� %s.\n"
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "������(%d) �������������� ������ ��� ������ ������ ������\n"
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "����������� \"%s\" � ������ %s.\n"
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "����������� %d ������� � ������ %s\n"
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "��������� %s ����� ��������� ���������� ������������� ���� � db3.\n"
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr "��������� dbpath �� ����������"
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "��������������� ���� ������ %s � %s\n"
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "��������� ���� ������ %s ��� ����������\n"
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr "��������� ������� %s\n"
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "��������� ������� %s: %s\n"
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "����������� ������ ���� ������ ����� dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "����������� ����� ���� ������ ����� dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "���������� �������� ������ (������������� � %u)\n"
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "������������ ���� ������ �� �������, ������ ���� ������ �������� �� �����\n"
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr "���������� �������� ������ ���� ������ �� �����!\n"
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "����� � %s ���������� ������� �� %s ��� ��������������"
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr "��������� ������� %s\n"
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "������ �������� �������� %s: %s\n"
@@ -3433,6 +3438,12 @@ msgstr "url ���� ������ ���� ������\n"
 msgid "failed to create %s: %s\n"
 msgstr "���������� ������� %s: %s\n"
 
+#~ msgid "cannot open rpm database in %s\n"
+#~ msgstr "���������� ������� ���� ������ RPM � %s\n"
+
+#~ msgid "cannot open %s/packages.rpm\n"
+#~ msgstr "������ �������� %s/packages.rpm\n"
+
 #~ msgid "add a signature to a package"
 #~ msgstr "�������� ������� � ������"
 
diff --git a/po/sk.po b/po/sk.po
index d2bde8741..f45fa1fbc 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: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,72 +9,67 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:37
-#, fuzzy, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr "nie je mo�n� otvori� %s/packages.rpm\n"
-
-#: build.c:48
+#: build.c:36
 #, fuzzy
 msgid "failed build dependencies:\n"
 msgstr "nevyrie�en� z�vislosti:\n"
 
-#: build.c:81
+#: build.c:65
 #, 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:159 build.c:171
+#: build.c:143 build.c:155
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Otvorenie r�ry pre tar zlyhalo: %s\n"
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, 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:206
+#: build.c:190
 #, 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:245
+#: build.c:229
 #, fuzzy, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "nepodarilo sa zisti� stav %s: %s"
 
-#: build.c:250
+#: build.c:234
 #, 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:259
+#: build.c:243
 #, 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:314
+#: build.c:301
 #, fuzzy, c-format
 msgid "Building target platforms: %s\n"
 msgstr "predefinova� cie�ov� platformu"
 
-#: build.c:329
+#: build.c:316
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "vyh�ad�va sa bal�k %s\n"
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr "argument nie je RPM bal�k\n"
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr "chyba pri ��tan� hlavi�ky bal�ka\n"
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "nie je mo�n� otvori� s�bor %s\n"
@@ -412,44 +407,44 @@ msgstr "--sign m��e by� pou��t� iba po�as zostavenia bal�ka"
 msgid "exec failed\n"
 msgstr "vykonanie zlyhalo\n"
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr "neboli zadan� �iadne bal�ky pre znovuzostavenie"
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr "neboli zadan� �iadne spec-s�bory pre zostavenie"
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr "neboli zadan� �iadne tar-s�bory pre zostavenie"
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr "neboli zadan� �iadne bal�ky pre odin�talovanie"
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr "neboli zadan� �iadne bal�ky pre in�tal�ciu"
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr "neboli zadan� �iadne argumenty pre ot�zku"
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr "neboli zadan� �iadne argumenty pre overenie"
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr "neo�ak�van� argumenty pre --querytags"
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 #, fuzzy
 msgid "no arguments given"
 msgstr "neboli zadan� �iadne argumenty pre ot�zku"
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Nie je mo�n� otvori� do�asn� s�bor"
@@ -670,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:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "riadok: %s"
@@ -745,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:81
+#: build/pack.c:79
 #, 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:84
+#: build/pack.c:82
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "vytvorenie arch�vu zlyhalo pri s�bore %s: %s"
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy z�pis zlyhal: %s"
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy ��tanie zlyhalo: %s"
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Nie je mo�n� otvori� PreIn s�bor: %s"
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Nie je mo�n� otvori� PreUn s�bor: %s"
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Nie je mo�n� otvori� PostIn s�bor: %s"
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Nie je mo�n� otvori� PostUn s�bor: %s"
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Nie je mo�n� otvori� VerifyScript s�bor: %s"
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, 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:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: otvorenie %s: %s\n"
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: ��tanie %s: %s\n"
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s nie je RPM bal�k\n"
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: ��tanie hlavi�ky %s\n"
 
-#: build/pack.c:475
+#: build/pack.c:467
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Nie je mo�n� pre��ta� ikonu: %s"
 
-#: build/pack.c:493
+#: build/pack.c:485
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Nie je mo�n� zap�sa� %s"
 
-#: build/pack.c:501
+#: build/pack.c:493
 #, fuzzy
 msgid "Bad CSA data\n"
 msgstr "Chybn� CSA d�ta"
 
-#: build/pack.c:536
+#: build/pack.c:528
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Nie je mo�n� zap�sa� %s"
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Vytv�ra sa PGP podpis: %d\n"
 
-#: build/pack.c:567
+#: build/pack.c:559
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Nie je mo�n� pre��ta� ikonu: %s"
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Otvorenie %s zlyhalo\n"
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nie je mo�n� zap�sa� bal�k: %s"
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Nie je pre��ta� sigtarget: %s"
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Nie je mo�n� pre��ta� ikonu: %s"
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, 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:660
+#: build/pack.c:652
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Nie je mo�n� pre��ta� ikonu: %s"
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, 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:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zap�san�: %s\n"
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, 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:775
+#: build/pack.c:767
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nie je mo�n� zap�sa� do %s: "
@@ -1470,73 +1465,93 @@ msgid " failed - "
 msgstr " zlyhalo - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 #, fuzzy
 msgid "NO "
 msgstr "NIE JE V PORIADKU"
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "nie je mo�n� otvori� %s/packages.rpm\n"
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, fuzzy, c-format
+msgid "package %s already added, ignoring\n"
+msgstr "bal�k %s nie je nain�talovan�\n"
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "s�bor %s nie je vlastnen� �iadnym bal�kom\n"
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "s�bor %s nie je vlastnen� �iadnym bal�kom\n"
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "s�bor %s nie je vlastnen� �iadnym bal�kom\n"
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "s�bor %s nie je vlastnen� �iadnym bal�kom\n"
@@ -1544,42 +1559,42 @@ msgstr "s�bor %s nie je vlastnen� �iadnym bal�kom\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "po�iadavka bal�ka %s nie je uspokojen�: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "bal�k %s koliduje: %s\n"
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "odstra�uje sa index skup�n\n"
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2347,66 +2362,66 @@ msgstr "nie je mo�n� zap�sa� do %s: "
 msgid "cannot write to %%%s %s\n"
 msgstr "nie je mo�n� zap�sa� do %s: "
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "o�ak�van� zdrojov� bal�k, n�jden� bin�rny"
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "zdrojov� bal�k neobsahuje �iadny .spec s�bor"
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "vykon�vaj� sa poin�tala�n� skripty (ak existuj�)\n"
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "bal�k: %s-%s-%s test s�borov = %d\n"
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "pou��vate� %s neexistuje - pou�ije sa root"
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s neexistuje - pou�ije sa root"
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalenie arch�vu zlyhalo%s%s: %s"
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr " pre s�bor "
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nepodarilo sa otvori� %s: %s"
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s zlyhalo"
@@ -2455,8 +2470,8 @@ msgstr "bal�k neobsahuje ani vlastn�ka s�boru, ani zoznamy identifik�ci�"
 msgid "can't query %s: %s\n"
 msgstr "zmazanie %s zlyhalo: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otvorenie %s zlyhalo\n"
@@ -2470,7 +2485,7 @@ msgstr "ot�zka na %s zlyhala\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "nie je mo�n� p�ta� sa zdrojov�ch bal�kov v starom form�te\n"
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
@@ -2530,7 +2545,7 @@ msgstr "po�aduje sa z�znam ��slo %d\n"
 msgid "record %u could not be read\n"
 msgstr "z�znam %d nie je mo�n� pre��ta�\n"
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "bal�k %s nie je nain�talovan�\n"
@@ -2608,58 +2623,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr "neboli zadan� �iadne bal�ky pre in�tal�ciu"
 
-#: lib/rpminstall.c:228
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "nie je mo�n� otvori� %s/packages.rpm\n"
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, 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:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr "... ako %s\n"
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s vynechan� - prenos zlyhal - %s\n"
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "bal�k %s nie je nain�talovan�\n"
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "chyba pri vytv�ran� do�asn�ho s�boru %s"
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nie je mo�n� nain�talova�\n"
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, 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:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr "nevyrie�en� z�vislosti:\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr "in�taluj� sa bin�rne bal�ky\n"
 
@@ -2668,26 +2678,21 @@ msgstr "in�taluj� sa bin�rne bal�ky\n"
 msgid "cannot open file %s: %s\n"
 msgstr "nie je mo�n� otvori� s�bor %s: %s"
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "nie je mo�n� otvori� %s/packages.rpm\n"
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" �pecifikuje viac bal�kov\n"
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr "odstr�nenie t�chto bal�kov by poru�ilo z�vislosti:\n"
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nie je mo�n� otvori� %s\n"
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr "In�taluje sa %s\n"
@@ -2953,7 +2958,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "%s vynechan� kv�li pr�znaku missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "vytv�ra sa adres�r %s\n"
@@ -3162,12 +3167,12 @@ msgstr "chyba pri z�pise z�znamu %s do %s"
 msgid "error(%d) removing record %s from %s\n"
 msgstr "chyba pri odstra�ovan� z�znamu %s z %s"
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "nebola nastaven� �iadna dbpath"
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 #, fuzzy
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
@@ -3177,115 +3182,115 @@ msgstr ""
 "datab�zy v novom form�te"
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, fuzzy, c-format
 msgid "error(%d) counting packages\n"
 msgstr "chyba pri h�adan� bal�ka %s\n"
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, fuzzy, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "z�znam ��slo %d v datab�ze je chybn� -- bol vynechan�"
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "nie je mo�n� pre��ta� hlavi�ku na %d pre vyh�adanie"
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstra�uje sa index skup�n\n"
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstra�uje sa index n�zvov\n"
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "chyba pri h�adan� bal�ka %s\n"
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "premenov�va sa %s na %s\n"
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "premenov�va sa %s na %s\n"
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr "nebola nastaven� �iadna dbpath"
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "znovu sa vytv�ra datab�za v adres�ri %s\n"
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "do�asn� datab�za %s u� existuje"
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "vytv�ra sa adres�r %s\n"
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "vytv�ra sa adres�r %s\n"
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otv�ra sa star� datab�za\n"
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otv�ra sa nov� datab�za\n"
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "nie je mo�n� prida� z�znam p�vodne na %d"
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "nepodarilo sa znovu vytvori� datab�zu; zost�va p�vodn�\n"
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr "nepodarilo sa nahradi� star� datab�zu novou!\n"
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "nahrad� s�bory v %s s�bormi z %s kv�li obnove"
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "vytv�ra sa adres�r %s\n"
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nepodarilo sa odstr�ni� adres�r %s: %s\n"
@@ -3501,6 +3506,13 @@ msgstr "url port mus� by� ��slo\n"
 msgid "failed to create %s: %s\n"
 msgstr "nepodarilo sa vytvori� %s\n"
 
+#, fuzzy
+#~ msgid "cannot open rpm database in %s\n"
+#~ msgstr "nie je mo�n� otvori� %s/packages.rpm\n"
+
+#~ msgid "cannot open %s/packages.rpm\n"
+#~ msgstr "nie je mo�n� otvori� %s/packages.rpm\n"
+
 #~ msgid "add a signature to a package"
 #~ msgstr "prida� podpis bal�ku"
 
diff --git a/po/sl.po b/po/sl.po
index 0d1936754..9bb345894 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.174 2001/10/26 04:16:46 jbj Exp $
+# $Id: sl.po,v 1.175 2001/10/27 20:09:35 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +14,66 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:37
-#, fuzzy, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr "datoteke %s/packages.rpm ni mogo�no odpreti\n"
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr "izdelava soodvisnosti je bila neuspe�na:\n"
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Datoteke s specifikacijami %s ni mo�no odpreti: %s\n"
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, 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:178
+#: build.c:162
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Neuspe�no branje datoteke s specifikacijami iz %s"
 
-#: build.c:206
+#: build.c:190
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Preimenovanje %s v %s je bilo neuspe�no: %m"
 
-#: build.c:245
+#: build.c:229
 #, fuzzy, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "status %s ni na voljo: %s"
 
-#: build.c:250
+#: build.c:234
 #, fuzzy, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "Datoteka ni obi�ajna datoteka: %s\n"
 
-#: build.c:259
+#: build.c:243
 #, 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:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Izgradnja za ciljna strojna okolja: %s\n"
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Izgradnja za ciljni sistem %s\n"
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr "navedeni argument ni paket RPM\n"
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr "napaka pri branju glave paketa\n"
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "ni mo�no vnovi� odpreti (payload): %s\n"
@@ -410,44 +405,44 @@ msgstr "--sign sme biti podan le ob izgradnji paketa"
 msgid "exec failed\n"
 msgstr "izvajanje je bilo neuspe�no\n"
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr "paketi za vnovi�no izgradnjo niso navedeni"
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr "datoteka spec za izgradnjo manjka"
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr "arhiv tar za izgradnjo manjka"
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr "paketi katere bi bilo potrebno odstraniti niso navedeni"
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr "argumenti za poizvedbo niso podani"
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr "argumenti za preverjanje niso podani"
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr "nepri�akovani argumenti za --querytags "
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 #, fuzzy
 msgid "no arguments given"
 msgstr "argumenti za poizvedbo niso podani"
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Za�asne datoteke ni mo�no odpreti"
@@ -668,7 +663,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:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "vrstica: %s"
@@ -743,157 +738,157 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Iskanje kanoni�nega imena gostitelja je bilo neuspe�no: %s\n"
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, 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:84
+#: build/pack.c:82
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "ustvarjanje arhiva je bilo za datoteko %s neuspe�no: %s"
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "pisanje cpio_copy neuspe�no: %s"
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "branje cpio_copy neuspe�no: %s"
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Datoteke PreIn ni mo�no odpreti: %s"
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Datoteke PreUn ni mo�no odpreti: %s"
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Datoteke PostIn ni mo�no odpreti: %s"
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Datoteke PostUn ni mo�no odpreti: %s"
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Datoteke VerifyScript ni mo�no odpreti: %s"
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Skriptne datoteke Trigger ni mo�no odpreti: %s"
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: odpiranje %s: %s\n"
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: branje %s: %s\n"
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe�no: %s\n"
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s ni paket tipa RPM\n"
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: branje glave %s\n"
 
-#: build/pack.c:475
+#: build/pack.c:467
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Ikone %s ni mo�no prebrati: %s"
 
-#: build/pack.c:493
+#: build/pack.c:485
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Ni mo�no zapisati paketa %s: %s"
 
-#: build/pack.c:501
+#: build/pack.c:493
 #, fuzzy
 msgid "Bad CSA data\n"
 msgstr "Po�kodovani podatki CSA"
 
-#: build/pack.c:536
+#: build/pack.c:528
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Ni mo�no zapisati paketa %s: %s"
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Izdelujemo podpis: %d\n"
 
-#: build/pack.c:567
+#: build/pack.c:559
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Ikone %s ni mo�no prebrati: %s"
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Ni mo�no odpreti %s: %s\n"
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Ni mo�no zapisati paketa: %s"
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Ciljnega podpisa %s ni mo�no odpreti: %s"
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Ikone %s ni mo�no prebrati: %s"
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Ni mo�no zapisati paketa %s: %s"
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Ikone %s ni mo�no prebrati: %s"
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ni mo�no zapisati paketa %s: %s"
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, 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:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "ni mo�no ustvariti %s: %s\n"
@@ -1471,7 +1466,7 @@ msgid " failed - "
 msgstr " neuspe�no - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1480,66 +1475,86 @@ msgstr ""
 "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 #, fuzzy
 msgid "NO "
 msgstr "NI DOBRO"
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "zbirko podatkov paketov ni mo�no odpreti v %s\n"
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, fuzzy, c-format
+msgid "package %s already added, ignoring\n"
+msgstr "paket %s-%s-%s je �e name��en"
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s DA (dodane datoteke)\n"
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s DA (dodane ponudbe)\n"
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-3s (predpomnjeno)\n"
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s DA (rpmrc ponudbe)\n"
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s DA (rpmlib ponudbe)\n"
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s DA (db datoteke)\n"
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s DA (db ponudbe)\n"
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %s zadovoljen ob paketih db.\n"
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NE\n"
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n"
@@ -1547,42 +1562,42 @@ msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s jw v sporu z: %s\n"
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "odstranjujemo seznam skupin\n"
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2348,66 +2363,66 @@ msgstr "ni mo�no ustvariti %s: %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "pisanje na %s ni mo�no"
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "pri�akovan je bil izvorni paket, najden binarni"
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "izvorni paket ne vsebuje datoteke .spec"
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "poganjanje ponamestitvenih skript (�e obstajajo)\n"
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, 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:1611
+#: lib/psm.c:1610
 #, 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:1958
+#: lib/psm.c:1957
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "paket: %s-%s-%s datoteke test = %d\n"
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "uporabnik %s ne obstaja - uporabljam root"
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s ne obstaja - uporabljam root"
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, 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:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr " za datoteko "
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspe�no odpiranje %s: %s\n"
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s neuspe�en"
@@ -2456,8 +2471,8 @@ msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id"
 msgid "can't query %s: %s\n"
 msgstr "ni mo�no poizvedeti o %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "odpiranje %s je bilo neuspe�no: %s\n"
@@ -2471,7 +2486,7 @@ msgstr "poizvedba po %s je bila neuspe�na\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "poizvedba po izvornih paketih v stari obliki ni mo�na\n"
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe�no: %s\n"
@@ -2531,7 +2546,7 @@ msgstr "�tevilka zapisa paketa: %d\n"
 msgid "record %u could not be read\n"
 msgstr "zapisa %d ni mo�no prebrati\n"
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s ni name��en\n"
@@ -2608,58 +2623,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr "paketi za namestitev niso navedeni"
 
-#: lib/rpminstall.c:228
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "zbirko podatkov paketov ni mo�no odpreti v %s\n"
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, 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:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... kot %s\n"
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "presko�eno - %s - prenos neuspe�en - %s\n"
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paketa %s ni mo�no premakniti\n"
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "napaka pri branju iz datoteke %s\n"
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, 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:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ni mo�no namestiti\n"
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "najdeno %d izvornih in %d binarnih paketov\n"
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr "neuspe�ne soodvisnosti:\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr "name��anje binarnih paketov\n"
 
@@ -2668,26 +2678,21 @@ msgstr "name��anje binarnih paketov\n"
 msgid "cannot open file %s: %s\n"
 msgstr "ni mo�no odpreti datoteke %s: %s\n"
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "datoteke %s/packages.rpm ni mo�no odpreti\n"
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" dolo�a ve� paketov\n"
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n"
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "ni mo�no odpreti %s: %s\n"
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr "Name��anje %s\n"
@@ -2951,7 +2956,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "%s presko�en zaradi manjkajo�e zastavice OK\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "izklju�evanje imenika %s\n"
@@ -3164,12 +3169,12 @@ msgstr "napaka(%d) pri pisanju zapisa %s v %s"
 msgid "error(%d) removing record %s from %s\n"
 msgstr "napaka(%d) pri brisanju zapisa %s iz %s"
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "dbpath ni nastavljena"
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 #, fuzzy
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
@@ -3178,117 +3183,117 @@ msgstr ""
 "da bi staro obliko zbirke podatkov pretvorili v novo po�enite --rebuilddb"
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, fuzzy, c-format
 msgid "error(%d) counting packages\n"
 msgstr "napaka(%d) pri �tetju paketov"
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, fuzzy, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "zapis �t. %d v zbirki je po�kodovan -- presko�eno."
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: ni mo�no prebrati glave pri 0x%x"
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstranjevanje \"%s\" iz kazala %s.\n"
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstranjevanje %d vnosov iz kazala %s\n"
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "napaka(%d) pri iskanju paketa %s\n"
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "dodajanje \"%s\" v kazalo %s.\n"
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "dodajanje %d vnosov v kazalo %s.\n"
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr "dbpath ni nastavljena"
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n"
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "za�asna podatkovna zbirka %s �e obstaja"
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "ustvarjanje imenika: %s\n"
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "ustvarjanje imenika: %s\n"
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "odpiranje stare podatkovne zbirke\n"
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "zapisa ni mo�no dodati na %d"
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "ponovna izgradnja podatkovne zbirke je bila neuspe�na; stara ostaja na\n"
 "istem mestu\n"
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspe�na!\n"
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "poskus povrnitve z nadomestitvijo datotek v %s z datotekami v %s"
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "odstranjevanje imenika: %s\n"
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspe�na odstranitev imenika %s: %s\n"
@@ -3504,6 +3509,13 @@ msgstr "vrata URL morajo biti �tevilka\n"
 msgid "failed to create %s: %s\n"
 msgstr "neuspe�no ustvarjanje %s: %s\n"
 
+#, fuzzy
+#~ msgid "cannot open rpm database in %s\n"
+#~ msgstr "datoteke %s/packages.rpm ni mogo�no odpreti\n"
+
+#~ msgid "cannot open %s/packages.rpm\n"
+#~ msgstr "datoteke %s/packages.rpm ni mo�no odpreti\n"
+
 #~ msgid "add a signature to a package"
 #~ msgstr "paketu(-om) dodaj podpis"
 
diff --git a/po/sr.po b/po/sr.po
index f3b71230a..6e988eeb2 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,77 +1,72 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
-#: build.c:37
-#, fuzzy, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr "gre�ka: ne mogu da otvorim %s%s/packages.rpm\n"
-
-#: build.c:48
+#: build.c:36
 #, fuzzy
 msgid "failed build dependencies:\n"
 msgstr "lo�e me�uzavisnosti:\n"
 
-#: build.c:81
+#: build.c:65
 #, fuzzy, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Ne mogu da otvorim %s za �itanje: %s"
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "neuspelo otvaranje %s\n"
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Neuspelo �itanje %s: %s."
 
-#: build.c:206
+#: build.c:190
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Neuspelo �itanje %s: %s."
 
-#: build.c:245
+#: build.c:229
 #, fuzzy, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build.c:250
+#: build.c:234
 #, fuzzy, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "%s ne li�i na RPM paket\n"
 
-#: build.c:259
+#: build.c:243
 #, 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:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "gre�ka potrage za paketom %s\n"
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 #, fuzzy
 msgid "error reading header from package\n"
 msgstr "gre�ka potrage za paketom %s\n"
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
@@ -403,44 +398,44 @@ msgstr "--sign se mo�e koristiti samo kod kreiranja paketa"
 msgid "exec failed\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr "nedosataje paket za rekreiranje"
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr "nedostaje specifikacije za kreiranje"
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr "nedostaju 'tar' datoteke za kreiranje"
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr "neodstaje paket za deinstalaciju"
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr "nedostaje paket za instalaciju"
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr "nedostaju argumenti za upit"
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr "nedostaju argumenti za proveru"
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr "neo�ekivani argumenti za --querytags"
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 #, fuzzy
 msgid "no arguments given"
 msgstr "nedostaju argumenti za upit"
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Ne mogu da otvorim %s za �itanje: %s"
@@ -654,7 +649,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:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
@@ -729,156 +724,156 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "neuspelo �itanje: %s (%d)"
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "neuspelo �itanje: %s (%d)"
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "gre�ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "gre�ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "gre�ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "gre�ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "gre�ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, 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:288
+#: build/pack.c:286
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "Neuspelo �itanje %s: %s."
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, 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:350
+#: build/pack.c:342
 #, fuzzy, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "gre�ka kod uzimanja sloga %s iz %s"
 
-#: build/pack.c:475
+#: build/pack.c:467
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:493
+#: build/pack.c:485
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:528
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "napravi PGP potpis"
 
-#: build/pack.c:567
+#: build/pack.c:559
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
@@ -1455,72 +1450,92 @@ msgid " failed - "
 msgstr "PGP omanuo"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "gre�ka: ne mogu da otvorim %s%s/packages.rpm\n"
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, fuzzy, c-format
+msgid "package %s already added, ignoring\n"
+msgstr "paket %s nije instaliran\n"
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
@@ -1528,42 +1543,42 @@ msgstr "datoteka %s ne pripada nijednom paketu\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s nije naveden u %s"
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "gre�ka uklanjanja sloga %s u %s"
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2333,65 +2348,65 @@ msgstr "Ne mogu da otvorim datoteku %s: "
 msgid "cannot write to %%%s %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "nemoj izvr�iti nijednu fazu"
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, 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:1611
+#: lib/psm.c:1610
 #, 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:1958
+#: lib/psm.c:1957
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "paket %s-%s-%s sadr�i deljene datoteke\n"
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupa %s ne sadr�i nijedan paket\n"
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "PGP omanuo"
@@ -2441,8 +2456,8 @@ msgstr "paket nema imena"
 msgid "can't query %s: %s\n"
 msgstr "gre�ka: ne mogu da otvorim %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
@@ -2456,7 +2471,7 @@ msgstr "upit nad %s neuspeo\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "Upit se ne mo�e izvesti nad izvorni paketima u starom formatu\n"
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
@@ -2516,7 +2531,7 @@ msgstr "pogre�an broj paketa: %s\n"
 msgid "record %u could not be read\n"
 msgstr "ne mogu da pro�itam slog %d\n"
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s nije instaliran\n"
@@ -2595,58 +2610,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr "nedostaje paket za instalaciju"
 
-#: lib/rpminstall.c:228
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "gre�ka: ne mogu da otvorim %s%s/packages.rpm\n"
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Pribavljam %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "gre�ka: preska�em %s - neuspelo preno�enje - %s\n"
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "gre�ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "gre�ka: %s se ne mo�e instalirati\n"
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "grupa %s ne sadr�i nijedan paket\n"
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr "lo�e me�uzavisnosti:\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "instaliraj paket"
@@ -2656,26 +2666,21 @@ msgstr "instaliraj paket"
 msgid "cannot open file %s: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/rpminstall.c:611
-#, fuzzy, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "gre�ka: ne mogu da otvorim %s%s/packages.rpm\n"
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" odre�uje vi�e paketa\n"
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr "uklanjanje oviha paketa �e naru�iti zavisnosti:\n"
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "gre�ka: ne mogu da otvorim %s\n"
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instaliram %s\n"
@@ -2942,7 +2947,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "gre�ka kod kreiranja direktorijuma %s: %s"
@@ -3145,126 +3150,126 @@ msgstr "gre�ka zapisivanja sloga %s u %s"
 msgid "error(%d) removing record %s from %s\n"
 msgstr "gre�ka uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "dbpath nije odre�en"
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, fuzzy, c-format
 msgid "error(%d) counting packages\n"
 msgstr "gre�ka kod potrage za paketom %s\n"
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, fuzzy, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "slog broj %d u bazi podataka je neispravan -- preska�em ga"
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "ne mogu da pro�itam zaglavlje na %d za proveru"
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "gre�ka uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "gre�ka uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "gre�ka kod potrage za paketom %s\n"
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "gre�ka uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr "dbpath nije odre�en"
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rekreiraj bazu podataka iz postoje�e baze"
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "privremena baza podataka %s ve� postoji"
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "gre�ka kod kreiranja direktorijuma %s: %s"
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "gre�ka kod kreiranja direktorijuma %s: %s"
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "rekreiraj bazu podataka iz postoje�e baze"
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "rekreiraj bazu podataka iz postoje�e baze"
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "ne mogu da dodam slog originalno na %d"
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "gre�ka kod kreiranja direktorijuma %s: %s"
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
@@ -3487,6 +3492,14 @@ msgstr "gre�ka: FTP port mora biti broj\n"
 msgid "failed to create %s: %s\n"
 msgstr "neuspelo kreiranje %s\n"
 
+#, fuzzy
+#~ msgid "cannot open rpm database in %s\n"
+#~ msgstr "gre�ka: ne mogu da otvorim %s%s/packages.rpm\n"
+
+#, fuzzy
+#~ msgid "cannot open %s/packages.rpm\n"
+#~ msgstr "gre�ka: ne mogu da otvorim %s%s/packages.rpm\n"
+
 #~ msgid "add a signature to a package"
 #~ msgstr "dodaj potpis u paket"
 
diff --git a/po/sv.po b/po/sv.po
index b5153df00..7520376be 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: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +9,66 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr "kan inte �ppna rpmdatabas i %s\n"
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr "ouppfyllda byggberoenden:\n"
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Kan inte �ppna specfilen %s: %s\n"
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Kunde inte �ppna \"tar\"-r�r: %m\n"
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Kunde inte l�sa specfil fr�n %s\n"
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Kunde inte byta namn p� %s till %s: %m\n"
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "kunde inte ta status p� %s: %m\n"
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "Filen %s �r inte en vanlig fil.\n"
 
-#: build.c:259
+#: build.c:243
 #, 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:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Bygger m�lplattformar: %s\n"
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Bygger f�r m�let %s\n"
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr "argumentet �r inte ett RPM-paket\n"
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr "fel vid l�sning av pakethuvud\n"
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "kan inte �ter�ppna lasten: %s\n"
@@ -402,44 +397,44 @@ msgstr "--sign kan enbart anv�ndas vid pakettillverkning"
 msgid "exec failed\n"
 msgstr "exec misslyckades\n"
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr "inga paketfiler angivna f�r omtillverkning"
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr "inga specfiler angivna f�r tillverkning"
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr "inga tar-filer angivna f�r tillverkning"
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr "inga paket angivna f�r avinstallation"
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr "inga paket angivna f�r installation"
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr "inga parametrar angivna f�r fr�ga"
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr "inga parametrar angivna f�r verifiering"
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr "ov�ntade argument till --querytags "
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 #, fuzzy
 msgid "no arguments given"
 msgstr "inga parametrar angivna f�r fr�ga"
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr "Kan inte �ppna tempor�r fil.\n"
 
@@ -650,7 +645,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:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr "rad: %s\n"
@@ -725,152 +720,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:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "skapande av arkiv misslyckades vid fil %s: %s\n"
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "skapande av arkiv misslyckades: %s\n"
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy kunde inte skriva: %s\n"
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy kunde inte l�sa: %s\n"
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Kunde inte �ppna PreIn-fil: %s\n"
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Kunde inte �ppna PreUn-fil: %s\n"
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Kunde inte �ppna PostIn-fil: %s\n"
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Kunde inte �ppna PostUn-fil: %s\n"
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Kunde inte �ppna VerifyScript-fil: %s\n"
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Kunde inte �ppna Trigger-skriptfil: %s\n"
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: �ppna %s: %s\n"
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: l�s %s: %s\n"
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek misslyckades: %s\n"
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s �r inte ett RPM-paket\n"
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: l�ser huvud fr�n %s\n"
 
-#: build/pack.c:475
+#: build/pack.c:467
 msgid "Unable to create immutable header region.\n"
 msgstr "Kan inte skapa of�r�nderlig huvudregion.\n"
 
-#: build/pack.c:493
+#: build/pack.c:485
 msgid "Unable to write temp header\n"
 msgstr "Kan inte skriva tempor�rhuvud\n"
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr "Felaktig CSA-data\n"
 
-#: build/pack.c:536
+#: build/pack.c:528
 msgid "Unable to write final header\n"
 msgstr "Kan inte skriva slutligt huvud\n"
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Genererar signatur: %d\n"
 
-#: build/pack.c:567
+#: build/pack.c:559
 msgid "Unable to reload signature header.\n"
 msgstr "Kan inte l�sa om signaturhuvud.\n"
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kunde inte �ppna %s: %s\n"
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunde inte skriva paket: %s\n"
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Kan inte l�sa signaturen %s: %s\n"
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, 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:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Kan inte skriva huvud till %s: %s\n"
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, 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:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kan inte skriva last till %s: %s\n"
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, 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:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kan inte skapa %s: %s\n"
@@ -1432,7 +1427,7 @@ msgid " failed - "
 msgstr " misslyckades - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1441,65 +1436,85 @@ msgstr ""
 "\"B\"-beroendet beh�ver en epok (antar samma som \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr "JA"
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr "NEJ "
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "kan inte �ppna paketdatabas i %s\n"
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, fuzzy, c-format
+msgid "package %s already added, ignoring\n"
+msgstr "paket %s �r redan installerat"
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s JA (lade till filer)\n"
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s JA (lade till tillhandah�llande)\n"
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (cachad)\n"
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s JA (rpmrc tillhandah�ller)\n"
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s JA (rpmlib tillhandah�ller)\n"
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s JA (db-filer)\n"
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s JA (db-tillhandah�llande)\n"
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s JA (db-paket)\n"
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NEJ\n"
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tillagt till beroendecachen.\n"
@@ -1507,43 +1522,43 @@ msgstr "%s: (%s, %s) tillagt till beroendecachen.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s st�r i konflikt: %s\n"
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "tar bort %s-%s-%s \"%s\" fr�n tsort-relationer.\n"
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr "========== noterar alla relationer\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== tsort:erar paket (ordning, #f�reg�ngare, #efterf�ljare, djup)\n"
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr "========== endast efterf�ljare (presentationsordning)\n"
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr "LOOP:\n"
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr "========== forts�tter med tsort ...\n"
 
@@ -2279,65 +2294,65 @@ msgstr "kan inte skapa %%%s %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "kan inte skriva till %%%s %s\n"
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr "k�llpaket f�rv�ntades, fann bin�rpaket\n"
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr "k�llpaket inneh�ller ingen .spec-fil\n"
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: k�r (eventuellt) %s-skript\n"
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, 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:1611
+#: lib/psm.c:1610
 #, 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:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s har %d filer, test = %d\n"
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr "%s: %s-skript misslyckades (%d), hoppar �ver %s-%s-%s\n"
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "anv�ndare %s finns inte - anv�nder root\n"
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupp %s finns inte - anv�nder root\n"
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "uppackning av arkiv misslyckades%s%s: %s\n"
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr " vid fil "
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s misslyckades p� fil %s: %s\n"
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s misslyckades: %s\n"
@@ -2385,8 +2400,8 @@ msgstr "paketet har varken fil�gare eller id-listor\n"
 msgid "can't query %s: %s\n"
 msgstr "kan inte fr�ga %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "misslyckades med att �ppna %s: %s\n"
@@ -2400,7 +2415,7 @@ msgstr "fr�ga av %s misslyckades\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "k�llpaket i gammalt format g�r inte att fr�ga om\n"
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: l�sning av paketlista misslyckades: %s\n"
@@ -2459,7 +2474,7 @@ msgstr "paketpost nummer: %u\n"
 msgid "record %u could not be read\n"
 msgstr "post %u kunde inte l�sas\n"
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s �r inte installerat\n"
@@ -2535,58 +2550,53 @@ msgstr "F�rbereder..."
 msgid "Preparing packages for installation..."
 msgstr "F�rbereder paket f�r installation ..."
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "kan inte �ppna paketdatabas i %s\n"
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, 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:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "hoppar �ver %s - �verf�ring misslyckades - %s\n"
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paket %s �r inte relokerbart\n"
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "fel vid l�sning fr�n fil %s\n"
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, 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:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s kan inte installeras\n"
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "hittade %d k�ll- och %d bin�rpaket\n"
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr "ouppfyllda beroenden:\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr "installerar bin�rpaket\n"
 
@@ -2595,26 +2605,21 @@ msgstr "installerar bin�rpaket\n"
 msgid "cannot open file %s: %s\n"
 msgstr "kan inte �ppna filen %s: %s\n"
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "kan inte �ppna %s/packages.rpm\n"
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" anger flera paket\n"
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr "att ta bort dessa paket skulle g�ra s�nder beroenden:\n"
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kan inte �ppna %s: %s\n"
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerar %s\n"
@@ -2872,7 +2877,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "%s �verhoppad p� grund av missingok-flagga\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "hoppar �ver katalogen %s\n"
@@ -3081,11 +3086,11 @@ msgstr "fel(%d) n�r post %s sparades i %s\n"
 msgid "error(%d) removing record %s from %s\n"
 msgstr "fel(%d) n�r post %s togs bort ur %s\n"
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr "ingen dbpath har satts\n"
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
@@ -3094,114 +3099,114 @@ msgstr ""
 "i nytt format\n"
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr "fel(%d) n�r paket r�knades\n"
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "post nummer %u i databasen �r felaktig -- hoppar �ver.\n"
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr "rpmdb: skadad huvudinstans #%u h�mtad, hoppar �ver.\n"
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: kan inte l�sa huvud vid 0x%x\n"
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "tar bort \"%s\" fr�n %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "tar bort %d poster fr�n %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "fel(%d) vid allokering av ny paketinstans\n"
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "l�gger till \"%s\" till %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "l�gger till %d poster till %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "tar bort %s efter lyckad db3-ombyggnad.\n"
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr "ingen dbpath har satts"
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "bygger om databas %s till %s\n"
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "tillf�llig databas %s existerar redan\n"
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr "skapar katalog %s\n"
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "skapar katalog %s: %s\n"
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "�ppnar gammal databas med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "�ppnar ny databas med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kan inte l�gga till post ursprungligen vid %u\n"
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n"
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr "kunde inte ers�tta gammal databas med ny databas!\n"
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "byt ut filer i %s med filer fr�n %s f�r att �terst�lla"
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr "tar bort katalog %s\n"
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunde inte ta bort katalogen %s: %s\n"
@@ -3413,6 +3418,12 @@ msgstr "url-port m�ste vara ett tal\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunde inte skapa %s: %s\n"
 
+#~ msgid "cannot open rpm database in %s\n"
+#~ msgstr "kan inte �ppna rpmdatabas i %s\n"
+
+#~ msgid "cannot open %s/packages.rpm\n"
+#~ msgstr "kan inte �ppna %s/packages.rpm\n"
+
 #~ msgid "add a signature to a package"
 #~ msgstr "l�gg till signatur till ett paket"
 
diff --git a/po/tr.po b/po/tr.po
index 7ac54f144..2d4d2a920 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: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +10,66 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.2alpha\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr "%s dizininde rpm veritaban� a��lam�yor\n"
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr "i�lem durdu, �nce ba��ml� paketler kurulmal�:\n"
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "%s spec dosyas� a��lamad�: %s\n"
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "tar veriyolu a��lamad�: %m\n"
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "%s paketinden spec dosyas� okunamad�\n"
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "%s %s olarak de�i�tirilemedi: %m\n"
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "%s durum bilgileri al�namad�: %m\n"
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "%s bir normal bir dosya de�il.\n"
 
-#: build.c:259
+#: build.c:243
 #, 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:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Hedef platformlar derleniyor: %s\n"
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr "%s i�in derleniyor\n"
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr "arg�man bir RPM paketi de�il\n"
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr "paketten ba�l�k okunmas� s�ras�nda hata olu�tu\n"
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "payload %s tekrar a��lam�yor\n"
@@ -409,44 +404,44 @@ msgstr "--sign sadece paket olu�turulurken kullan�labilir"
 msgid "exec failed\n"
 msgstr "icra ba�ar�s�z\n"
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr "yeniden olu�turmak i�in paket dosyalar� belirtilmemi�"
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr "olu�turma i�in gerekli spec dosyas� belirtilmemi�"
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr "olu�turma i�in gereken tar dosyalar� belirtilmemi�"
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr "sistemden silinecek paket(ler) belirtilmedi"
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr "y�klenecek paket(ler) belirtilmedi"
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr "sorgulama i�in hi� arg�man belirtilmedi"
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr "denetleme i�in hi� arg�man belirtilmedi"
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags ile beklenmeyen girdiler"
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 #, fuzzy
 msgid "no arguments given"
 msgstr "sorgulama i�in hi� arg�man belirtilmedi"
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr "Ge�ici dosya a��lamad�.\n"
 
@@ -657,7 +652,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:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr "sat�r: %s\n"
@@ -732,156 +727,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:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "%s dosyas�nda ar�iv olu�turulamad�: %s\n"
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "ar�iv olu�turulamad�: %s\n"
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy yazma hatas�:%s\n"
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy okuma hatas�: %s\n"
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "PreIn dosyas� a��lamad�: %s\n"
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "PreUn dosyas� a��lamad�: %s\n"
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "PostIn dosyas� a��lamad�: %s\n"
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "PostUn dosyas� a��lamad�: %s\n"
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "VerifyScript dosyas� a��lamad�: %s\n"
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Trigger betik dosyas� a��lamad�: %s\n"
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: %s a��l�rken: %s\n"
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: %s okunurken: %s\n"
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek ba�ar�s�z: %s\n"
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s bir RPM paketi de�il\n"
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: %s ba�l��� okunuyor\n"
 
-#: build/pack.c:475
+#: build/pack.c:467
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "%s'den ba�l�k okunamad�: %s\n"
 
-#: build/pack.c:493
+#: build/pack.c:485
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "%s'e ba�l�k yaz�lamad�: %s\n"
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr "CSA verisi ge�ersiz\n"
 
-#: build/pack.c:536
+#: build/pack.c:528
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "%s'e ba�l�k yaz�lamad�: %s\n"
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "�mza �retiliyor: %d\n"
 
-#: build/pack.c:567
+#: build/pack.c:559
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "%s'den ba�l�k okunamad�: %s\n"
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s a��lamad�: %s\n"
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "paket yaz�lamad�: %s\n"
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "sigtarget %s a��lamad�: %s\n"
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "%s'den ba�l�k okunamad�: %s\n"
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "%s'e ba�l�k yaz�lamad�: %s\n"
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "%s'den payload okunamad�: %s\n"
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s'e payload yaz�lamad�: %s\n"
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Yaz�ld�: %s\n"
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, 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:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s dosyas� olu�turulam�yor: %s\n"
@@ -1452,7 +1447,7 @@ msgid " failed - "
 msgstr " ba�ar�s�z - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, fuzzy, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1461,65 +1456,85 @@ msgstr ""
 "\"B\" ba��ml�l��� bir d�nemsellik gerektirir (tabii ki \"A\" da)\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr "EVET"
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr "HAYIR "
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "%s de Paket veritaban� a��lamad�\n"
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, fuzzy, c-format
+msgid "package %s already added, ignoring\n"
+msgstr "%s zaten kurulu"
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s EVET (dosyalar eklendi)\n"
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s EVET (�nlem eklendi)\n"
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (arabellekli)\n"
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s EVET (rpmrc sa�lar)\n"
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s EVET (rpmlib sa�lar)\n"
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s EVET (db dosyalar�)\n"
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s EVET (db sa�lar)\n"
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s EVET (db paketi)\n"
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s HAYIR\n"
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) Ba��ml�lar alan�na eklendi.\n"
@@ -1527,43 +1542,43 @@ msgstr "%s: (%s, %s) Ba��ml�lar alan�na eklendi.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s-%s-%s gereksinimi tatmin edici de�il: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s paketi �eli�iyor: %s\n"
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%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:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort ba��nt�lar� kaydediliyor\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== paketler tsort'lan�yor (s�ra, #�nc�ller, #ard�llar, derinlik)\n"
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr "========== sadece ard�llar (sunum s�ras�)\n"
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr "�EVR�M:\n"
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort s�r�yor ...\n"
 
@@ -2303,64 +2318,64 @@ msgstr "%%%s dosyas� olu�turulam�yor: %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s dosyas�na yaz�lamaz %s\n"
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr "kaynak paketi gerekirken �al��t�r�labilir paketi bulundu\n"
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr "kaynak paketi .spec dosyas� i�ermiyor\n"
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: %s beti�i �al��t�r�l�yor (varsa)\n"
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, 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:1611
+#: lib/psm.c:1610
 #, 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:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s %d dosya i�eriyor, test = %d\n"
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr "%s: %s beti�i ba�ar�s�z (%d), %s-%s-%s atlan�yor\n"
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "kullan�c� %s yok - root kullan�lacak\n"
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grup %s yok - root kullan�lacak\n"
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, 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:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr " dosyada "
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s a��lamad�: %s\n"
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s ba�ar�s�z\n"
@@ -2408,8 +2423,8 @@ msgstr "paket ne dosya sahibi ne de kimlik listesi i�eriyor\n"
 msgid "can't query %s: %s\n"
 msgstr "%s sorgulanam�yor: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s a��lamad�: %s\n"
@@ -2423,7 +2438,7 @@ msgstr "%s 'nin sorgulamas� ba�ar�s�zl�kla sonu�land�\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "eski bi�em kaynak paketleri sorgulanamaz\n"
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: bildirge okuma ba�ar�s�z: %s\n"
@@ -2482,7 +2497,7 @@ msgstr "paket kay�t numaras�: %u\n"
 msgid "record %u could not be read\n"
 msgstr "%u. kay�t okunamad�\n"
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s paketi kurulu de�il\n"
@@ -2558,58 +2573,53 @@ msgstr "Haz�rlan�yor..."
 msgid "Preparing packages for installation..."
 msgstr "Kurulacak paketler haz�rlan�yor..."
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "%s de Paket veritaban� a��lamad�\n"
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, 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:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr "... %s olarak\n"
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s atlan�yor - aktar�m ba�ar�s�z - %s\n"
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "%s paketi yeniden konumland�r�lamaz\n"
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "%s dosyas�ndan okuma hatal�\n"
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, 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:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s y�klenemedi\n"
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n"
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr "ba��ml�l�klarda hata; gerekli paketler:\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr "icra edilebilir paketleri kuruluyor\n"
 
@@ -2618,26 +2628,21 @@ msgstr "icra edilebilir paketleri kuruluyor\n"
 msgid "cannot open file %s: %s\n"
 msgstr "%s dosyas� a��lamad�: %s\n"
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "%s/packages.rpm a��lam�yor\n"
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" birden fazla paketi tan�ml�yor\n"
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 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:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "%s a��lamad�: %s\n"
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s kuruluyor\n"
@@ -2893,7 +2898,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "missingok flamas�ndan dolay� %s atland�\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "%s dizini d��lan�yor\n"
@@ -3103,11 +3108,11 @@ msgstr "hata(%d): %s kay�t %s i�ine yaz�l�yor\n"
 msgid "error(%d) removing record %s from %s\n"
 msgstr "hata(%d) %s kayd�n %s dosyas�ndan silinmesi\n"
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr "belirtilmi� bir dbpath de�eri yok\n"
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
@@ -3116,116 +3121,116 @@ msgstr ""
 "rebuilddb kullan�n\n"
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr "paketler taran�rken hata(%d)\n"
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "veritaban�ndaki %u. kay�t hatal� -- atlan�yor\n"
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr "rpmdb: bozuk ba�l�k �rne�i #%u al�nd�, atlan�yor.\n"
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: 0x%x de ba�l�k okunamad�\n"
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "\"%s\" %s indeksinden siliniyor.\n"
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "%d girdi %s indeksinden siliniyor.\n"
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "yeni paket �rne�ini tutma hatas�(%d)\n"
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "\"%s\" %s indeksine ekleniyor.\n"
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%d girdi %s indeksine ekleniyor.\n"
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "ba�ar�l� db3 yeniden olu�turma ertesinde %s kald�r�l�yor\n"
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr "belirtilmi� bir dbpath yok"
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "%s veritaban� %s i�inde yeniden olu�turuluyor\n"
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "ge�ici veritaban� %s zaten mevcut\n"
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr "%s dizini olu�turuluyor\n"
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "%s dizini olu�turuluyor: %s\n"
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "eski veritaban� dbapi %d ile a��l�yor\n"
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "yeni veritaban� dbapi %d ile a��l�yor\n"
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kay�t �zg�n olarak %u e eklenemedi\n"
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "veritaban� yeniden olu�turulamad�: mevcut veritaban� de�i�meden\n"
 "yerinde b�rak�ld�\n"
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr "eski veritaban�n�n yenisiyle de�i�tirilirmesi ba�ar�s�z!\n"
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "kurtarmak i�in %s i�indeki dosyalar %s deki dosyalarla de�i�tiriliyor"
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr "%s dizini siliniyor\n"
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s dizininin silinmesi ba�ar�s�z: %s\n"
@@ -3437,6 +3442,12 @@ msgstr "url portu bir say� olmal�\n"
 msgid "failed to create %s: %s\n"
 msgstr "%s olu�turulamad�: %s\n"
 
+#~ msgid "cannot open rpm database in %s\n"
+#~ msgstr "%s dizininde rpm veritaban� a��lam�yor\n"
+
+#~ msgid "cannot open %s/packages.rpm\n"
+#~ msgstr "%s/packages.rpm a��lam�yor\n"
+
 #~ msgid "add a signature to a package"
 #~ msgstr "pakete bir imza ekler"
 
diff --git a/po/uk.po b/po/uk.po
index 285b4d05b..9935eb869 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +14,66 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr ""
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr ""
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr ""
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr ""
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr ""
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr ""
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +392,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +636,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +711,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:475
+#: build/pack.c:467
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:493
+#: build/pack.c:485
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:528
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:567
+#: build/pack.c:559
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1416,72 +1411,92 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, c-format
+msgid "package %s already added, ignoring\n"
+msgstr ""
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1504,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2241,64 +2256,64 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2346,8 +2361,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2361,7 +2376,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2420,7 +2435,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2496,58 +2511,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr ""
 
@@ -2556,26 +2566,21 @@ msgstr ""
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr ""
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3029,125 +3034,125 @@ msgstr ""
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 285b4d05b..9935eb869 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +14,66 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr ""
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr ""
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr ""
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr ""
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr ""
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr ""
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +392,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +636,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +711,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:475
+#: build/pack.c:467
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:493
+#: build/pack.c:485
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:528
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:567
+#: build/pack.c:559
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1416,72 +1411,92 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, c-format
+msgid "package %s already added, ignoring\n"
+msgstr ""
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1504,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2241,64 +2256,64 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2346,8 +2361,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2361,7 +2376,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2420,7 +2435,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2496,58 +2511,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr ""
 
@@ -2556,26 +2566,21 @@ msgstr ""
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr ""
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3029,125 +3034,125 @@ msgstr ""
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 285b4d05b..9935eb869 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +14,66 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr ""
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr ""
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr ""
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr ""
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr ""
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr ""
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +392,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +636,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +711,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:475
+#: build/pack.c:467
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:493
+#: build/pack.c:485
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:528
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:567
+#: build/pack.c:559
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1416,72 +1411,92 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, c-format
+msgid "package %s already added, ignoring\n"
+msgstr ""
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1504,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2241,64 +2256,64 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2346,8 +2361,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2361,7 +2376,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2420,7 +2435,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2496,58 +2511,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr ""
 
@@ -2556,26 +2566,21 @@ msgstr ""
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr ""
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3029,125 +3034,125 @@ msgstr ""
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 285b4d05b..9935eb869 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-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,71 +14,66 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr ""
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr ""
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr ""
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr ""
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr ""
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr ""
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +392,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +636,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +711,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:475
+#: build/pack.c:467
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:493
+#: build/pack.c:485
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:528
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:567
+#: build/pack.c:559
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1416,72 +1411,92 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, c-format
+msgid "package %s already added, ignoring\n"
+msgstr ""
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1504,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2241,64 +2256,64 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2346,8 +2361,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2361,7 +2376,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2420,7 +2435,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2496,58 +2511,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr ""
 
@@ -2556,26 +2566,21 @@ msgstr ""
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr ""
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3029,125 +3034,125 @@ msgstr ""
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 8b3985f03..fa97a6fd6 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -17,6 +17,7 @@
 #include "Python.h"
 #include "rpmio_internal.h"
 #include "rpmcli.h"	/* XXX for rpmCheckSig */
+#include "depends.h"	/* XXX for ts->rpmdb */
 #include "legacy.h"
 #include "misc.h"
 #include "header_internal.h"
@@ -1543,6 +1544,7 @@ static PyObject * rpmtransGetAttr(rpmtransObject * o, char * name) {
 static void rpmtransDealloc(PyObject * o) {
     rpmtransObject * trans = (void *) o;
 
+    trans->ts->rpmdb = NULL;	/* XXX HACK: avoid rpmdb close/free */
     rpmtransFree(trans->ts);
     if (trans->dbo) {
 	Py_DECREF(trans->dbo);
@@ -1619,9 +1621,10 @@ static PyObject * rpmtransCreate(PyObject * self, PyObject * args) {
     o = (void *) PyObject_NEW(rpmtransObject, &rpmtransType);
 
     Py_XINCREF(db);
-    o->dbo = db;
+    o->dbo = db;	/* XXX DYING: separate refcounts is bad craziness */
     o->scriptFd = NULL;
-    o->ts = rpmtransCreateSet(db ? db->db : NULL, rootPath);
+    o->ts = rpmtransCreateSet(NULL, rootPath);
+    o->ts->rpmdb = (db ? db->db : NULL);
     o->keyList = PyList_New(0);
 
     return (void *) o;
diff --git a/rpm.spec b/rpm.spec
index d52bed8dc..21ce227b1 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -533,4 +533,8 @@ fi
 - wire transactions through rpmcli signature modes.
 - wire transactions through rpmcli query/verify modes.
 - wire transactions through rpmcli install/erase modes.
-- legacy signatures always checked on package read.
+- legacy signatures always checked where possible on package read.
+- wire transactions through rpmcli build modes.
+- lazy rpmdb open/close through transaction methods (mostly anyways).
+- no-brainer refcounts for rpmdb object.
+- check added header against transaction set, replace if newer.
diff --git a/rpm.spec.in b/rpm.spec.in
index 3bf22b0d6..b7ab33c48 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -533,4 +533,8 @@ fi
 - wire transactions through rpmcli signature modes.
 - wire transactions through rpmcli query/verify modes.
 - wire transactions through rpmcli install/erase modes.
-- legacy signatures always checked on package read.
+- legacy signatures always checked where possible on package read.
+- wire transactions through rpmcli build modes.
+- lazy rpmdb open/close through transaction methods (mostly anyways).
+- no-brainer refcounts for rpmdb object.
+- check added header against transaction set, replace if newer.
diff --git a/rpm2cpio.c b/rpm2cpio.c
index 43025558e..73bbf804e 100644
--- a/rpm2cpio.c
+++ b/rpm2cpio.c
@@ -30,22 +30,14 @@ int main(int argc, char **argv)
     }
     fdo = fdDup(STDOUT_FILENO);
 
-#ifdef	DYING
-    rc = rpmReadPackageHeader(fdi, &h, NULL, NULL, NULL);
-#else
-    {	const char * rootDir = "";
-	rpmdb db = NULL;
-	rpmTransactionSet ts = rpmtransCreateSet(db, rootDir);
-
-	ts->need_payload = 1;
+    {	rpmTransactionSet ts = rpmtransCreateSet(NULL, NULL);
+
 	/*@-mustmod@*/      /* LCL: segfault */
 	rc = rpmReadPackageFile(ts, fdi, "rpm2cpio", &h);
 	/*@=mustmod@*/
-	ts->need_payload = 0;
 
 	ts = rpmtransFree(ts);
     }
-#endif
 
     switch (rc) {
     case RPMRC_BADSIZE:
diff --git a/rpmdb/db1.c b/rpmdb/db1.c
index bfeaa9e04..57ea66721 100644
--- a/rpmdb/db1.c
+++ b/rpmdb/db1.c
@@ -516,7 +516,7 @@ static int db1close(/*@only@*/ dbiIndex dbi, /*@unused@*/ unsigned int flags)
     return rc;
 }
 
-static int db1open(/*@keep@*/ rpmdb rpmdb, int rpmtag,
+static int db1open(rpmdb rpmdb, int rpmtag,
 		/*@out@*/ dbiIndex * dbip)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem @*/
diff --git a/rpmdb/db3.c b/rpmdb/db3.c
index 4739dd114..f35a16d51 100644
--- a/rpmdb/db3.c
+++ b/rpmdb/db3.c
@@ -801,7 +801,7 @@ exit:
 }
 /*@=moduncon@*/
 
-static int db3open(/*@keep@*/ rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
+static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem @*/
 	/*@modifies *dbip, fileSystem @*/
diff --git a/rpmdb/dbconfig.c b/rpmdb/dbconfig.c
index 75d209901..83f3966f8 100644
--- a/rpmdb/dbconfig.c
+++ b/rpmdb/dbconfig.c
@@ -476,16 +476,16 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag)
     dbOpts = _free(dbOpts);
 
     /*@-assignexpose@*/
-    *dbi = db3dbi;	/* structure assignment */
+/*@i@*/	*dbi = db3dbi;	/* structure assignment */
     /*@=assignexpose@*/
     memset(&db3dbi, 0, sizeof(db3dbi));
 
     if (!(dbi->dbi_perms & 0600))
 	dbi->dbi_perms = 0644;
     dbi->dbi_mode = rpmdb->db_mode;
-    /*@-keeptrans@*/
-    dbi->dbi_rpmdb = rpmdb;
-    /*@=keeptrans@*/
+    /*@-assignexpose -newreftrans@*/ /* FIX: figger rpmdb/dbi refcounts */
+/*@i@*/	dbi->dbi_rpmdb = rpmdb;
+    /*@=assignexpose =newreftrans@*/
     dbi->dbi_rpmtag = rpmtag;
     
     /*
diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index c94daab1b..c865861ec 100644
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -817,7 +817,9 @@ int rpmdbClose(rpmdb db)
     int dbix;
     int rc = 0;
 
-    if (db == NULL) return 0;
+    if (db == NULL || --db->nrefs > 0)
+	return 0;
+
     if (db->_dbi)
     for (dbix = db->db_ndbi; --dbix >= 0; ) {
 	int xx;
@@ -833,7 +835,7 @@ int rpmdbClose(rpmdb db)
     db->db_root = _free(db->db_root);
     db->db_home = _free(db->db_home);
     db->_dbi = _free(db->_dbi);
-    db = _free(db);
+    /*@-refcounttrans@*/ db = _free(db); /*@=refcounttrans@*/
     return rc;
 }
 
@@ -858,9 +860,8 @@ static /*@only@*/ /*@null@*/
 rpmdb newRpmdb(/*@kept@*/ /*@null@*/ const char * root,
 		/*@kept@*/ /*@null@*/ const char * home,
 		int mode, int perms, int flags)
-	/*@globals _db_filter_dups, rpmGlobalMacroContext,
-		fileSystem @*/
-	/*@modifies _db_filter_dups, rpmGlobalMacroContext, fileSystem @*/
+	/*@globals _db_filter_dups, rpmGlobalMacroContext @*/
+	/*@modifies _db_filter_dups, rpmGlobalMacroContext @*/
 {
     rpmdb db = xcalloc(sizeof(*db), 1);
     const char * epfx = _DB_ERRPFX;
@@ -875,6 +876,8 @@ rpmdb newRpmdb(/*@kept@*/ /*@null@*/ const char * root,
     *db = dbTemplate;	/* structure assignment */
     /*@=assignexpose@*/
 
+    db->_dbi = NULL;
+
     if (!(perms & 0600)) perms = 0644;	/* XXX sanity */
 
     if (mode >= 0)	db->db_mode = mode;
@@ -887,7 +890,9 @@ rpmdb newRpmdb(/*@kept@*/ /*@null@*/ const char * root,
     /*@=nullpass@*/
     if (!(db->db_home && db->db_home[0] != '%')) {
 	rpmError(RPMERR_DBOPEN, _("no dbpath has been set\n"));
-	(void) rpmdbClose(db);
+	db->db_root = _free(db->db_root);
+	db->db_home = _free(db->db_home);
+	db = _free(db);
 	/*@-globstate@*/ return NULL; /*@=globstate@*/
     }
     /*@-nullpass@*/
@@ -897,6 +902,7 @@ rpmdb newRpmdb(/*@kept@*/ /*@null@*/ const char * root,
     db->db_filter_dups = _db_filter_dups;
     db->db_ndbi = dbiTagsMax;
     db->_dbi = xcalloc(db->db_ndbi, sizeof(*db->_dbi));
+    db->nrefs = 1;
     /*@-globstate@*/ return db; /*@=globstate@*/
 }
 /*@=mods@*/
@@ -1048,6 +1054,18 @@ exit:
     return rc;
 }
 
+rpmdb rpmdbLink(rpmdb db)
+{
+    db->nrefs++;
+    /*@-refcounttrans@*/ return db; /*@=refcounttrans@*/
+}
+
+rpmdb rpmdbUnlink(rpmdb db)
+{
+    db->nrefs--;
+    return NULL;
+}
+
 /* XXX python/rpmmodule.c */
 /*@-globs@*/ /* FIX: rpmGlobalMacroContext not in <rpmlib.h> */
 int rpmdbOpen (const char * prefix, rpmdb *dbp, int mode, int perms)
@@ -1517,7 +1535,7 @@ typedef struct miRE_s {
 struct _rpmdbMatchIterator {
 /*@only@*/ const void *	mi_keyp;
     size_t		mi_keylen;
-/*@kept@*/ rpmdb	mi_rpmdb;
+/*@refcounted@*/ rpmdb	mi_db;
     int			mi_rpmtag;
     dbiIndexSet		mi_set;
     DBC *		mi_dbc;
@@ -1547,7 +1565,7 @@ rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi)
     if (mi == NULL)
 	return mi;
 
-    dbi = dbiOpen(mi->mi_rpmdb, RPMDBI_PACKAGES, 0);
+    dbi = dbiOpen(mi->mi_db, RPMDBI_PACKAGES, 0);
     /*@-branchstate@*/
     if (mi->mi_h) {
 	if (dbi && mi->mi_dbc && mi->mi_modified && mi->mi_prevoffset) {
@@ -1584,18 +1602,11 @@ rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi)
     mi->mi_dbc = NULL;
     mi->mi_set = dbiFreeIndexSet(mi->mi_set);
     mi->mi_keyp = _free(mi->mi_keyp);
+    mi->mi_db = rpmdbUnlink(mi->mi_db);
     mi = _free(mi);
     return mi;
 }
 
-rpmdb rpmdbGetIteratorRpmDB(rpmdbMatchIterator mi) {
-    if (mi == NULL)
-	return NULL;
-    /*@-retexpose -retalias@*/
-    return mi->mi_rpmdb;
-    /*@=retexpose =retalias@*/
-}
-
 unsigned int rpmdbGetIteratorOffset(rpmdbMatchIterator mi) {
     if (mi == NULL)
 	return 0;
@@ -2023,7 +2034,7 @@ Header rpmdbNextIterator(rpmdbMatchIterator mi)
     if (mi == NULL)
 	return NULL;
 
-    dbi = dbiOpen(mi->mi_rpmdb, RPMDBI_PACKAGES, 0);
+    dbi = dbiOpen(mi->mi_db, RPMDBI_PACKAGES, 0);
     if (dbi == NULL)
 	return NULL;
 
@@ -2163,7 +2174,7 @@ static int rpmdbGrowIterator(/*@null@*/ rpmdbMatchIterator mi,
     if (!(mi && keyp))
 	return 1;
 
-    dbi = dbiOpen(mi->mi_rpmdb, mi->mi_rpmtag, 0);
+    dbi = dbiOpen(mi->mi_db, mi->mi_rpmtag, 0);
     if (dbi == NULL)
 	return 1;
 
@@ -2294,7 +2305,7 @@ fprintf(stderr, "*** RMW %s %p\n", tagName(rpmtag), dbi->dbi_rmw);
     mi->mi_keylen = keylen;
 
     /*@-assignexpose@*/
-    mi->mi_rpmdb = db;
+    mi->mi_db = rpmdbLink(db);
     /*@=assignexpose@*/
     mi->mi_rpmtag = rpmtag;
 
diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h
index 25875023a..d6fccff68 100644
--- a/rpmdb/rpmdb.h
+++ b/rpmdb/rpmdb.h
@@ -31,19 +31,6 @@ struct _dbiIndexItem {
     unsigned int dbNum;			/*!< database index */
 };
 
-#ifdef DYING
-/** \ingroup dbi
- * A single item in an index database (i.e. the "data saved").
- */
-struct _dbiIR {
-/*@unused@*/ unsigned int recOffset;	/*!< byte offset of header in db */
-/*@unused@*/ unsigned int fileNumber;	/*!< file array index */
-};
-/*@-typeuse@*/
-typedef	struct _dbiIR * DBIR_t;
-/*@=typeuse@*/
-#endif	/* DYING */
-
 /** \ingroup dbi
  * Items retrieved from the index database.
  */
@@ -299,7 +286,7 @@ struct _dbiIndex {
 	/* queue access parameters */
     unsigned int	dbi_q_extentsize;
 
-/*@kept@*/ rpmdb	dbi_rpmdb;
+/*@refcounted@*/ rpmdb	dbi_rpmdb;
     rpmTag	dbi_rpmtag;		/*!< rpm tag used for index */
     int		dbi_jlen;		/*!< size of join key */
 
@@ -341,6 +328,8 @@ struct rpmdb_s {
 	/*@modifies *ptr @*/;
     int		db_ndbi;	/*!< No. of tag indices. */
     dbiIndex *	_dbi;		/*!< Tag indices. */
+
+/*@refs@*/ int nrefs;		/*!< Reference count. */
 };
 
 /* for RPM's internal use only */
@@ -364,7 +353,7 @@ extern "C" {
  * Return new configured index database handle instance.
  * @param rpmdb		rpm database
  */
-/*@only@*/ /*@null@*/ dbiIndex db3New(/*@keep@*/ rpmdb rpmdb, int rpmtag)
+/*@only@*/ /*@null@*/ dbiIndex db3New(rpmdb rpmdb, int rpmtag)
 	/*@globals rpmGlobalMacroContext @*/
 	/*@modifies rpmGlobalMacroContext @*/;
 
diff --git a/rpmio/rpmmessages.h b/rpmio/rpmmessages.h
index 029f9167d..b9efff8fd 100644
--- a/rpmio/rpmmessages.h
+++ b/rpmio/rpmmessages.h
@@ -56,8 +56,7 @@ extern "C" {
 
 /**
  */
-typedef /*@only@*/ /*@null@*/
-    void * (*rpmCallbackFunction)
+typedef void * (*rpmCallbackFunction)
 		(/*@null@*/ const void * h, 
 		const rpmCallbackType what, 
 		const unsigned long amount, 
diff --git a/rpmqv.c b/rpmqv.c
index 3f5817252..aa0193bcf 100755
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -952,9 +952,7 @@ int main(int argc, const char ** argv)
     case MODE_REBUILD:
     case MODE_RECOMPILE:
     {	const char * pkg;
-	const char * rootDir = "";
-	rpmdb db = NULL;
-	rpmTransactionSet ts = NULL;
+	rpmTransactionSet ts;
 
         while (!rpmIsVerbose())
 	    rpmIncreaseVerbosity();
@@ -971,12 +969,7 @@ int main(int argc, const char ** argv)
 	    ba->buildAmount |= RPMBUILD_RMBUILD;
 	}
 
-        if (rpmdbOpen(rootDir, &db, O_RDONLY, 0644)) {
-	    ec = 1;
-	    break;
-	}
-	ts = rpmtransCreateSet(db, rootDir);
-
+	ts = rpmtransCreateSet(NULL, NULL);
 	while ((pkg = poptGetArg(optCon))) {
 	    const char * specFile = NULL;
 
@@ -993,8 +986,8 @@ int main(int argc, const char ** argv)
 	    if (ec)
 		/*@loopbreak@*/ break;
 	}
-
 	ts = rpmtransFree(ts);
+
     }	break;
 
     case MODE_BUILD:
diff --git a/tools/rpmsort.c b/tools/rpmsort.c
index af4fc66ef..b33bdd6b5 100644
--- a/tools/rpmsort.c
+++ b/tools/rpmsort.c
@@ -32,7 +32,6 @@ static int
 do_tsort(const char *fileArgv[])
 {
     const char * rootdir = "/";
-    rpmdb rpmdb = NULL;
     rpmTransactionSet ts = NULL;
     const char ** pkgURL = NULL;
     char * pkgState = NULL;
@@ -53,17 +52,17 @@ do_tsort(const char *fileArgv[])
     if (fileArgv == NULL)
 	return 0;
 
-    rc = rpmdbOpen(rootdir, &rpmdb, O_RDONLY, 0644);
+    ts = rpmtransCreateSet(NULL, NULL);
+    if (!noChainsaw)
+	ts->transFlags = RPMTRANS_FLAG_CHAINSAW;
+
+    rc = rpmtsOpenDB(ts, O_RDONLY);
     if (rc) {
 	rpmMessage(RPMMESS_ERROR, _("cannot open Packages database\n"));
 	rc = -1;
 	goto exit;
     }
 
-    ts = rpmtransCreateSet(rpmdb, rootdir);
-    if (!noChainsaw)
-	ts->transFlags = RPMTRANS_FLAG_CHAINSAW;
-
     /* Load all the available packages. */
     if (!(noDeps || noAvailable)) {
 	rpmdbMatchIterator mi = NULL;
@@ -262,14 +261,14 @@ restart:
     rc = 0;
 
 exit:
-    if (ts) rpmtransFree(ts);
     for (i = 0; i < numPkgs; i++) {
         pkgURL[i] = _free(pkgURL[i]);
     }
     pkgState = _free(pkgState);
     pkgURL = _free(pkgURL);
     argv = _free(argv);
-    if (rpmdb) rpmdbClose(rpmdb);
+
+    ts = rpmtransFree(ts);
     return rc;
 }