diff --git a/CHANGES b/CHANGES
index 6e598e279..9159061c1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -38,6 +38,7 @@
 	- depends.c: availablePackage is (almost) opaque.
 	- invent some toy transactionElement iterators.
 	- create rpmDepSet constructors/destructors.
+	- create toy rpmDepSet iterators.
 
 4.0.3 -> 4.0.4:
 
diff --git a/lib/depends.c b/lib/depends.c
index 0f4c8b001..658f80a3a 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -38,53 +38,6 @@ int _ts_debug = 0;
 /*@unchecked@*/
 static int _te_debug = 0;
 
-/**
- * Return formatted dependency string.
- * @param depend	type of dependency ("R" == Requires, "C" == Conflcts)
- * @param key		dependency
- * @return		formatted dependency (malloc'ed)
- */
-static /*@only@*/ char * printDepend(const char * depend, const rpmDepSet key)
-	/*@*/
-{
-    char * tbuf, * t;
-    size_t nb;
-
-    nb = 0;
-    if (depend)	nb += strlen(depend) + 1;
-    if (key->N[key->i])	nb += strlen(key->N[key->i]);
-    if (key->Flags[key->i] & RPMSENSE_SENSEMASK) {
-	if (nb)	nb++;
-	if (key->Flags[key->i] & RPMSENSE_LESS)	nb++;
-	if (key->Flags[key->i] & RPMSENSE_GREATER) nb++;
-	if (key->Flags[key->i] & RPMSENSE_EQUAL)	nb++;
-    }
-    if (key->EVR[key->i] && *key->EVR[key->i]) {
-	if (nb)	nb++;
-	nb += strlen(key->EVR[key->i]);
-    }
-
-    t = tbuf = xmalloc(nb + 1);
-    if (depend) {
-	t = stpcpy(t, depend);
-	*t++ = ' ';
-    }
-    if (key->N[key->i])
-	t = stpcpy(t, key->N[key->i]);
-    if (key->Flags[key->i] & RPMSENSE_SENSEMASK) {
-	if (t != tbuf)	*t++ = ' ';
-	if (key->Flags[key->i] & RPMSENSE_LESS)	*t++ = '<';
-	if (key->Flags[key->i] & RPMSENSE_GREATER) *t++ = '>';
-	if (key->Flags[key->i] & RPMSENSE_EQUAL)	*t++ = '=';
-    }
-    if (key->EVR[key->i] && *key->EVR[key->i]) {
-	if (t != tbuf)	*t++ = ' ';
-	t = stpcpy(t, key->EVR[key->i]);
-    }
-    *t = '\0';
-    return tbuf;
-}
-
 /**
  * Split EVR into epoch, version, and release components.
  * @param evr		[epoch:]version[-release] string
@@ -143,8 +96,8 @@ int rpmFLAGS = RPMSENSE_EQUAL;
 
 int rpmRangesOverlap(const rpmDepSet A, const rpmDepSet B)
 {
-    const char *aDepend = printDepend(NULL, A);
-    const char *bDepend = printDepend(NULL, B);
+    const char *aDepend = (A->DNEVR != NULL ? xstrdup(A->DNEVR+2) : "");
+    const char *bDepend = (B->DNEVR != NULL ? xstrdup(B->DNEVR+2) : "");
     char *aEVR, *bEVR;
     const char *aE, *aV, *aR, *bE, *bV, *bR;
     int result;
@@ -217,14 +170,11 @@ exit:
 }
 
 static int rangeMatchesDepFlags (Header h, const rpmDepSet req)
-	/*@*/
+	/*@modifies h @*/
 {
-    HGE_t hge = (HGE_t)headerGetEntryMinMemory;
-    HFD_t hfd = headerFreeData;
-    rpmTagType pnt, pvt;
-    rpmDepSet provides = memset(alloca(sizeof(*provides)), 0, sizeof(*provides));
-    int result;
-    int xx;
+    int scareMem = 1;
+    rpmDepSet provides = NULL;
+    int result = 0;
 
     if (!(req->Flags[req->i] & RPMSENSE_SENSEMASK) || !req->EVR[req->i] || *req->EVR[req->i] == '\0')
 	return 1;
@@ -234,20 +184,18 @@ static int rangeMatchesDepFlags (Header h, const rpmDepSet req)
      * Rpm prior to 3.0.3 does not have versioned provides.
      * If no provides version info is available, match any requires.
      */
-    if (!hge(h, RPMTAG_PROVIDEVERSION, &pvt,
-		(void **) &provides->EVR, &provides->Count))
-	return 1;
+    provides = dsiInit(dsNew(h, RPMTAG_PROVIDENAME, scareMem));
+    if (provides == NULL)
+	goto exit;	/* XXX should never happen */
 
-    xx = hge(h, RPMTAG_PROVIDEFLAGS, NULL, (void **) &provides->Flags, NULL);
-
-    if (!hge(h, RPMTAG_PROVIDENAME, &pnt, (void **) &provides->N, &provides->Count))
-    {
-	provides->EVR = hfd(provides->EVR, pvt);
-	return 0;	/* XXX should never happen */
+    if (provides->EVR == NULL) {
+	result = 1;
+	goto exit;
     }
 
     result = 0;
-    for (provides->i = 0; provides->i < provides->Count; provides->i++) {
+    if (provides != NULL)
+    while (dsiNext(provides) >= 0) {
 
 	/* Filter out provides that came along for the ride. */
 	if (strcmp(provides->N[provides->i], req->N[req->i]))
@@ -260,8 +208,8 @@ static int rangeMatchesDepFlags (Header h, const rpmDepSet req)
 	    break;
     }
 
-    provides->N = hfd(provides->N, pnt);
-    provides->EVR = hfd(provides->EVR, pvt);
+exit:
+    provides = dsFree(provides);
 
     return result;
 }
@@ -275,6 +223,7 @@ int headerMatchesDepFlags(Header h, const rpmDepSet req)
     char * p;
     int_32 pkgFlags = RPMSENSE_EQUAL;
     rpmDepSet pkg = memset(alloca(sizeof(*pkg)), 0, sizeof(*pkg));
+    int rc;
 
     if (!((req->Flags[req->i] & RPMSENSE_SENSEMASK) && req->EVR[req->i] && *req->EVR[req->i]))
 	return 1;
@@ -291,17 +240,25 @@ int headerMatchesDepFlags(Header h, const rpmDepSet req)
     }
     (void) stpcpy( stpcpy( stpcpy(p, version) , "-") , release);
 
+    /*@-compmempass@*/ /* FIX: move pkg immediate variables from stack */
+    pkg->i = -1;
+    pkg->Type = "Provides";
+    pkg->tagN = RPMTAG_PROVIDENAME;
+    pkg->DNEVR = NULL;
     /*@-immediatetrans@*/
     pkg->N = &name;
     pkg->EVR = &pkgEVR;
     pkg->Flags = &pkgFlags;
     /*@=immediatetrans@*/
     pkg->Count = 1;
-    pkg->i = 0;
+    (void) dsiNext(dsiInit(pkg));
 
-    /*@-compmempass@*/ /* FIX: move pkg immediate variables from stack */
-    return rpmRangesOverlap(pkg, req);
+    rc = rpmRangesOverlap(pkg, req);
+
+    pkg->DNEVR = _free(pkg->DNEVR);
     /*@=compmempass@*/
+
+    return rc;
 }
 
 rpmTransactionSet XrpmtsUnlink(rpmTransactionSet ts, const char * msg, const char * fn, unsigned ln)
@@ -690,9 +647,9 @@ assert(apx == ts->numAddedPackages);
 	mi = rpmdbFreeIterator(mi);
     }
 
-    obsoletes = dsNew(h, RPMTAG_OBSOLETENAME, scareMem);
+    obsoletes = dsiInit(dsNew(h, RPMTAG_OBSOLETENAME, scareMem));
     if (obsoletes != NULL)
-    for (obsoletes->i = 0; obsoletes->i < obsoletes->Count; obsoletes->i++) {
+    while (dsiNext(obsoletes) >= 0) {
 
 	/* XXX avoid self-obsoleting packages. */
 	if (!strcmp(name, obsoletes->N[obsoletes->i]))
@@ -791,38 +748,15 @@ rpmTransactionSet rpmtransFree(rpmTransactionSet ts)
 }
 /*@=nullstate@*/
 
-rpmDependencyConflict rpmdepFreeConflicts(rpmDependencyConflict conflicts,
-		int numConflicts)
-{
-    int i;
-
-    if (conflicts)
-    for (i = 0; i < numConflicts; i++) {
-	conflicts[i].byHeader = headerFree(conflicts[i].byHeader, "problem");
-	conflicts[i].byName = _free(conflicts[i].byName);
-	conflicts[i].byVersion = _free(conflicts[i].byVersion);
-	conflicts[i].byRelease = _free(conflicts[i].byRelease);
-	conflicts[i].needsName = _free(conflicts[i].needsName);
-	conflicts[i].needsVersion = _free(conflicts[i].needsVersion);
-	conflicts[i].suggestedPackages = _free(conflicts[i].suggestedPackages);
-    }
-
-    return (conflicts = _free(conflicts));
-}
-
 /**
  * Check key for an unsatisfied dependency.
  * @todo Eliminate rpmrc provides.
  * @param al		available list
- * @param keyType	type of dependency
- * @param keyDepend	dependency string representation
  * @param key		dependency
  * @retval suggestion	possible package(s) to resolve dependency
  * @return		0 if satisfied, 1 if not satisfied, 2 if error
  */
-static int unsatisfiedDepend(rpmTransactionSet ts,
-		const char * keyType, const char * keyDepend,
-		rpmDepSet key,
+static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key,
 		/*@null@*/ /*@out@*/ availablePackage ** suggestion)
 	/*@globals _cacheDependsRC, fileSystem @*/
 	/*@modifies ts, *suggestion, _cacheDependsRC, fileSystem @*/
@@ -843,23 +777,32 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
 	    _cacheDependsRC = 0;
 	else {
 	    DBC * dbcursor = NULL;
-	    size_t keylen = strlen(keyDepend);
+	    size_t keylen = (key->DNEVR != NULL ? strlen(key->DNEVR) : 0);
 	    void * datap = NULL;
 	    size_t datalen = 0;
 	    int xx;
 	    xx = dbiCopen(dbi, &dbcursor, 0);
 	    /*@-mods@*/		/* FIX: keyDepends mod undocumented. */
-	    xx = dbiGet(dbi, dbcursor, (void **)&keyDepend, &keylen, &datap, &datalen, 0);
+	    /*@-nullstate@*/	/* FIX: key->NEVR may be NULL */
+	    xx = dbiGet(dbi, dbcursor, (void **)&key->DNEVR, &keylen, &datap, &datalen, 0);
+	    /*@=nullstate@*/
 	    /*@=mods@*/
 	    if (xx == 0 && datap && datalen == 4) {
 		memcpy(&rc, datap, datalen);
-		rpmMessage(RPMMESS_DEBUG, _("%s: %-45s %-s (cached)\n"),
-			keyType, keyDepend, (rc ? _("NO ") : _("YES")));
+		rpmMessage(RPMMESS_DEBUG, _("%9s: %-45s %-s (cached)\n"),
+			key->Type, (key->DNEVR != NULL ? key->DNEVR : "???"),
+			(rc ? _("NO ") : _("YES")));
 		xx = dbiCclose(dbi, NULL, 0);
 
-		if (suggestion && rc == 1)
+		/*@-mods@*/	/* FIX: sick hack */
+		if (suggestion && rc == 1) {
+		    const char * Type = key->Type;
+		    key->Type = NULL;
 		    *suggestion = alAllSatisfiesDepend(ts->availablePackages,
-				NULL, NULL, key);
+				key);
+		    key->Type = Type;
+		}
+		/*@=mods@*/
 
 		return rc;
 	    }
@@ -882,8 +825,8 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
 	while ((start = strstr(rcProvidesString, key->N[key->i]))) {
 	/*@=observertrans =mayaliasunique@*/
 	    if (xisspace(start[i]) || start[i] == '\0' || start[i] == ',') {
-		rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (rpmrc provides)\n"),
-			keyType, keyDepend+2);
+		rpmMessage(RPMMESS_DEBUG, _("%9s: %-45s YES (rpmrc provides)\n"),
+			key->Type, (key->DNEVR != NULL ? key->DNEVR+2 : "???"));
 		goto exit;
 	    }
 	    rcProvidesString = start + 1;
@@ -899,14 +842,14 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
      */
     if (!strncmp(key->N[key->i], "rpmlib(", sizeof("rpmlib(")-1)) {
 	if (rpmCheckRpmlibProvides(key)) {
-	    rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (rpmlib provides)\n"),
-			keyType, keyDepend+2);
+	    rpmMessage(RPMMESS_DEBUG, _("%9s: %-45s YES (rpmlib provides)\n"),
+			key->Type, (key->DNEVR != NULL ? key->DNEVR+2 : "???"));
 	    goto exit;
 	}
 	goto unsatisfied;
     }
 
-    if (alSatisfiesDepend(ts->addedPackages, keyType, keyDepend, key) != -1L)
+    if (alSatisfiesDepend(ts->addedPackages, key) != -1L)
     {
 	goto exit;
     }
@@ -922,8 +865,8 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
 			ts->removedPackages, ts->numRemovedPackages, 1);
 
 	    while ((h = rpmdbNextIterator(mi)) != NULL) {
-		rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (db files)\n"),
-			keyType, keyDepend+2);
+		rpmMessage(RPMMESS_DEBUG, _("%9s: %-45s YES (db files)\n"),
+			key->Type, (key->DNEVR != NULL ? key->DNEVR+2 : "???"));
 		mi = rpmdbFreeIterator(mi);
 		goto exit;
 	    }
@@ -935,8 +878,8 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
 			ts->removedPackages, ts->numRemovedPackages, 1);
 	while ((h = rpmdbNextIterator(mi)) != NULL) {
 	    if (rangeMatchesDepFlags(h, key)) {
-		rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (db provides)\n"),
-			keyType, keyDepend+2);
+		rpmMessage(RPMMESS_DEBUG, _("%9s: %-45s YES (db provides)\n"),
+			key->Type, (key->DNEVR != NULL ? key->DNEVR+2 : "???"));
 		mi = rpmdbFreeIterator(mi);
 		goto exit;
 	    }
@@ -949,8 +892,8 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
 			ts->removedPackages, ts->numRemovedPackages, 1);
 	while ((h = rpmdbNextIterator(mi)) != NULL) {
 	    if (rangeMatchesDepFlags(h, key)) {
-		rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (db package)\n"),
-			keyType, keyDepend+2);
+		rpmMessage(RPMMESS_DEBUG, _("%9s: %-45s YES (db package)\n"),
+			key->Type, (key->DNEVR != NULL ? key->DNEVR+2 : "???"));
 		mi = rpmdbFreeIterator(mi);
 		goto exit;
 	    }
@@ -960,12 +903,18 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
 
     }
 
-    if (suggestion)
-	*suggestion = alAllSatisfiesDepend(ts->availablePackages, NULL, NULL,
-				key);
+    /*@-mods@*/	/* FIX: sick hack */
+    if (suggestion) {
+	const char * Type = key->Type;
+	key->Type = NULL;
+	*suggestion = alAllSatisfiesDepend(ts->availablePackages, key);
+	key->Type = Type;
+    }
+    /*@=mods@*/
 
 unsatisfied:
-    rpmMessage(RPMMESS_DEBUG, _("%s: %-45s NO\n"), keyType, keyDepend+2);
+    rpmMessage(RPMMESS_DEBUG, _("%9s: %-45s NO\n"),
+			key->Type, (key->DNEVR != NULL ? key->DNEVR+2 : "???"));
     rc = 1;	/* dependency is unsatisfied */
 
 exit:
@@ -978,17 +927,23 @@ exit:
 	if (dbi == NULL) {
 	    _cacheDependsRC = 0;
 	} else {
-	    DBC * dbcursor = NULL;
-	    int xx;
-	    xx = dbiCopen(dbi, &dbcursor, DBI_WRITECURSOR);
-	    xx = dbiPut(dbi, dbcursor, keyDepend, strlen(keyDepend), &rc, sizeof(rc), 0);
+	    int xx = 0;
+	    if (key->DNEVR != NULL) {
+		DBC * dbcursor = NULL;
+		xx = dbiCopen(dbi, &dbcursor, DBI_WRITECURSOR);
+		xx = dbiPut(dbi, dbcursor, key->DNEVR, strlen(key->DNEVR),
+			&rc, sizeof(rc), 0);
+		xx = dbiCclose(dbi, dbcursor, DBI_WRITECURSOR);
+	    }
 	    if (xx)
 		_cacheDependsRC = 0;
 #if 0	/* XXX NOISY */
 	    else
-		rpmMessage(RPMMESS_DEBUG, _("%s: (%s, %s) added to Depends cache.\n"), keyType, keyDepend, (rc ? _("NO ") : _("YES")));
+		rpmMessage(RPMMESS_DEBUG,
+			_("%9s: (%s, %s) added to Depends cache.\n"),
+			key->Type, (key->DNEVR != NULL ? key->DNEVR : "???"),
+			(rc ? _("NO ") : _("YES")));
 #endif
-	    xx = dbiCclose(dbi, dbcursor, DBI_WRITECURSOR);
 	}
     }
     return rc;
@@ -1018,10 +973,9 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp,
 
     xx = headerNVR(h, &name, &version, &release);
 
-    requires = dsNew(h, RPMTAG_REQUIRENAME, scareMem);
+    requires = dsiInit(dsNew(h, RPMTAG_REQUIRENAME, scareMem));
     if (requires != NULL)
-    for (requires->i = 0; requires->i < requires->Count && !ourrc; requires->i++) {
-	const char * keyDepend;
+    while (!ourrc && dsiNext(requires) >= 0) {
 
 	/* Filter out requires that came along for the ride. */
 	if (keyName && strcmp(keyName, requires->N[requires->i]))
@@ -1032,17 +986,15 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp,
 	if (multiLib && !isDependsMULTILIB(requires->Flags[requires->i]))
 	    continue;
 
-	keyDepend = printDepend("R", requires);
-
-	rc = unsatisfiedDepend(ts, " Requires", keyDepend, requires,
-			&suggestion);
+	rc = unsatisfiedDepend(ts, requires, &suggestion);
 
 	switch (rc) {
 	case 0:		/* requirements are satisfied. */
 	    /*@switchbreak@*/ break;
 	case 1:		/* requirements are not satisfied. */
 	    rpmMessage(RPMMESS_DEBUG, _("package %s-%s-%s require not satisfied: %s\n"),
-		    name, version, release, keyDepend+2);
+		    name, version, release,
+		    (requires->DNEVR ? requires->DNEVR+2 : "???"));
 
 	    if (psp->num == psp->alloced) {
 		psp->alloced += 5;
@@ -1083,14 +1035,12 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp,
 	    ourrc = 1;
 	    /*@switchbreak@*/ break;
 	}
-	keyDepend = _free(keyDepend);
     }
     requires = dsFree(requires);
 
-    conflicts = dsNew(h, RPMTAG_CONFLICTNAME, scareMem);
+    conflicts = dsiInit(dsNew(h, RPMTAG_CONFLICTNAME, scareMem));
     if (conflicts != NULL)
-    for (conflicts->i = 0; conflicts->i < conflicts->Count && !ourrc; conflicts->i++) {
-	const char * keyDepend;
+    while (!ourrc && dsiNext(conflicts) >= 0) {
 
 	/* Filter out conflicts that came along for the ride. */
 	if (keyName && strcmp(keyName, conflicts->N[conflicts->i]))
@@ -1101,15 +1051,13 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp,
 	if (multiLib && !isDependsMULTILIB(conflicts->Flags[conflicts->i]))
 	    continue;
 
-	keyDepend = printDepend("C", conflicts);
-
-	rc = unsatisfiedDepend(ts, "Conflicts", keyDepend, conflicts, NULL);
+	rc = unsatisfiedDepend(ts, conflicts, NULL);
 
 	/* 1 == unsatisfied, 0 == satsisfied */
 	switch (rc) {
 	case 0:		/* conflicts exist. */
 	    rpmMessage(RPMMESS_DEBUG, _("package %s conflicts: %s\n"),
-		    name, keyDepend+2);
+		    name, (conflicts->DNEVR ? conflicts->DNEVR+2 : "???"));
 
 	    if (psp->num == psp->alloced) {
 		psp->alloced += 5;
@@ -1138,7 +1086,6 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp,
 	    ourrc = 1;
 	    /*@switchbreak@*/ break;
 	}
-	keyDepend = _free(keyDepend);
     }
     conflicts = dsFree(conflicts);
 
@@ -1354,7 +1301,7 @@ zapRelation(transactionElement q, transactionElement p,
 	if (requires->Flags == NULL) continue;	/* XXX can't happen */
 
 	requires->i = tsi->tsi_reqx;	/* XXX hack */
-	dp = printDepend( identifyDepend(requires->Flags[requires->i]), requires);
+	dp = dsDNEVR( identifyDepend(requires->Flags[requires->i]), requires);
 
 	/*
 	 * Attempt to unravel a dependency loop by eliminating Requires's.
@@ -1414,7 +1361,13 @@ static inline int addRelation(rpmTransactionSet ts,
     if (!requires->N || !requires->EVR || !requires->Flags)
 	return 0;
 
-    matchNum = alSatisfiesDepend(ts->addedPackages, NULL, NULL, requires);
+    /*@-mods@*/	/* FIX: sick hack */
+    {	const char * Type = requires->Type;
+	requires->Type = NULL;
+	matchNum = alSatisfiesDepend(ts->addedPackages, requires);
+	requires->Type = Type;
+    }
+    /*@=mods@*/
 /*@-modfilesystem -nullpass@*/
 if (_te_debug)
 fprintf(stderr, "addRelation: matchNum %d\n", (int)matchNum);
@@ -1615,11 +1568,6 @@ prtTSI(p->NEVR, &p->tsi);
 	if (requires->Flags == NULL) /* XXX can't happen */
 	    continue;
 
-/*@-modfilesystem -nullpass@*/
-if (_te_debug)
-fprintf(stderr, "\t+++ %p[%d] %s %s-%s-%s requires[%d] %p[%d] Flags %p\n", p, teGetOc(pi), p->NEVR, p->name, p->version, p->release, p->u.addedIndex, requires, requires->Count, requires->Flags);
-/*@=modfilesystem =nullpass@*/
-
 	memset(selected, 0, sizeof(*selected) * ts->orderCount);
 
 	/* Avoid narcisstic relations. */
@@ -1628,7 +1576,9 @@ fprintf(stderr, "\t+++ %p[%d] %s %s-%s-%s requires[%d] %p[%d] Flags %p\n", p, te
 	/* T2. Next "q <- p" relation. */
 
 	/* First, do pre-requisites. */
-	for (requires->i = 0; requires->i < requires->Count; requires->i++) {
+	requires = dsiInit(requires);
+	if (requires != NULL)
+	while (dsiNext(requires) >= 0) {
 
 	    /* Skip if not %pre/%post requires or legacy prereq. */
 
@@ -1643,7 +1593,9 @@ fprintf(stderr, "\t+++ %p[%d] %s %s-%s-%s requires[%d] %p[%d] Flags %p\n", p, te
 	}
 
 	/* Then do co-requisites. */
-	for (requires->i = 0; requires->i < requires->Count; requires->i++) {
+	requires = dsiInit(requires);
+	if (requires != NULL)
+	while (dsiNext(requires) >= 0) {
 
 	    /* Skip if %pre/%post requires or legacy prereq. */
 
@@ -1802,6 +1754,7 @@ prtTSI(" p", &p->tsi);
 
 	    /* T13. Print predecessor chain from start of loop. */
 	    while ((p = q) != NULL && (q = p->tsi.tsi_chain) != NULL) {
+		rpmDepSet requires;
 		const char * dp;
 		char buf[4096];
 
@@ -1814,9 +1767,9 @@ prtTSI(" p", &p->tsi);
 		}
 
 		/* Find (and destroy if co-requisite) "q <- p" relation. */
-		dp = zapRelation(q, p,
-			alGetRequires(ts->addedPackages, p->u.addedIndex),
-			1, &nzaps);
+		requires = alGetRequires(ts->addedPackages, p->u.addedIndex);
+		requires = dsiInit(requires);
+		dp = zapRelation(q, p, requires, 1, &nzaps);
 
 		/* Print next member of loop. */
 		buf[0] = '\0';
@@ -2056,7 +2009,9 @@ int rpmdepCheck(rpmTransactionSet ts,
 	    continue;
 
 	rc = 0;
-	for (provides->i = 0; provides->i < provides->Count; provides->i++) {
+	provides = dsiInit(provides);
+	if (provides != NULL)
+	while (dsiNext(provides) >= 0) {
 	    /* Adding: check provides key against conflicts matches. */
 	    if (!checkDependentConflicts(ts, ps, provides->N[provides->i]))
 		/*@innercontinue@*/ continue;
@@ -2093,10 +2048,9 @@ int rpmdepCheck(rpmTransactionSet ts,
 	}
 
 	    rc = 0;
-	    provides = dsNew(h, RPMTAG_PROVIDENAME, scareMem);
+	    provides = dsiInit(dsNew(h, RPMTAG_PROVIDENAME, scareMem));
 	    if (provides != NULL)
-	    for (provides->i = 0; provides->i < provides->Count; provides->i++)
-	    {
+	    while (dsiNext(provides) >= 0) {
 		/* Erasing: check provides against requiredby matches. */
 		if (!checkDependentPackages(ts, ps, provides->N[provides->i]))
 		    /*@innercontinue@*/ continue;
diff --git a/lib/depends.h b/lib/depends.h
index c0d54aa0a..185669b23 100644
--- a/lib/depends.h
+++ b/lib/depends.h
@@ -12,6 +12,7 @@
 typedef /*@abstract@*/ struct tsortInfo_s *		tsortInfo;
 typedef /*@abstract@*/ struct orderListIndex_s *	orderListIndex;
 typedef /*@abstract@*/ struct transactionElement_s *	transactionElement;
+
 typedef /*@abstract@*/ struct teIterator_s *		teIterator;
 
 typedef /*@abstract@*/ struct availableList_s *		availableList;
@@ -99,18 +100,24 @@ struct transactionElement_s {
  * A package dependency set.
  */
 struct rpmDepSet_s {
-    int i;			/*!< Dependency set element index. */
-    rpmTag tagN;		/*!< Type of dependency set. */
+    int i;			/*!< Element index. */
+
+/*@observer@*/
+    const char * Type;		/*!< Tag name. */
+/*@only@*/ /*@null@*/
+    const char * DNEVR;		/*!< Formatted dependency string. */
+
+    rpmTag tagN;		/*!< Header tag. */
 /*@refcounted@*/ /*@null@*/
     Header h;			/*!< Header for dependency set (or NULL) */
 /*@only@*/
-    const char ** N;		/*!< Dependency name(s}. */
+    const char ** N;		/*!< Name. */
 /*@only@*/
-    const char ** EVR;		/*!< Dependency epoch-version-release. */
+    const char ** EVR;		/*!< Epoch-Version-Release. */
 /*@only@*/
-    const int_32 * Flags;	/*!< Dependency flags. */
-    rpmTagType Nt, EVRt, Ft;
-    int Count;			/*!< No. of dependency elements */
+    const int_32 * Flags;	/*!< Flags identifying context/comparison. */
+    rpmTagType Nt, EVRt, Ft;	/*!< Tag data types. */
+    int Count;			/*!< No. of elements */
 };
 
 /** \ingroup rpmdep
@@ -270,6 +277,10 @@ transactionElement teNextIterator(teIterator tei)
 
 /*@access rpmDepSet @*/
 
+#if 0
+#define	_DS_DEBUG	1
+#endif
+
 /**
  * Destroy a new dependency set.
  * @param ds		dependency set
@@ -282,6 +293,9 @@ rpmDepSet dsFree(/*@only@*/ /*@null@*/ rpmDepSet ds)
     HFD_t hfd = headerFreeData;
     rpmTag tagEVR, tagF;
 
+#ifdef	_DS_DEBUG
+fprintf(stderr, "*** ds %p --\n", ds);
+#endif
     if (ds == NULL)
 	return ds;
 
@@ -313,6 +327,9 @@ rpmDepSet dsFree(/*@only@*/ /*@null@*/ rpmDepSet ds)
 	/*@=evalorder@*/
 	ds->h = headerFree(ds->h, "dsFree");
     }
+
+    ds->DNEVR = _free(ds->DNEVR);
+
     /*@=branchstate@*/
     memset(ds, 0, sizeof(*ds));		/* XXX trash and burn */
     ds = _free(ds);
@@ -334,28 +351,37 @@ rpmDepSet dsNew(Header h, rpmTag tagN, int scareMem)
 	(scareMem ? (HGE_t) headerGetEntryMinMemory : (HGE_t) headerGetEntry);
     rpmTag tagEVR, tagF;
     rpmDepSet ds = NULL;
+    const char * Type;
 
     if (tagN == RPMTAG_PROVIDENAME) {
+	Type = "Provides";
 	tagEVR = RPMTAG_PROVIDEVERSION;
 	tagF = RPMTAG_PROVIDEFLAGS;
     } else
     if (tagN == RPMTAG_REQUIRENAME) {
+	Type = "Requires";
 	tagEVR = RPMTAG_REQUIREVERSION;
 	tagF = RPMTAG_REQUIREFLAGS;
     } else
     if (tagN == RPMTAG_CONFLICTNAME) {
+	Type = "Conflicts";
 	tagEVR = RPMTAG_CONFLICTVERSION;
 	tagF = RPMTAG_CONFLICTFLAGS;
     } else
     if (tagN == RPMTAG_OBSOLETENAME) {
+	Type = "Obsoletes";
 	tagEVR = RPMTAG_OBSOLETEVERSION;
 	tagF = RPMTAG_OBSOLETEFLAGS;
     } else {
-	return ds;
+	goto exit;
     }
 
     ds = xcalloc(1, sizeof(*ds));
     ds->i = -1;
+
+    ds->Type = Type;
+    ds->DNEVR = NULL;
+
     ds->tagN = tagN;
     ds->h = (scareMem ? headerLink(h, "dsNew") : NULL);
     if (hge(h, tagN, &ds->Nt, (void **) &ds->N, &ds->Count)) {
@@ -367,11 +393,108 @@ rpmDepSet dsNew(Header h, rpmTag tagN, int scareMem)
                                 ds->Flags, ds->Count* sizeof(*ds->Flags));
     } else
 	ds->h = headerFree(ds->h, "dsNew");
+
+exit:
     /*@-nullret@*/ /* FIX: ds->Flags may be NULL. */
+#ifdef	_DS_DEBUG
+fprintf(stderr, "*** ds %p ++ %s[%d]\n", ds, ds->Type, ds->Count);
+#endif
     return ds;
     /*@=nullret@*/
 }
 
+/**
+ * Return formatted dependency string.
+ * @param depend	type of dependency ("R" == Requires, "C" == Conflcts)
+ * @param key		dependency
+ * @return		formatted dependency (malloc'ed)
+ */
+/*@unused@*/ static inline /*@only@*/
+char * dsDNEVR(const char * depend, const rpmDepSet key)
+	/*@*/
+{
+    char * tbuf, * t;
+    size_t nb;
+
+    nb = 0;
+    if (depend)	nb += strlen(depend) + 1;
+    if (key->N[key->i])	nb += strlen(key->N[key->i]);
+    if (key->Flags[key->i] & RPMSENSE_SENSEMASK) {
+	if (nb)	nb++;
+	if (key->Flags[key->i] & RPMSENSE_LESS)	nb++;
+	if (key->Flags[key->i] & RPMSENSE_GREATER) nb++;
+	if (key->Flags[key->i] & RPMSENSE_EQUAL)	nb++;
+    }
+    if (key->EVR[key->i] && *key->EVR[key->i]) {
+	if (nb)	nb++;
+	nb += strlen(key->EVR[key->i]);
+    }
+
+    t = tbuf = xmalloc(nb + 1);
+    if (depend) {
+	t = stpcpy(t, depend);
+	*t++ = ' ';
+    }
+    if (key->N[key->i])
+	t = stpcpy(t, key->N[key->i]);
+    if (key->Flags[key->i] & RPMSENSE_SENSEMASK) {
+	if (t != tbuf)	*t++ = ' ';
+	if (key->Flags[key->i] & RPMSENSE_LESS)	*t++ = '<';
+	if (key->Flags[key->i] & RPMSENSE_GREATER) *t++ = '>';
+	if (key->Flags[key->i] & RPMSENSE_EQUAL)	*t++ = '=';
+    }
+    if (key->EVR[key->i] && *key->EVR[key->i]) {
+	if (t != tbuf)	*t++ = ' ';
+	t = stpcpy(t, key->EVR[key->i]);
+    }
+    *t = '\0';
+    return tbuf;
+}
+/**
+ * Return next dependency set iterator index.
+ * @param ds		dependency set
+ * @return		dependency set iterator index, -1 on termination
+ */
+/*@unused@*/ static inline
+int dsiNext(/*@null@*/ rpmDepSet ds)
+	/*@modifies ds @*/
+{
+    int i = -1;
+
+    if (ds != NULL && ++ds->i >= 0) {
+	if (ds->i < ds->Count) {
+	    char t[2];
+	    i = ds->i;
+	    ds->DNEVR = _free(ds->DNEVR);
+	    t[0] = ((ds->Type != NULL) ? ds->Type[0] : '\0');
+	    t[1] = '\0';
+	    /*@-nullstate@*/
+	    ds->DNEVR = dsDNEVR(t, ds);
+	    /*@=nullstate@*/
+#ifdef	_DS_DEBUG
+fprintf(stderr, "*** ds %p[%d] %s: %s\n", ds, i, ds->Type, ds->DNEVR);
+#endif
+	}
+    }
+    if (i >= 0) {
+    }
+    return i;
+}
+
+/**
+ * Initialize dependency set iterator.
+ * @param ds		dependency set
+ * @return		dependency set
+ */
+/*@unused@*/ static inline /*@null@*/
+rpmDepSet dsiInit(/*@returned@*/ /*@null@*/ rpmDepSet ds)
+	/*@modifies ds @*/
+{
+    if (ds != NULL)
+	ds->i = -1;
+    return ds;
+}
+
 /**
  * Return (malloc'd) header name-version-release string.
  * @param h		header
diff --git a/lib/problems.c b/lib/problems.c
index c323106ee..75616b768 100644
--- a/lib/problems.c
+++ b/lib/problems.c
@@ -176,6 +176,26 @@ static int sameProblem(const rpmDependencyConflict ap,
     return 0;
 }
 
+/* XXX FIXME: merge into problems */
+rpmDependencyConflict rpmdepFreeConflicts(rpmDependencyConflict conflicts,
+		int numConflicts)
+{
+    int i;
+
+    if (conflicts)
+    for (i = 0; i < numConflicts; i++) {
+	conflicts[i].byHeader = headerFree(conflicts[i].byHeader, "problem");
+	conflicts[i].byName = _free(conflicts[i].byName);
+	conflicts[i].byVersion = _free(conflicts[i].byVersion);
+	conflicts[i].byRelease = _free(conflicts[i].byRelease);
+	conflicts[i].needsName = _free(conflicts[i].needsName);
+	conflicts[i].needsVersion = _free(conflicts[i].needsVersion);
+	conflicts[i].suggestedPackages = _free(conflicts[i].suggestedPackages);
+    }
+
+    return (conflicts = _free(conflicts));
+}
+
 /* XXX FIXME: merge into problems */
 void printDepProblems(FILE * fp,
 		const rpmDependencyConflict conflicts, int numConflicts)
diff --git a/lib/psm.c b/lib/psm.c
index 3e82a49a0..718a7996a 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -10,6 +10,8 @@
 #include <rpmmacro.h>
 #include <rpmurl.h>
 
+#include "depends.h"
+
 #include "rpmlead.h"		/* writeLead proto */
 #include "signature.h"		/* signature constants */
 #include "legacy.h"		/* XXX buildOrigFileList() */
@@ -1680,7 +1682,7 @@ static int handleOneTrigger(PSM_t psm, Header sourceH, Header triggeredH,
 			int arg2, unsigned char * triggersAlreadyRun)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem, internalState@*/
-	/*@modifies psm, *triggersAlreadyRun, rpmGlobalMacroContext,
+	/*@modifies psm, triggeredH, *triggersAlreadyRun, rpmGlobalMacroContext,
 		fileSystem, internalState @*/
 {
     const rpmTransactionSet ts = psm->ts;
@@ -1691,25 +1693,31 @@ static int handleOneTrigger(PSM_t psm, Header sourceH, Header triggeredH,
     const char ** triggerScripts;
     const char ** triggerProgs;
     int_32 * triggerIndices;
-    rpmTagType tnt, tvt, tft;
     const char * triggerPackageName;
     const char * sourceName;
     rpmRC rc = RPMRC_OK;
     int xx;
     int skip;
 
-    if (!(	hge(triggeredH, RPMTAG_TRIGGERNAME, &tnt, 
+    trigger->Type = "Trigger";
+    trigger->tagN = RPMTAG_TRIGGERNAME;
+    trigger->h = headerLink(triggeredH, "triggeredH");
+    trigger->i = -1;
+
+    if (!(	hge(triggeredH, RPMTAG_TRIGGERNAME, &trigger->Nt, 
 			(void **) &trigger->N, &trigger->Count) &&
-		hge(triggeredH, RPMTAG_TRIGGERFLAGS, &tft,
+		hge(triggeredH, RPMTAG_TRIGGERFLAGS, &trigger->Ft,
 			(void **) &trigger->Flags, NULL) &&
-		hge(triggeredH, RPMTAG_TRIGGERVERSION, &tvt,
+		hge(triggeredH, RPMTAG_TRIGGERVERSION, &trigger->EVRt,
 			(void **) &trigger->EVR, NULL))
 	)
 	return 0;
 
     xx = headerNVR(sourceH, &sourceName, NULL, NULL);
 
-    for (trigger->i = 0; trigger->i < trigger->Count; trigger->i++) {
+    trigger = dsiInit(trigger);
+    if (trigger != NULL)
+    while (dsiNext(trigger) >= 0) {
 	rpmTagType tit, tst, tpt;
 
 	if (!(trigger->Flags[trigger->i] & psm->sense)) continue;
@@ -1777,9 +1785,13 @@ static int handleOneTrigger(PSM_t psm, Header sourceH, Header triggeredH,
 	break;
     }
 
-    trigger->N = hfd(trigger->N, tnt);
-    trigger->Flags = hfd(trigger->Flags, tft);
-    trigger->EVR = hfd(trigger->EVR, tvt);
+    if (trigger != NULL) {
+	trigger->N = hfd(trigger->N, trigger->Nt);
+	trigger->Flags = hfd(trigger->Flags, trigger->Ft);
+	trigger->EVR = hfd(trigger->EVR, trigger->EVRt);
+	trigger->DNEVR = _free(trigger->DNEVR);
+	trigger->h = headerFree(trigger->h, "triggeredH");
+    }
 
     return rc;
 }
diff --git a/lib/rpmal.c b/lib/rpmal.c
index 1a092a25f..94c62c9c1 100644
--- a/lib/rpmal.c
+++ b/lib/rpmal.c
@@ -663,8 +663,8 @@ void alMakeIndex(availableList al)
 }
 
 availablePackage *
-alAllFileSatisfiesDepend(const availableList al,
-		const char * keyType, const char * fileName)
+alAllFileSatisfiesDepend(const availableList al, const char * keyType,
+		const char * fileName)
 {
     int i, found = 0;
     const char * dirName;
@@ -723,7 +723,7 @@ alAllFileSatisfiesDepend(const availableList al,
 #endif
 
 	    if (keyType)
-		rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (added files)\n"),
+		rpmMessage(RPMMESS_DEBUG, _("%9s: %-45s YES (added files)\n"),
 			keyType, fileName);
 
 	    ret = xrealloc(ret, (found+2) * sizeof(*ret));
@@ -751,8 +751,8 @@ exit:
  * @return		available package pointer
  */
 /*@unused@*/ static /*@dependent@*/ /*@null@*/ availablePackage
-alFileSatisfiesDepend(const availableList al,
-		const char * keyType, const char * fileName)
+alFileSatisfiesDepend(const availableList al, const char * keyType,
+		const char * fileName)
 	/*@*/
 {
     availablePackage ret;
@@ -768,9 +768,7 @@ alFileSatisfiesDepend(const availableList al,
 #endif	/* DYING */
 
 availablePackage *
-alAllSatisfiesDepend(const availableList al,
-		const char * keyType, const char * keyDepend,
-		const rpmDepSet key)
+alAllSatisfiesDepend(const availableList al, const rpmDepSet key)
 {
     availableIndexEntry needle =
 		memset(alloca(sizeof(*needle)), 0, sizeof(*needle));
@@ -779,7 +777,7 @@ alAllSatisfiesDepend(const availableList al,
     int rc, found;
 
     if (*key->N[key->i] == '/') {
-	ret = alAllFileSatisfiesDepend(al, keyType, key->N[key->i]);
+	ret = alAllFileSatisfiesDepend(al, key->Type, key->N[key->i]);
 	/* XXX Provides: /path was broken with added packages (#52183). */
 	if (ret != NULL && *ret != NULL)
 	    return ret;
@@ -807,19 +805,12 @@ alAllSatisfiesDepend(const availableList al,
 		indexcmp(match, needle) == 0;
 	 match++)
     {
-	int isave;
-
 	p = match->package;
 	rc = 0;
-	if (p->provides != NULL)
-	    isave = p->provides->i;	/* XXX hack */
 	switch (match->type) {
 	case IET_PROVIDES:
 	    if (p->provides != NULL)
-	    for (p->provides->i = 0;
-		 p->provides->i < p->provides->Count;
-		 p->provides->i++)
-	    {
+	    for (dsiInit(p->provides) != NULL; dsiNext(p->provides) >= 0;) {
 
 		/* Filter out provides that came along for the ride. */
 		if (strcmp(p->provides->N[p->provides->i], key->N[key->i]))
@@ -829,13 +820,13 @@ alAllSatisfiesDepend(const availableList al,
 		if (rc)
 		    /*@innerbreak@*/ break;
 	    }
-	    if (keyType && keyDepend && rc)
-		rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (added provide)\n"),
-				keyType, keyDepend+2);
+	    if (key->Type && rc)
+		if (key->DNEVR)
+		    rpmMessage(RPMMESS_DEBUG,
+			_("%9s: %-45s YES (added provide)\n"),
+				key->Type, key->DNEVR+2);
 	    /*@switchbreak@*/ break;
 	}
-	if (p->provides != NULL)
-	    p->provides->i = isave;	/* XXX hack */
 
 	/*@-branchstate@*/
 	if (rc) {
@@ -852,11 +843,9 @@ alAllSatisfiesDepend(const availableList al,
     return ret;
 }
 
-long alSatisfiesDepend(const availableList al,
-		const char * keyType, const char * keyDepend,
-		const rpmDepSet key)
+long alSatisfiesDepend(const availableList al, const rpmDepSet key)
 {
-    availablePackage * tmp = alAllSatisfiesDepend(al, keyType, keyDepend, key);
+    availablePackage * tmp = alAllSatisfiesDepend(al, key);
 
     if (tmp) {
 	availablePackage ret = tmp[0];
diff --git a/lib/rpmal.h b/lib/rpmal.h
index 790374fa1..2b618c85e 100644
--- a/lib/rpmal.h
+++ b/lib/rpmal.h
@@ -241,14 +241,11 @@ availablePackage * alAllFileSatisfiesDepend(const availableList al,
 /**
  * Check added package file lists for package(s) that have a provide.
  * @param al		available list
- * @param keyType	type of dependency
- * @param keyDepend	dependency string representation
  * @param key		dependency
  * @return		available package pointer
  */
 /*@only@*/ /*@null@*/
 availablePackage * alAllSatisfiesDepend(const availableList al,
-		const char * keyType, const char * keyDepend,
 		const rpmDepSet key)
 	/*@*/;
 
@@ -256,14 +253,10 @@ availablePackage * alAllSatisfiesDepend(const availableList al,
  * Check added package file lists for first package that has a provide.
  * @todo Eliminate.
  * @param al		available list
- * @param keyType	type of dependency
- * @param keyDepend	dependency string representation
  * @param key		dependency
  * @return		available package index, -1 on not found
  */
-long alSatisfiesDepend(const availableList al,
-		const char * keyType, const char * keyDepend,
-		const rpmDepSet key)
+long alSatisfiesDepend(const availableList al, const rpmDepSet key)
 	/*@*/;
 
 #ifdef __cplusplus
diff --git a/lib/rpmlibprov.c b/lib/rpmlibprov.c
index 40026a328..1b0a1efcf 100644
--- a/lib/rpmlibprov.c
+++ b/lib/rpmlibprov.c
@@ -63,16 +63,20 @@ int rpmCheckRpmlibProvides(const rpmDepSet key)
     int rc = 0;
     rpmDepSet pro = memset(alloca(sizeof(*pro)), 0, sizeof(*pro));
 
+    pro->Type = "Provides";
+    pro->tagN = RPMTAG_PROVIDENAME;
     for (rlp = rpmlibProvides; rlp->featureName != NULL; rlp++) {
 	if (rlp->featureEVR && rlp->featureFlags) {
 	    /*@-immediatetrans@*/
+	    pro->DNEVR = NULL;
 	    pro->N = (const char **) &rlp->featureName;
 	    pro->EVR = (const char **) &rlp->featureEVR;
 	    pro->Flags = &rlp->featureFlags;
-	    pro->Count = 1;
-	    pro->i = 0;
 	    /*@=immediatetrans@*/
+	    pro->Count = 1;
+	    (void) dsiNext(dsiInit(pro));
 	    rc = rpmRangesOverlap(key, pro);
+	    pro->DNEVR = _free(pro->DNEVR);
 	}
 	if (rc)
 	    break;
diff --git a/po/cs.po b/po/cs.po
index 1b7f1eaaa..26256aab3 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -831,7 +831,7 @@ msgstr "Nemohu p
 msgid "Could not open %s: %s\n"
 msgstr "Nemohu otevøít %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nemohu zapsat balíèek: %s\n"
@@ -861,7 +861,7 @@ msgstr "Nemohu p
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nemohu zapsat payload do %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapsáno: %s\n"
@@ -1433,7 +1433,7 @@ msgid " failed - "
 msgstr "selhal - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1442,124 +1442,124 @@ msgstr ""
 "Závislost \"B\" potøebuje období (pøedpokládáno stejné jako \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr "ANO"
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr "NE "
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nemohu otevøít databázi balíèkù v %s\n"
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "balíèek %s je ji¾ nainstalován"
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
-#, c-format
-msgid "%s: %-45s %-s (cached)\n"
+#: lib/depends.c:792
+#, fuzzy, c-format
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (ke¹ováno)\n"
 
-#: lib/depends.c:885
-#, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+#: lib/depends.c:828
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s ANO (rpmrc poskytuje)\n"
 
-#: lib/depends.c:902
-#, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+#: lib/depends.c:845
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s ANO (rpmlib poskytuje)\n"
 
-#: lib/depends.c:925
-#, c-format
-msgid "%s: %-45s YES (db files)\n"
+#: lib/depends.c:868
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db files)\n"
 msgstr "%s: %-45s ANO (db soubory)\n"
 
-#: lib/depends.c:938
-#, c-format
-msgid "%s: %-45s YES (db provides)\n"
+#: lib/depends.c:881
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s ANO (db poskytuje)\n"
 
-#: lib/depends.c:952
-#, c-format
-msgid "%s: %-45s YES (db package)\n"
+#: lib/depends.c:895
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db package)\n"
 msgstr "%s: %-45s ANO (db balíèek)\n"
 
-#: lib/depends.c:968
-#, c-format
-msgid "%s: %-45s NO\n"
+#: lib/depends.c:916
+#, fuzzy, c-format
+msgid "%9s: %-45s NO\n"
 msgstr "%s: %-45s NE\n"
 
-#: lib/depends.c:989
-#, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+#: lib/depends.c:943
+#, fuzzy, c-format
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n"
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, 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:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balíèek %s koliduje: %s\n"
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n"
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr "========== ukládání tsort relací\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 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:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n"
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr "SMYÈKA:\n"
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr "========== pokraèuje tsort ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1664,7 +1664,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "Poèet dataLength() RPM_STRING_TYPE musí bıt 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datovı typ %d není podporován\n"
@@ -2185,173 +2185,173 @@ msgstr "podepsat bal
 msgid "generate signature"
 msgstr "generovat PGP/GPG podpis"
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " je nutné pro %s-%s-%s\n"
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " koliduje s %s-%s-%s\n"
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr "balíèek %s je pro jinou architekturu"
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr "balíèek %s je pro jinı operaèní systém"
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr "balíèek %s je ji¾ nainstalován"
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "cesta %s v balíèku %s není pøemístitelná"
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "soubor %s zpùsobuje konflikt mezi instalovanım %s a %s"
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "soubor %s z instalace %s koliduje se souborem z balíèku %s"
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "balíèek %s (kterı je novìj¹í, ne¾ %s) je ji¾ nainstalován"
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "instalace balíèku %s potøebuje %ld%cB na systému souborù %s"
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "instalace balíèku %s potøebuje %ld inodù na systému souborù %s"
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "pøedtransakèní syscall v balíèku %s: %s selhalo: %s"
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "neznámá chyba %d vznikla pøi manipulaci s balíèkem %s"
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr "========== relokace\n"
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d vynechávám %s\n"
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d pøemís»uji %s -> %s\n"
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "vynechávám multilib cestu %s%s\n"
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "vynechávám %s %s\n"
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "pøemís»uji %s do %s\n"
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "pøemís»uji adresáø %s do %s\n"
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nemohu vytvoøit %s: %s\n"
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nemohu zapsat do %%%s %s\n"
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 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:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr "zdrojovı balíèek neobsahuje .spec soubor\n"
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: spou¹tím %s skript(y) (pokud existují)\n"
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, 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:1600
+#: lib/psm.c:1602
 #, 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:1945
+#: 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:2062
+#: 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:2176
+#: lib/psm.c:2188
 #, 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:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s neexistuje - pou¾ita skupina root\n"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalování archívu selhalo %s%s: %s\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr " na souboru "
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nemohu otevøít %s: %s\n"
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s selhalo\n"
diff --git a/po/da.po b/po/da.po
index b8d8ae831..ddd0b50f3 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -828,7 +828,7 @@ msgstr "Kunne ikke l
 msgid "Could not open %s: %s\n"
 msgstr "Kunne ikke åbne %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke skrive pakke: %s\n"
@@ -858,7 +858,7 @@ msgstr "Kunne ikke l
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
@@ -1434,7 +1434,7 @@ msgid " failed - "
 msgstr " mislykkedes - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1443,124 +1443,124 @@ msgstr ""
 "\"B\"-afhængighed kræver en epoke (antager samme som \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 #, fuzzy
 msgid "NO "
 msgstr "IKKE O.K."
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kunne ikke åbne Packages-database i %s\n"
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "pakken %s er allerede installeret"
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, fuzzy, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-3s (husket)\n"
 
-#: lib/depends.c:885
-#, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+#: lib/depends.c:828
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s JA (rpmrc tilfører)\n"
 
-#: lib/depends.c:902
-#, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+#: lib/depends.c:845
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s JA (rpmlib tilfører)\n"
 
-#: lib/depends.c:925
-#, c-format
-msgid "%s: %-45s YES (db files)\n"
+#: lib/depends.c:868
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db files)\n"
 msgstr "%s: %-45s JA (db-filer)\n"
 
-#: lib/depends.c:938
-#, c-format
-msgid "%s: %-45s YES (db provides)\n"
+#: lib/depends.c:881
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s JA (db tilfører)\n"
 
-#: lib/depends.c:952
-#, c-format
-msgid "%s: %-45s YES (db package)\n"
+#: lib/depends.c:895
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db package)\n"
 msgstr "%s: %-45s JA (db-pakke)\n"
 
-#: lib/depends.c:968
-#, c-format
-msgid "%s: %-45s NO\n"
+#: lib/depends.c:916
+#, fuzzy, c-format
+msgid "%9s: %-45s NO\n"
 msgstr "%s: %-45s NEJ\n"
 
-#: lib/depends.c:989
-#, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+#: lib/depends.c:943
+#, fuzzy, c-format
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n"
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, 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:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakke %s skaber konflikt: %s\n"
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n"
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr "========== gemmer tsort-relationer\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n"
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr "LØKKE:\n"
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr "========== fortsætter tsort ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1664,7 +1664,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "dataLength() RPM_STRING_TYPE-antal skal være 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatype %d understøttes ikke\n"
@@ -2203,176 +2203,176 @@ msgstr "underskriv en pakke (slet nuv
 msgid "generate signature"
 msgstr "generér PGP/GPG-signatur"
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " kræves af %s-%s-%s\n"
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " skaber konflikt med %s-%s-%s\n"
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr "pakken %s hører til en anden arkitektur"
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr "pakken %s hører til et andet operativsystem"
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr "pakken %s er allerede installeret"
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "sti %s i pakke %s kan ikke omrokeres"
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "filen %s skaber konflikt mellem den forsøgte installation af %s og %s"
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "filen %s fra installationen af %s skaber konflikt med fil fra pakken %s"
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "pakke %s (som er nyere end %s) er allerede installeret"
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "installation af pakke %s kræver %ld%cb på %s-filsystemet"
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "installation af pakken %s kræver %ld inode'r på %s-filsystemet"
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "pakke %s prætransaktion-systemkald: %s mislykkedes: %s"
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "ukendt fejl %d under arbejdet med pakken %s"
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr "========== gemmer omrokeringer\n"
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d ekskluderer %s\n"
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d omrokerer %s -> %s\n"
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "ekskluderer multilib-sti %s%s\n"
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "ekskluderer %s %s\n"
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "omrokerer %s til %s\n"
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "omrokerer kataloget %s til %s\n"
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kunne ikke skrive til %s\n"
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr "kildepakke forventet, binær fundet\n"
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr "kildepakke indeholder ingen .spec-fil\n"
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "kører postinstallations-skript (hvis det findes)\n"
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, 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:1600
+#: lib/psm.c:1602
 #, 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:1945
+#: 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:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "bruger %s eksisterer ikke - bruger root\n"
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "gruppe %s eksisterer ikke - bruger root\n"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "udpakning af arkiv mislykkedes%s%s: %s\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr " for fil "
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "kunne ikke åbne %s: %s\n"
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s mislykkedes\n"
diff --git a/po/de.po b/po/de.po
index 17e30c4be..04de7ef87 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -921,7 +921,7 @@ msgid "Could not open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen\n"
 
 # , c-format
-#: build/pack.c:603 lib/psm.c:2140
+#: 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"
@@ -956,7 +956,7 @@ msgstr "Nicht m
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1569,131 +1569,132 @@ msgid " failed - "
 msgstr "pgp fehlgeschlagen"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, fuzzy, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:885
-#, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
-msgstr ""
-
-#: lib/depends.c:902
+#: lib/depends.c:828
 #, fuzzy, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:925
-#, c-format
-msgid "%s: %-45s YES (db files)\n"
-msgstr ""
-
-#: lib/depends.c:938
-#, c-format
-msgid "%s: %-45s YES (db provides)\n"
-msgstr ""
-
-#: lib/depends.c:952
+#: lib/depends.c:845
 #, fuzzy, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:968
-#, c-format
-msgid "%s: %-45s NO\n"
-msgstr ""
-
-#: lib/depends.c:989
+#: lib/depends.c:868
 #, fuzzy, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: %-45s YES (db files)\n"
+msgstr "die Datei »%s« gehört zu keinem Paket\n"
+
+#: lib/depends.c:881
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db provides)\n"
+msgstr "die Datei »%s« gehört zu keinem Paket\n"
+
+#: lib/depends.c:895
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db package)\n"
+msgstr "die Datei »%s« gehört zu keinem Paket\n"
+
+# , c-format
+#: lib/depends.c:916
+#, fuzzy, c-format
+msgid "%9s: %-45s NO\n"
+msgstr "Öffnen von %s fehlgeschlagen: %s"
+
+#: lib/depends.c:943
+#, fuzzy, c-format
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, 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:1111
+#: lib/depends.c:1059
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
 # FIXME
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1801,7 +1802,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2369,183 +2370,183 @@ msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
 msgid "generate signature"
 msgstr "PGP-Signatur generieren"
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " wird von %s-%s-%s gebraucht\n"
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " steht im Konflikt mit %s-%s-%s\n"
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, fuzzy, c-format
 msgid "package %s is for a different architecture"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, fuzzy, c-format
 msgid "package %s is for a different operating system"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, fuzzy, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr " steht im Konflikt mit %s-%s-%s\n"
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, fuzzy, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
 # , c-format
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Hole %s heraus\n"
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
 # , c-format
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "Hole %s heraus\n"
 
 # , c-format
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Hole %s heraus\n"
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "Keine Stufen ausführen"
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, 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:1600
+#: lib/psm.c:1602
 #, 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:1945
+#: 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:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "öffnen von %s fehlgeschlagen: %s\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
 # , c-format
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "pgp fehlgeschlagen"
diff --git a/po/en_RN.po b/po/en_RN.po
index edcf1f6dd..663a1e02a 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,130 +1411,130 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:925
+#: lib/depends.c:868
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%9s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:938
+#: lib/depends.c:881
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:968
+#: lib/depends.c:916
 #, c-format
-msgid "%s: %-45s NO\n"
+msgid "%9s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:989
+#: lib/depends.c:943
 #, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1636,7 +1636,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2143,173 +2143,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1945
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index edcf1f6dd..663a1e02a 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,130 +1411,130 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:925
+#: lib/depends.c:868
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%9s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:938
+#: lib/depends.c:881
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:968
+#: lib/depends.c:916
 #, c-format
-msgid "%s: %-45s NO\n"
+msgid "%9s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:989
+#: lib/depends.c:943
 #, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1636,7 +1636,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2143,173 +2143,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1945
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index edcf1f6dd..663a1e02a 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,130 +1411,130 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:925
+#: lib/depends.c:868
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%9s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:938
+#: lib/depends.c:881
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:968
+#: lib/depends.c:916
 #, c-format
-msgid "%s: %-45s NO\n"
+msgid "%9s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:989
+#: lib/depends.c:943
 #, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1636,7 +1636,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2143,173 +2143,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1945
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 94de6d35b..6d03d2493 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -835,7 +835,7 @@ msgstr "%s:n kirjoitus ei onnistu"
 msgid "Could not open %s: %s\n"
 msgstr "%s:n avaus epäonnistui\n"
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
@@ -865,7 +865,7 @@ msgstr "%s:n kirjoitus ei onnistu"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1452,130 +1452,130 @@ msgid " failed - "
 msgstr "pgp epäonnistui"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "virhe: en voi avata %s%s/packages.rpm\n"
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, fuzzy, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:885
-#, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
-msgstr ""
-
-#: lib/depends.c:902
+#: lib/depends.c:828
 #, fuzzy, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:925
-#, c-format
-msgid "%s: %-45s YES (db files)\n"
-msgstr ""
-
-#: lib/depends.c:938
-#, c-format
-msgid "%s: %-45s YES (db provides)\n"
-msgstr ""
-
-#: lib/depends.c:952
+#: lib/depends.c:845
 #, fuzzy, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:968
-#, c-format
-msgid "%s: %-45s NO\n"
-msgstr ""
-
-#: lib/depends.c:989
+#: lib/depends.c:868
 #, fuzzy, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: %-45s YES (db files)\n"
+msgstr "tiedostoa %s ei omista mikään paketti\n"
+
+#: lib/depends.c:881
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db provides)\n"
+msgstr "tiedostoa %s ei omista mikään paketti\n"
+
+#: lib/depends.c:895
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db package)\n"
+msgstr "tiedostoa %s ei omista mikään paketti\n"
+
+#: lib/depends.c:916
+#, fuzzy, c-format
+msgid "%9s: %-45s NO\n"
+msgstr "en voinut avata %s: %s"
+
+#: lib/depends.c:943
+#, fuzzy, c-format
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, 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:1111
+#: lib/depends.c:1059
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1679,7 +1679,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2236,174 +2236,174 @@ msgstr "allekirjoita paketti (hylk
 msgid "generate signature"
 msgstr "generoi PGP-allekirjoitus"
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr "vaatii %s-%s-%s\n"
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " on ristiriidassa %s-%s-%s:n kanssa\n"
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, fuzzy, c-format
 msgid "package %s is for a different architecture"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, fuzzy, c-format
 msgid "package %s is for a different operating system"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, fuzzy, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr " on ristiriidassa %s-%s-%s:n kanssa\n"
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, fuzzy, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Haen: %s\n"
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "Haen: %s\n"
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Haen: %s\n"
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, 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:1600
+#: lib/psm.c:1602
 #, 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:1945
+#: 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:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "pgp epäonnistui"
diff --git a/po/fr.po b/po/fr.po
index f6ff0d78f..28f005c81 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -870,7 +870,7 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -900,7 +900,7 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1492,130 +1492,130 @@ msgid " failed - "
 msgstr "La construction a chou.\n"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:925
+#: lib/depends.c:868
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%9s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:938
+#: lib/depends.c:881
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:968
-#, c-format
-msgid "%s: %-45s NO\n"
-msgstr ""
+#: lib/depends.c:916
+#, fuzzy, c-format
+msgid "%9s: %-45s NO\n"
+msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/depends.c:989
+#: lib/depends.c:943
 #, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, 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:1111
+#: lib/depends.c:1059
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1717,7 +1717,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2289,175 +2289,175 @@ msgstr ""
 msgid "generate signature"
 msgstr "      --sign            - genre une signature PGP"
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, fuzzy, c-format
 msgid "package %s is for a different architecture"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, fuzzy, c-format
 msgid "package %s is for a different operating system"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr ""
 "        -f <file>+        - interroge le package  qui appartient <file>"
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1945
+#: 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:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "La construction a chou.\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "La construction a chou.\n"
diff --git a/po/gl.po b/po/gl.po
index d0783a669..1794de6e3 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -811,7 +811,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -841,7 +841,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1406,130 +1406,130 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:925
+#: lib/depends.c:868
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%9s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:938
+#: lib/depends.c:881
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:968
+#: lib/depends.c:916
 #, c-format
-msgid "%s: %-45s NO\n"
+msgid "%9s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:989
+#: lib/depends.c:943
 #, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1631,7 +1631,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2138,173 +2138,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1945
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index edcf1f6dd..663a1e02a 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,130 +1411,130 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:925
+#: lib/depends.c:868
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%9s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:938
+#: lib/depends.c:881
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:968
+#: lib/depends.c:916
 #, c-format
-msgid "%s: %-45s NO\n"
+msgid "%9s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:989
+#: lib/depends.c:943
 #, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1636,7 +1636,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2143,173 +2143,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1945
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index edcf1f6dd..663a1e02a 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,130 +1411,130 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:925
+#: lib/depends.c:868
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%9s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:938
+#: lib/depends.c:881
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:968
+#: lib/depends.c:916
 #, c-format
-msgid "%s: %-45s NO\n"
+msgid "%9s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:989
+#: lib/depends.c:943
 #, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1636,7 +1636,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2143,173 +2143,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1945
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 73ea460c4..668a4c815 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -815,7 +815,7 @@ msgstr "Get ekki lesi
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Get ekki ritağ í pakka: %s\n"
@@ -845,7 +845,7 @@ msgstr "Get ekki lesi
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Get ekki ritağ innihald í %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrifaği: %s\n"
@@ -1411,130 +1411,130 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "get ekki opnağ pakka gagnagrunn í\n"
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:925
+#: lib/depends.c:868
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%9s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:938
+#: lib/depends.c:881
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:968
-#, c-format
-msgid "%s: %-45s NO\n"
-msgstr ""
+#: lib/depends.c:916
+#, fuzzy, c-format
+msgid "%9s: %-45s NO\n"
+msgstr "%s: %s\n"
 
-#: lib/depends.c:989
+#: lib/depends.c:943
 #, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1636,7 +1636,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2148,173 +2148,173 @@ msgstr ""
 msgid "generate signature"
 msgstr "búa til undirskrift"
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d færa %s -> %s\n"
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "gat ekki búiğ til %%%s %s\n"
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "get ekki ritağ í %%%s %s\n"
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr "pakkinn inniheldur enga .spec skrá\n"
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1945
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "gat ekki opnağ %s: %s\n"
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s brást\n"
diff --git a/po/it.po b/po/it.po
index edcf1f6dd..663a1e02a 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,130 +1411,130 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:925
+#: lib/depends.c:868
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%9s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:938
+#: lib/depends.c:881
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:968
+#: lib/depends.c:916
 #, c-format
-msgid "%s: %-45s NO\n"
+msgid "%9s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:989
+#: lib/depends.c:943
 #, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1636,7 +1636,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2143,173 +2143,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1945
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 1fefd7059..b95d6ed66 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -862,7 +862,7 @@ msgstr "
 msgid "Could not open %s: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s"
@@ -892,7 +892,7 @@ msgstr "
 msgid "Unable to write payload to %s: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s"
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "½ñ¤­¹ş¤ßÃæ: %s\n"
@@ -1484,7 +1484,7 @@ msgid " failed - "
 msgstr "¼ºÇÔ - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1493,123 +1493,123 @@ msgstr ""
 "\"B\" ¤Î°Í¸À­¤Ï epoch ¤òɬÍפȤ·¤Ş¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤¹"
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, fuzzy, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, fuzzy, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, fuzzy, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
-#: lib/depends.c:925
-#, c-format
-msgid "%s: %-45s YES (db files)\n"
-msgstr ""
-
-#: lib/depends.c:938
+#: lib/depends.c:868
 #, fuzzy, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db files)\n"
+msgstr "%s: %s ¤Ï¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
+
+#: lib/depends.c:881
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, fuzzy, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: lib/depends.c:968
-#, c-format
-msgid "%s: %-45s NO\n"
-msgstr ""
-
-#: lib/depends.c:989
+#: lib/depends.c:916
 #, fuzzy, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: %-45s NO\n"
+msgstr "¥Õ¥¡¥¤¥ë %s: %s\n"
+
+#: lib/depends.c:943
+#, fuzzy, c-format
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëş¤¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Ş¤¹: %s\n"
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Ş¤¹\n"
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1714,7 +1714,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabDate() RPM_STRING_TYPE ¥«¥¦¥ó¥È¤Ï 1 ¤Ç¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó¡£\n"
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "¥Ç¡¼¥¿¥¿¥¤¥× %d ¤Ï¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤»¤ó\n"
@@ -2287,185 +2287,185 @@ msgstr "
 msgid "generate signature"
 msgstr "PGP/GPG ½ğ̾¤òÀ¸À®¤·¤Ş¤¹"
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Ş¤¹\n"
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " %s-%s-%s ¤È¶¥¹ç¤·¤Ş¤¹\n"
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, fuzzy, c-format
 msgid "package %s is for a different architecture"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¸ş¤±¤Ç¤¹"
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, fuzzy, c-format
 msgid "package %s is for a different operating system"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë OS ¸ş¤±¤Ç¤¹"
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤¹"
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Ş¤»¤ó"
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, fuzzy, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 "¥Õ¥¡¥¤¥ë %s ¤Ï %s-%s-%s ¤È %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Î¥Õ¥¡¥¤¥ë¤È¶¥¹ç¤·¤Æ¤¤¤Ş¤¹"
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, fuzzy, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "%s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤«¤é¤Î¥Õ¥¡¥¤¥ë %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤«¤é¤Î¥Õ¥¡¥¤¥ë"
 "¤È¶¥¹ç¤·¤Æ¤¤¤Ş¤¹"
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s (%s-%s-%s¤è¤ê¤â¿·¤·¤¤¤â¤Î) ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş"
 "¤¹"
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, fuzzy, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å"
 "¤Ç)"
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, fuzzy, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å"
 "¤Ç)"
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, fuzzy, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼ %d ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ÎÁàºîÃæ¤Ë¤ª¤­¤Ş¤·¤¿"
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS ¤Ï½ü³°¤µ¤ì¤Æ¤¤¤Ş¤¹: %s"
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Ş¤¹\n"
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n"
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n"
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Ş¤¹\n"
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Ş¤¹\n"
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%s ¤òºîÀ®¤Ç¤­¤Ş¤»¤ó: %s\n"
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%s ¤Ø½ñ¤­¹ş¤á¤Ş¤»¤ó"
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Ş¤¹¡¢¥Ğ¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Ş¤·¤¿"
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Ş¤ó¤Ç¤¤¤Ş¤»¤ó"
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "¥İ¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ğ)¤ò¼Â¹Ô¤·¤Ş¤¹\n"
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ"
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ"
 
-#: lib/psm.c:1945
+#: 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:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Ş¤»¤ó - root ¤ò»ÈÍѤ·¤Ş¤¹"
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Ş¤»¤ó - root ¤ò»ÈÍѤ·¤Ş¤¹"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 #, fuzzy
 msgid " on file "
 msgstr "¥Õ¥¡¥¤¥ë¾å"
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s ¼ºÇÔ"
@@ -3563,10 +3563,6 @@ msgstr "url 
 msgid "failed to create %s: %s\n"
 msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#, fuzzy
-#~ msgid "%s: %-45s YES (added files)\n"
-#~ msgstr "%s: %s ¤Ï¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
-
 #, fuzzy
 #~ msgid "%s: %-45s YES (added provide)\n"
 #~ msgstr "%s: %s ¤Ï provide ¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
diff --git a/po/ko.po b/po/ko.po
index d71a847cb..9bc0e1c17 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: 2001-09-07 22:03+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -822,7 +822,7 @@ msgstr "
 msgid "Could not open %s: %s\n"
 msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "ÆĞÅ°Áö¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n"
@@ -852,7 +852,7 @@ msgstr "%s 
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s ¿¡ payload¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "ÀÛ¼º: %s\n"
@@ -1424,7 +1424,7 @@ msgid " failed - "
 msgstr " ½ÇÆĞÇÔ - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1433,124 +1433,124 @@ msgstr ""
 "\"B\" ÀÇÁ¸¼ºÀº Áß¿ä½Ã µÇ´Â °Í(epoch)À» ÇÊ¿ä·Î ÇÕ´Ï´Ù (\"A\" ·Î °¡Á¤ÇÕ´Ï´Ù)\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr "¿¹"
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr "¾Æ´Ï¿À"
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "%s ¾ÈÀÇ ÆĞÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "%s ÆĞÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
-#, c-format
-msgid "%s: %-45s %-s (cached)\n"
+#: lib/depends.c:792
+#, fuzzy, c-format
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (ij½ÃµÊ)\n"
 
-#: lib/depends.c:885
-#, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+#: lib/depends.c:828
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n"
 
-#: lib/depends.c:902
-#, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+#: lib/depends.c:845
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n"
 
-#: lib/depends.c:925
-#, c-format
-msgid "%s: %-45s YES (db files)\n"
+#: lib/depends.c:868
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db files)\n"
 msgstr "%s: %-45s ¿¹ (db ÆÄÀÏ)\n"
 
-#: lib/depends.c:938
-#, c-format
-msgid "%s: %-45s YES (db provides)\n"
+#: lib/depends.c:881
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n"
 
-#: lib/depends.c:952
-#, c-format
-msgid "%s: %-45s YES (db package)\n"
+#: lib/depends.c:895
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db package)\n"
 msgstr "%s: %-45s ¿¹ (db ÆĞÅ°Áö)\n"
 
-#: lib/depends.c:968
-#, c-format
-msgid "%s: %-45s NO\n"
+#: lib/depends.c:916
+#, fuzzy, c-format
+msgid "%9s: %-45s NO\n"
 msgstr "%s: %-45s ¾Æ´Ï¿À\n"
 
-#: lib/depends.c:989
-#, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+#: lib/depends.c:943
+#, fuzzy, c-format
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n"
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "%s-%s-%s ÆĞÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "ÆĞÅ°Áö %s (ÀÌ)°¡ Ãæµ¹ÇÔ: %s\n"
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n"
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== ÆĞÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n"
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n"
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr "·çÇÁ(LOOP):\n"
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1655,7 +1655,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "dataLength() RPM_STRING_TYPE Ä«¿îÆ®´Â ¹İµå½Ã '1' À̾î¾ß ÇÕ´Ï´Ù.\n"
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "%d µ¥ÀÌÅÍ À¯ÇüÀº »ç¿ëÇÏ½Ç ¼ö ¾ø½À´Ï´Ù\n"
@@ -2179,185 +2179,185 @@ msgstr "
 msgid "generate signature"
 msgstr "¼­¸íÀ» ÀÛ¼ºÇÕ´Ï´Ù"
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " (Àº)´Â %s-%s-%s ¿¡¼­ ÇÊ¿ä·Î ÇÕ´Ï´Ù\n"
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " %s-%s-%s (¿Í)°ú Ãæµ¹ÇÕ´Ï´Ù\n"
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr "%s (Àº)´Â ´Ù¸¥ ¾ÆÅ°ÅØÃĸ¦ À§ÇÑ ÆĞÅ°ÁöÀÔ´Ï´Ù"
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr "%s (Àº)´Â ´Ù¸¥ ¿î¿µÃ¼Á¦¸¦ À§ÇÑ ÆĞÅ°ÁöÀÔ´Ï´Ù"
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr "%s ÆĞÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "%2$s ÆĞÅ°Áö ¾ÈÀÇ %1$s °æ·Î´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "%2$s (¿Í)°ú %3$s ÀÇ ¼³Ä¡ °úÁ¤¿¡¼­ %1$s ÆÄÀÏÀÌ ¼­·Î Ãæµ¹ÇÕ´Ï´Ù"
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "%2$s ¿¡¼­ ¼³Ä¡µÇ´Â %1$s ÆÄÀÏÀº %3$s ÆĞÅ°ÁöÀÇ ÆÄÀÏ°ú Ãæµ¹ÇÕ´Ï´Ù"
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "%s ÆĞÅ°Áö (%s º¸´Ù ÃÖ½ÅÀÇ ÆĞÅ°Áö)´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 "%4$s ÆÄÀϽýºÅÛ »ó¿¡¼­ %1$s ÆĞÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld%3$cb (ÀÌ)°¡ ÇÊ¿äÇÕ"
 "´Ï´Ù"
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 "%3$s ÆÄÀϽýºÅÛ »ó¿¡¼­ %1$s ÆĞÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld ÀÇ ¾ÆÀ̳ëµå(inode)"
 "°¡ ÇÊ¿äÇÕ´Ï´Ù"
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 "%s ÆĞÅ°ÁöÀÇ ¼±(pre)-Æ®·£Àè¼Ç ½Ã½ºÅÛÄİ(syscall): %s (ÀÌ)°¡ ½ÇÆĞÇß½À´Ï´Ù: %s"
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 "%2$s ÆĞÅ°Áö¸¦ ó¸®ÇÏ´Â °úÁ¤¿¡¼­ ¾Ë ¼ö ¾ø´Â ¿À·ù %1$d (ÀÌ)°¡ ¹ß»ıÇß½À´Ï´Ù"
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr "========== Àç¹èÄ¡\n"
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d Á¦¿Ü(exclude)  %s\n"
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d Àç¹èÄ¡ %s -> %s\n"
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "%s%s multilib °æ·Î¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n"
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "%s %s (À»)¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n"
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s ¿¡¼­ %s (À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n"
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%s µğ·ºÅ丮¸¦ %s (À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n"
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%%%s %s (À»)¸¦ »ı¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s %s (À»)¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr "¼Ò½º ÆĞÅ°Áö°¡ ¿ä±¸µË´Ï´Ù, ¹ÙÀ̳ʸ®¸¦ ã¾Ò½À´Ï´Ù\n"
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr "¼Ò½º ÆĞÅ°Áö¿¡ .spec ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n"
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: %s ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÕ´Ï´Ù (ÀÖÀ» °æ¿ì)\n"
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, 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:1600
+#: lib/psm.c:1602
 #, 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:1945
+#: 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:2062
+#: 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:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n"
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆĞÇÔ%s%s: %s\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr " ´ÙÀ½ ÆÄÀÏ¿¡ "
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%2$s ÆÄÀÏÀÇ %1$s (ÀÌ)°¡ ½ÇÆĞÇÔ: %3$s\n"
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s (ÀÌ)°¡ ½ÇÆĞÇÔ: %s\n"
diff --git a/po/no.po b/po/no.po
index 6572891b2..6b49180b0 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -825,7 +825,7 @@ msgstr "Kunne ikke 
 msgid "Could not open %s: %s\n"
 msgstr "Kunne ikke åpne %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke skrive pakke: %s\n"
@@ -855,7 +855,7 @@ msgstr "Kunne ikke lese \"payload\" fra %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke skrive \"payload\" til %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
@@ -1425,130 +1425,130 @@ msgid " failed - "
 msgstr " feilet - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr "JA"
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr "NEI"
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kan ikke åpne pakkedatabase i %s\n"
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "pakke %s er allerede installert"
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:925
+#: lib/depends.c:868
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%9s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:938
+#: lib/depends.c:881
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:968
-#, c-format
-msgid "%s: %-45s NO\n"
-msgstr ""
+#: lib/depends.c:916
+#, fuzzy, c-format
+msgid "%9s: %-45s NO\n"
+msgstr "%s: %s\n"
 
-#: lib/depends.c:989
+#: lib/depends.c:943
 #, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakke %s er i konflikt: %s\n"
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1650,7 +1650,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatype %d ikke støttet\n"
@@ -2170,173 +2170,173 @@ msgstr "signer en pakke (forkast n
 msgid "generate signature"
 msgstr "generer signatur"
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " kreves av %s-%s-%s\n"
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " er i konflikt med %s-%s-%s\n"
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr "pakke %s er for en annen arkitektur"
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr "pakke %s er for et annet operativsystem"
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr "pakke %s er allerede installert"
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "sti %s i pakke %s kan ikke relokeres"
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d omplasser %s -> %s\n"
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "ekskluderer multilib-sti %s%s\n"
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "eksluderer %s %s\n"
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "relokerer %s til %s\n"
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "relokerer katalog %s til %s\n"
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan ikke opprette %%%s %s\n"
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kan ikke skrive til %%%s %s\n"
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr "kildepakke forventet, binær funnet\n"
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr "kildepakke inneholder ikke en .spec-fil\n"
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: kjører %s-skript (hvis noen)\n"
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1945
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "klarte ikke å åpne %s: %s\n"
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s feilet\n"
diff --git a/po/pl.po b/po/pl.po
index 55c96da10..3e2d51dbf 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -852,7 +852,7 @@ msgstr "Nie mo
 msgid "Could not open %s: %s\n"
 msgstr "Nie mo¿na otworzyæ %s\n"
 
-#: build/pack.c:603 lib/psm.c:2140
+#: 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"
@@ -882,7 +882,7 @@ msgstr "Nie mo
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie mo¿na zapisaæ pakietu: %s"
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
@@ -1466,131 +1466,131 @@ msgid " failed - "
 msgstr " nie powiod³o siê -"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 #, fuzzy
 msgid "NO "
 msgstr "NIE DOBRZE"
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany"
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, fuzzy, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:885
-#, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
-msgstr ""
-
-#: lib/depends.c:902
+#: lib/depends.c:828
 #, fuzzy, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:925
-#, c-format
-msgid "%s: %-45s YES (db files)\n"
-msgstr ""
-
-#: lib/depends.c:938
-#, c-format
-msgid "%s: %-45s YES (db provides)\n"
-msgstr ""
-
-#: lib/depends.c:952
+#: lib/depends.c:845
 #, fuzzy, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:968
-#, c-format
-msgid "%s: %-45s NO\n"
-msgstr ""
-
-#: lib/depends.c:989
+#: lib/depends.c:868
 #, fuzzy, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: %-45s YES (db files)\n"
+msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
+
+#: lib/depends.c:881
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db provides)\n"
+msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
+
+#: lib/depends.c:895
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db package)\n"
+msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
+
+#: lib/depends.c:916
+#, fuzzy, c-format
+msgid "%9s: %-45s NO\n"
+msgstr "plik %s: %s\n"
+
+#: lib/depends.c:943
+#, fuzzy, c-format
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, 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:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakiet %s jest w konflikcie: %s\n"
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "usuwanie indeksu grupy\n"
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1695,7 +1695,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE licznik musi byæ 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ danych %d nie jest obs³ugiwany\n"
@@ -2250,177 +2250,177 @@ msgstr "podpisz pakiet (porzu
 msgid "generate signature"
 msgstr "generuj sygnaturê PGP/GPG"
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " jest wymagany przez %s-%s-%s\n"
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " jest w konflikcie z %s-%s-%s\n"
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, fuzzy, c-format
 msgid "package %s is for a different architecture"
 msgstr "pakiet %s-%s-%s zbudowano dla innej architektury"
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, fuzzy, c-format
 msgid "package %s is for a different operating system"
 msgstr "pakiet %s-%s-%s zbudowano dla innego systemu operacyjnego"
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany"
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "pakiet %s nie jest przesuwalny\n"
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, fuzzy, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "plik %s z pakietu %s-%s-%s jest w konflikcie z plikiem z pakietu %s-%s-%s"
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 "pakiet %s-%s-%s (który jest nowszy ni¿ %s-%s-%s) jest ju¿ zainstalowany"
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, fuzzy, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s"
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, fuzzy, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s"
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, fuzzy, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "wyst±pi³ nieznany b³±d %d w trakcie manipulowania pakietem %s-%s-%s"
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Ten OS nie jest wspierany: %s"
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "wy³±czanie %s\n"
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "wy³±czanie %s\n"
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nie mo¿na utworzyæ %s"
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nie mo¿na zapisaæ do %s"
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "spodziewany pakiet ¼ród³owy a nie binarny"
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n"
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, 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:1600
+#: lib/psm.c:1602
 #, 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:1945
+#: 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:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, 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:2185
+#: lib/psm.c:2197
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupa %s nie istnieje - u¿yto grupy root"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, 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:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr " na pliku "
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s"
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s nie powiod³o siê"
diff --git a/po/pt.po b/po/pt.po
index e2617dd83..12435f5d7 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: 2000-06-22 01:13+01:00\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires\n"
 "Language-Team: pt <kde@poli.org>\n"
@@ -823,7 +823,7 @@ msgstr "N
 msgid "Could not open %s: %s\n"
 msgstr "Não consigo aceder ao %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:2140
+#: 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"
@@ -853,7 +853,7 @@ msgstr "N
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Não consegui escrever o conteúdo de %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Gravei: %s\n"
@@ -1421,7 +1421,7 @@ msgid " failed - "
 msgstr " falhou - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1430,124 +1430,124 @@ msgstr ""
 "A dependência \"B\" precisa duma época (assumindo a mesma que \"A\")\n"
 "\t %s\tB %s\n"
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s     A %s\tB %s\n"
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 #, fuzzy
 msgid "NO "
 msgstr "NÃO-OK"
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, 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:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "o pacote %s já está instalado"
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, fuzzy, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-3s (em cache)\n"
 
-#: lib/depends.c:885
-#, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+#: lib/depends.c:828
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n"
 
-#: lib/depends.c:902
-#, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+#: lib/depends.c:845
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n"
 
-#: lib/depends.c:925
-#, c-format
-msgid "%s: %-45s YES (db files)\n"
+#: lib/depends.c:868
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db files)\n"
 msgstr "%s: %-45s SIM (ficheiros db)\n"
 
-#: lib/depends.c:938
-#, c-format
-msgid "%s: %-45s YES (db provides)\n"
+#: lib/depends.c:881
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s SI (oferecidos pelo db)\n"
 
-#: lib/depends.c:952
-#, c-format
-msgid "%s: %-45s YES (db package)\n"
+#: lib/depends.c:895
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db package)\n"
 msgstr "%s: %-45s SIM (pacote db)\n"
 
-#: lib/depends.c:968
-#, c-format
-msgid "%s: %-45s NO\n"
+#: lib/depends.c:916
+#, fuzzy, c-format
+msgid "%9s: %-45s NO\n"
 msgstr "%s: %-45s NÃO\n"
 
-#: lib/depends.c:989
-#, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+#: lib/depends.c:943
+#, fuzzy, c-format
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) adicionado à cache de dependências.\n"
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, 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:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "o pacote %s está em conflito: %s\n"
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "a remover o %s-%s-%s \"%s\" das relações do tsort.\n"
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr "=========== a guardar as relações do tsort\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr "========== só os sucessores (ordem de apresentação)\n"
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr "CICLO:\n"
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr "========== a prosseguir o tsort ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1651,7 +1651,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "o valor RPM_STRING_TYPE do dataLength() tem de ser 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "O tipo de dados %d não é suportado\n"
@@ -2182,173 +2182,173 @@ msgstr "assinar um pacote (retira a assinatura actual)"
 msgid "generate signature"
 msgstr "gerar a assinatura PGP/GPG"
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " é necessário pelo %s-%s-%s\n"
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " está em conflito com o %s-%s-%s\n"
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr "o pacote %s é para uma arquitectura diferente"
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr "o pacote %s é para um sistema operativo diferente"
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr "o pacote %s já está instalado"
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "a directoria %s no pacote %s não pode ser mudada de sítio"
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "o ficheiro %s está em conflito com as tentativas de instalação do %s e %s"
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "o ficheiro %s da instalação do %s está em conflito com o ficheiro do pacote %s"
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "o pacote %s (que é mais recente que o %s) já está instalado"
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "a instalação do pacote %s precisa de %ld%cb no sistema de ficheiros %s"
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "a instalação do pacote %s precisa de %ld 'inodes' no sistema de ficheiros %s"
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "a(s) chamada(s) de pré-transacção do pacote %s: %s falhou: %s"
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "encontrado o erro desconhecido %d ao manipular o pacote %s"
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr "========== mudanças de local\n"
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d excluir o %s\n"
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d mudar de local %s -> %s\n"
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "a exclur a directoria 'multilib' %s%s\n"
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "a excluir o %s %s\n"
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "a mudar o %s para %s\n"
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "a mudar a directoria %s para %s\n"
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "não consigo criar o %s: %s\n"
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "não consigo escrever em %s\n"
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 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:1315
+#: lib/psm.c:1317
 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:1425
+#: lib/psm.c:1427
 #, 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:1593
+#: lib/psm.c:1595
 #, 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:1600
+#: lib/psm.c:1602
 #, 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:1945
+#: 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:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, 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:2185
+#: lib/psm.c:2197
 #, 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:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "a abertura do pacote falhou%s%s: %s\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr " no ficheiro "
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "falhei ao aceder ao %s: %s\n"
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "O %s falhou\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6f4a59a27..e48a48268 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 
 #: build.c:36
 #, fuzzy
@@ -911,7 +911,7 @@ msgid "Could not open %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -946,7 +946,7 @@ msgstr "No consegui abrir: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1578,132 +1578,133 @@ msgid " failed - "
 msgstr "Construo falhou.\n"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
 # , c-format
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:925
+#: lib/depends.c:868
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%9s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:938
+#: lib/depends.c:881
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:968
-#, c-format
-msgid "%s: %-45s NO\n"
-msgstr ""
+# , c-format
+#: lib/depends.c:916
+#, fuzzy, c-format
+msgid "%9s: %-45s NO\n"
+msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: lib/depends.c:989
+#: lib/depends.c:943
 #, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, 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:1111
+#: lib/depends.c:1059
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "no foi passado pacote para desinstalao"
 
 # , c-format
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "No consegui abrir: %s\n"
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1812,7 +1813,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2377,72 +2378,72 @@ msgstr "assine um pacote (descarte a assinatura corrente)"
 msgid "generate signature"
 msgstr "gere assinatura PGP"
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, fuzzy, c-format
 msgid "package %s is for a different architecture"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, fuzzy, c-format
 msgid "package %s is for a different operating system"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
@@ -2454,13 +2455,13 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "RPM verso %s\n"
 
 # , c-format
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -2473,7 +2474,7 @@ msgstr "No consegui abrir: %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "RPM verso %s\n"
@@ -2486,94 +2487,94 @@ msgstr "RPM verso %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "RPM verso %s\n"
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
 # , c-format
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "no execute nenhum estgio"
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1945
+#: 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:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "Construo falhou.\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
 # , c-format
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "Construo falhou.\n"
diff --git a/po/ro.po b/po/ro.po
index a0e3b7038..6e179a662 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -811,7 +811,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -841,7 +841,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1406,130 +1406,130 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:925
+#: lib/depends.c:868
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%9s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:938
+#: lib/depends.c:881
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:968
+#: lib/depends.c:916
 #, c-format
-msgid "%s: %-45s NO\n"
+msgid "%9s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:989
+#: lib/depends.c:943
 #, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1631,7 +1631,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2138,173 +2138,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1945
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 9e73df821..da8724c7a 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,130 +1411,130 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:925
+#: lib/depends.c:868
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%9s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:938
+#: lib/depends.c:881
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:968
+#: lib/depends.c:916
 #, c-format
-msgid "%s: %-45s NO\n"
+msgid "%9s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:989
+#: lib/depends.c:943
 #, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1636,7 +1636,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2143,173 +2143,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1945
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 903d85696..7643d3105 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: 2001-08-29 13:55-0400\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team:  Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -834,7 +834,7 @@ msgstr "
 msgid "Could not open %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ĞÁËÅÔ: %s\n"
@@ -864,7 +864,7 @@ msgstr "
 msgid "Unable to write payload to %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ÓÏÄÅÒÖÉÍÏÅ × %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "úÁĞÉÓÁÎ: %s\n"
@@ -1442,7 +1442,7 @@ msgid " failed - "
 msgstr "ÎÅ ÕÄÁÌÏÓØ - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1451,125 +1451,125 @@ msgstr ""
 "ÄÌÑ ÚÁ×ÉÓÉÍÏÓÔÉ \"B\" ÎÕÖÎÏ ÕËÁÚÁÔØ \"epoch\" (ÔÁË ÖÅ ËÁË ÄÌÑ \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr "äá"
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr "îåT"
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n"
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "ĞÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
-#, c-format
-msgid "%s: %-45s %-s (cached)\n"
+#: lib/depends.c:792
+#, fuzzy, c-format
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (cached)\n"
 
-#: lib/depends.c:885
-#, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+#: lib/depends.c:828
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s YES (rpmrc provides)\n"
 
-#: lib/depends.c:902
-#, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+#: lib/depends.c:845
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s YES (rpmlib provides)\n"
 
-#: lib/depends.c:925
-#, c-format
-msgid "%s: %-45s YES (db files)\n"
+#: lib/depends.c:868
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db files)\n"
 msgstr "%s: %-45s YES (db files)\n"
 
-#: lib/depends.c:938
-#, c-format
-msgid "%s: %-45s YES (db provides)\n"
+#: lib/depends.c:881
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s YES (db provides)\n"
 
-#: lib/depends.c:952
-#, c-format
-msgid "%s: %-45s YES (db package)\n"
+#: lib/depends.c:895
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db package)\n"
 msgstr "%s: %-45s YES (db package)\n"
 
-#: lib/depends.c:968
-#, c-format
-msgid "%s: %-45s NO\n"
+#: lib/depends.c:916
+#, fuzzy, c-format
+msgid "%9s: %-45s NO\n"
 msgstr "%s: %-45s NO\n"
 
-#: lib/depends.c:989
-#, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+#: lib/depends.c:943
+#, fuzzy, c-format
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n"
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "ĞÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n"
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕĞÏÒÑÄÏŞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n"
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr "========== ÚÁĞÉÓØ ÕĞÏÒÑÄÏŞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== ÓÏÒÔÉÒÏ×ËÁ ĞÁËÅÔÏ× (ÏŞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, "
 "ÇÌÕÂÉÎÁ)\n"
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr "========== ÔÏÌØËÏ ĞÏÓÌÅÄÏ×ÁÔÅÌÉ (× ĞÏÒÑÄËÅ ĞÒÅÄÓÔÁ×ÌÅÎÉÑ)\n"
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr "ãéëì:\n"
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr "========== ĞÒÏÄÏÌÖÅÎÉÅ ÕĞÏÒÑÄÏŞÅÎÉÑ ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1674,7 +1674,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "dataLength() ÄÏĞÕÓÔÉÍ ÔÏÌØËÏ ÏÄÉÎ ÜÌÅÍÅÎÔ ÔÉĞÁ RPM_STRING_TYPE\n"
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "ôÉĞ ÄÁÎÎÙÈ %d ÎÅ ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
@@ -2198,173 +2198,173 @@ msgstr "
 msgid "generate signature"
 msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ ĞÏÄĞÉÓØ"
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n"
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " ËÏÎÆÌÉËÔÕÅÔ Ó %s-%s-%s\n"
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr "ĞÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÁÒÈÉÔÅËÔÕÒÙ"
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr "ĞÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÏĞÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ"
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr "ĞÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "ĞÕÔØ %s × ĞÁËÅÔÅ %s - ÎÅ ĞÅÒÅÍÅİÁÅÍÙÊ"
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "ËÏÎÆÌÉËÔ ÆÁÊÌÁ %s ĞÒÉ ĞÏĞÙÔËÁÈ ÕÓÔÁÎÏ×ËÉ %s É %s"
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "ÆÁÊÌ %s ÉÚ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ ĞÁËÅÔÁ %s ËÏÎÆÌÉËÔÕÅÔ Ó ÆÁÊÌÏÍ ÉÚ ĞÁËÅÔÁ %s"
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "ĞÁËÅÔ %s (ËÏÔÏÒÙÊ ÎÏ×ÅÅ, ŞÅÍ %s) ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ĞÁËÅÔÁ %s ÎÕÖÎÏ %ld%cb ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s"
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ĞÁËÅÔÁ %s ÎÕÖÎÏ %ld inodes ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s"
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "ĞÁËÅÔ %s pre-transaction syscall(s): %s: ÏÛÉÂËÁ: %s"
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ %d ĞÒÉ ÒÁÂÏÔÅ Ó ĞÁËÅÔÏÍ %s"
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr "========== ĞÅÒÅÍÅİÅÎÉÊ\n"
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d ÉÓËÌÀŞÅÎ %s\n"
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d ĞÅÒÅÍÅİÅÎÉÅ %s -> %s\n"
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "ÉÓËÌÀŞÁÅÔÓÑ ÍÎÏÇÏÂÉÂÌÉÏÔÅŞÎÙÊ ĞÕÔØ %s%s\n"
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "ÉÓËÌÀŞÁÅÔÓÑ %s %s\n"
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "ĞÅÒÅÍÅİÁÅÔÓÑ %s × %s\n"
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "ĞÅÒÅÍÅİÁÅÔÓÑ ËÁÔÁÌÏÇ %s × %s\n"
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %%%s %s\n"
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÉÓÁÔØ × %%%s %s\n"
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉŞÎÙÊ ĞÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ\n"
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr "ÉÓÈÏÄÎÙÊ ĞÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ ÓĞÅÃÉÆÉËÁÃÉÉ\n"
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: ×ÙĞÏÌÎÑÅÔÓÑ ÓÃÅÎÁÒÉÊ %s (ÅÓÌÉ ÅÓÔØ)\n"
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, 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:1600
+#: lib/psm.c:1602
 #, 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:1945
+#: 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:2062
+#: 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:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "ĞÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕİÅÓÔ×ÕÅÔ - ÉÓĞÏÌØÚÕÅÔÓÑ root\n"
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "ÇÒÕĞĞÁ %s ÎÅ ÓÕİÅÓÔ×ÕÅÔ - ÉÓĞÏÌØÚÕÅÔÓÑ root\n"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "ÒÁÓĞÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr " ÎÁ ÆÁÊÌÅ "
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n"
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n"
diff --git a/po/sk.po b/po/sk.po
index 1c8eef1d9..03214dca1 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -850,7 +850,7 @@ msgstr "Nie je mo
 msgid "Could not open %s: %s\n"
 msgstr "Otvorenie %s zlyhalo\n"
 
-#: build/pack.c:603 lib/psm.c:2140
+#: 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"
@@ -880,7 +880,7 @@ msgstr "Nie je mo
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie je mo¾né zapísa» balík: %s"
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapísané: %s\n"
@@ -1465,131 +1465,131 @@ msgid " failed - "
 msgstr " zlyhalo - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 #, fuzzy
 msgid "NO "
 msgstr "NIE JE V PORIADKU"
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "balík %s nie je nain¹talovanı\n"
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, fuzzy, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
 
-#: lib/depends.c:885
-#, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
-msgstr ""
-
-#: lib/depends.c:902
+#: lib/depends.c:828
 #, fuzzy, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
 
-#: lib/depends.c:925
-#, c-format
-msgid "%s: %-45s YES (db files)\n"
-msgstr ""
-
-#: lib/depends.c:938
-#, c-format
-msgid "%s: %-45s YES (db provides)\n"
-msgstr ""
-
-#: lib/depends.c:952
+#: lib/depends.c:845
 #, fuzzy, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
 
-#: lib/depends.c:968
-#, c-format
-msgid "%s: %-45s NO\n"
-msgstr ""
-
-#: lib/depends.c:989
+#: lib/depends.c:868
 #, fuzzy, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: %-45s YES (db files)\n"
+msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
+
+#: lib/depends.c:881
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db provides)\n"
+msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
+
+#: lib/depends.c:895
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db package)\n"
+msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
+
+#: lib/depends.c:916
+#, fuzzy, c-format
+msgid "%9s: %-45s NO\n"
+msgstr "súbor %s: %s\n"
+
+#: lib/depends.c:943
+#, fuzzy, c-format
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, 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:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balík %s koliduje: %s\n"
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "odstraòuje sa index skupín\n"
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1694,7 +1694,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE poèet musí by» 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ údajov %d nie je podorovanı\n"
@@ -2249,175 +2249,175 @@ msgstr "podp
 msgid "generate signature"
 msgstr "vytvori» PGP/GPG podpis"
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " je vy¾adované %s-%s-%s\n"
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " koliduje s %s-%s-%s\n"
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, fuzzy, c-format
 msgid "package %s is for a different architecture"
 msgstr "balík %s nie je nain¹talovanı\n"
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "balík %s nie je nain¹talovanı\n"
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "balík %s nie je nain¹talovanı\n"
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "balík %s nie je nain¹talovanı\n"
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS je vynechanı: %s"
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "presúva sa %s do %s\n"
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "vynecháva sa %s\n"
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "vynecháva sa %s\n"
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "presúva sa %s do %s\n"
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "presúva sa %s do %s\n"
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nie je mo¾né zapísa» do %s: "
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nie je mo¾né zapísa» do %s: "
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "oèakávanı zdrojovı balík, nájdenı binárny"
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "zdrojovı balík neobsahuje ¾iadny .spec súbor"
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n"
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/psm.c:1945
+#: 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:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root"
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s neexistuje - pou¾ije sa root"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalenie archívu zlyhalo%s%s: %s"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr " pre súbor "
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nepodarilo sa otvori» %s: %s"
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s zlyhalo"
diff --git a/po/sl.po b/po/sl.po
index 11b531732..2a0a88568 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.185 2001/11/02 05:37:10 jbj Exp $
+# $Id: sl.po,v 1.186 2001/11/02 21:01:54 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -848,7 +848,7 @@ msgstr "Ikone %s ni mo
 msgid "Could not open %s: %s\n"
 msgstr "Ni mo¾no odpreti %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:2140
+#: 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"
@@ -878,7 +878,7 @@ msgstr "Ikone %s ni mo
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ni mo¾no zapisati paketa %s: %s"
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
@@ -1466,7 +1466,7 @@ msgid " failed - "
 msgstr " neuspe¹no - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1475,124 +1475,124 @@ msgstr ""
 "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 #, fuzzy
 msgid "NO "
 msgstr "NI DOBRO"
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, 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:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "paket %s-%s-%s je ¾e name¹èen"
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, fuzzy, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-3s (predpomnjeno)\n"
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, fuzzy, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s DA (rpmrc ponudbe)\n"
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, fuzzy, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s DA (rpmlib ponudbe)\n"
 
-#: lib/depends.c:925
-#, c-format
-msgid "%s: %-45s YES (db files)\n"
+#: lib/depends.c:868
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db files)\n"
 msgstr "%s: %-45s DA (db datoteke)\n"
 
-#: lib/depends.c:938
+#: lib/depends.c:881
 #, fuzzy, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s DA (db ponudbe)\n"
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, fuzzy, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr "%s: %s zadovoljen ob paketih db.\n"
 
-#: lib/depends.c:968
-#, c-format
-msgid "%s: %-45s NO\n"
+#: lib/depends.c:916
+#, fuzzy, c-format
+msgid "%9s: %-45s NO\n"
 msgstr "%s: %-45s NE\n"
 
-#: lib/depends.c:989
+#: lib/depends.c:943
 #, fuzzy, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n"
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, 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:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s jw v sporu z: %s\n"
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "odstranjujemo seznam skupin\n"
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1697,7 +1697,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "¹tevec grabData() RPM_STRING_TYPE mora biti 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Tip podatkov %d ni podprt\n"
@@ -2249,176 +2249,176 @@ msgstr "podpi
 msgid "generate signature"
 msgstr "izdelava podpisa PGP/GPG"
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " potrebuje %s-%s-%s\n"
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " je v sporu z %s-%s-%s\n"
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, fuzzy, c-format
 msgid "package %s is for a different architecture"
 msgstr "paket %s-%s-%s je za drug tip arhitekture"
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, fuzzy, c-format
 msgid "package %s is for a different operating system"
 msgstr "paket %s-%s-%s je za drug operacijski sistem"
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "paket %s-%s-%s je ¾e name¹èen"
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "paketa %s ni mo¾no prestaviti\n"
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, fuzzy, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "datoteka %s je v sporu med poskusom namestitve %s in %s"
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, fuzzy, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "datoteka %s name¹èena z %s-%s-%s je v sporu z datoteko iz paketa %s-%s-%s"
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "paket %s-%s-%s (ki je novej¹i kot %s-%s-%s) je ¾e name¹èen"
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, fuzzy, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "namestitev paketa %s-%s-%s zahteva %ld%cb na datoteènem sistemu %s"
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, fuzzy, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "paket %s pred-prenosljivih sistemskih klicov: %s ni uspelo: %s"
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, fuzzy, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s"
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS je izkljuèen: %s"
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "premikanje %s v %s\n"
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "izkljuèevanje datoteke %s%s\n"
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "izkljuèevanje datoteke %s%s\n"
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "premikanje %s v %s\n"
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "premiokanje imenika %s v %s\n"
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "ni mo¾no ustvariti %s: %s\n"
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "pisanje na %s ni mo¾no"
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "prièakovan je bil izvorni paket, najden binarni"
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "izvorni paket ne vsebuje datoteke .spec"
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n"
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, 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:1600
+#: lib/psm.c:1602
 #, 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:1945
+#: 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:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "uporabnik %s ne obstaja - uporabljam root"
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s ne obstaja - uporabljam root"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, 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:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr " za datoteko "
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspe¹no odpiranje %s: %s\n"
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s neuspe¹en"
diff --git a/po/sr.po b/po/sr.po
index 68c52be4e..e3d8f9c6a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
@@ -833,7 +833,7 @@ msgstr "Ne mogu da upi
 msgid "Could not open %s: %s\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build/pack.c:603 lib/psm.c:2140
+#: 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"
@@ -863,7 +863,7 @@ msgstr "Ne mogu da upi
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1450,130 +1450,130 @@ msgid " failed - "
 msgstr "PGP omanuo"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, 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:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, fuzzy, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:885
-#, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
-msgstr ""
-
-#: lib/depends.c:902
+#: lib/depends.c:828
 #, fuzzy, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:925
-#, c-format
-msgid "%s: %-45s YES (db files)\n"
-msgstr ""
-
-#: lib/depends.c:938
-#, c-format
-msgid "%s: %-45s YES (db provides)\n"
-msgstr ""
-
-#: lib/depends.c:952
+#: lib/depends.c:845
 #, fuzzy, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:968
-#, c-format
-msgid "%s: %-45s NO\n"
-msgstr ""
-
-#: lib/depends.c:989
+#: lib/depends.c:868
 #, fuzzy, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: %-45s YES (db files)\n"
+msgstr "datoteka %s ne pripada nijednom paketu\n"
+
+#: lib/depends.c:881
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db provides)\n"
+msgstr "datoteka %s ne pripada nijednom paketu\n"
+
+#: lib/depends.c:895
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db package)\n"
+msgstr "datoteka %s ne pripada nijednom paketu\n"
+
+#: lib/depends.c:916
+#, fuzzy, c-format
+msgid "%9s: %-45s NO\n"
+msgstr "neuspelo otvaranje %s: %s"
+
+#: lib/depends.c:943
+#, fuzzy, c-format
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, 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:1111
+#: lib/depends.c:1059
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1677,7 +1677,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2235,174 +2235,174 @@ msgstr "potpi
 msgid "generate signature"
 msgstr "napravi PGP potpis"
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " je potreban paketu %s-%s-%s\n"
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " se sudara sa %s-%s-%s\n"
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, fuzzy, c-format
 msgid "package %s is for a different architecture"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, fuzzy, c-format
 msgid "package %s is for a different operating system"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, fuzzy, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr " se sudara sa %s-%s-%s\n"
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, fuzzy, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "nemoj izvr¹iti nijednu fazu"
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, 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:1600
+#: lib/psm.c:1602
 #, 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:1945
+#: 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:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupa %s ne sadr¾i nijedan paket\n"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "PGP omanuo"
diff --git a/po/sv.po b/po/sv.po
index 1b0ac58f4..5f0b7ddea 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: 2001-09-12 14:18+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -825,7 +825,7 @@ msgstr "Kan inte l
 msgid "Could not open %s: %s\n"
 msgstr "Kunde inte öppna %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunde inte skriva paket: %s\n"
@@ -855,7 +855,7 @@ msgstr "Kan inte l
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kan inte skriva last till %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
@@ -1427,7 +1427,7 @@ msgid " failed - "
 msgstr " misslyckades - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1436,124 +1436,124 @@ msgstr ""
 "\"B\"-beroendet behöver en epok (antar samma som \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr "JA"
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr "NEJ "
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kan inte öppna paketdatabas i %s\n"
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "paket %s är redan installerat"
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
-#, c-format
-msgid "%s: %-45s %-s (cached)\n"
+#: lib/depends.c:792
+#, fuzzy, c-format
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (cachad)\n"
 
-#: lib/depends.c:885
-#, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+#: lib/depends.c:828
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n"
 
-#: lib/depends.c:902
-#, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+#: lib/depends.c:845
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n"
 
-#: lib/depends.c:925
-#, c-format
-msgid "%s: %-45s YES (db files)\n"
+#: lib/depends.c:868
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db files)\n"
 msgstr "%s: %-45s JA (db-filer)\n"
 
-#: lib/depends.c:938
-#, c-format
-msgid "%s: %-45s YES (db provides)\n"
+#: lib/depends.c:881
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s JA (db-tillhandahållande)\n"
 
-#: lib/depends.c:952
-#, c-format
-msgid "%s: %-45s YES (db package)\n"
+#: lib/depends.c:895
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db package)\n"
 msgstr "%s: %-45s JA (db-paket)\n"
 
-#: lib/depends.c:968
-#, c-format
-msgid "%s: %-45s NO\n"
+#: lib/depends.c:916
+#, fuzzy, c-format
+msgid "%9s: %-45s NO\n"
 msgstr "%s: %-45s NEJ\n"
 
-#: lib/depends.c:989
-#, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+#: lib/depends.c:943
+#, fuzzy, c-format
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tillagt till beroendecachen.\n"
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, 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:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s står i konflikt: %s\n"
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "tar bort %s-%s-%s \"%s\" från tsort-relationer.\n"
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr "========== noterar alla relationer\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n"
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr "========== endast efterföljare (presentationsordning)\n"
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr "LOOP:\n"
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr "========== fortsätter med tsort ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1658,7 +1658,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "dataLength() RPM_STRING_TYPE antal måste vara 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatyp %d stöds inte\n"
@@ -2181,174 +2181,174 @@ msgstr "signera ett paket (sl
 msgid "generate signature"
 msgstr "generera signatur"
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " behövs av %s-%s-%s\n"
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " står i konflikt med %s-%s-%s\n"
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr "paket %s är för en annan arkitektur"
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr "paket %s är för ett annat operativsystem"
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr "paket %s är redan installerat"
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "sökväg %s i paket %s är inte relokerbar"
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "fil %s är en konflikt mellan installationsförsök av %s och %s"
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "fil %s från installation av %s står i konflikt med filen från paket %s"
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "paket %s (som är nyare än %s) är redan installerat"
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "installation av paket %s kräver %ld%cB på filsystem %s"
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "installation av paket %s kräver %ld inoder på filsystem %s"
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "paket %s systemanrop före transaktion: %s misslyckades: %s"
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "okänt fel %d uppträdde under behandling av paket %s"
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr "========== omflyttningar\n"
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d utesluter  %s\n"
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d flyttar om %s -> %s\n"
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "hoppar över multilib-sökväg %s%s\n"
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "hoppar över %s %s\n"
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "flyttar %s till %s\n"
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "flyttar katalogen %s till %s\n"
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan inte skapa %%%s %s\n"
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kan inte skriva till %%%s %s\n"
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr "källpaket förväntades, fann binärpaket\n"
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr "källpaket innehåller ingen .spec-fil\n"
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: kör (eventuellt) %s-skript\n"
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, 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:1600
+#: lib/psm.c:1602
 #, 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:1945
+#: 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:2062
+#: 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:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "användare %s finns inte - använder root\n"
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupp %s finns inte - använder root\n"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "uppackning av arkiv misslyckades%s%s: %s\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr " vid fil "
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s misslyckades på fil %s: %s\n"
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s misslyckades: %s\n"
diff --git a/po/tr.po b/po/tr.po
index 274124149..b10dc1c36 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -836,7 +836,7 @@ msgstr "%s'den ba
 msgid "Could not open %s: %s\n"
 msgstr "%s açılamadı: %s\n"
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "paket yazılamadı: %s\n"
@@ -866,7 +866,7 @@ msgstr "%s'den payload okunamad
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s'e payload yazılamadı: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Yazıldı: %s\n"
@@ -1447,7 +1447,7 @@ msgid " failed - "
 msgstr " başarısız - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, fuzzy, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1456,124 +1456,124 @@ msgstr ""
 "\"B\" bağımlılığı bir dönemsellik gerektirir (tabii ki \"A\" da)\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr "EVET"
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr "HAYIR "
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "%s de Paket veritabanı açılamadı\n"
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "%s zaten kurulu"
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
-#, c-format
-msgid "%s: %-45s %-s (cached)\n"
+#: lib/depends.c:792
+#, fuzzy, c-format
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (arabellekli)\n"
 
-#: lib/depends.c:885
-#, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+#: lib/depends.c:828
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s EVET (rpmrc sağlar)\n"
 
-#: lib/depends.c:902
-#, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+#: lib/depends.c:845
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s EVET (rpmlib sağlar)\n"
 
-#: lib/depends.c:925
-#, c-format
-msgid "%s: %-45s YES (db files)\n"
+#: lib/depends.c:868
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db files)\n"
 msgstr "%s: %-45s EVET (db dosyaları)\n"
 
-#: lib/depends.c:938
-#, c-format
-msgid "%s: %-45s YES (db provides)\n"
+#: lib/depends.c:881
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s EVET (db sağlar)\n"
 
-#: lib/depends.c:952
-#, c-format
-msgid "%s: %-45s YES (db package)\n"
+#: lib/depends.c:895
+#, fuzzy, c-format
+msgid "%9s: %-45s YES (db package)\n"
 msgstr "%s: %-45s EVET (db paketi)\n"
 
-#: lib/depends.c:968
-#, c-format
-msgid "%s: %-45s NO\n"
+#: lib/depends.c:916
+#, fuzzy, c-format
+msgid "%9s: %-45s NO\n"
 msgstr "%s: %-45s HAYIR\n"
 
-#: lib/depends.c:989
-#, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+#: lib/depends.c:943
+#, fuzzy, c-format
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) Bağımlılar alanına eklendi.\n"
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, 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:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s paketi çelişiyor: %s\n"
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "tsort bağıntılarından %s-%s-%s \"%s\" kaldırılıyor\n"
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort bağıntıları kaydediliyor\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== paketler tsort'lanıyor (sıra, #öncüller, #ardıllar, derinlik)\n"
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr "========== sadece ardıllar (sunum sırası)\n"
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr "ÇEVRİM:\n"
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort sürüyor ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1678,7 +1678,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "dataLength() RPM_STRING_TYPE sayısı 1 olmalı.\n"
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "%d veri türü desteklenmiyor\n"
@@ -2205,173 +2205,173 @@ msgstr "paketi imzalar (mevcut imza kald
 msgid "generate signature"
 msgstr "imza üretir"
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " %s-%s-%s için gerekli\n"
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " %s-%s-%s ile çelişiyor\n"
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr "%s farklı bir mimari için"
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr "%s farklı bir işletim sistemi için"
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr "%s zaten kurulu"
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "%s dosya yolu %s paketinde yeniden konumlandırılamaz"
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "%s dosyası kalkışılan %s ve %s kurulumları arasında çelişiyor"
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "%s dosyasının %s kurulumu %s kurulumundaki dosya ile çelişiyor"
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "%s paketi zaten yüklü (%s sürümünden daha yeni)"
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "%s kurulumu %ld%cb gerektiriyor (%s dosya sisteminde)"
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "%s kurulumu %ld i-düğüm gerektiriyor (%s dosya sisteminde)"
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "%s işlem öncesi sistem çağrı(sı/ları): %s başarısız: %s"
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "anlaşılamayan %d hatası, %s paketi işlenirken saptandı"
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr "========== yeniden konumlama\n"
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d %s'i dışlıyor\n"
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d yeniden konumlandırılıyor: %s -> %s\n"
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "multilib dosya yolu dışlanıyor %s%s\n"
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "%s %s dışlanıyor\n"
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s %s'e konumlanıyor\n"
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%s dizini %s de yeniden konumlanıyor\n"
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%%%s dosyası oluşturulamıyor: %s\n"
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s dosyasına yazılamaz %s\n"
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr "kaynak paketi gerekirken çalıştırılabilir paketi bulundu\n"
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr "kaynak paketi .spec dosyası içermiyor\n"
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: %s betiği çalıştırılıyor (varsa)\n"
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, 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:1600
+#: lib/psm.c:1602
 #, 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:1945
+#: 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:2062
+#: 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:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "kullanıcı %s yok - root kullanılacak\n"
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grup %s yok - root kullanılacak\n"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, 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:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr " dosyada "
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s açılamadı: %s\n"
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s başarısız\n"
diff --git a/po/uk.po b/po/uk.po
index edcf1f6dd..663a1e02a 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,130 +1411,130 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:925
+#: lib/depends.c:868
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%9s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:938
+#: lib/depends.c:881
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:968
+#: lib/depends.c:916
 #, c-format
-msgid "%s: %-45s NO\n"
+msgid "%9s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:989
+#: lib/depends.c:943
 #, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1636,7 +1636,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2143,173 +2143,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1945
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index edcf1f6dd..663a1e02a 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,130 +1411,130 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:925
+#: lib/depends.c:868
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%9s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:938
+#: lib/depends.c:881
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:968
+#: lib/depends.c:916
 #, c-format
-msgid "%s: %-45s NO\n"
+msgid "%9s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:989
+#: lib/depends.c:943
 #, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1636,7 +1636,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2143,173 +2143,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1945
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index edcf1f6dd..663a1e02a 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,130 +1411,130 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:925
+#: lib/depends.c:868
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%9s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:938
+#: lib/depends.c:881
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:968
+#: lib/depends.c:916
 #, c-format
-msgid "%s: %-45s NO\n"
+msgid "%9s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:989
+#: lib/depends.c:943
 #, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1636,7 +1636,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2143,173 +2143,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1945
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index edcf1f6dd..663a1e02a 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-11-02 00:20-0500\n"
+"POT-Creation-Date: 2001-11-02 15:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:2140
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2405
+#: build/pack.c:683 lib/psm.c:2417
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,130 +1411,130 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:183
+#: lib/depends.c:136
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:212
+#: lib/depends.c:165
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:213 lib/depends.c:857 lib/depends.c:989
+#: lib/depends.c:166 lib/depends.c:794 lib/depends.c:945
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:357
+#: lib/depends.c:314
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:590
+#: lib/depends.c:547
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:595
+#: lib/depends.c:552
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:600
+#: lib/depends.c:557
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:792
 #, c-format
-msgid "%s: %-45s %-s (cached)\n"
+msgid "%9s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:885
+#: lib/depends.c:828
 #, c-format
-msgid "%s: %-45s YES (rpmrc provides)\n"
+msgid "%9s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:902
+#: lib/depends.c:845
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%9s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:925
+#: lib/depends.c:868
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%9s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:938
+#: lib/depends.c:881
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%9s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:952
+#: lib/depends.c:895
 #, c-format
-msgid "%s: %-45s YES (db package)\n"
+msgid "%9s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:968
+#: lib/depends.c:916
 #, c-format
-msgid "%s: %-45s NO\n"
+msgid "%9s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:989
+#: lib/depends.c:943
 #, c-format
-msgid "%s: (%s, %s) added to Depends cache.\n"
+msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1044
+#: lib/depends.c:995
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1111
+#: lib/depends.c:1059
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1365
+#: lib/depends.c:1312
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1603
+#: lib/depends.c:1556
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1677
+#: lib/depends.c:1629
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1752
+#: lib/depends.c:1704
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1812
+#: lib/depends.c:1765
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1847
+#: lib/depends.c:1800
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1852
+#: lib/depends.c:1805
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1636,7 +1636,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:951
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2143,173 +2143,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:202
+#: lib/problems.c:222
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:205
+#: lib/problems.c:225
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:245
+#: lib/problems.c:265
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:250
+#: lib/problems.c:270
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:255
+#: lib/problems.c:275
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:260
+#: lib/problems.c:280
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:265
+#: lib/problems.c:285
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:270
+#: lib/problems.c:290
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:275
+#: lib/problems.c:295
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:280
+#: lib/problems.c:300
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:290
+#: lib/problems.c:310
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:295
+#: lib/problems.c:315
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:322
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:265
+#: lib/psm.c:267
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:269
+#: lib/psm.c:271
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:272
+#: lib/psm.c:274
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:342
+#: lib/psm.c:344
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:408
+#: lib/psm.c:410
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:418
+#: lib/psm.c:420
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:497
+#: lib/psm.c:499
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1146
+#: lib/psm.c:1148
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1152
+#: lib/psm.c:1154
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1192
+#: lib/psm.c:1194
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1315
+#: lib/psm.c:1317
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1425
+#: lib/psm.c:1427
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1593
+#: lib/psm.c:1595
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1945
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2062
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2176
+#: lib/psm.c:2188
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2185
+#: lib/psm.c:2197
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2238
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2239
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2413
+#: lib/psm.c:2425
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2416
+#: lib/psm.c:2428
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/rpm.spec b/rpm.spec
index f5c36b9fc..d0ebc83ae 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -550,3 +550,4 @@ fi
 - depends.c: availablePackage is (almost) opaque.
 - invent some toy transactionElement iterators.
 - create rpmDepSet constructors/destructors.
+- create toy rpmDepSet iterators.
diff --git a/rpm.spec.in b/rpm.spec.in
index a7aa3d692..eb116add2 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -550,3 +550,4 @@ fi
 - depends.c: availablePackage is (almost) opaque.
 - invent some toy transactionElement iterators.
 - create rpmDepSet constructors/destructors.
+- create toy rpmDepSet iterators.