Merge scriptlet handling into psm.c, remove from API.

CVS patchset: 4587
CVS date: 2001/02/28 15:49:23

67 files changed, 3319 insertions, 3404 deletions

diff --git a/Doxyfile.in b/Doxyfile.in
index 4f5e25148..32b147288 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -315,8 +315,6 @@ INPUT                  = \
 	./lib/rpmlib.h \
 	./lib/rpmlibprov.c \
 	./lib/rpmrc.c \
-	./lib/scriptlet.c \
-	./lib/scriptlet.h \
 	./lib/signature.c \
 	./lib/signature.h \
 	./lib/stringbuf.c \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5c6d58d2e..83faf1aac 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -13,7 +13,7 @@ pkginc_HEADERS = \
 noinst_HEADERS = \
 	cpio.h depends.h falloc.h fprint.h fsm.h hash.h \
 	md5.h psm.h \
-	rpmdb.h rpmlead.h scriptlet.h signature.h
+	rpmdb.h rpmlead.h signature.h
 
 mylibpaths =	-L$(top_builddir)/lib/.libs -L$(top_builddir)/rpmio/.libs \
 		-L$(top_builddir)/popt/.libs
@@ -27,7 +27,7 @@ librpm_la_SOURCES = \
 	md5.c md5sum.c misc.c package.c problems.c \
 	poptBT.c poptQV.c psm.c query.c \
 	rpmchecksig.c rpmdb.c rpminstall.c \
-	rpmlead.c rpmlibprov.c rpmrc.c scriptlet.c signature.c stringbuf.c \
+	rpmlead.c rpmlibprov.c rpmrc.c signature.c stringbuf.c \
 	tagName.c tagtable.c transaction.c verify.c
 librpm_la_LDFLAGS = @libdb3@ @libdb2@ @libdb1@
 librpm_la_LIBADD = $(DBLIBOBJS)
diff --git a/lib/psm.c b/lib/psm.c
index 162e41b24..71a10e393 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -867,135 +867,546 @@ exit:
     return rc;
 }
 
+static char * SCRIPT_PATH = "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin";
+
+/**
+ * Return scriptlet name from tag.
+ * @param tag		scriptlet tag
+ * @return		name of scriptlet
+ */
+static /*@observer@*/ const char * const tag2sln(int tag)
+{
+    switch (tag) {
+    case RPMTAG_PREIN:		return "%pre";
+    case RPMTAG_POSTIN:		return "%post";
+    case RPMTAG_PREUN:		return "%preun";
+    case RPMTAG_POSTUN:		return "%postun";
+    case RPMTAG_VERIFYSCRIPT:	return "%verify";
+    }
+    return "%unknownscript";
+}
+
 /**
- * Enter and leave a chroot.
+ * Run scriptlet with args.
+ *
+ * Run a script with an interpreter. If the interpreter is not specified,
+ * /bin/sh will be used. If the interpreter is /bin/sh, then the args from
+ * the header will be ignored, passing instead arg1 and arg2.
+ * 
  * @param psm		package state machine data
- * @return		0 on sucess or not performed, chroot(2) rc otherwise
+ * @param h		header
+ * @param sln		name of scriptlet section
+ * @param progArgc	no. of args from header
+ * @param progArgv	args from header, progArgv[0] is the interpreter to use
+ * @param script	scriptlet from header
+ * @param arg1		no. instances of package installed after scriptlet exec
+ *			(-1 is no arg)
+ * @param arg2		ditto, but for the target package
+ * @return		0 on success, 1 on error
  */
-static int psmChroot(PSM_t psm, int enter)
+static int runScript(PSM_t psm, Header h,
+		const char * sln,
+		int progArgc, const char ** progArgv, 
+		const char * script, int arg1, int arg2)
 {
     const rpmTransactionSet ts = psm->ts;
     TFI_t fi = psm->fi;
+    HGE_t hge = fi->hge;
+    HFD_t hfd = fi->hfd;
+    const char ** argv = NULL;
+    int argc = 0;
+    const char ** prefixes = NULL;
+    int numPrefixes;
+    int_32 ipt;
+    const char * oldPrefix;
+    int maxPrefixLength;
+    int len;
+    char * prefixBuf = NULL;
+    pid_t child;
+    int status = 0;
+    const char * fn = NULL;
+    int i;
+    int freePrefixes = 0;
+    FD_t out;
     int rc = 0;
+    const char *n, *v, *r;
 
-    if (enter) {
-	/* Change root directory if requested and not already done. */
-	if (ts->rootDir && !ts->chrootDone && !fi->chrootDone) {
-	    static int _loaded = 0;
+    if (!progArgv && !script)
+	return 0;
 
-	    /*
-	     * This loads all of the name services libraries, in case we
-	     * don't have access to them in the chroot().
-	     */
-	    if (!_loaded) {
-		(void)getpwnam("root");
-		endpwent();
-		_loaded++;
+    if (!progArgv) {
+	argv = alloca(5 * sizeof(char *));
+	argv[0] = "/bin/sh";
+	argc = 1;
+    } else {
+	argv = alloca((progArgc + 4) * sizeof(char *));
+	memcpy(argv, progArgv, progArgc * sizeof(char *));
+	argc = progArgc;
+    }
+
+    headerNVR(h, &n, &v, &r);
+    if (hge(h, RPMTAG_INSTPREFIXES, &ipt, (void **) &prefixes, &numPrefixes)) {
+	freePrefixes = 1;
+    } else if (hge(h, RPMTAG_INSTALLPREFIX, NULL, (void **) &oldPrefix, NULL)) {
+	prefixes = &oldPrefix;
+	numPrefixes = 1;
+    } else {
+	numPrefixes = 0;
+    }
+
+    maxPrefixLength = 0;
+    for (i = 0; i < numPrefixes; i++) {
+	len = strlen(prefixes[i]);
+	if (len > maxPrefixLength) maxPrefixLength = len;
+    }
+    prefixBuf = alloca(maxPrefixLength + 50);
+
+    if (script) {
+	FD_t fd;
+	if (makeTempFile((!ts->chrootDone ? ts->rootDir : "/"), &fn, &fd)) {
+	    if (freePrefixes) free(prefixes);
+	    return 1;
+	}
+
+	if (rpmIsDebug() &&
+	    (!strcmp(argv[0], "/bin/sh") || !strcmp(argv[0], "/bin/bash")))
+	    (void)Fwrite("set -x\n", sizeof(char), 7, fd);
+
+	(void)Fwrite(script, sizeof(script[0]), strlen(script), fd);
+	Fclose(fd);
+
+	{   const char * sn = fn;
+	    if (!ts->chrootDone &&
+		!(ts->rootDir[0] == '/' && ts->rootDir[1] == '\0'))
+	    {
+		sn += strlen(ts->rootDir)-1;
+	    }
+	    argv[argc++] = sn;
+	}
+
+	if (arg1 >= 0) {
+	    char *av = alloca(20);
+	    sprintf(av, "%d", arg1);
+	    argv[argc++] = av;
+	}
+	if (arg2 >= 0) {
+	    char *av = alloca(20);
+	    sprintf(av, "%d", arg2);
+	    argv[argc++] = av;
+	}
+    }
+
+    argv[argc] = NULL;
+
+    if (ts->scriptFd != NULL) {
+	if (rpmIsVerbose()) {
+	    out = fdDup(Fileno(ts->scriptFd));
+	} else {
+	    out = Fopen("/dev/null", "w.fdio");
+	    if (Ferror(out)) {
+		out = fdDup(Fileno(ts->scriptFd));
+	    }
+	}
+    } else {
+	out = fdDup(STDOUT_FILENO);
+	out = fdLink(out, "runScript persist");
+    }
+    
+    if (!(child = fork())) {
+	const char * rootDir;
+	int pipes[2];
+
+	pipes[0] = pipes[1] = 0;
+	/* make stdin inaccessible */
+	pipe(pipes);
+	close(pipes[1]);
+	dup2(pipes[0], STDIN_FILENO);
+	close(pipes[0]);
+
+	if (ts->scriptFd != NULL) {
+	    if (Fileno(ts->scriptFd) != STDERR_FILENO)
+		dup2(Fileno(ts->scriptFd), STDERR_FILENO);
+	    if (Fileno(out) != STDOUT_FILENO)
+		dup2(Fileno(out), STDOUT_FILENO);
+	    /* make sure we don't close stdin/stderr/stdout by mistake! */
+	    if (Fileno(out) > STDERR_FILENO && Fileno(out) != Fileno(ts->scriptFd)) {
+		Fclose (out);
+	    }
+	    if (Fileno(ts->scriptFd) > STDERR_FILENO) {
+		Fclose (ts->scriptFd);
+	    }
+	}
+
+	{   const char *ipath = rpmExpand("PATH=%{_install_script_path}", NULL);
+	    const char *path = SCRIPT_PATH;
+
+	    if (ipath && ipath[5] != '%')
+		path = ipath;
+	    doputenv(path);
+	    if (ipath)	free((void *)ipath);
+	}
+
+	for (i = 0; i < numPrefixes; i++) {
+	    sprintf(prefixBuf, "RPM_INSTALL_PREFIX%d=%s", i, prefixes[i]);
+	    doputenv(prefixBuf);
+
+	    /* backwards compatibility */
+	    if (i == 0) {
+		sprintf(prefixBuf, "RPM_INSTALL_PREFIX=%s", prefixes[i]);
+		doputenv(prefixBuf);
 	    }
+	}
 
+	rootDir = ts->rootDir;
+	switch(urlIsURL(rootDir)) {
+	case URL_IS_PATH:
+	    rootDir += sizeof("file://") - 1;
+	    rootDir = strchr(rootDir, '/');
+	    /*@fallthrough@*/
+	case URL_IS_UNKNOWN:
+	    if (!ts->chrootDone && !(rootDir[0] == '/' && rootDir[1] == '\0')) {
+		/*@-unrecog@*/ chroot(rootDir); /*@=unrecog@*/
+	    }
 	    chdir("/");
-	    /*@-unrecog@*/
-	    rc = chroot(ts->rootDir);
-	    /*@=unrecog@*/
-	    fi->chrootDone = ts->chrootDone = 1;
+	    execv(argv[0], (char *const *)argv);
+	    break;
+	default:
+	    break;
 	}
+
+ 	_exit(-1);
+	/*@notreached@*/
+    }
+
+    if (waitpid(child, &status, 0) < 0) {
+	rpmError(RPMERR_SCRIPT,
+		 _("execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"),
+		 sln, n, v, r, strerror (errno));
+	/* XXX what to do here? */
+	rc = 0;
     } else {
-	/* Restore root directory if changed. */
-	if (fi->chrootDone) {
-	    /*@-unrecog@*/
-	    rc = chroot(".");
-	    /*@=unrecog@*/
-	    fi->chrootDone = ts->chrootDone = 0;
-	    chdir(ts->currDir);
+	if (!WIFEXITED(status) || WEXITSTATUS(status)) {
+	    rpmError(RPMERR_SCRIPT,
+		     _("execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"),
+		     sln, n, v, r, WEXITSTATUS(status));
+	    rc = 1;
+	}
+    }
+
+    if (freePrefixes) prefixes = hfd(prefixes, ipt);
+
+    Fclose(out);	/* XXX dup'd STDOUT_FILENO */
+    
+    if (script) {
+	if (!rpmIsDebug()) unlink(fn);
+	free((void *)fn);
+    }
+
+    return rc;
+}
+
+/**
+ * Retrieve and run scriptlet from header.
+ * @param psm		package state machine data
+ * @return		0 on success
+ */
+static int runInstScript(PSM_t psm)
+{
+    const rpmTransactionSet ts = psm->ts;
+    TFI_t fi = psm->fi;
+    HGE_t hge = fi->hge;
+    HFD_t hfd = fi->hfd;
+    void ** programArgv;
+    int programArgc;
+    const char ** argv;
+    int_32 ptt, stt;
+    const char * script;
+    int rc;
+
+    if (ts->transFlags & RPMTRANS_FLAG_NOSCRIPTS)
+	return 0;
+
+    /*
+     * headerGetEntry() sets the data pointer to NULL if the entry does
+     * not exist.
+     */
+    hge(fi->h, psm->progTag, &ptt, (void **) &programArgv, &programArgc);
+    hge(fi->h, psm->scriptTag, &stt, (void **) &script, NULL);
+
+    if (programArgv && ptt == RPM_STRING_TYPE) {
+	argv = alloca(sizeof(char *));
+	*argv = (const char *) programArgv;
+    } else {
+	argv = (const char **) programArgv;
+    }
+
+    rc = runScript(psm, fi->h, tag2sln(psm->scriptTag), programArgc, argv,
+		script, psm->scriptArg, -1);
+    programArgv = hfd(programArgv, ptt);
+    script = hfd(script, stt);
+    return rc;
+}
+
+/**
+ * @param psm		package state machine data
+ * @param sourceH
+ * @param triggeredH
+ * @param arg2
+ * @param triggersAlreadyRun
+ * @return
+ */
+static int handleOneTrigger(PSM_t psm, Header sourceH, Header triggeredH,
+			int arg2, char * triggersAlreadyRun)
+{
+    const rpmTransactionSet ts = psm->ts;
+    TFI_t fi = psm->fi;
+    HGE_t hge = fi->hge;
+    HFD_t hfd = fi->hfd;
+    const char ** triggerNames;
+    const char ** triggerEVR;
+    const char ** triggerScripts;
+    const char ** triggerProgs;
+    int_32 * triggerFlags;
+    int_32 * triggerIndices;
+    int_32 tnt, tvt, tft;
+    const char * triggerPackageName;
+    const char * sourceName;
+    int numTriggers;
+    int rc = 0;
+    int i;
+    int skip;
+
+    if (!hge(triggeredH, RPMTAG_TRIGGERNAME, &tnt, 
+			(void **) &triggerNames, &numTriggers))
+	return 0;
+
+    headerNVR(sourceH, &sourceName, NULL, NULL);
+
+    hge(triggeredH, RPMTAG_TRIGGERFLAGS, &tft, (void **) &triggerFlags, NULL);
+    hge(triggeredH, RPMTAG_TRIGGERVERSION, &tvt, (void **) &triggerEVR, NULL);
+
+    for (i = 0; i < numTriggers; i++) {
+	int_32 tit, tst, tpt;
+
+	if (!(triggerFlags[i] & psm->sense)) continue;
+	if (strcmp(triggerNames[i], sourceName)) continue;
+
+	/*
+	 * For some reason, the TRIGGERVERSION stuff includes the name of
+	 * the package which the trigger is based on. We need to skip
+	 * over that here. I suspect that we'll change our minds on this
+	 * and remove that, so I'm going to just 'do the right thing'.
+	 */
+	skip = strlen(triggerNames[i]);
+	if (!strncmp(triggerEVR[i], triggerNames[i], skip) &&
+	    (triggerEVR[i][skip] == '-'))
+	    skip++;
+	else
+	    skip = 0;
+
+	if (!headerMatchesDepFlags(sourceH, triggerNames[i],
+		triggerEVR[i] + skip, triggerFlags[i]))
+	    continue;
+
+	hge(triggeredH, RPMTAG_TRIGGERINDEX, &tit,
+		       (void **) &triggerIndices, NULL);
+	hge(triggeredH, RPMTAG_TRIGGERSCRIPTS, &tst,
+		       (void **) &triggerScripts, NULL);
+	hge(triggeredH, RPMTAG_TRIGGERSCRIPTPROG, &tpt,
+		       (void **) &triggerProgs, NULL);
+
+	headerNVR(triggeredH, &triggerPackageName, NULL, NULL);
+
+	{   int arg1;
+	    int index;
+
+	    arg1 = rpmdbCountPackages(ts->rpmdb, triggerPackageName);
+	    if (arg1 < 0) {
+		rc = 1;	/* XXX W2DO? same as "execution of script failed" */
+	    } else {
+		arg1 += psm->countCorrection;
+		index = triggerIndices[i];
+		if (!triggersAlreadyRun || !triggersAlreadyRun[index]) {
+		    rc = runScript(psm, triggeredH, "%trigger", 1,
+			    triggerProgs + index, triggerScripts[index], 
+			    arg1, arg2);
+		    if (triggersAlreadyRun) triggersAlreadyRun[index] = 1;
+		}
+	    }
+	}
+
+	triggerIndices = hfd(triggerIndices, tit);
+	triggerScripts = hfd(triggerScripts, tst);
+	triggerProgs = hfd(triggerProgs, tpt);
+
+	/*
+	 * Each target/source header pair can only result in a single
+	 * script being run.
+	 */
+	break;
+    }
+
+    triggerNames = hfd(triggerNames, tnt);
+    triggerFlags = hfd(triggerFlags, tft);
+    triggerEVR = hfd(triggerEVR, tvt);
+
+    return rc;
+}
+
+/**
+ * Run trigger scripts in the database that are fired by this header.
+ * @param psm		package state machine data
+ * @return		0 on success, 1 on error
+ */
+static int runTriggers(PSM_t psm)
+{
+    const rpmTransactionSet ts = psm->ts;
+    TFI_t fi = psm->fi;
+    int numPackage;
+    int rc = 0;
+
+    numPackage = rpmdbCountPackages(ts->rpmdb, fi->name) + psm->countCorrection;
+    if (numPackage < 0)
+	return 1;
+
+    {	Header triggeredH;
+	rpmdbMatchIterator mi;
+	int countCorrection = psm->countCorrection;
+
+	psm->countCorrection = 0;
+	mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_TRIGGERNAME, fi->name, 0);
+	while((triggeredH = rpmdbNextIterator(mi)) != NULL) {
+	    rc |= handleOneTrigger(psm, fi->h, triggeredH, numPackage, NULL);
+	}
+
+	rpmdbFreeIterator(mi);
+	psm->countCorrection = countCorrection;
+    }
+
+    return rc;
+}
+
+/**
+ * Run triggers from this header that are fired by headers in the database.
+ * @param psm		package state machine data
+ * @return		0 on success, 1 on error
+ */
+static int runImmedTriggers(PSM_t psm)
+{
+    const rpmTransactionSet ts = psm->ts;
+    TFI_t fi = psm->fi;
+    HGE_t hge = fi->hge;
+    HFD_t hfd = fi->hfd;
+    const char ** triggerNames;
+    int numTriggers;
+    int_32 * triggerIndices;
+    int_32 tnt, tit;
+    int numTriggerIndices;
+    char * triggersRun;
+    int rc = 0;
+
+    if (!hge(fi->h, RPMTAG_TRIGGERNAME, &tnt,
+			(void **) &triggerNames, &numTriggers))
+	return 0;
+
+    hge(fi->h, RPMTAG_TRIGGERINDEX, &tit, (void **) &triggerIndices, 
+		   &numTriggerIndices);
+    triggersRun = alloca(sizeof(*triggersRun) * numTriggerIndices);
+    memset(triggersRun, 0, sizeof(*triggersRun) * numTriggerIndices);
+
+    {	Header sourceH = NULL;
+	int i;
+
+	for (i = 0; i < numTriggers; i++) {
+	    rpmdbMatchIterator mi;
+
+	    if (triggersRun[triggerIndices[i]]) continue;
+	
+	    mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_NAME, triggerNames[i], 0);
+
+	    while((sourceH = rpmdbNextIterator(mi)) != NULL) {
+		rc |= handleOneTrigger(psm, sourceH, fi->h, 
+				rpmdbGetIteratorCount(mi),
+				triggersRun);
+	    }
+
+	    rpmdbFreeIterator(mi);
 	}
     }
+    triggerIndices = hfd(triggerNames, tit);
+    triggerNames = hfd(triggerNames, tnt);
     return rc;
 }
 
-int psmStage(PSM_t psm, fileStage stage)
+int psmStage(PSM_t psm, pkgStage stage)
 {
-    const char * const cur = fileStageString(stage);
+    const rpmTransactionSet ts = psm->ts;
+    TFI_t fi = psm->fi;
     int rc = psm->rc;
     int i;
 
     switch (stage) {
-    case FSM_UNKNOWN:
-	break;
-    case FSM_PKGINSTALL:
-	break;
-    case FSM_PKGERASE:
-	break;
-    case FSM_PKGSAVE:
-	break;
-    case FSM_PKGCOMMIT:
-	break;
-    case FSM_PKGBUILD:
-	break;
-    case FSM_CREATE:
-	break;
-    case FSM_INIT:
-	break;
-    case FSM_PRE:
+    case PSM_UNKNOWN:
 	break;
-    case FSM_MAP:
+    case PSM_INIT:
 	break;
-    case FSM_MKDIRS:
+    case PSM_PRE:
 	break;
-    case FSM_RMDIRS:
+    case PSM_PROCESS:
 	break;
-    case FSM_PROCESS:
+    case PSM_POST:
 	break;
-    case FSM_POST:
+    case PSM_UNDO:
 	break;
-    case FSM_MKLINKS:
+    case PSM_FINI:
 	break;
-    case FSM_NOTIFY:
+    case PSM_NOTIFY:
 	break;
-    case FSM_UNDO:
+    case PSM_COMMIT:
 	break;
-    case FSM_FINI:
+    case PSM_CREATE:
 	break;
-    case FSM_COMMIT:
+    case PSM_DESTROY:
 	break;
-    case FSM_DESTROY:
+
+    case PSM_CHROOT_IN:
+	/* Change root directory if requested and not already done. */
+	if (ts->rootDir && !ts->chrootDone && !psm->chrootDone) {
+	    static int _loaded = 0;
+
+	    /*
+	     * This loads all of the name services libraries, in case we
+	     * don't have access to them in the chroot().
+	     */
+	    if (!_loaded) {
+		(void)getpwnam("root");
+		endpwent();
+		_loaded++;
+	    }
+
+	    chdir("/");
+	    /*@-unrecog@*/
+	    rc = chroot(ts->rootDir);
+	    /*@=unrecog@*/
+	    psm->chrootDone = ts->chrootDone = 1;
+	}
 	break;
-    case FSM_VERIFY:
+    case PSM_CHROOT_OUT:
+	/* Restore root directory if changed. */
+	if (psm->chrootDone) {
+	    /*@-unrecog@*/
+	    rc = chroot(".");
+	    /*@=unrecog@*/
+	    psm->chrootDone = ts->chrootDone = 0;
+	    chdir(ts->currDir);
+	}
 	break;
-
-    case FSM_UNLINK:
-    case FSM_RENAME:
-    case FSM_MKDIR:
-    case FSM_RMDIR:
-    case FSM_CHOWN:
-    case FSM_LCHOWN:
-    case FSM_CHMOD:
-    case FSM_UTIME:
-    case FSM_SYMLINK:
-    case FSM_LINK:
-    case FSM_MKFIFO:
-    case FSM_MKNOD:
-    case FSM_LSTAT:
-    case FSM_STAT:
-    case FSM_READLINK:
+    case PSM_SCRIPT:
+	rc = runInstScript(psm);
 	break;
-    case FSM_CHROOT:
+    case PSM_TRIGGER:
 	break;
 
-    case FSM_NEXT:
-    case FSM_EAT:
-    case FSM_POS:
-    case FSM_PAD:
-    case FSM_TRAILER:
-    case FSM_HREAD:
-    case FSM_HWRITE:
-    case FSM_DREAD:
-    case FSM_DWRITE:
-    case FSM_ROPEN:
-    case FSM_READ:
-    case FSM_RCLOSE:
-    case FSM_WOPEN:
-    case FSM_WRITE:
-    case FSM_WCLOSE:
     default:
 	break;
     }
@@ -1096,7 +1507,7 @@ int installBinaryPackage(PSM_t psm)
     }
 
     /* Change root directory if requested and not already done. */
-    (void) psmChroot(psm, 1);
+    (void) psmStage(psm, PSM_CHROOT_IN);
 
     if (fi->fc > 0 && !(ts->transFlags & RPMTRANS_FLAG_JUSTDB)) {
 
@@ -1109,7 +1520,7 @@ int installBinaryPackage(PSM_t psm)
     }
 
     /* Restore root directory if changed. */
-    (void) psmChroot(psm, 0);
+    (void) psmStage(psm, PSM_CHROOT_OUT);
 
     if (fi->fc > 0 && fi->fstates) {
 	headerAddEntry(fi->h, RPMTAG_FILESTATES, RPM_CHAR_TYPE,
@@ -1183,7 +1594,7 @@ int installBinaryPackage(PSM_t psm)
 
 exit:
     /* Restore root directory if changed. */
-    (void) psmChroot(psm, 0);
+    (void) psmStage(psm, PSM_CHROOT_OUT);
 
     if (oldH)
 	headerFree(oldH);
@@ -1231,7 +1642,7 @@ assert(fi->type == TR_REMOVED);
     }
 
     /* Change root directory if requested and not already done. */
-    (void) psmChroot(psm, 1);
+    (void) psmStage(psm, PSM_CHROOT_IN);
 
     if (!(ts->transFlags & RPMTRANS_FLAG_NOTRIGGERS)) {
 	/* run triggers from this package which are keyed on installed 
@@ -1245,8 +1656,6 @@ assert(fi->type == TR_REMOVED);
 	}
 
 	/* run triggers which are set off by the removal of this package */
-	psm->sense = RPMSENSE_TRIGGERUN;
-	psm->countCorrection = -1;
 	rc = runTriggers(psm);
 	if (rc) {
 	    rc = 1;
@@ -1302,7 +1711,7 @@ assert(fi->type == TR_REMOVED);
 
 exit:
     /* Restore root directory if changed. */
-    (void) psmChroot(psm, 0);
+    (void) psmStage(psm, PSM_CHROOT_OUT);
 
     if (!rc && !(ts->transFlags & RPMTRANS_FLAG_TEST))
 	rpmdbRemove(ts->rpmdb, ts->id, fi->record);
@@ -1437,7 +1846,7 @@ assert(fi->type == TR_REMOVED);
     if (rc) goto exit;
 
     /* Change root directory if requested and not already done. */
-    (void) psmChroot(psm, 1);
+    (void) psmStage(psm, PSM_CHROOT_IN);
 
     /* Write the payload into the package. */
     {	FD_t cfd;
@@ -1463,7 +1872,7 @@ assert(fi->type == TR_REMOVED);
 
 exit:
     /* Restore root directory if changed. */
-    (void) psmChroot(psm, 0);
+    (void) psmStage(psm, PSM_CHROOT_OUT);
 
     if (h)	headerFree(h);
     if (oh)	headerFree(oh);
diff --git a/lib/psm.h b/lib/psm.h
index b44ba35cc..924c457c6 100644
--- a/lib/psm.h
+++ b/lib/psm.h
@@ -6,18 +6,10 @@
 
 #include <rpmlib.h>
 #include "depends.h"
-#include "scriptlet.h"
 #include "fsm.h"
 
 /**
  */
-typedef	enum rollbackDir_e {
-    ROLLBACK_SAVE	= 1,	/*!< Save files. */
-    ROLLBACK_RESTORE	= 2,	/*!< Restore files. */
-} rollbackDir;
-
-/**
- */
 struct sharedFile {
     int mainFileNumber;
     int secRecOffset;
@@ -72,7 +64,6 @@ struct transactionFileInfo_s {
     int dnlmax;			/*!< Length (in bytes) of longest dir name. */
     int astriplen;
     int striplen;
-    int chrootDone;
     unsigned int archiveSize;
     mode_t dperms;		/*!< Directory perms (0755) if not mapped. */
     mode_t fperms;		/*!< File perms (0644) if not mapped. */
@@ -97,16 +88,49 @@ struct transactionFileInfo_s {
 
 /**
  */
+#define	PSM_VERBOSE	0x8000
+#define	PSM_INTERNAL	0x4000
+#define	PSM_SYSCALL	0x2000
+#define	PSM_DEAD	0x1000
+#define	_fv(_a)		((_a) | PSM_VERBOSE)
+#define	_fi(_a)		((_a) | PSM_INTERNAL)
+#define	_fs(_a)		((_a) | (PSM_INTERNAL | PSM_SYSCALL))
+#define	_fd(_a)		((_a) | (PSM_INTERNAL | PSM_DEAD))
+typedef enum pkgStage_e {
+    PSM_UNKNOWN =  0,
+    PSM_INIT	=  1,
+    PSM_PRE	=  2,
+    PSM_PROCESS	=  3,
+    PSM_POST	=  4,
+    PSM_UNDO	=  5,
+    PSM_FINI	=  6,
+    PSM_NOTIFY	=  7,
+    PSM_COMMIT	=  8,
+    PSM_CREATE	=  9,
+    PSM_DESTROY	=  10,
+    PSM_CHROOT_IN= 11,
+    PSM_CHROOT_OUT=12,
+    PSM_SCRIPT	=  13,
+    PSM_TRIGGER	=  14,
+} pkgStage;
+#undef	_fv
+#undef	_fi
+#undef	_fs
+#undef	_fd
+
+/**
+ */
 struct psm_s {
     rpmTransactionSet ts;
     TFI_t fi;
-    int scriptTag;		/*!< Scriptlet tag. */
+    int scriptTag;		/*!< Scriptlet data tag. */
     int progTag;		/*!< Scriptlet interpreter tag. */
     int scriptArg;		/*!< No. of installed instances. */
     int sense;			/*!< One of RPMSENSE_TRIGGER{IN,UN,POSTUN}. */
     int countCorrection;	/*!< 0 if installing, -1 if removing. */
+    int chrootDone;		/*!< Was chroot(2) done by pkgStage? */
     int rc;
-    fileStage stage;
+    pkgStage stage;
 };
 
 #ifdef __cplusplus
@@ -167,7 +191,7 @@ int repackage(PSM_t psm)
 
 /**
  */
-int psmStage(PSM_t psm, fileStage stage)
+int psmStage(PSM_t psm, pkgStage stage)
 	/*@modifies psm @*/;
 
 #ifdef __cplusplus
diff --git a/lib/scriptlet.c b/lib/scriptlet.c
deleted file mode 100644
index 3ab047bcd..000000000
--- a/lib/scriptlet.c
+++ /dev/null
@@ -1,474 +0,0 @@
-/** \ingroup rpmtrans payload
- * \file lib/scriptlet.c
- */
-
-#include "system.h"
-
-#include <rpmlib.h>
-#include <rpmurl.h>
-#include <rpmmacro.h>	/* XXX for rpmExpand */
-
-#include "depends.h"	/* XXX for headerMatchesDepFlags */
-#include "psm.h"
-#include "scriptlet.h"
-#include "misc.h"	/* XXX for makeTempFile, doputenv */
-#include "debug.h"
-
-/*@access Header @*/		/* XXX compared with NULL */
-/*@access PSM_t @*/
-
-static char * SCRIPT_PATH = "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin";
-
-/**
- * Return scriptlet name from tag.
- * @param tag		scriptlet tag
- * @return		name of scriptlet
- */
-static /*@observer@*/ const char * const tag2sln(int tag)
-{
-    switch (tag) {
-    case RPMTAG_PREIN:		return "%pre";
-    case RPMTAG_POSTIN:		return "%post";
-    case RPMTAG_PREUN:		return "%preun";
-    case RPMTAG_POSTUN:		return "%postun";
-    case RPMTAG_VERIFYSCRIPT:	return "%verify";
-    }
-    return "%unknownscript";
-}
-
-/**
- * Run scriptlet with args.
- *
- * Run a script with an interpreter. If the interpreter is not specified,
- * /bin/sh will be used. If the interpreter is /bin/sh, then the args from
- * the header will be ignored, passing instead arg1 and arg2.
- * 
- * @param psm		package state machine data
- * @param h		header
- * @param sln		name of scriptlet section
- * @param progArgc	no. of args from header
- * @param progArgv	args from header, progArgv[0] is the interpreter to use
- * @param script	scriptlet from header
- * @param arg1		no. instances of package installed after scriptlet exec
- *			(-1 is no arg)
- * @param arg2		ditto, but for the target package
- * @return		0 on success, 1 on error
- */
-static int runScript(PSM_t psm, Header h,
-		const char * sln,
-		int progArgc, const char ** progArgv, 
-		const char * script, int arg1, int arg2)
-{
-    const rpmTransactionSet ts = psm->ts;
-    TFI_t fi = psm->fi;
-    HGE_t hge = fi->hge;
-    HFD_t hfd = fi->hfd;
-    const char ** argv = NULL;
-    int argc = 0;
-    const char ** prefixes = NULL;
-    int numPrefixes;
-    int_32 ipt;
-    const char * oldPrefix;
-    int maxPrefixLength;
-    int len;
-    char * prefixBuf = NULL;
-    pid_t child;
-    int status = 0;
-    const char * fn = NULL;
-    int i;
-    int freePrefixes = 0;
-    FD_t out;
-    int rc = 0;
-    const char *n, *v, *r;
-
-    if (!progArgv && !script)
-	return 0;
-
-    if (!progArgv) {
-	argv = alloca(5 * sizeof(char *));
-	argv[0] = "/bin/sh";
-	argc = 1;
-    } else {
-	argv = alloca((progArgc + 4) * sizeof(char *));
-	memcpy(argv, progArgv, progArgc * sizeof(char *));
-	argc = progArgc;
-    }
-
-    headerNVR(h, &n, &v, &r);
-    if (hge(h, RPMTAG_INSTPREFIXES, &ipt, (void **) &prefixes, &numPrefixes)) {
-	freePrefixes = 1;
-    } else if (hge(h, RPMTAG_INSTALLPREFIX, NULL, (void **) &oldPrefix, NULL)) {
-	prefixes = &oldPrefix;
-	numPrefixes = 1;
-    } else {
-	numPrefixes = 0;
-    }
-
-    maxPrefixLength = 0;
-    for (i = 0; i < numPrefixes; i++) {
-	len = strlen(prefixes[i]);
-	if (len > maxPrefixLength) maxPrefixLength = len;
-    }
-    prefixBuf = alloca(maxPrefixLength + 50);
-
-    if (script) {
-	FD_t fd;
-	if (makeTempFile((!ts->chrootDone ? ts->rootDir : "/"), &fn, &fd)) {
-	    if (freePrefixes) free(prefixes);
-	    return 1;
-	}
-
-	if (rpmIsDebug() &&
-	    (!strcmp(argv[0], "/bin/sh") || !strcmp(argv[0], "/bin/bash")))
-	    (void)Fwrite("set -x\n", sizeof(char), 7, fd);
-
-	(void)Fwrite(script, sizeof(script[0]), strlen(script), fd);
-	Fclose(fd);
-
-	{   const char * sn = fn;
-	    if (!ts->chrootDone &&
-		!(ts->rootDir[0] == '/' && ts->rootDir[1] == '\0'))
-	    {
-		sn += strlen(ts->rootDir)-1;
-	    }
-	    argv[argc++] = sn;
-	}
-
-	if (arg1 >= 0) {
-	    char *av = alloca(20);
-	    sprintf(av, "%d", arg1);
-	    argv[argc++] = av;
-	}
-	if (arg2 >= 0) {
-	    char *av = alloca(20);
-	    sprintf(av, "%d", arg2);
-	    argv[argc++] = av;
-	}
-    }
-
-    argv[argc] = NULL;
-
-    if (ts->scriptFd != NULL) {
-	if (rpmIsVerbose()) {
-	    out = fdDup(Fileno(ts->scriptFd));
-	} else {
-	    out = Fopen("/dev/null", "w.fdio");
-	    if (Ferror(out)) {
-		out = fdDup(Fileno(ts->scriptFd));
-	    }
-	}
-    } else {
-	out = fdDup(STDOUT_FILENO);
-	out = fdLink(out, "runScript persist");
-    }
-    
-    if (!(child = fork())) {
-	const char * rootDir;
-	int pipes[2];
-
-	pipes[0] = pipes[1] = 0;
-	/* make stdin inaccessible */
-	pipe(pipes);
-	close(pipes[1]);
-	dup2(pipes[0], STDIN_FILENO);
-	close(pipes[0]);
-
-	if (ts->scriptFd != NULL) {
-	    if (Fileno(ts->scriptFd) != STDERR_FILENO)
-		dup2(Fileno(ts->scriptFd), STDERR_FILENO);
-	    if (Fileno(out) != STDOUT_FILENO)
-		dup2(Fileno(out), STDOUT_FILENO);
-	    /* make sure we don't close stdin/stderr/stdout by mistake! */
-	    if (Fileno(out) > STDERR_FILENO && Fileno(out) != Fileno(ts->scriptFd)) {
-		Fclose (out);
-	    }
-	    if (Fileno(ts->scriptFd) > STDERR_FILENO) {
-		Fclose (ts->scriptFd);
-	    }
-	}
-
-	{   const char *ipath = rpmExpand("PATH=%{_install_script_path}", NULL);
-	    const char *path = SCRIPT_PATH;
-
-	    if (ipath && ipath[5] != '%')
-		path = ipath;
-	    doputenv(path);
-	    if (ipath)	free((void *)ipath);
-	}
-
-	for (i = 0; i < numPrefixes; i++) {
-	    sprintf(prefixBuf, "RPM_INSTALL_PREFIX%d=%s", i, prefixes[i]);
-	    doputenv(prefixBuf);
-
-	    /* backwards compatibility */
-	    if (i == 0) {
-		sprintf(prefixBuf, "RPM_INSTALL_PREFIX=%s", prefixes[i]);
-		doputenv(prefixBuf);
-	    }
-	}
-
-	rootDir = ts->rootDir;
-	switch(urlIsURL(rootDir)) {
-	case URL_IS_PATH:
-	    rootDir += sizeof("file://") - 1;
-	    rootDir = strchr(rootDir, '/');
-	    /*@fallthrough@*/
-	case URL_IS_UNKNOWN:
-	    if (!ts->chrootDone && !(rootDir[0] == '/' && rootDir[1] == '\0')) {
-		/*@-unrecog@*/ chroot(rootDir); /*@=unrecog@*/
-	    }
-	    chdir("/");
-	    execv(argv[0], (char *const *)argv);
-	    break;
-	default:
-	    break;
-	}
-
- 	_exit(-1);
-	/*@notreached@*/
-    }
-
-    if (waitpid(child, &status, 0) < 0) {
-	rpmError(RPMERR_SCRIPT,
-		 _("execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"),
-		 sln, n, v, r, strerror (errno));
-	/* XXX what to do here? */
-	rc = 0;
-    } else {
-	if (!WIFEXITED(status) || WEXITSTATUS(status)) {
-	    rpmError(RPMERR_SCRIPT,
-		     _("execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"),
-		     sln, n, v, r, WEXITSTATUS(status));
-	    rc = 1;
-	}
-    }
-
-    if (freePrefixes) prefixes = hfd(prefixes, ipt);
-
-    Fclose(out);	/* XXX dup'd STDOUT_FILENO */
-    
-    if (script) {
-	if (!rpmIsDebug()) unlink(fn);
-	free((void *)fn);
-    }
-
-    return rc;
-}
-
-int runInstScript(PSM_t psm)
-{
-    const rpmTransactionSet ts = psm->ts;
-    TFI_t fi = psm->fi;
-    HGE_t hge = fi->hge;
-    HFD_t hfd = fi->hfd;
-    void ** programArgv;
-    int programArgc;
-    const char ** argv;
-    int_32 ptt, stt;
-    const char * script;
-    int rc;
-
-    if (ts->transFlags & RPMTRANS_FLAG_NOSCRIPTS)
-	return 0;
-
-    /*
-     * headerGetEntry() sets the data pointer to NULL if the entry does
-     * not exist.
-     */
-    hge(fi->h, psm->progTag, &ptt, (void **) &programArgv, &programArgc);
-    hge(fi->h, psm->scriptTag, &stt, (void **) &script, NULL);
-
-    if (programArgv && ptt == RPM_STRING_TYPE) {
-	argv = alloca(sizeof(char *));
-	*argv = (const char *) programArgv;
-    } else {
-	argv = (const char **) programArgv;
-    }
-
-    rc = runScript(psm, fi->h, tag2sln(psm->scriptTag), programArgc, argv,
-		script, psm->scriptArg, -1);
-    programArgv = hfd(programArgv, ptt);
-    script = hfd(script, stt);
-    return rc;
-}
-
-/**
- * @param psm		package state machine data
- * @param sourceH
- * @param triggeredH
- * @param arg2
- * @param triggersAlreadyRun
- * @return
- */
-static int handleOneTrigger(PSM_t psm, Header sourceH, Header triggeredH,
-			int arg2, char * triggersAlreadyRun)
-{
-    const rpmTransactionSet ts = psm->ts;
-    TFI_t fi = psm->fi;
-    HGE_t hge = fi->hge;
-    HFD_t hfd = fi->hfd;
-    const char ** triggerNames;
-    const char ** triggerEVR;
-    const char ** triggerScripts;
-    const char ** triggerProgs;
-    int_32 * triggerFlags;
-    int_32 * triggerIndices;
-    int_32 tnt, tvt, tft;
-    const char * triggerPackageName;
-    const char * sourceName;
-    int numTriggers;
-    int rc = 0;
-    int i;
-    int skip;
-
-    if (!hge(triggeredH, RPMTAG_TRIGGERNAME, &tnt, 
-			(void **) &triggerNames, &numTriggers))
-	return 0;
-
-    headerNVR(sourceH, &sourceName, NULL, NULL);
-
-    hge(triggeredH, RPMTAG_TRIGGERFLAGS, &tft, (void **) &triggerFlags, NULL);
-    hge(triggeredH, RPMTAG_TRIGGERVERSION, &tvt, (void **) &triggerEVR, NULL);
-
-    for (i = 0; i < numTriggers; i++) {
-	int_32 tit, tst, tpt;
-
-	if (!(triggerFlags[i] & psm->sense)) continue;
-	if (strcmp(triggerNames[i], sourceName)) continue;
-
-	/*
-	 * For some reason, the TRIGGERVERSION stuff includes the name of
-	 * the package which the trigger is based on. We need to skip
-	 * over that here. I suspect that we'll change our minds on this
-	 * and remove that, so I'm going to just 'do the right thing'.
-	 */
-	skip = strlen(triggerNames[i]);
-	if (!strncmp(triggerEVR[i], triggerNames[i], skip) &&
-	    (triggerEVR[i][skip] == '-'))
-	    skip++;
-	else
-	    skip = 0;
-
-	if (!headerMatchesDepFlags(sourceH, triggerNames[i],
-		triggerEVR[i] + skip, triggerFlags[i]))
-	    continue;
-
-	hge(triggeredH, RPMTAG_TRIGGERINDEX, &tit,
-		       (void **) &triggerIndices, NULL);
-	hge(triggeredH, RPMTAG_TRIGGERSCRIPTS, &tst,
-		       (void **) &triggerScripts, NULL);
-	hge(triggeredH, RPMTAG_TRIGGERSCRIPTPROG, &tpt,
-		       (void **) &triggerProgs, NULL);
-
-	headerNVR(triggeredH, &triggerPackageName, NULL, NULL);
-
-	{   int arg1;
-	    int index;
-
-	    arg1 = rpmdbCountPackages(ts->rpmdb, triggerPackageName);
-	    if (arg1 < 0) {
-		rc = 1;	/* XXX W2DO? same as "execution of script failed" */
-	    } else {
-		arg1 += psm->countCorrection;
-		index = triggerIndices[i];
-		if (!triggersAlreadyRun || !triggersAlreadyRun[index]) {
-		    rc = runScript(psm, triggeredH, "%trigger", 1,
-			    triggerProgs + index, triggerScripts[index], 
-			    arg1, arg2);
-		    if (triggersAlreadyRun) triggersAlreadyRun[index] = 1;
-		}
-	    }
-	}
-
-	triggerIndices = hfd(triggerIndices, tit);
-	triggerScripts = hfd(triggerScripts, tst);
-	triggerProgs = hfd(triggerProgs, tpt);
-
-	/*
-	 * Each target/source header pair can only result in a single
-	 * script being run.
-	 */
-	break;
-    }
-
-    triggerNames = hfd(triggerNames, tnt);
-    triggerFlags = hfd(triggerFlags, tft);
-    triggerEVR = hfd(triggerEVR, tvt);
-
-    return rc;
-}
-
-int runTriggers(PSM_t psm)
-{
-    const rpmTransactionSet ts = psm->ts;
-    TFI_t fi = psm->fi;
-    int numPackage;
-    int rc = 0;
-
-    numPackage = rpmdbCountPackages(ts->rpmdb, fi->name) + psm->countCorrection;
-    if (numPackage < 0)
-	return 1;
-
-    {	Header triggeredH;
-	rpmdbMatchIterator mi;
-	int countCorrection = psm->countCorrection;
-
-	psm->countCorrection = 0;
-	mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_TRIGGERNAME, fi->name, 0);
-	while((triggeredH = rpmdbNextIterator(mi)) != NULL) {
-	    rc |= handleOneTrigger(psm, fi->h, triggeredH, numPackage, NULL);
-	}
-
-	rpmdbFreeIterator(mi);
-	psm->countCorrection = countCorrection;
-    }
-
-    return rc;
-}
-
-int runImmedTriggers(PSM_t psm)
-{
-    const rpmTransactionSet ts = psm->ts;
-    TFI_t fi = psm->fi;
-    HGE_t hge = fi->hge;
-    HFD_t hfd = fi->hfd;
-    const char ** triggerNames;
-    int numTriggers;
-    int_32 * triggerIndices;
-    int_32 tnt, tit;
-    int numTriggerIndices;
-    char * triggersRun;
-    int rc = 0;
-
-    if (!hge(fi->h, RPMTAG_TRIGGERNAME, &tnt,
-			(void **) &triggerNames, &numTriggers))
-	return 0;
-
-    hge(fi->h, RPMTAG_TRIGGERINDEX, &tit, (void **) &triggerIndices, 
-		   &numTriggerIndices);
-    triggersRun = alloca(sizeof(*triggersRun) * numTriggerIndices);
-    memset(triggersRun, 0, sizeof(*triggersRun) * numTriggerIndices);
-
-    {	Header sourceH = NULL;
-	int i;
-
-	for (i = 0; i < numTriggers; i++) {
-	    rpmdbMatchIterator mi;
-
-	    if (triggersRun[triggerIndices[i]]) continue;
-	
-	    mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_NAME, triggerNames[i], 0);
-
-	    while((sourceH = rpmdbNextIterator(mi)) != NULL) {
-		rc |= handleOneTrigger(psm, sourceH, fi->h, 
-				rpmdbGetIteratorCount(mi),
-				triggersRun);
-	    }
-
-	    rpmdbFreeIterator(mi);
-	}
-    }
-    triggerIndices = hfd(triggerNames, tit);
-    triggerNames = hfd(triggerNames, tnt);
-    return rc;
-}
diff --git a/lib/scriptlet.h b/lib/scriptlet.h
deleted file mode 100644
index 7ca356434..000000000
--- a/lib/scriptlet.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef H_SCRIPTLET
-#define H_SCRIPTLET
-
-/** \file lib/scriptlet.h
- */
-
-#include <rpmlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Retrieve and run scriptlet from header.
- * @param psm		package state machine data
- * @return		0 on success
- */
-int runInstScript(PSM_t psm)
-	/*@modifies psm @*/;
-
-/**
- * Run trigger scripts in the database that are fired by this header.
- * @param psm		package state machine data
- * @return		0 on success, 1 on error
- */
-int runTriggers(PSM_t psm)
-	/*@modifies psm @*/;
-
-/**
- * Run triggers from this header that are fired by headers in the database.
- * @param psm		package state machine data
- * @return		0 on success, 1 on error
- */
-int runImmedTriggers(PSM_t psm)
-	/*@modifies psm @*/;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* H_SCRIPTLET */
diff --git a/lib/verify.c b/lib/verify.c
index 008a222df..8810f9170 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -299,7 +299,7 @@ int rpmVerifyScript(const char * rootDir, Header h, FD_t scriptFd)
     psm->fi = fi;
     psm->scriptTag = RPMTAG_VERIFYSCRIPT;
     psm->progTag = RPMTAG_VERIFYSCRIPTPROG;
-    rc = runInstScript(psm);
+    rc = psmStage(psm, PSM_SCRIPT);
     freeFi(fi);
     fi = _free(fi);
     rpmtransFree(ts);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 48f8d5015..74cc045b0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -51,7 +51,6 @@ lib/rpmdb.c
 lib/rpminstall.c
 lib/rpmlead.c
 lib/rpmrc.c
-lib/scriptlet.c
 lib/signature.c
 lib/stringbuf.c
 lib/transaction.c
diff --git a/po/cs.po b/po/cs.po
index 3e187ed73..fd68f2fe0 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-0500\n"
 "PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -1886,7 +1886,7 @@ msgstr "Generuji podpis: %d\n"
 msgid "Could not open %s: %s\n"
 msgstr "Nemohu otevřít %s: %s\n"
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nemohu zapsat balíček: %s"
@@ -1916,7 +1916,7 @@ msgstr "Nemohu přečíst ikonu %s: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nemohu zapsat balíček %s: %s"
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapsáno: %s\n"
@@ -2593,27 +2593,27 @@ msgstr "řádek %d: %s"
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "varování: %s uloženo jako %s"
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "nemohu odstranit %s - adresář není prázdný"
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "rmdir %s selhalo: %s"
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "otevření %s selhalo: %s\n"
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "varování: %s vytvořeno jako %s"
@@ -3063,18 +3063,28 @@ msgstr "zdrojový balíček neobsahuje spec soubor"
 msgid "source package expected, binary found\n"
 msgstr "očekávám balíček se zdrojovými kódy, nalezen však binární"
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, fuzzy, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr "provedení %s-%s-%s skriptu selhalo, návratový kód: %d"
+
+#: lib/psm.c:1090
+#, fuzzy, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr "provedení %s-%s-%s skriptu selhalo, návratový kód: %d"
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "balíček: %s-%s-%s test souborů = %d\n"
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, fuzzy, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr "spouštím případný postinstalační skript\n"
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 #, fuzzy
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr "přeskakuji %s - přenos selhal - %s\n"
@@ -3221,67 +3231,67 @@ msgstr "%s: Fwrite selhalo: %s\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: RPM v1.0 nelze podepsat\n"
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: Nemohu znovu podepsat RPM v2.0\n"
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature selhalo\n"
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Není dostupný žádný podpis\n"
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead selhalo: %s\n"
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature selhalo: %s\n"
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Není dostupný žádný podpis (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr "NENÍ OK"
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr " (CHYBÍ KLÍČ:"
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEDŮVĚRYHODNÝ KLÍČ:"
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr "OK"
 
@@ -3340,105 +3350,105 @@ msgstr "chyba(%d) při počítání balíčků"
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: nemohu číst hlavičku na 0x%x"
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraňuji \"%s\" z indexu %s.\n"
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstraňuji %d položek z indexu %s.\n"
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "chyba(%d) při alokaci nové instance balíčku"
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "přidávám \"%s\" do indexu %s\n"
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "přidávám %d položek do indexu %s.\n"
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr "nebyla nastavena dbpath"
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "databázi %s převádím do %s\n"
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "dočasná databáze %s již existuje"
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr "vytvářím adresář %s\n"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "vytvářím adresář %s\n"
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otevírám starou databázi s dbapi %d\n"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otevírám novou databázi s dbapi %d\n"
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr "záznam číslo %d v databázi je chybný -- vynechávám."
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, fuzzy, c-format
 msgid "cannot add record originally at %d\n"
 msgstr "nemohu přidat záznam - původně u %d"
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "databázi nelze zvovu vytvořit; původní databáze zůstává na svém místě\n"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr "starou databázi nelze nahradit novou databází!\n"
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "pro obnovení nahraďte soubory v %s soubory z %s"
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr "mažu adresář %s\n"
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nemohu odstranit adresář %s: %s\n"
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3654,16 +3664,6 @@ msgstr "Neznámý systém: %s\n"
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Zkontaktujte prosím rpm-list@redhat.com\n"
 
-#: lib/scriptlet.c:229
-#, fuzzy, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr "provedení %s-%s-%s skriptu selhalo, návratový kód: %d"
-
-#: lib/scriptlet.c:236
-#, fuzzy, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr "provedení %s-%s-%s skriptu selhalo, návratový kód: %d"
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr "není obyčejný soubor -- přeskakuji kontrolu velikosti\n"
@@ -3678,163 +3678,163 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr "Velikost podpisu: %d\n"
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr "Chybí podpis\n"
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr "Starý PGP podpis\n"
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Starý (pouze interní) podpis! Jak jste to získali!?"
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Velikost podpisu: %d\n"
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "Nemohu spustit pgp (%s)"
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp selhalo"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp selhalo při zápisu podpisu"
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Velikost podpisu PGP: %d\n"
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "nemohu číst podpis"
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Přečteno %d bajtů PGP podpisu\n"
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "Nemohu spustit gpg"
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg selhalo"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg selhalo při zápisu podpisu"
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Velikost GPG podpisu: %d\n"
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Přečteno %d bajtů GPG podpisu\n"
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr "Generuji PGP podpis.\n"
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr "Generuji GPG podpis.\n"
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 #, fuzzy
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr "Nemohu spustit pgp. Vynechte kontroly PGP pomocí --nopgp."
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr "Nelze spustit gpg. Vynechte kontroly GPG pomocí --nogpg."
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "Nemohu spustit pgp"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 #, fuzzy
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Špatná %%_signature spec v souboru maker.\n"
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 #, fuzzy
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Musíte nastavit \"%%_gpg_name\" ve svém makro souboru"
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 #, fuzzy
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Musíte nastavit \"%%_pgp_name\" ve svém makro souboru"
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS je vyřazen: %s"
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "přemísťuji %s do %s\n"
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "vynechávám soubor %s%s\n"
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "vynechávám soubor %s%s\n"
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "přemísťuji %s do %s\n"
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "přemísťuji adresář %s do %s\n"
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "vynechávám adresář %s\n"
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s přeskočeno, protože chybí příznak\n"
@@ -3848,25 +3848,25 @@ msgstr "nekontrolovat soubory v balíčku"
 msgid "do not execute %verifyscript (if any)"
 msgstr "nespouštět žádné etapy"
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 #, fuzzy
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 "balíček neobsahuje ani uživatelská jména ani seznam id (nemělo by se nikdy "
 "stát)"
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 #, fuzzy
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "balíček neobsahuje ani jména skupin ani seznam id (nemělo by se nikdy stát)"
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "chybí      %s\n"
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nevyřešené závislosti pro %s-%s-%s: "
diff --git a/po/da.po b/po/da.po
index ddf93384a..537509248 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -1834,7 +1834,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kan ikke ĺbne spec-fil %s: %s\n"
@@ -1864,7 +1864,7 @@ msgstr "Kan ikke ĺbne spec-fil %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kan ikke ĺbne spec-fil %s: %s\n"
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2507,27 +2507,27 @@ msgstr "%6d %s\n"
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "fjernelse af %s fejlede: %s"
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "fjernelse af %s fejlede: %s"
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "fjernelse af %s fejlede: %s"
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2954,18 +2954,28 @@ msgstr ""
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3110,67 +3120,67 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr "IKKE OK"
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr "OK"
 
@@ -3225,104 +3235,104 @@ msgstr ""
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "RPM-database eksisterer allerede"
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr "opretter kataloget %s\n"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "opretter kataloget %s\n"
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, c-format
 msgid "cannot add record originally at %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr "fjener kataloget %s\n"
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3537,16 +3547,6 @@ msgstr "Ukendt system: %s\n"
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Kontakt venligst rpm-list@redhat.com\n"
 
-#: lib/scriptlet.c:229
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:236
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3561,152 +3561,152 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp fejlede"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg fejlede"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3719,20 +3719,20 @@ msgstr ""
 msgid "do not execute %verifyscript (if any)"
 msgstr ""
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 82bf1c314..857de91ef 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -2053,7 +2053,7 @@ msgid "Could not open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen\n"
 
 # , c-format
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
@@ -2088,7 +2088,7 @@ msgstr "Nicht möglich %s zu schreiben"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2774,27 +2774,27 @@ msgstr "Öffnen von %s fehlgeschlagen: %s"
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "kann %s nicht entfernen - Verzeichnis ist nicht leer"
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "Entfernen von %s fehlgeschlagen: %s"
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "öffnen von %s fehlgeschlagen: %s\n"
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "kann Datei %s nicht öffnen: "
@@ -3265,19 +3265,29 @@ msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 msgid "source package expected, binary found\n"
 msgstr ""
 
+#: lib/psm.c:1083
+#, 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:1090
+#, 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:927 lib/psm.c:1101
+#: lib/psm.c:1432 lib/psm.c:1613
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, fuzzy, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr "Keine Stufen ausführen"
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 #, fuzzy
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
@@ -3429,68 +3439,68 @@ msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: Kann v1.0-RPM nicht signieren\n"
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: Kann v2.0-RPM nicht erneuert signieren\n"
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: ťrpmReadSignatureŤ fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Keine Signatur verfügbar\n"
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: ťrpmReadSignatureŤ fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (FEHLENDE SCHLüSSEL)"
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3548,108 +3558,108 @@ msgid "%s: cannot read header at 0x%x\n"
 msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen"
 
 # FIXME
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 # FIXME
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
 # FIXME
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr "ťdbpathŤ ist nicht gesetzt"
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "die temporäre Datenbank %s existiert schon"
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 "Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen"
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, fuzzy, c-format
 msgid "cannot add record originally at %d\n"
 msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d"
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
 # , c-format
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3873,16 +3883,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, fuzzy, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr "Ausführung des Skripts fehlgeschlagen"
-
-#: lib/scriptlet.c:236
-#, fuzzy, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr "Ausführung des Skripts fehlgeschlagen"
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3897,169 +3897,169 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 #, fuzzy
 msgid "No signature\n"
 msgstr "%s: Keine Signatur verfügbar\n"
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "PGP-Signatur generieren"
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Alte Signatur (nur intern)!  Wie bist du daran gekommen!?"
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "Konnte pgp nicht durchführen"
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp fehlgeschlagen"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp fehlgeschlagen beim Schreiben der Signatur"
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "nicht möglich, die Signatur zu lesen"
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "Konnte pgp nicht durchführen"
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "pgp fehlgeschlagen"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "pgp fehlgeschlagen beim Schreiben der Signatur"
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "PGP-Signatur generieren"
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "PGP-Signatur generieren"
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 #, fuzzy
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr "Konnte pgp nicht aufrufen.  Überspring die PGP-Checks mit --nopgp."
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr "Konnte pgp nicht aufrufen.  Überspring die PGP-Checks mit --nopgp."
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "Konnte pgp nicht durchführen"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 #, fuzzy
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 #, fuzzy
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
 # , c-format
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Hole %s heraus\n"
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
 # , c-format
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "Hole %s heraus\n"
 
 # , c-format
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Hole %s heraus\n"
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -4074,20 +4074,20 @@ msgstr "Paket installieren"
 msgid "do not execute %verifyscript (if any)"
 msgstr "Keine Stufen ausführen"
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "fehlende { nach %{"
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: "
diff --git a/po/es.po b/po/es.po
index 877d0563d..17a24b9d6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -1808,7 +1808,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -1838,7 +1838,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2481,27 +2481,27 @@ msgstr ""
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2925,18 +2925,28 @@ msgstr ""
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3081,67 +3091,67 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3196,104 +3206,104 @@ msgstr ""
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, c-format
 msgid "cannot add record originally at %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3508,16 +3518,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:236
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3532,150 +3532,150 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3688,20 +3688,20 @@ msgstr ""
 msgid "do not execute %verifyscript (if any)"
 msgstr ""
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 69e8f984d..623ba493d 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -1808,7 +1808,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -1838,7 +1838,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2481,27 +2481,27 @@ msgstr ""
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2925,18 +2925,28 @@ msgstr ""
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3081,67 +3091,67 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3196,104 +3206,104 @@ msgstr ""
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, c-format
 msgid "cannot add record originally at %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3508,16 +3518,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:236
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3532,150 +3532,150 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3688,20 +3688,20 @@ msgstr ""
 msgid "do not execute %verifyscript (if any)"
 msgstr ""
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index eb4ffd448..3085849b4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -1983,7 +1983,7 @@ msgstr "generoi PGP-allekirjoitus"
 msgid "Could not open %s: %s\n"
 msgstr "%s:n avaus epäonnistui\n"
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
@@ -2013,7 +2013,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:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2671,27 +2671,27 @@ msgstr "en voinut avata %s: %s"
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "en voi poistaa %s -hakemisto ei ole tyhjä"
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "%s:n rmdir epäonnistui: %s"
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "en voinut avata tiedostoa %s: "
@@ -3154,18 +3154,28 @@ msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, 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:1090
+#, 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:1432 lib/psm.c:1613
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, fuzzy, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 #, fuzzy
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
@@ -3315,68 +3325,68 @@ msgstr "%s: readLead  epäonnistui\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: En voi allekirjoittaa v1.0 RPM:ää\n"
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: En voi uudelleen allekirjoittaa v2.0 RPM:ää\n"
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature epäonnistui\n"
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ei allekirjoitusta saatavilla\n"
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature epäonnistui\n"
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr "(PUUTTUVAT AVAIMET)"
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3432,104 +3442,104 @@ msgstr "virhe etsittäessä pakettia %s\n"
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "en voi lukea headeria %d:stä päivittäessä"
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr "dbpath ei ole asetettu"
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "väliaikainen tietokanta %s on jo olemassa"
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen"
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, fuzzy, c-format
 msgid "cannot add record originally at %d\n"
 msgstr "en voi lisätä tietuetta %d:stä"
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3748,16 +3758,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, fuzzy, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr "skriptin ajo epäonnistui"
-
-#: lib/scriptlet.c:236
-#, fuzzy, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr "skriptin ajo epäonnistui"
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3772,166 +3772,166 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 #, fuzzy
 msgid "No signature\n"
 msgstr "%s: Ei allekirjoitusta saatavilla\n"
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "generoi PGP-allekirjoitus"
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Vanha (sisäisen käytön) allekirjoitus! Mistä sait sen!?"
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "En voinut ajaa pgp:tä"
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp epäonnistui"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp ei voinut kirjoittaa allekirjoitusta"
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "en voinut lukea allekirjoitusta"
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "En voinut ajaa pgp:tä"
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "pgp epäonnistui"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "pgp ei voinut kirjoittaa allekirjoitusta"
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "generoi PGP-allekirjoitus"
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "generoi PGP-allekirjoitus"
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 #, fuzzy
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr "En voinut ajaa pgp:tä. Käytä --nopgpg ohittaaksesi PGP-tarkistus"
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr "En voinut ajaa pgp:tä. Käytä --nopgpg ohittaaksesi PGP-tarkistus"
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "En voinut ajaa pgp:tä"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 #, fuzzy
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa"
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 #, fuzzy
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa"
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Haen: %s\n"
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "Haen: %s\n"
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Haen: %s\n"
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3946,20 +3946,20 @@ msgstr "asenna paketti"
 msgid "do not execute %verifyscript (if any)"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "puuttuva '{' '%':n jälkeen"
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:"
diff --git a/po/fr.po b/po/fr.po
index 24679a904..33dffe196 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2001-02-19 11:19-0500\n"
+msgstr "POT-Creation-Date: 2001-02-28 10:48-0500\n"
 
 #: build.c:25
 #, fuzzy, c-format
@@ -2003,7 +2003,7 @@ msgstr "      --sign            - genčre une signature PGP"
 msgid "Could not open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -2033,7 +2033,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:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2689,27 +2689,27 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "La construction a échoué.\n"
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "La construction a échoué.\n"
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -3179,18 +3179,28 @@ msgstr ""
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3339,67 +3349,67 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3454,104 +3464,104 @@ msgstr "aucun package n'a été spécifié pour l'installation"
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, c-format
 msgid "cannot add record originally at %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3768,16 +3778,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:236
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3792,160 +3792,160 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "      --sign            - genčre une signature PGP"
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "La construction a échoué.\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "La construction a échoué.\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "      --sign            - genčre une signature PGP"
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "      --sign            - genčre une signature PGP"
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3958,20 +3958,20 @@ msgstr ""
 msgid "do not execute %verifyscript (if any)"
 msgstr ""
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 877d0563d..17a24b9d6 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -1808,7 +1808,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -1838,7 +1838,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2481,27 +2481,27 @@ msgstr ""
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2925,18 +2925,28 @@ msgstr ""
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3081,67 +3091,67 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3196,104 +3206,104 @@ msgstr ""
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, c-format
 msgid "cannot add record originally at %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3508,16 +3518,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:236
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3532,150 +3532,150 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3688,20 +3688,20 @@ msgstr ""
 msgid "do not execute %verifyscript (if any)"
 msgstr ""
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 877d0563d..17a24b9d6 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -1808,7 +1808,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -1838,7 +1838,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2481,27 +2481,27 @@ msgstr ""
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2925,18 +2925,28 @@ msgstr ""
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3081,67 +3091,67 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3196,104 +3206,104 @@ msgstr ""
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, c-format
 msgid "cannot add record originally at %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3508,16 +3518,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:236
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3532,150 +3532,150 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3688,20 +3688,20 @@ msgstr ""
 msgid "do not execute %verifyscript (if any)"
 msgstr ""
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 877d0563d..17a24b9d6 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -1808,7 +1808,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -1838,7 +1838,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2481,27 +2481,27 @@ msgstr ""
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2925,18 +2925,28 @@ msgstr ""
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3081,67 +3091,67 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3196,104 +3206,104 @@ msgstr ""
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, c-format
 msgid "cannot add record originally at %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3508,16 +3518,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:236
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3532,150 +3532,150 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3688,20 +3688,20 @@ msgstr ""
 msgid "do not execute %verifyscript (if any)"
 msgstr ""
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/is.po b/po/is.po
index fca8052e1..6a020bee4 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-0500\n"
 "PO-Revision-Date: 2000-08-02 13:00+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -1837,7 +1837,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Get ekki opnađ spec skrána %s: %s\n"
@@ -1867,7 +1867,7 @@ msgstr "Get ekki opnađ spec skrána %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Get ekki opnađ spec skrána %s: %s\n"
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2510,27 +2510,27 @@ msgstr "Skrá %s: %s"
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "gat ekki búiđ til %s: %s\n"
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "Get ekki opnađ spec skrána %s: %s\n"
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "Get ekki opnađ spec skrána %s: %s\n"
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "gat ekki búiđ til %s: %s\n"
@@ -2959,18 +2959,28 @@ msgstr "fyrirspurn á pakkann sem á <skrá>"
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3115,67 +3125,67 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3230,104 +3240,104 @@ msgstr ""
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, c-format
 msgid "cannot add record originally at %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3542,16 +3552,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:236
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3566,150 +3566,150 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "gat ekki búiđ til %s: %s\n"
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3722,20 +3722,20 @@ msgstr ""
 msgid "do not execute %verifyscript (if any)"
 msgstr ""
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 877d0563d..17a24b9d6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -1808,7 +1808,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -1838,7 +1838,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2481,27 +2481,27 @@ msgstr ""
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2925,18 +2925,28 @@ msgstr ""
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3081,67 +3091,67 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3196,104 +3206,104 @@ msgstr ""
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, c-format
 msgid "cannot add record originally at %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3508,16 +3518,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:236
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3532,150 +3532,150 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3688,20 +3688,20 @@ msgstr ""
 msgid "do not execute %verifyscript (if any)"
 msgstr ""
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 07ef32e2e..92c1dfa0f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -88,7 +88,7 @@ msgstr "ĽżĄźĽ˛ĽĂĽČ %s ÍѤ˺îŔŽĂć\n"
 # build root [BuildRoot]
 # net share [ĽÍĽĂĽČśŚÍ­]
 # reloate [şĆÇŰĂÖ/°ÜĆ°¤š¤ë]
-# $Id: ja.po,v 1.157 2001/02/27 21:30:29 jbj Exp $
+# $Id: ja.po,v 1.158 2001/02/28 15:49:25 jbj Exp $
 #: rpm.c:200 rpmqv.c:356
 #, c-format
 msgid "rpm: %s\n"
@@ -1969,7 +1969,7 @@ msgstr "˝đĚž¤ÎŔ¸ŔŽĂć: %d\n"
 msgid "Could not open %s: %s\n"
 msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Î˝ń¤­šţ¤ß¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s"
@@ -1999,7 +1999,7 @@ msgstr "Ľ˘Ľ¤ĽłĽó¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Î˝ń¤­šţ¤ß¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s"
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "˝ń¤­šţ¤ßĂć: %s\n"
@@ -2679,27 +2679,27 @@ msgstr "%d šÔĚÜ: %s"
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "ˇŮšđ: %s ¤Ď %s ¤Č¤ˇ¤ĆĘݸ¤ľ¤ě¤Ţ¤š"
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "%s ¤ňşď˝ü¤Ç¤­¤Ţ¤ť¤ó - ĽÇĽŁĽěĽŻĽČĽę¤Źśő¤Ç¤˘¤ę¤Ţ¤ť¤ó"
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "%s ¤Î rmdir ¤ËźşÇÔ: %s"
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s\n"
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "ˇŮšđ: %s ¤Ď %s ¤Č¤ˇ¤ĆşîŔŽ¤ľ¤ě¤Ţ¤š"
@@ -3174,18 +3174,28 @@ msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ď .spec ĽŐĽĄĽ¤Ľë¤ň´Ţ¤ó¤Ç¤¤¤Ţ¤ť¤ó"
 msgid "source package expected, binary found\n"
 msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ź´üÂÔ¤ľ¤ě¤Ţ¤šĄ˘ĽĐĽ¤ĽĘĽę¤Ď¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż"
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, fuzzy, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr "ĽšĽŻĽęĽ×ĽČ¤ÎźÂšÔ¤ËźşÇÔ"
+
+#: lib/psm.c:1090
+#, fuzzy, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr "ĽšĽŻĽęĽ×ĽČ¤ÎźÂšÔ¤ËźşÇÔ"
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸: %s-%s-%s ĽŐĽĄĽ¤ĽëĽĆĽšĽČ = %d\n"
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, fuzzy, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr "ĽÝĽšĽČĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ­¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n"
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 #, fuzzy
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr "%s ¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š - ĹžÁ÷źşÇÔ - %s\n"
@@ -3334,68 +3344,68 @@ msgstr "%s: Fwrite ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: v1.0 ¤Î RPM ¤Ë¤Ď˝đĚž¤Ç¤­¤Ţ¤ť¤ó\n"
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: v2.0 ¤Î RPM ¤Ë¤ĎşĆ˝đĚž¤Ç¤­¤Ţ¤ť¤ó\n"
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Í­¸ú¤Ę˝đĚž¤Ď¤˘¤ę¤Ţ¤ť¤ó\n"
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writedLead ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Í­¸ú¤Ę˝đĚž¤Ď¤˘¤ę¤Ţ¤ť¤ó(v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (Ľ­Ąź¤ÎĘśźş) "
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr " (żŽÍę¤Ç¤­¤Ę¤¤¸°:"
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3451,106 +3461,106 @@ msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ÎĂľş÷Ľ¨ĽéĄź\n"
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "¸Ąş÷¤Î¤ż¤á¤Î %d ¤Ç ĽŘĽĂĽŔ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó"
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "group Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "name Ľ¤ĽóĽÇĽĂĽŻĽšşď˝ü¤ˇ¤Ţ¤š\n"
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ÎĂľş÷Ľ¨ĽéĄź\n"
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "%s ¤ň %s ¤ŘĚžÁ°¤ňĘŃšš¤ˇ¤Ţ¤š\n"
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%s ¤ň %s ¤ŘĚžÁ°¤ňĘŃšš¤ˇ¤Ţ¤š\n"
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr "dbpath ¤ŹŔßÄꤾ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rootdir %s Ăć¤ÇĽÇĄźĽżĽŮĄźĽš¤ňşĆš˝Ăۤˇ¤Ţ¤š\n"
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "°ěťţĹŞ¤ĘĽÇĄźĽżĽŮĄźĽš %s ¤Ď¤š¤Ç¤Ë¸şß¤ˇ¤Ć¤¤¤Ţ¤š"
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "¸Ĺ¤¤ĽÇĄźĽżĽŮĄźĽš¤ÎĽŞĄźĽ×Ľó\n"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "żˇ¤ˇ¤¤ĽÇĄźĽżĽŮĄźĽš¤ÎĽŞĄźĽ×Ľó\n"
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr "ĽÇĄźĽżĽŮĄźĽšĂć¤ÎĽěĽłĄźĽÉČÖšć %d ¤ĎÉÔŔľ¤Ç¤š -- ĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, fuzzy, c-format
 msgid "cannot add record originally at %d\n"
 msgstr "%d ¤Ë ĽŞĽęĽ¸ĽĘĽë¤ÎĽěĽłĄźĽÉ¤ňÉղäǤ­¤Ţ¤ť¤ó"
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "ĽÇĄźĽżĽŮĄźĽš¤ÎşĆš˝Ăۤ˟şÇÔ; ĽŞĽęĽ¸ĽĘĽëĽÇĄźĽżĽŮĄźĽš¤Ź¤Ţ¤Ŕ¤˝¤ł¤ËťÄ¤Ă¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr "¸Ĺ¤¤ĽÇĄźĽżĽŮĄźĽš¤ňżˇ¤ˇ¤¤ĽÇĄźĽżĽŮĄźĽš¤ËĂÖ¤­´š¤¨¤ë¤Î¤ËźşÇÔ!\n"
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "%s Ăć¤ÎĽŐĽĄĽ¤Ľë¤ňĽęĽŤĽĐĄź¤š¤ë¤ż¤á¤Ë %s ¤Ť¤éĽŐĽĄĽ¤Ľë¤ČĂÖ¤­´š¤¨¤Ţ¤š"
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤Îşď˝üźşÇÔ: %s\n"
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3766,16 +3776,6 @@ msgstr "ÉÔĚŔ¤ĘĽˇĽšĽĆĽŕ: %s\n"
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "rpm-list@redhat.com ¤ËϢÍí¤ň˛ź¤ľ¤¤\n"
 
-#: lib/scriptlet.c:229
-#, fuzzy, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr "ĽšĽŻĽęĽ×ĽČ¤ÎźÂšÔ¤ËźşÇÔ"
-
-#: lib/scriptlet.c:236
-#, fuzzy, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr "ĽšĽŻĽęĽ×ĽČ¤ÎźÂšÔ¤ËźşÇÔ"
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3791,169 +3791,169 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr "˝đĚžĽľĽ¤Ľş: %d\n"
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr "˝đĚž¤Ď¤˘¤ę¤Ţ¤ť¤ó\n"
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr "¸Ĺ¤¤ PGP ˝đĚž\n"
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "¸Ĺ¤¤(ĆâÉô¤Ŕ¤ą¤Î)˝đĚž!  ¤É¤Ś¤ä¤Ă¤Ć¤˝¤ě¤ňźę¤Ë¤¤¤ě¤Ţ¤ˇ¤ż¤Ť!?"
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "˝đĚžĽľĽ¤Ľş: %d\n"
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "pgp ¤ňźÂšÔ¤Ç¤­¤Ţ¤ť¤ó(%s)"
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp źşÇÔ"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp ¤Ź˝đĚž¤ň˝ń¤­šţ¤ŕ¤Î¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż"
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP ˝đĚžĽľĽ¤Ľş: %s\n"
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "˝đĚž¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó"
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "PGP ˝đĚž¤Î %d ĽĐĽ¤ĽČ¤ňźčĆŔ\n"
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "gpg ¤ňźÂšÔ¤Ç¤­¤Ţ¤ť¤ó"
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg źşÇÔ"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg ¤Ź˝đĚž¤ň˝ń¤­šţ¤ŕ¤Î¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż"
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, fuzzy, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG ˝đĚžĽľĽ¤Ľş: %s\n"
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, fuzzy, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "GPG ˝đĚž¤Î %d ĽĐĽ¤ĽČ¤ňźčĆŔ\n"
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "PGP ¤ňťČÍѤˇ¤Ć˝đĚž¤ÎŔ¸ŔŽĂć\n"
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "GPG ¤ňťČÍѤˇ¤Ć˝đĚž¤ÎŔ¸ŔŽĂć\n"
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 #, fuzzy
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 "pgp ¤ňźÂšÔ¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤żĄŁ\n"
 "PGP ĽÁĽ§ĽĂĽŻ¤ňĽšĽ­ĽĂĽ×¤š¤ë¤ż¤á¤Ë --nopgp ¤ňťČÍѤˇ¤Ć¤Ż¤Ŕ¤ľ¤¤ĄŁ"
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 "gpg ¤ňźÂšÔ¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤żĄŁ\n"
 "GPG ĽÁĽ§ĽĂĽŻ¤ňĽšĽ­ĽĂĽ×¤š¤ë¤ż¤á¤Ë --nogpg ¤ňťČÍѤˇ¤Ć¤Ż¤Ŕ¤ľ¤¤ĄŁ"
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "pgp ¤ňźÂšÔ¤Ç¤­¤Ţ¤ť¤ó"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 #, fuzzy
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "ĽŢĽŻĽíĽŐĽĄĽ¤ĽëĂć¤ÎĚľ¸ú¤Ę %%_signature ĄŁ\n"
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 #, fuzzy
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "ĽŢĽŻĽíĽŐĽĄĽ¤Ľë¤Ë \"%%_pgp_name\" ¤ňŔßÄꤡ¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 #, fuzzy
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "ĽŢĽŻĽíĽŐĽĄĽ¤Ľë¤Ë \"%%_pgp_name\" ¤ňŔßÄꤡ¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS ¤Ď˝üł°¤ľ¤ě¤Ć¤¤¤Ţ¤š: %s"
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "ĽŐĽĄĽ¤Ľë¤Î˝üł°: %s%s\n"
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë¤Î˝üł°: %s%s\n"
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę¤Î˝üł°: %s\n"
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ¤Ď missingok ĽŐĽéĽ°¤Î¤ż¤áĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š\n"
@@ -3968,26 +3968,26 @@ msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 msgid "do not execute %verifyscript (if any)"
 msgstr "¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 #, fuzzy
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 "ĽŃĽĂĽąĄźĽ¸¤Ď ĽćĄźĽśĚž¤Č id "
 "ĽęĽšĽČ¤ÎΞĘý¤Źˇç¤ą¤Ć¤¤¤Ţ¤š(¤ł¤ě¤Ďˇč¤ˇ¤ĆľŻ¤­¤Ć¤Ď¤Ę¤é¤Ę¤¤)"
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 #, fuzzy
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "ĽŃĽĂĽąĄźĽ¸¤ĎĽ°ĽëĄźĽ×Ěž¤Č id "
 "ĽęĽšĽČ¤ÎΞĘý¤Źˇç¤ą¤Ć¤¤¤Ţ¤š(¤ł¤ě¤Ďˇč¤ˇ¤ĆľŻ¤­¤Ć¤Ď¤Ę¤é¤Ę¤¤)"
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "%s ¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó\n"
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s ¤Î¤ż¤á¤Î°Í¸Ŕ­¤ňËţ¤ż¤ˇ¤Ć¤¤¤Ţ¤ť¤ó:"
diff --git a/po/ko.po b/po/ko.po
index 877d0563d..17a24b9d6 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -1808,7 +1808,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -1838,7 +1838,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2481,27 +2481,27 @@ msgstr ""
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2925,18 +2925,28 @@ msgstr ""
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3081,67 +3091,67 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3196,104 +3206,104 @@ msgstr ""
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, c-format
 msgid "cannot add record originally at %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3508,16 +3518,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:236
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3532,150 +3532,150 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3688,20 +3688,20 @@ msgstr ""
 msgid "do not execute %verifyscript (if any)"
 msgstr ""
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/no.po b/po/no.po
index 1d8eab183..38ad8a093 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-0500\n"
 "PO-Revision-Date: 2000-08-17 20:22+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -1856,7 +1856,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke ĺpne spec fil %s: %s\n"
@@ -1886,7 +1886,7 @@ msgstr "Kunne ikke ĺpne spec fil %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke ĺpne spec fil %s: %s\n"
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2531,27 +2531,27 @@ msgstr "Fil %s: %s"
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "lesing feilet: %s (%d)"
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "lesing feilet: %s (%d)"
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "lesing feilet: %s (%d)"
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "kunne ikke opprette %s: %s\n"
@@ -2986,18 +2986,28 @@ msgstr "spřr pakke som eier <fil>"
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, fuzzy, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr "ikke kjřr noen steg"
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3142,67 +3152,67 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3257,104 +3267,104 @@ msgstr ""
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, c-format
 msgid "cannot add record originally at %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3570,16 +3580,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:236
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3594,150 +3594,150 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3751,20 +3751,20 @@ msgstr ""
 msgid "do not execute %verifyscript (if any)"
 msgstr "ikke kjřr noen steg"
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "mangler andre ':' ved %s:%d"
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index f7077369d..3663b10d5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -1964,7 +1964,7 @@ msgstr "Generowanie sygnatury: %d\n"
 msgid "Could not open %s: %s\n"
 msgstr "Nie można otworzyć %s\n"
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nie można zapisać pakietu: %s"
@@ -1994,7 +1994,7 @@ msgstr "Nie można odczytać ikony: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie można zapisać pakietu: %s"
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
@@ -2664,27 +2664,27 @@ msgstr "linia %d: %s"
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "ostrzeżenie: %s zapisany jako %s"
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "nie można usunąć %s - katalog nie jest pusty"
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "skasowanie katalogu %s nie powiodło się"
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "otwarcie %s nie powiodło się\n"
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "ostrzeżenie: %s utworzony jako %s"
@@ -3140,18 +3140,28 @@ msgstr "pakiet źródłowy nie zawiera pliku .spec"
 msgid "source package expected, binary found\n"
 msgstr "spodziewany pakiet źródłowy a nie binarny"
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, 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:1090
+#, 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:1432 lib/psm.c:1613
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "pakiet: %s-%s-%s test plików = %d\n"
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, fuzzy, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr "uruchamianie skryptu postinstall (jeśli istnieje)\n"
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 #, fuzzy
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr "%s pomijany - transmisja %s nie powiodła się\n"
@@ -3300,67 +3310,67 @@ msgstr "%s: readLead nie powiodło się\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead nie powiodło się\n"
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead nie powiodło się\n"
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: Nie można podpisać v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: Nie można ponownie podpisać v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature nie powiodło się\n"
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Sygnatura nie jest dostępna\n"
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead nie powiodło się\n"
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature nie powiodło się\n"
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Sygnatura nie jest dostępna (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr "NIE DOBRZE"
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr " (BRAK KLUCZY:"
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr "(NIEWIARYGODNE KLUCZE:"
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr "OK"
 
@@ -3419,105 +3429,105 @@ msgstr "błąd szukania pakietu %s\n"
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "nie można odczytać nagłówka przy %d dla poszukiwania"
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "usuwanie indeksu grupy\n"
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "usuwanie indeksu nazw\n"
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "błąd szukania pakietu %s\n"
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr "ścieżka bazy danych nie została podana"
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "odbudowywuję bazę danych w rootdir %s\n"
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "tymczasowa baza danych %s już istnieje"
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otwieranie starej bazy danych\n"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otwieranie nowej bazy danych\n"
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr "rekord numer %d w bazie danych jest błędny -- rekord pominięto"
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, fuzzy, c-format
 msgid "cannot add record originally at %d\n"
 msgstr "nie można dodać rekordu oryginalnie przy %d"
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "przebudowanie bazy nie powiodło się; stara pozostała na miejscu\n"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr "zamiana starej bazy na nową nie powiodła się!\n"
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "naprawcze zastępowanie plików w %s plikami z %s"
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "usunięcie katalogu %s nie powiodło się: %s\n"
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3733,16 +3743,6 @@ msgstr "Nieznany system: %s\n"
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Skontaktuj się, proszę, z rpm-list@redhat.com\n"
 
-#: lib/scriptlet.c:229
-#, 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/scriptlet.c:236
-#, 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/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr "plik nieregularny -- sprawdzanie rozmiaru pominięte\n"
@@ -3757,165 +3757,165 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr "Rozmiar sygnatury: %d\n"
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr "Brak sygnatury\n"
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr "Stara sygnatura PGP\n"
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Stara (tylko wewnętrzna) sygnatura! Skąd Ty to wziąłeś!?"
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Rozmiar sygnatury: %d\n"
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "Nie można uruchomić pgp"
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp nie powiodło się"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "zapisanie sygnatury przez pgp nie powiodło się"
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "rozmiar sygnatury PGP: %d\n"
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "nie można odczytać sygnatury"
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Mam %d bajtów sygnatury PGP\n"
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "Nie można uruchomić gpg"
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg nie powiodło się"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "zapisanie sygnatury przez gpg nie powiodło się"
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "rozmiar sygnatury GPG: %d\n"
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Mam %d bajtów sygnatury GPG\n"
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "Generowanie sygnatury: %d\n"
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "Generowanie sygnatury: %d\n"
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 #, fuzzy
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr "Nie można uruchomić pgp. Użyj --nopgp aby pominąć sprawdz. PGP"
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr "Nie można uruchomić gpg. Użyj --nopgp aby pominąć sprawdz. GPG"
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "Nie można uruchomić pgp"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 #, fuzzy
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Błędny %%_signature spec w pliku makra.\n"
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 #, fuzzy
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Musisz ustawić \"%%_gpg_name\" w pliku swego makra"
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 #, fuzzy
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Musisz ustawić \"%%_pgp_name\" w pliku swego makra"
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Ten OS nie jest wspierany: %s"
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "wyłączanie %s\n"
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "wyłączanie %s\n"
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s pominięty z powodu flagi missingok\n"
@@ -3929,26 +3929,26 @@ msgstr "nie sprawdzaj plików pakietu"
 msgid "do not execute %verifyscript (if any)"
 msgstr "nie wykonuj żadnych etapów"
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 #, fuzzy
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 "pakiet nie specyfikuje ani nazwy użytkownika ani list id (to nie powinno się "
 "zdarzyć)"
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 #, fuzzy
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "pakiet nie specyfikuje ani nazwy grupy ani list id (to nie powinno się "
 "zdarzyć)"
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "brak    %s\n"
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Niespełnione zależności dla %s-%s-%s: "
diff --git a/po/pt.po b/po/pt.po
index f37deab85..65d38a121 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-0500\n"
 "PO-Revision-Date: 2000-08-01 21:11+01:00\n"
 "Last-Translator: Pedro Morais <morais@poli.org>\n"
 "Language-Team: pt <morais@poli.org>\n"
@@ -1807,7 +1807,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "năo consigo abrir ficheiro spec %s: %s\n"
@@ -1837,7 +1837,7 @@ msgstr "năo consigo abrir ficheiro spec %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "năo consigo abrir ficheiro spec %s: %s\n"
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2482,27 +2482,27 @@ msgstr ""
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "năo consigo abrir ficheiro spec %s: %s\n"
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "năo consigo abrir ficheiro spec %s: %s\n"
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2930,18 +2930,28 @@ msgstr ""
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3086,67 +3096,67 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3205,104 +3215,104 @@ msgstr ""
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, c-format
 msgid "cannot add record originally at %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3521,16 +3531,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:236
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3545,150 +3545,150 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3701,20 +3701,20 @@ msgstr ""
 msgid "do not execute %verifyscript (if any)"
 msgstr ""
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0a633b541..6d65ee8e9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 2001-02-19 11:19-0500\n"
+msgstr "POT-Creation-Date: 2001-02-28 10:48-0500\n"
 
 # , c-format
 #: build.c:25
@@ -2057,7 +2057,7 @@ msgid "Could not open %s: %s\n"
 msgstr "Năo consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Năo consegui abrir: %s\n"
@@ -2092,7 +2092,7 @@ msgstr "Năo consegui abrir: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Năo consegui abrir: %s\n"
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2799,29 +2799,29 @@ msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
 # , c-format
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "Năo consegui abrir: %s\n"
 
 # , c-format
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "Construçăo falhou.\n"
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "Construçăo falhou.\n"
 
 # , c-format
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "Năo consegui abrir: %s\n"
@@ -3285,18 +3285,28 @@ msgstr "pesquise o pacote ao qual <arquivo> pertence"
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "năo foi passado pacote para instalaçăo"
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, fuzzy, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr "năo execute nenhum estágio"
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3449,68 +3459,68 @@ msgstr "Năo consegui abrir: %s\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3570,93 +3580,93 @@ msgstr "năo foi passado pacote para instalaçăo"
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "năo foi passado pacote para desinstalaçăo"
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "năo foi passado pacote para instalaçăo"
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "Năo consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, c-format
 msgid "cannot add record originally at %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
@@ -3669,18 +3679,18 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "RPM versăo %s\n"
 
 # , c-format
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3918,16 +3928,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:236
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3942,124 +3942,124 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
 # , c-format
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "Năo consegui ler o arquivo spec de %s\n"
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "Construçăo falhou.\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
 # , c-format
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "Năo consegui ler o arquivo spec de %s\n"
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "Construçăo falhou.\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
 # , c-format
-#: lib/signature.c:741
+#: lib/signature.c:736
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "Năo consegui ler o arquivo spec de %s\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
@@ -4071,13 +4071,13 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "RPM versăo %s\n"
 
 # , c-format
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "Năo consegui abrir: %s\n"
@@ -4090,7 +4090,7 @@ msgstr "Năo consegui abrir: %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "RPM versăo %s\n"
@@ -4103,18 +4103,18 @@ msgstr "RPM versăo %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "RPM versăo %s\n"
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
 # , c-format
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "Năo consegui abrir: %s\n"
@@ -4127,12 +4127,12 @@ msgstr "Năo consegui abrir: %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "RPM versăo %s\n"
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -4147,20 +4147,20 @@ msgstr "instale pacote"
 msgid "do not execute %verifyscript (if any)"
 msgstr "năo execute nenhum estágio"
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 735434ad6..4d2842b67 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -1803,7 +1803,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -1833,7 +1833,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2476,27 +2476,27 @@ msgstr ""
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2920,18 +2920,28 @@ msgstr ""
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3076,67 +3086,67 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3191,104 +3201,104 @@ msgstr ""
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, c-format
 msgid "cannot add record originally at %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3503,16 +3513,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:236
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3527,150 +3527,150 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3683,20 +3683,20 @@ msgstr ""
 msgid "do not execute %verifyscript (if any)"
 msgstr ""
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index a89b71209..623ba493d 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-02-28 08:53-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -1808,7 +1808,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:484 lib/psm.c:1421
+#: build/pack.c:484 lib/psm.c:1830
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -1838,7 +1838,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:566 lib/psm.c:1477
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2925,18 +2925,28 @@ msgstr ""
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1021 lib/psm.c:1202
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:1085 lib/psm.c:1154 lib/psm.c:1257 lib/psm.c:1283
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
 
-#: lib/psm.c:1093
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3508,16 +3518,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:233
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:240
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index b1e7f2cdb..0134665ee 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-0500\n"
 "PO-Revision-Date: 2000-08-08 01:20+0300\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -1902,7 +1902,7 @@ msgstr "çĹÎĹŇÉŇŐĹÔÓŃ ĐĎÄĐÉÓŘ: %d\n"
 msgid "Could not open %s: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐÉÓÁÔŘ ĐÁËĹÔ: %s"
@@ -1932,7 +1932,7 @@ msgstr "îĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ ĐÉËÔĎÇŇÁÍÍŐ %s: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐÉÓÁÔŘ ĐÁËĹÔ %s: %s"
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "úÁĐÉÓÁÎ: %s\n"
@@ -2610,27 +2610,27 @@ msgstr "ÓÔŇĎËÁ %d: %s"
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "×ÎÉÍÁÎÉĹ: %s ÓĎČŇÁÎĹÎ ËÁË %s"
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ŐÄÁĚÉÔŘ %s - ËÁÔÁĚĎÇ ÎĹ ĐŐÓÔ"
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "ĎŰÉÂËÁ ŐÄÁĚĹÎÉŃ ËÁÔÁĚĎÇÁ %s: %s"
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "×ÎÉÍÁÎÉĹ: %s ÓĎÚÄÁÎ ËÁË %s"
@@ -3080,18 +3080,28 @@ msgstr "ÉÓČĎÄÎŮĘ ĐÁËĹÔ ÎĹ ÓĎÄĹŇÖÉÔ ĆÁĘĚÁ .spec"
 msgid "source package expected, binary found\n"
 msgstr "ĎÂÎÁŇŐÖĹÎ Ä×ĎÉŢÎŮĘ ĐÁËĹÔ ×ÍĹÓÔĎ ĎÖÉÄÁĹÍĎÇĎ ÉÓČĎÄÎĎÇĎ"
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, fuzzy, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr "ĎŰÉÂËÁ ×ŮĐĎĚÎĹÎÉŃ ÓËŇÉĐÔÁ %s-%s-%s, ËĎÄ ×ĎÚ×ŇÁÔÁ %d"
+
+#: lib/psm.c:1090
+#, fuzzy, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr "ĎŰÉÂËÁ ×ŮĐĎĚÎĹÎÉŃ ÓËŇÉĐÔÁ %s-%s-%s, ËĎÄ ×ĎÚ×ŇÁÔÁ %d"
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "ĐÁËĹÔ: %s-%s-%s ĆÁĘĚĎ×; test = %d\n"
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, fuzzy, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr "×ŮĐĎĚÎŃĹÔÓŃ ÓËŇÉĐÔ postinstall (ĹÓĚÉ ĹÓÔŘ)\n"
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 #, fuzzy
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr "%s ĐŇĎĐŐÓËÁĹÔÓŃ - ĎŰÉÂËÁ ĐĹŇĹÄÁŢÉ - %s\n"
@@ -3238,67 +3248,67 @@ msgstr "%s: ĎŰÉÂËÁ Fwrite: %s\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: ĎŰÉÂËÁ Fread: %s\n"
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: ĎŰÉÂËÁ readLead\n"
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: îĹ ÍĎÇŐ ĐĎÄĐÉÓÁÔŘ RPM v1.0\n"
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: îĹ ÍĎÇŐ ĐĹŇĹĐĎÄĐÉÓÁÔŘ RPM v2.0\n"
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: ĎŰÉÂËÁ rpmReadSignature\n"
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: đĎÄĐÉÓŘ ÎĹÄĎÓÔŐĐÎÁ\n"
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: ĎŰÉÂËÁ writeLead: %s\n"
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: ĎŰÉÂËÁ rpmWriteSignature: %s\n"
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: đĎÄĐÉÓÉ ÎĹÔ (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr "îĺ Oë"
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr " (ďôóőôóô÷őŕô ëěŕţé:"
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr " (îĺô äď÷ĺňéń ë ëěŕţáí:"
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr "Oë"
 
@@ -3357,105 +3367,105 @@ msgstr "ĎŰÉÂËÁ(%d) ĐŇÉ ĐĎÄÓŢŁÔĹ ĐÁËĹÔĎ×"
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: ÎĹ×ĎÚÍĎÖÎĎ ĐŇĎŢĹÓÔŘ ÚÁÇĎĚĎ×ĎË × 0x%x"
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "ŐÄÁĚŃĹÔÓŃ \"%s\" ÉÚ ÉÎÄĹËÓÁ %s.\n"
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "ŐÄÁĚŃĹÔÓŃ %d ÚÁĐÉÓĹĘ ÉÚ ÉÎÄĹËÓÁ %s.\n"
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "ĎŰÉÂËÁ(%d) ŇĹÚĹŇ×ÉŇĎ×ÁÎÉŃ ĐÁÍŃÔÉ ÄĚŃ ĎÂŇÁÚÁ ÎĎ×ĎÇĎ ĐÁËĹÔÁ"
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "ÄĎÂÁ×ĚŃĹÔÓŃ \"%s\" × ÉÎÄĹËÓ %s.\n"
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "ÄĎÂÁ×ĚŃĹÔÓŃ %d ÚÁĐÉÓĹĘ × ÉÎÄĹËÓ %s\n"
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr "ĐÁŇÁÍĹÔĹŇ dbpath ÎĹ ŐÓÔÁÎĎ×ĚĹÎ"
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ĐĹŇĹÓÔŇÁÉ×ÁĹÔÓŃ ÂÁÚÁ ÄÁÎÎŮČ %s × %s\n"
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "×ŇĹÍĹÎÎÁŃ ÂÁÚÁ ÄÁÎÎŮČ %s ŐÖĹ ÓŐÝĹÓÔ×ŐĹÔ"
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr "ÓĎÚÄÁŁÔÓŃ ËÁÔÁĚĎÇ %s\n"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "ÓĎÚÄÁŁÔÓŃ ËÁÔÁĚĎÇ %s\n"
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "ĎÔËŇŮ×ÁĹÔÓŃ ÓÔÁŇÁŃ ÂÁÚÁ ÄÁÎÎŮČ ŢĹŇĹÚ dbapi %d\n"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "ĎÔËŇŮ×ÁĹÔÓŃ ÎĎ×ÁŃ ÂÁÚÁ ÄÁÎÎŮČ ŢĹŇĹÚ dbapi %d\n"
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr "ÚÁĐÉÓŘ ÎĎÍĹŇ %d × ÂÁÚĹ ÄÁÎÎŮČ ÎĹ×ĹŇÎÁ, ĐŇĎĐŐÓËÁĹÔÓŃ."
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, fuzzy, c-format
 msgid "cannot add record originally at %d\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÄĎÂÁ×ÉÔŘ ÚÁĐÉÓŘ (ĐĹŇ×ĎÎÁŢÁĚŘÎĎ × %d)"
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "ĐĹŇĹÓÔŇĎĹÎÉĹ ÂÁÚŮ ÄÁÎÎŮČ ÎĹ ŐÄÁĚĎÓŘ, ÓÔÁŇÁŃ ÂÁÚÁ ÄÁÎÎŮČ ĎÓÔÁĹÔÓŃ ÎÁ ÍĹÓÔĹ\n"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÚÁÍĹÎÉÔŘ ÓÔÁŇŐŔ ÂÁÚŐ ÄÁÎÎŮČ ÎÁ ÎĎ×ŐŔ!\n"
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "ĆÁĘĚŮ × %s ÚÁÍĹÎŃŔÔÓŃ ĆÁĘĚÁÍÉ ÉÚ %s ÄĚŃ ×ĎÓÓÔÁÎĎ×ĚĹÎÉŃ"
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr "ŐÄÁĚŃĹÔÓŃ ËÁÔÁĚĎÇ %s\n"
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "ĎŰÉÂËÁ ŐÄÁĚĹÎÉŃ ËÁÔÁĚĎÇÁ %s: %s\n"
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3671,16 +3681,6 @@ msgstr "îĹÉÚ×ĹÓÔÎÁŃ ÓÉÓÔĹÍÁ: %s\n"
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "ó×ŃÖÉÔĹÓŘ Ó rpm-list@redhat.com\n"
 
-#: lib/scriptlet.c:229
-#, fuzzy, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr "ĎŰÉÂËÁ ×ŮĐĎĚÎĹÎÉŃ ÓËŇÉĐÔÁ %s-%s-%s, ËĎÄ ×ĎÚ×ŇÁÔÁ %d"
-
-#: lib/scriptlet.c:236
-#, fuzzy, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr "ĎŰÉÂËÁ ×ŮĐĎĚÎĹÎÉŃ ÓËŇÉĐÔÁ %s-%s-%s, ËĎÄ ×ĎÚ×ŇÁÔÁ %d"
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr "ÎĹĎÂŮŢÎŮĘ ĆÁĘĚ -- ĐŇĎĐŐÓËÁŔ ĐŇĎ×ĹŇËŐ ŇÁÚÍĹŇÁ\n"
@@ -3695,168 +3695,168 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr "ňÁÚÍĹŇ ĐĎÄĐÉÓÉ: %d\n"
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr "đĎÄĐÉÓÉ ÎĹÔ\n"
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr "óÔÁŇÁŃ ĐĎÄĐÉÓŘ PGP\n"
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 "óÔÁŇÁŃ (ÔĎĚŘËĎ ÄĚŃ ×ÎŐÔŇĹÎÎĹÇĎ ÉÓĐĎĚŘÚĎ×ÁÎÉŃ) ĐĎÄĐÉÓŘ! çÄĹ ×Ů üôď ×ÚŃĚÉ!?"
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "ňÁÚÍĹŇ ĐĎÄĐÉÓÉ: %d\n"
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "î×ĎÚÍĎÖÎĎ ÚÁĐŐÓÔÉÔŘ pgp (%s)"
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "ĎŰÉÂËÁ pgp"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "ĎŰÉÂËÁ pgp ĐŇÉ ÚÁĐÉÓÉ ĐĎÄĐÉÓÉ"
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "ňÁÚÍĹŇ ĐĎÄĐÉÓÉ PGP: %d\n"
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐŇĎŢĹÓÔŘ ĐĎÄĐÉÓŘ"
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "đĎĚŐŢĹÎĎ %d ÂÁĘÔ ĐĎÄĐÉÓÉ PGP\n"
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐŐÓÔÉÔŘ gpg"
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "ĎŰÉÂËÁ gpg"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "ĎŰÉÂËÁ gpg ĐŇÉ ÚÁĐÉÓÉ ĐĎÄĐÉÓÉ"
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "ňÁÚÍĹŇ ĐĎÄĐÉÓÉ GPG: %d\n"
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "đĎĚŐŢĹÎĎ %d ÂÁĘÔ ĐĎÄĐÉÓÉ GPG\n"
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr "çĹÎĹŇÉŇŐĹÔÓŃ ĐĎÄĐÉÓŘ PGP.\n"
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr "çĹÎĹŇÉŇŐĹÔÓŃ ĐĎÄĐÉÓŘ GPG.\n"
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 #, fuzzy
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 "î×ĎÚÍĎÖÎĎ ÚÁĐŐÓÔÉÔŘ pgp. éÓĐĎĚŘÚŐĘÔĹ --nopgp ŢÔĎÂŮ ĐŇĎĐŐÓÔÉÔŘ ĐŇĎ×ĹŇËŐ PGP "
 "ĐĎÄĐÉÓĹĘ."
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 "îĹ×ĎÚÍĎÖÎĎ ÚÁĐŐÓÔÉÔŘ gpg. éÓĐĎĚŘÚŐĘÔĹ --nogpg ŢÔĎÂŮ ĐŇĎĐŐÓÔÉÔŘ ĐŇĎ×ĹŇËŐ GPG "
 "ĐĎÄĐÉÓĹĘ."
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐŐÓÔÉÔŘ pgp"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 #, fuzzy
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "îĹ×ĹŇÎÁŃ ÓĐĹĂÉĆÉËÁĂÉŃ %%_signature × ÍÁËŇĎĆÁĘĚĹ.\n"
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 #, fuzzy
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "÷Ů ÄĎĚÖÎŮ ŐÓÔÁÎĎ×ÉÔŘ \"%%_gpg_name\" × ×ÁŰĹÍ ÍÁËŇĎĆÁĘĚĹ"
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 #, fuzzy
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "÷Ů ÄĎĚÖÎŮ ŐÓÔÁÎĎ×ÉÔŘ \"%%_pgp_name\" × ×ÁŰĹÍ ÍÁËŇĎĆÁĘĚĹ"
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "ďó ÉÓËĚŔŢĹÎÁ: %s"
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ %s × %s\n"
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "ÉÓËĚŔŢÁŔ ĆÁĘĚ %s%s\n"
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "ÉÓËĚŔŢÁŔ ĆÁĘĚ %s%s\n"
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ %s × %s\n"
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ ËÁÔÁĚĎÇ %s × %s\n"
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ÉÓËĚŔŢÁĹÔÓŃ ËÁÔÁĚĎÇ %s\n"
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ĐŇĎĐŐÝĹÎ ÉÚ-ÚÁ ĆĚÁÇÁ missingok\n"
@@ -3870,22 +3870,22 @@ msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĆÁĘĚŮ ĐÁËĹÔÁ"
 msgid "do not execute %verifyscript (if any)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ ÎÉËÁËÉČ ÜÔÁĐĎ×"
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 #, fuzzy
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr "× ĐÁËĹÔĹ ÎĹÔ ÎÉ ÉÍĹÎ ĐĎĚŘÚĎ×ÁÔĹĚĹĘ, ÎÉ ÉČ ID (ÔÁË ÎĹ ÄĎĚÖÎĎ ÂŮÔŘ)"
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 #, fuzzy
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr "× ĐÁËĹÔĹ ÎĹÔ ÎÉ ÉÍĹÎ ÇŇŐĐĐ, ÎÉ ÉČ ID (ÔÁË ÎĹ ÄĎĚÖÎĎ ÂŮÔŘ)"
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ %s\n"
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "îĹŐÄĎ×ĚĹÔ×ĎŇĹÎÎŮĹ ÚÁ×ÉÓÉÍĎÓÔÉ ÄĚŃ %s-%s-%s: "
diff --git a/po/sk.po b/po/sk.po
index 9231db7c7..d5b04d095 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -1970,7 +1970,7 @@ msgstr "Vytvára sa PGP podpis: %d\n"
 msgid "Could not open %s: %s\n"
 msgstr "Otvorenie %s zlyhalo\n"
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nie je možné zapísať balík: %s"
@@ -2000,7 +2000,7 @@ msgstr "Nie je možné prečítať ikonu: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie je možné zapísať balík: %s"
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapísané: %s\n"
@@ -2669,27 +2669,27 @@ msgstr "riadok %d: %s"
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "varovanie: %s uchovaný ako %s"
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "nie je možné odstrániť %s - adresár nie je prázdny"
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "rmdir %s zlyhalo: %s"
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "otvorenie %s zlyhalo\n"
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "varovanie: %s vytvorené ako %s"
@@ -3143,18 +3143,28 @@ msgstr "zdrojový balík neobsahuje žiadny .spec súbor"
 msgid "source package expected, binary found\n"
 msgstr "očakávaný zdrojový balík, nájdený binárny"
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, fuzzy, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr "vykonanie skriptu zlyhalo"
+
+#: lib/psm.c:1090
+#, fuzzy, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr "vykonanie skriptu zlyhalo"
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, 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"
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, fuzzy, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr "vykonávajú sa poinštalačné skripty (ak existujú)\n"
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 #, fuzzy
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr "%s vynechané - prenos zlyhal - %s\n"
@@ -3303,67 +3313,67 @@ msgstr "%s: readLead zlyhalo\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: Nie je možné podpísať v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: Nie je možné znovu podpísať v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature zlyhalo\n"
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Podpis nie je k dispozícii\n"
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature zlyhalo\n"
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Podpis nie je k dispozícii (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr "NIE JE V PORIADKU"
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr " (CHÝBAJÚCE KĽÚČE):"
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEDÔVERUJE SA KĽÚČOM: "
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr "V PORIADKU"
 
@@ -3422,105 +3432,105 @@ msgstr "chyba pri hľadaní balíka %s\n"
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "nie je možné prečítať hlavičku na %d pre vyhľadanie"
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraňuje sa index skupín\n"
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstraňuje sa index názvov\n"
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "chyba pri hľadaní balíka %s\n"
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr "nebola nastavená žiadna dbpath"
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "znovu sa vytvára databáza v adresári %s\n"
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "dočasná databáza %s už existuje"
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otvára sa stará databáza\n"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otvára sa nová databáza\n"
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr "záznam číslo %d v databáze je chybný -- bol vynechaný"
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, fuzzy, c-format
 msgid "cannot add record originally at %d\n"
 msgstr "nie je možné pridať záznam pôvodne na %d"
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "nepodarilo sa znovu vytvoriť databázu; zostáva pôvodná\n"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr "nepodarilo sa nahradiť starú databázu novou!\n"
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "nahradí súbory v %s súbormi z %s kvôli obnove"
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nepodarilo sa odstrániť adresár %s: %s\n"
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3736,16 +3746,6 @@ msgstr "Neznámy systém: %s\n"
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Kontaktujte prosím rpm-list@redhat.com\n"
 
-#: lib/scriptlet.c:229
-#, fuzzy, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr "vykonanie skriptu zlyhalo"
-
-#: lib/scriptlet.c:236
-#, fuzzy, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr "vykonanie skriptu zlyhalo"
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr "nejde o bežný súbor - kontrola veľkosti vynechaná\n"
@@ -3760,165 +3760,165 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr "Veľkosť podpisu:   %d\n"
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr "Podpis nie je k dispozícii\n"
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr "Starý PGP podpis\n"
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Starý (iba interný) podpis! Ako ste sa k tomu dostali?!"
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Veľkosť podpisu:   %d\n"
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "Nie je možné spustiť pgp"
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp zlyhalo"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp sa nepodarilo zapísať podpis"
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Veľkosť PGP podpisu: %d\n"
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "nie je možné prečítať podpis"
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Prečítaný PGP podpis obsahuje %d bajtov\n"
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "Nie je možné spustiť gpg"
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg zlyhalo"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg sa nepodarilo zapísať podpis"
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Veľkosť GPG podpisu: %d\n"
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Prečítaný GPG podpis obsahuje %d bajtov\n"
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "Vytvára sa PGP podpis: %d\n"
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "Vytvára sa PGP podpis: %d\n"
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 #, fuzzy
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr "Nie je možné spustiť pgp. Použite --nopgp pre vynechanie PGP kontrol."
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr "Nie je možné spustiť gpg. Použite --nogpg pre vynechanie GPG kontrol."
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "Nie je možné spustiť pgp"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 #, fuzzy
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Chybná špecifikácia %%_signature v makro-súbore.\n"
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 #, fuzzy
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Musíte nastaviť \"%%gpg_name\" vo vašom makro-súbore"
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 #, fuzzy
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Musíte nastaviť \"%%pgp_name\" vo vašom makro-súbore"
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS je vynechaný: %s"
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "presúva sa %s do %s\n"
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "vynecháva sa %s\n"
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "vynecháva sa %s\n"
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "presúva sa %s do %s\n"
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "presúva sa %s do %s\n"
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s vynechané kvôli príznaku missingok\n"
@@ -3933,26 +3933,26 @@ msgstr "zobraziť súbory v balíku"
 msgid "do not execute %verifyscript (if any)"
 msgstr "nevykonať žiadne etapy"
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 #, fuzzy
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 "v balíku chýba tak meno používateľa, ako aj zoznamy identifikácií (nemalo by "
 "sa nikdy stať)"
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 #, fuzzy
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "v balíku chýba tak meno skupiny, ako aj zoznamy identifikácií (nemalo by sa "
 "nikdy stať)"
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "chýbajúce    %s\n"
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nevyriešené závislosti pre %s-%s-%s: "
diff --git a/po/sl.po b/po/sl.po
index 4ad99a283..899001c51 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.142 2001/02/27 21:30:31 jbj Exp $
+# $Id: sl.po,v 1.143 2001/02/28 15:49:30 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -1955,7 +1955,7 @@ msgstr "Izdelujemo podpis: %d\n"
 msgid "Could not open %s: %s\n"
 msgstr "Ni možno odpreti %s: %s\n"
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Ni možno zapisati paketa: %s"
@@ -1985,7 +1985,7 @@ msgstr "Ikone %s ni možno prebrati: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ni možno zapisati paketa %s: %s"
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
@@ -2664,27 +2664,27 @@ msgstr "vrstica %d: %s"
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "opozorilo: %s shranjen kot %s"
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "ni možno odstraniti %s - imenik ni prazen"
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "odstranitev imenika %s je bila neuspešna: %s"
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "odpiranje %s je bilo neuspešno: %s\n"
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "opozorilo: %s ustvarjen kot %s"
@@ -3140,18 +3140,28 @@ msgstr "izvorni paket ne vsebuje datoteke .spec"
 msgid "source package expected, binary found\n"
 msgstr "pričakovan je bil izvorni paket, najden binarni"
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, 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:1090
+#, 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:1432 lib/psm.c:1613
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "paket: %s-%s-%s datoteke test = %d\n"
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, fuzzy, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr "poganjanje ponamestitvenih skript (če obstajajo)\n"
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 #, fuzzy
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr "preskočeno - %s - prenos neuspešen - %s\n"
@@ -3299,67 +3309,67 @@ msgstr "%s: pisanje Fwrite je bilo neuspešno: %s\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspešno: %s\n"
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead je bil neuspešen\n"
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: Podpis RPM v1.0 ni možen\n"
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: Sprememba podpisa RPM v2.0 ni možna\n"
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature je bil neuspešen\n"
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Podpis ni na voljo\n"
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead je bil neuspešen: %s\n"
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature je bilo neuspešno: %s\n"
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Podpis ni na voljo (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr "NI DOBRO"
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr " (MANJKAJOČI KLJUČI:"
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEPREVERJENI KLJUČI:"
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr "V REDU"
 
@@ -3417,107 +3427,107 @@ msgstr "napaka(%d) pri štetju paketov"
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: ni možno prebrati glave pri 0x%x"
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstranjevanje \"%s\" iz kazala %s.\n"
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstranjevanje %d vnosov iz kazala %s\n"
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "napaka(%d) pri iskanju paketa %s\n"
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "dodajanje \"%s\" v kazalo %s.\n"
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "dodajanje %d vnosov v kazalo %s.\n"
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr "dbpath ni nastavljena"
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n"
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "začasna podatkovna zbirka %s že obstaja"
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "ustvarjanje imenika: %s\n"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "ustvarjanje imenika: %s\n"
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "odpiranje stare podatkovne zbirke\n"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n"
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr "zapis št. %d v zbirki je poškodovan -- preskočeno."
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, fuzzy, c-format
 msgid "cannot add record originally at %d\n"
 msgstr "zapisa ni možno dodati na %d"
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "ponovna izgradnja podatkovne zbirke je bila neuspešna; stara ostaja na\n"
 "istem mestu\n"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspešna!\n"
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "poskus povrnitve z nadomestitvijo datotek v %s z datotekami v %s"
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "odstranjevanje imenika: %s\n"
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspešna odstranitev imenika %s: %s\n"
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3733,16 +3743,6 @@ msgstr "Neznan sistem: %s\n"
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Prosimo, pišite na rpm-list@redhat.com\n"
 
-#: lib/scriptlet.c:229
-#, 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/scriptlet.c:236
-#, 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/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr "datoteka ni navadna datoteka -- preskakujemo preverjanje velikosti\n"
@@ -3757,163 +3757,163 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr "Dolž. podpisa : %d\n"
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr "Podpis manjka\n"
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr "Stari podpis PGP\n"
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Podpis v (interni) stari obliki! Kje ste ga dobili?"
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Dolž. podpisa : %d\n"
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "Ni možno pognati pgp (%s)"
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp je bil neuspešen"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp je bil neuspešen pri zapisu podpisa"
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Dolž. podpisa PGP: %d\n"
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "branje podpisa je bilo neuspešno"
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Prebrano %d bajtov podpisa PGP\n"
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "Ni možno pognati gpg"
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg je bil neuspešen"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg je boil neuspešen pri zapisu podpisa"
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Dolž. podpisa GnuPG: %d\n"
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Prebrano %d bajtov podpisa GnuPG\n"
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr "Ustvarjanje podpisa s PGP.\n"
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr "Ustvarjanje podpisa z GnuPG.\n"
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 #, fuzzy
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr "Ni možno pognati pgp. Preverjanja PGP lahko preskočite z --nopgp"
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr "Ni možno pognati gpg. Preverjanja GnuPG lahko preskočite z --nogpg"
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "Ni možno pognati pgp"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 #, fuzzy
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Neveljaven %%_signature v makro-datoteki.\n"
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 #, fuzzy
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 #, fuzzy
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS je izključen: %s"
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "premikanje %s v %s\n"
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "izključevanje datoteke %s%s\n"
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "izključevanje datoteke %s%s\n"
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "premikanje %s v %s\n"
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "premiokanje imenika %s v %s\n"
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "izključevanje imenika %s\n"
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s preskočen zaradi manjkajoče zastavice OK\n"
@@ -3927,24 +3927,24 @@ msgstr "brez preverjanja datotek v paketu"
 msgid "do not execute %verifyscript (if any)"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 #, fuzzy
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 "v paketu manjka tako seznam uporabnikov kot identitet (to se ne sme zgoditi)"
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 #, fuzzy
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "v paketu manjka tako seznam skupin kot identitet (to se ne sme zgoditi)"
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "manjka     %s\n"
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: "
diff --git a/po/sr.po b/po/sr.po
index 1af33c336..fdb49cd61 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -1955,7 +1955,7 @@ msgstr "napravi PGP potpis"
 msgid "Could not open %s: %s\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Ne mogu da upišem %s"
@@ -1985,7 +1985,7 @@ msgstr "Ne mogu da upišem %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ne mogu da upišem %s"
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2643,27 +2643,27 @@ msgstr "neuspelo otvaranje %s: %s"
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "ne mogu da uklonim %s - direktorijum nije prazan"
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "neuspela komanda rmdir %s: %s"
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
@@ -3124,18 +3124,28 @@ msgstr "upit nad paketom koji ima <datoteku>"
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, 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:1090
+#, 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:1432 lib/psm.c:1613
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "paket %s-%s-%s sadrži deljene datoteke\n"
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, fuzzy, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr "nemoj izvršiti nijednu fazu"
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 #, fuzzy
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr "greška: preskačem %s - neuspelo prenošenje - %s\n"
@@ -3285,68 +3295,68 @@ msgstr "%s: Neuspeo 'readLead'\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: Ne mogu da potpišem v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: Ne mogu da ponovo potpišem v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: Neuspelo 'rpmReadSignature'\n"
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: Neuspelo 'rpmReadSignature'\n"
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (NEDOSTAJUĆI KLJUČEVI)"
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3402,104 +3412,104 @@ msgstr "greška kod potrage za paketom %s\n"
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "ne mogu da pročitam zaglavlje na %d za proveru"
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "greška uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "greška uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "greška kod potrage za paketom %s\n"
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "greška uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr "dbpath nije određen"
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rekreiraj bazu podataka iz postojeće baze"
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "privremena baza podataka %s već postoji"
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "rekreiraj bazu podataka iz postojeće baze"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "rekreiraj bazu podataka iz postojeće baze"
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr "slog broj %d u bazi podataka je neispravan -- preskačem ga"
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, fuzzy, c-format
 msgid "cannot add record originally at %d\n"
 msgstr "ne mogu da dodam slog originalno na %d"
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3718,16 +3728,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, fuzzy, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr "neuspelo izvršavanje skripta"
-
-#: lib/scriptlet.c:236
-#, fuzzy, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr "neuspelo izvršavanje skripta"
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3742,166 +3742,166 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 #, fuzzy
 msgid "No signature\n"
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "napravi PGP potpis"
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Stari (interni) potpis!  Odakle vam!?"
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "Ne mogu da izvršim PGP"
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "PGP omanuo"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "PGP nije uspeo da zapiše potpis"
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "ne mogu da pročitam potpis"
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "Ne mogu da izvršim PGP"
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "PGP omanuo"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "PGP nije uspeo da zapiše potpis"
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "napravi PGP potpis"
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "napravi PGP potpis"
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 #, fuzzy
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr "Ne mogu da pokrenem pgp. Koristite --nopgp da preskočite PGP proveru."
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr "Ne mogu da pokrenem pgp. Koristite --nopgp da preskočite PGP proveru."
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "Ne mogu da izvršim PGP"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 #, fuzzy
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Morate podesiti \"pgp_name:\" u vašoj rpmrc datoteci"
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 #, fuzzy
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Morate podesiti \"pgp_name:\" u vašoj rpmrc datoteci"
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3916,20 +3916,20 @@ msgstr "instaliraj paket"
 msgid "do not execute %verifyscript (if any)"
 msgstr "nemoj izvršiti nijednu fazu"
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "nedostaje { posle %"
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nezadovoljene međuzavisnosti za %s-%s-%s: "
diff --git a/po/sv.po b/po/sv.po
index 613567126..77511e5e9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-0500\n"
 "PO-Revision-Date: 2000-10-09 22:31+0200\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -1882,7 +1882,7 @@ msgstr "Genererar signatur: %d\n"
 msgid "Could not open %s: %s\n"
 msgstr "Kunde inte öppna %s: %s\n"
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunde inte skriva paket: %s"
@@ -1912,7 +1912,7 @@ msgstr "Kan inte läsa ikon %s: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kan inte skriva paket %s: %s"
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
@@ -2588,27 +2588,27 @@ msgstr "rad %d: %s"
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "varning: %s sparades som %s"
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "kan inte ta bort %s - katalogen är inte tom"
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "rmdir av %s misslyckades: %s"
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "misslyckades öppna %s: %s\n"
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "varning: %s skapades som %s"
@@ -3061,18 +3061,28 @@ msgstr "källpaket innehĺller ingen spec-fil"
 msgid "source package expected, binary found\n"
 msgstr "källpaket förväntades, fann binärpaket"
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, fuzzy, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr "körning av skript frĺn %s-%s-%s misslyckades, slutstatus %d"
+
+#: lib/psm.c:1090
+#, fuzzy, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr "körning av skript frĺn %s-%s-%s misslyckades, slutstatus %d"
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "paket: %s-%s-%s filtest = %d\n"
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, fuzzy, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr "kör (eventuellt) postinstallationsskript\n"
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 #, fuzzy
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr "hoppar över %s - överföring misslyckades - %s\n"
@@ -3219,67 +3229,67 @@ msgstr "%s: Fwrite misslyckades: %s\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead misslyckades\n"
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: Kan inte signera v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: Kan inte signera om v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature misslyckades\n"
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen signatur tillgänglig\n"
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ingen signatur tillgänglig (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr "EJ OK"
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr " (SAKNADE NYCKLAR:"
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr " (EJ BETRODDA NYCKLAR:"
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr "OK"
 
@@ -3338,104 +3348,104 @@ msgstr "fel(%d) när paket räknades"
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: kan inte läsa huvud vid 0x%x"
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "tar bort \"%s\" frĺn %s-indexet.\n"
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "tar bort %d poster frĺn %s-indexet.\n"
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "fel(%d) vid allokering av ny paketinstans"
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "lägger till \"%s\" till %s-indexet.\n"
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "lägger till %d poster till %s-indexet.\n"
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr "ingen dbpath har satts"
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "bygger om databas %s till %s\n"
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "tillfällig databas %s existerar redan"
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr "skapar katalog %s\n"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "skapar katalog %s\n"
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "öppnar gammal databas med dbapi %d\n"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "öppnar ny databas med dbapi %d\n"
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr "post nummer %d i databasen är felaktig -- hoppar över den."
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, fuzzy, c-format
 msgid "cannot add record originally at %d\n"
 msgstr "kan inte lägga till post ursprungligen vid %d"
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr "kunde inte ersätta gammal databas med ny databas!\n"
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "byt ut filer i %s med filer frĺn %s för att ĺterställa"
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr "tar bort katalog %s\n"
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunde inte ta bort katalogen %s: %s\n"
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3651,16 +3661,6 @@ msgstr "Okänt system: %s\n"
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Var god kontakta rpm-list@redhat.com\n"
 
-#: lib/scriptlet.c:229
-#, fuzzy, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr "körning av skript frĺn %s-%s-%s misslyckades, slutstatus %d"
-
-#: lib/scriptlet.c:236
-#, fuzzy, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr "körning av skript frĺn %s-%s-%s misslyckades, slutstatus %d"
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr "filen är inte en vanlig fil -- hoppar över storlekskontroll\n"
@@ -3675,163 +3675,163 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr "Signaturstorlek  : %d\n"
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr "Ingen signatur\n"
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr "Gammal PGP-signatur\n"
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Gammal (endast intern) signatur!  Hur fick du tag i den!?"
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Signaturstorlek  : %d\n"
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "Kunde inte köra pgp (%s)"
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp misslyckades"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp misslyckades att skriva en signatur"
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP signaturstorlek: %d\n"
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "kan inte läsa signaturen"
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Fick %d byte PGPsignatur\n"
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "Kunde inte köra gpg"
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg misslyckades"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg kunde inte skriva signatur"
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG signaturstorlek: %d\n"
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Fick %d byte GPGsignatur\n"
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr "Genererar signatur med PGP.\n"
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr "Genererar signatur med GPG.\n"
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 #, fuzzy
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr "Kunde inte köra pgp.  Använd --nopgp för att hoppa över PGPkontroll."
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr "Kunde inte köra gpg.  Använd --nogpg för att hoppa över GPGkontroll."
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "Kunde inte köra pgp"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 #, fuzzy
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Felaktig %%_signature spec i makrofil.\n"
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 #, fuzzy
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Du mĺste sätta \"%%_gpg_name\" i din makrofil"
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 #, fuzzy
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Du mĺste sätta \"%%_pgp_name\" i din makrofil"
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS är uteslutet: %s"
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "flyttar %s till %s\n"
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "hoppar över %s%s\n"
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "hoppar över %s%s\n"
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "flyttar %s till %s\n"
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "flyttar katalogen %s till %s\n"
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "hoppar över katalogen %s\n"
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s överhoppad pĺ grund av missingok-flagga\n"
@@ -3845,24 +3845,24 @@ msgstr "verifiera inte filerna i paketet"
 msgid "do not execute %verifyscript (if any)"
 msgstr "utför inga steg"
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 #, fuzzy
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 "paket saknar bĺde användarnamn och id-listor (detta borde aldrig inträffa)"
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 #, fuzzy
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "paket saknar bĺde gruppnamn och id-listor (detta borde aldrig inträffa)"
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "saknas     %s\n"
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Ouppfyllda beroenden för %s-%s-%s: "
diff --git a/po/tr.po b/po/tr.po
index 999669782..1478f10ec 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -1996,7 +1996,7 @@ msgstr "PGP-imzasý yaratýr"
 msgid "Could not open %s: %s\n"
 msgstr "%s 'ye eriţimde hata oluţtu\n"
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "%s 'nin yazýlmasý mümkün deđil"
@@ -2026,7 +2026,7 @@ msgstr "%s 'nin yazýlmasý mümkün deđil"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s 'nin yazýlmasý mümkün deđil"
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2685,27 +2685,27 @@ msgstr "%s açýlamadý: %s"
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "%s dosyasý açýlamýyor: "
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "%s silinemedi - belirtilen dizin boţ deđil"
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "%s dizinin silinmesinde belirtilen hata oluţtu: %s"
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "%s 'ye erisimde belirtilen hata oluţtu: %s\n"
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "%s dosyasý açýlamýyor: "
@@ -3170,18 +3170,28 @@ msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, fuzzy, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr "betik (script) çalýţtýrýlamadý "
+
+#: lib/psm.c:1090
+#, fuzzy, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr "betik (script) çalýţtýrýlamadý "
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n"
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, fuzzy, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr "adýmlarýn hiçbirini çalýţtýrmaz"
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 #, fuzzy
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr "hata: %s atlanýyor - aktarým baţarýsýz - %s\n"
@@ -3331,68 +3341,68 @@ msgstr "%s: 'readLead' hata verdi\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: 'readLead' hata verdi\n"
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: 'readLead' hata verdi\n"
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: v1.0-RPM (eski sürüm) imzalanamýyor\n"
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: v2.0-RPM (eski sürüm) yeniden imzalanamýyor\n"
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: 'rpmReadSignature' hata verdi\n"
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ýmza bulunmuyor\n"
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: 'readLead' hata verdi\n"
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: 'rpmReadSignature' hata verdi\n"
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ýmza bulundurmuyor (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (EKSÝK ANAHTARLAR)"
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3448,104 +3458,104 @@ msgstr "%s pakedi aranýrken hata oluţtu\n"
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%d kaydýndan baţlýk bilgisi okunamadý"
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "%s pakedi aranýrken hata oluţtu\n"
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr "dbpath deđeri girilmemiţ"
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluţturur"
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "geçici veritabaný %s mevcut"
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "%s dizinin oluţturulmasýnda hata: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "%s dizinin oluţturulmasýnda hata: %s"
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluţturur"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluţturur"
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr "veritabanýndaki %d numaralý kayýt hatalý -- atlanýyor"
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, fuzzy, c-format
 msgid "cannot add record originally at %d\n"
 msgstr "%d de yer alan kayýt saklayamýyor"
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "%s dizinin oluţturulmasýnda hata: %s"
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s açýlamadý: %s"
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3764,16 +3774,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, fuzzy, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr "betik (script) çalýţtýrýlamadý "
-
-#: lib/scriptlet.c:236
-#, fuzzy, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr "betik (script) çalýţtýrýlamadý "
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3788,166 +3788,166 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 #, fuzzy
 msgid "No signature\n"
 msgstr "%s: Ýmza bulunmuyor\n"
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "PGP-imzasý yaratýr"
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Eski imza !!! Eee bunu nasýl baţardýn bakiiim ?"
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "PGP çalýţtýrýlamadý"
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "PGP hata verdi"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "PGP imzasýnýn yazýlmasý sýrasýnda hata oluţtu"
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "imzayý okumak mümkün olmadý"
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "PGP çalýţtýrýlamadý"
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "PGP hata verdi"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "PGP imzasýnýn yazýlmasý sýrasýnda hata oluţtu"
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "PGP-imzasý yaratýr"
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "PGP-imzasý yaratýr"
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 #, fuzzy
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr "PGP çalýţtýrýlamadý. PGP kontrollerini atlamak için --nopgp kullanýn."
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr "PGP çalýţtýrýlamadý. PGP kontrollerini atlamak için --nopgp kullanýn."
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "PGP çalýţtýrýlamadý"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 #, fuzzy
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "rpmrc dosyanýzda \"pgp_name:\" tanýmlanmýţ olmalý"
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 #, fuzzy
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "rpmrc dosyanýzda \"pgp_name:\" tanýmlanmýţ olmalý"
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%s alýnýyor\n"
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%s dosyasý açýlamýyor: "
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "%s alýnýyor\n"
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "%s alýnýyor\n"
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%s dizinin oluţturulmasýnda hata: %s"
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "%s dizinin oluţturulmasýnda hata: %s"
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3962,20 +3962,20 @@ msgstr "paket yüklemek"
 msgid "do not execute %verifyscript (if any)"
 msgstr "adýmlarýn hiçbirini çalýţtýrmaz"
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "% den sonra eksik {"
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s 'nin bađýmlýlýk sorunlarý: "
diff --git a/po/uk.po b/po/uk.po
index 877d0563d..17a24b9d6 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -1808,7 +1808,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -1838,7 +1838,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2481,27 +2481,27 @@ msgstr ""
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2925,18 +2925,28 @@ msgstr ""
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3081,67 +3091,67 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3196,104 +3206,104 @@ msgstr ""
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, c-format
 msgid "cannot add record originally at %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3508,16 +3518,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:236
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3532,150 +3532,150 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3688,20 +3688,20 @@ msgstr ""
 msgid "do not execute %verifyscript (if any)"
 msgstr ""
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 877d0563d..17a24b9d6 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -1808,7 +1808,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -1838,7 +1838,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2481,27 +2481,27 @@ msgstr ""
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2925,18 +2925,28 @@ msgstr ""
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3081,67 +3091,67 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3196,104 +3206,104 @@ msgstr ""
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, c-format
 msgid "cannot add record originally at %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3508,16 +3518,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:236
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3532,150 +3532,150 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3688,20 +3688,20 @@ msgstr ""
 msgid "do not execute %verifyscript (if any)"
 msgstr ""
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 877d0563d..17a24b9d6 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -1808,7 +1808,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -1838,7 +1838,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2481,27 +2481,27 @@ msgstr ""
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2925,18 +2925,28 @@ msgstr ""
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3081,67 +3091,67 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3196,104 +3206,104 @@ msgstr ""
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, c-format
 msgid "cannot add record originally at %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3508,16 +3518,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:236
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3532,150 +3532,150 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3688,20 +3688,20 @@ msgstr ""
 msgid "do not execute %verifyscript (if any)"
 msgstr ""
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 877d0563d..17a24b9d6 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.1\n"
-"POT-Creation-Date: 2001-02-19 11:19-0500\n"
+"POT-Creation-Date: 2001-02-28 10:48-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"
@@ -1808,7 +1808,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:484 lib/psm.c:1304
+#: build/pack.c:484 lib/psm.c:1830
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -1838,7 +1838,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:566 lib/psm.c:1360
+#: build/pack.c:566 lib/psm.c:1886
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2481,27 +2481,27 @@ msgstr ""
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1345 lib/fsm.c:1462
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1487
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1492
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1501
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1518
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2925,18 +2925,28 @@ msgstr ""
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:927 lib/psm.c:1101
+#: lib/psm.c:1083
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
+msgstr ""
+
+#: lib/psm.c:1090
+#, c-format
+msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1432 lib/psm.c:1613
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
 #. XXX WTFO? erase failures are not cause for stopping.
-#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
+#: lib/psm.c:1496 lib/psm.c:1565 lib/psm.c:1666 lib/psm.c:1692
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
 
-#: lib/psm.c:998
+#: lib/psm.c:1504
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3081,67 +3091,67 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:137 lib/rpmchecksig.c:273
+#: lib/rpmchecksig.c:121 lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:142
+#: lib/rpmchecksig.c:126
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:146
+#: lib/rpmchecksig.c:130
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:155 lib/rpmchecksig.c:289
+#: lib/rpmchecksig.c:139 lib/rpmchecksig.c:269
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:159 lib/rpmchecksig.c:294
+#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:192
+#: lib/rpmchecksig.c:176
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:182
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:279
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:443
+#: lib/rpmchecksig.c:423
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:444 lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:446 lib/rpmchecksig.c:460
+#: lib/rpmchecksig.c:426 lib/rpmchecksig.c:440
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:447 lib/rpmchecksig.c:461
+#: lib/rpmchecksig.c:427 lib/rpmchecksig.c:441
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:449 lib/rpmchecksig.c:463
+#: lib/rpmchecksig.c:429 lib/rpmchecksig.c:443
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:437
 msgid "OK"
 msgstr ""
 
@@ -3196,104 +3206,104 @@ msgstr ""
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:1699
+#: lib/rpmdb.c:1698
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1708
+#: lib/rpmdb.c:1707
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1862
+#: lib/rpmdb.c:1890
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1973
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2286
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2312
+#: lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2337
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2341
+#: lib/rpmdb.c:2397
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: lib/rpmdb.c:2347
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2405
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2356
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2390
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2485
 #, c-format
 msgid "cannot add record originally at %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2447
+#: lib/rpmdb.c:2503
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2511
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2457
+#: lib/rpmdb.c:2513
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2467
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2525
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:147
+#: lib/rpminstall.c:148
 msgid "Preparing..."
 msgstr ""
 
@@ -3508,16 +3518,6 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/scriptlet.c:229
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
-msgstr ""
-
-#: lib/scriptlet.c:236
-#, c-format
-msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
-msgstr ""
-
 #: lib/signature.c:125
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
@@ -3532,150 +3532,150 @@ msgstr ""
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:161
+#: lib/signature.c:156
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:165
+#: lib/signature.c:160
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:176
+#: lib/signature.c:171
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:230
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:289
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:300
+#: lib/signature.c:295
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:307
+#: lib/signature.c:302
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:312
+#: lib/signature.c:307
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:323 lib/signature.c:400
+#: lib/signature.c:318 lib/signature.c:395
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:328
+#: lib/signature.c:323
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:366 lib/signature.c:712
+#: lib/signature.c:361 lib/signature.c:707
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:377
+#: lib/signature.c:372
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:384
+#: lib/signature.c:379
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:389
+#: lib/signature.c:384
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:405
+#: lib/signature.c:400
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:433
+#: lib/signature.c:428
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:439
+#: lib/signature.c:434
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:519 lib/signature.c:580
+#: lib/signature.c:514 lib/signature.c:575
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:653
+#: lib/signature.c:648
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:741
+#: lib/signature.c:736
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:745 lib/signature.c:798
+#: lib/signature.c:740 lib/signature.c:793
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:773
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:790
+#: lib/signature.c:785
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:403
+#: lib/transaction.c:404
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:406
+#: lib/transaction.c:407
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:409
+#: lib/transaction.c:410
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:483
+#: lib/transaction.c:484
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:532
+#: lib/transaction.c:533
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:539
+#: lib/transaction.c:540
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:611
+#: lib/transaction.c:612
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:616
+#: lib/transaction.c:617
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:740
+#: lib/transaction.c:741
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3688,20 +3688,20 @@ msgstr ""
 msgid "do not execute %verifyscript (if any)"
 msgstr ""
 
-#: lib/verify.c:239
+#: lib/verify.c:249
 msgid "package lacks both user name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:257
+#: lib/verify.c:267
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:319
+#: lib/verify.c:340
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:400
+#: lib/verify.c:421
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/popt/po/cs.po b/popt/po/cs.po
index a3edc24e0..892c91f4c 100644
--- a/popt/po/cs.po
+++ b/popt/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/da.po b/popt/po/da.po
index 9e2db83f2..d22c4cbea 100644
--- a/popt/po/da.po
+++ b/popt/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/de.po b/popt/po/de.po
index f810615b1..ae68916a9 100644
--- a/popt/po/de.po
+++ b/popt/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/es.po b/popt/po/es.po
index f810615b1..ae68916a9 100644
--- a/popt/po/es.po
+++ b/popt/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/eu_ES.po b/popt/po/eu_ES.po
index a90e3c1f6..3687099c0 100644
--- a/popt/po/eu_ES.po
+++ b/popt/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/fi.po b/popt/po/fi.po
index f810615b1..ae68916a9 100644
--- a/popt/po/fi.po
+++ b/popt/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/fr.po b/popt/po/fr.po
index f810615b1..ae68916a9 100644
--- a/popt/po/fr.po
+++ b/popt/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/gl.po b/popt/po/gl.po
index e0b0b4dc1..8696d518d 100644
--- a/popt/po/gl.po
+++ b/popt/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -99,10 +99,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/hu.po b/popt/po/hu.po
index 267ed7696..a0f69a724 100644
--- a/popt/po/hu.po
+++ b/popt/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: László Németh <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/id.po b/popt/po/id.po
index f810615b1..ae68916a9 100644
--- a/popt/po/id.po
+++ b/popt/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/is.po b/popt/po/is.po
index 9005a7dc6..faa18c640 100644
--- a/popt/po/is.po
+++ b/popt/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/it.po b/popt/po/it.po
index f810615b1..ae68916a9 100644
--- a/popt/po/it.po
+++ b/popt/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/ja.po b/popt/po/ja.po
index f810615b1..ae68916a9 100644
--- a/popt/po/ja.po
+++ b/popt/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/ko.po b/popt/po/ko.po
index f810615b1..ae68916a9 100644
--- a/popt/po/ko.po
+++ b/popt/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/no.po b/popt/po/no.po
index 004f9b69c..f83d266bf 100644
--- a/popt/po/no.po
+++ b/popt/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/pl.po b/popt/po/pl.po
index f810615b1..ae68916a9 100644
--- a/popt/po/pl.po
+++ b/popt/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/pt.po b/popt/po/pt.po
index 83edf25da..621a00ac1 100644
--- a/popt/po/pt.po
+++ b/popt/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/pt_BR.po b/popt/po/pt_BR.po
index f810615b1..ae68916a9 100644
--- a/popt/po/pt_BR.po
+++ b/popt/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/ro.po b/popt/po/ro.po
index 2f2bf3753..f36a58d98 100644
--- a/popt/po/ro.po
+++ b/popt/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -91,10 +91,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/popt/po/ru.po b/popt/po/ru.po
index 3cffcd434..5ff7be39a 100644
--- a/popt/po/ru.po
+++ b/popt/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-08-13 21:00+0300\n"
 "Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/sk.po b/popt/po/sk.po
index b92dff260..4f3ba8bb6 100644
--- a/popt/po/sk.po
+++ b/popt/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -94,10 +94,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/sl.po b/popt/po/sl.po
index 6171f378b..f0543ff49 100644
--- a/popt/po/sl.po
+++ b/popt/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/sr.po b/popt/po/sr.po
index f810615b1..ae68916a9 100644
--- a/popt/po/sr.po
+++ b/popt/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/sv.po b/popt/po/sv.po
index da6b310d9..407c4d0a4 100644
--- a/popt/po/sv.po
+++ b/popt/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/tr.po b/popt/po/tr.po
index d42534919..03c94a857 100644
--- a/popt/po/tr.po
+++ b/popt/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: Görkem Çetin <kabalak@gmx.net>\n"
 "Language-Team: Gelecek A.Ţ <gorkem@gelecek.com.tr>\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/uk.po b/popt/po/uk.po
index 6ce797fb3..011fcccb0 100644
--- a/popt/po/uk.po
+++ b/popt/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -94,10 +94,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/wa.po b/popt/po/wa.po
index f9bb6f6b2..5537215af 100644
--- a/popt/po/wa.po
+++ b/popt/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -98,10 +98,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/zh.po b/popt/po/zh.po
index f810615b1..ae68916a9 100644
--- a/popt/po/zh.po
+++ b/popt/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/zh_CN.GB2312.po b/popt/po/zh_CN.GB2312.po
index d2769e41e..2545528b5 100644
--- a/popt/po/zh_CN.GB2312.po
+++ b/popt/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""