Sync with rpm-3.0.5 chnages.

CVS patchset: 3958
CVS date: 2000/07/17 00:40:17

35 files changed, 1124 insertions, 2463 deletions

diff --git a/CHANGES b/CHANGES
index c6f08e34d..df6cf4f99 100644
--- a/CHANGES
+++ b/CHANGES
@@ -71,27 +71,20 @@
 	- multilib patch, take 1.
 	- add pre-transaction syscall's to handle /etc/init.d change.
 	- don't bother saving '/' as fingerprint subdir.
-	- eliminate legacy RPMTAG_{OBSOLETES,PROVIDES,CAPABILITY}.
-	- eliminate unused headerGz{Read,Write}.
 	- prefix payload paths with "./", otherwise "/" can't be represented.
 	- fix: compressFilelist broke when fed '/'.
 	- fix: typo in --last popt alias (#12690).
 	- fix: clean file paths before performing -qf (#12493).
 	- remove build mode help from rpm.c, use rpmb instead.
-	- support for rpmlib(...) internal feature dependencies.
 	- fix: set multilibno on sparc per-platform config.
 	- fix: legacy requires './' payload prefix to be omitted for rpm itself.
 	- fix: remove verbose database +++/--- messages to conform to doco.
-	- compare versions if doing --freshen.
 	- add S_ISLNK pre-transaction syscall test.
 	- fix: initialize pretransaction argv (segfault).
 	- fix: check rpmlib features w/o database (and check earlier as well).
 	- rip out pre-transaction syscalls, more design is needed.
-	- display rpmlib provides when invoked with --showrc.
 	- remove (dead) dependency checks on implicitly provided package names.
 	- remove (dead) rpmdb API code in python bindings.
-	- remove (legacy) support for version 1 packaging.
-	- remove (legacy) support for converting gdbm databases.
 	- fix: make set of replaced file headers unique.
 	- fix: don't attempt dbiOpen with anything but requested dbN.
 
@@ -116,6 +109,14 @@
 	- support for bzip payloads.
 	- fix: payload compression tag not nul terminated.
 	- identify package when install scriptlet fails (#12448).
+	- remove (unused) RPMTAG_CAPABILITY.
+	- remove (legacy) use of RPMTAG_{OBSOLETES,PROVIDES} internally.
+	- remove (legacy) support for version 1 packaging.
+	- remove (legacy) support for converting gdbm databases.
+	- eliminate unused headerGz{Read,Write}.
+	- support for rpmlib(...) internal feature dependencies.
+	- display rpmlib provides when invoked with --showrc.
+	- fix: compare versions if doing --freshen.
 
 3.0.3 -> 3.0.4
 	- use compressed filenames on install side.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7c3fe8947..b713064ab 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -12,7 +12,7 @@ pkginc_HEADERS = \
 	header.h misc.h rpmlib.h stringbuf.h
 noinst_HEADERS = \
 	cpio.h depends.h falloc.h fprint.h hash.h install.h \
-	md5.h oldheader.h oldrpmdb.h rpm_malloc.h \
+	md5.h rpm_malloc.h \
 	rpmdb.h rpmlead.h signature.h
 
 mylibpaths =	-L$(top_builddir)/lib/.libs -L$(top_builddir)/rpmio/.libs \
@@ -24,7 +24,7 @@ lib_LTLIBRARIES = librpm.la
 librpm_la_SOURCES = \
 	cpio.c $(DBLIBOBJS) depends.c \
 	formats.c fprint.c fs.c hash.c header.c install.c \
-	md5.c md5sum.c misc.c oldheader.c package.c problems.c \
+	md5.c md5sum.c misc.c package.c problems.c \
 	poptBT.c poptQV.c query.c rpmchecksig.c rpmdb.c rpminstall.c \
 	rpmlead.c rpmlibprov.c rpmrc.c signature.c stringbuf.c stubs.c \
 	tagName.c tagtable.c transaction.c uninstall.c verify.c
diff --git a/lib/depends.c b/lib/depends.c
index b69bae51e..dc198fc50 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -958,6 +958,7 @@ static int unsatisfiedDepend(rpmTransactionSet rpmdep,
 	goto exit;
     }
 
+    /* XXX only the installer does not have the database open here. */
     if (rpmdep->rpmdb != NULL) {
 	if (*keyName == '/') {
 	    /* keyFlags better be 0! */
diff --git a/lib/install.c b/lib/install.c
index 2189aee42..c6fd63c07 100644
--- a/lib/install.c
+++ b/lib/install.c
@@ -447,23 +447,26 @@ static int markReplacedFiles(rpmdb db, const struct sharedFileInfo * replList)
 	int modified;
 	int count;
 
-	headerGetEntry(h, RPMTAG_FILESTATES, NULL, (void **)&secStates, &count);
-	
 	modified = 0;
+
+	if (!headerGetEntry(h, RPMTAG_FILESTATES, NULL, (void **)&secStates, &count))
+	    continue;
+	
 	prev = rpmdbGetIteratorOffset(mi);
 	num = 0;
 	while (fileInfo->otherPkg && fileInfo->otherPkg == prev) {
 	    assert(fileInfo->otherFileNum < count);
 	    if (secStates[fileInfo->otherFileNum] != RPMFILE_STATE_REPLACED) {
 		secStates[fileInfo->otherFileNum] = RPMFILE_STATE_REPLACED;
-		modified = 1;
+		if (modified == 0) {
+		    /* Modified header will be rewritten. */
+		    modified = 1;
+		    rpmdbSetIteratorModified(mi, modified);
+		}
 		num++;
 	    }
 	    fileInfo++;
 	}
-
-	/* XXX for dbN with falloc, headers *must* be the same size */
-	rpmdbSetIteratorModified(mi, modified);
     }
     rpmdbFreeIterator(mi);
 
diff --git a/lib/oldheader.c b/lib/oldheader.c
deleted file mode 100644
index 42e6bbd80..000000000
--- a/lib/oldheader.c
+++ /dev/null
@@ -1,363 +0,0 @@
-#include "system.h"
-
-#ifdef	__LCLINT__
-#define	ntohl(_x)	(_x)
-#define	ntohs(_x)	(_x)
-#define	htonl(_x)	(_x)
-#define	htons(_x)	(_x)
-#else
-#include <netinet/in.h>
-#endif	/* __LCLINT__ */
-
-#include <rpmlib.h>
-
-#include "misc.h"
-#include "oldheader.h"
-
-/* This *can't* read 1.0 headers -- it needs 1.1 (w/ group and icon fields)
-   or better. I'd be surprised if any 1.0 headers are left anywhere anyway.
-   Red Hat 2.0 shipped with 1.1 headers, but some old BETAs used 1.0. */
-
-struct literalHeader {
-    unsigned char m1, m2, m3, m4;
-    unsigned char major, minor;
-
-    unsigned short type, cpu;
-    char labelstr[66];
-    unsigned int specOffset;
-    unsigned int specLength;
-    unsigned int archiveOffset;
-    unsigned int size;
-    unsigned int os;
-    unsigned int groupLength;
-    unsigned int iconLength;
-} ;
-
-/* this leaves the file pointer pointing at the data section */
-
-char * oldhdrReadFromStream(FD_t fd, struct oldrpmHeader * header) {
-    struct literalHeader lit;
-    char * chptr;
-    int bytesRead;
-    char ch;
-    unsigned int specOffset;
-    unsigned int archiveOffset;
-    unsigned int groupLength;
-
-    if (timedRead(fd, (char *)&lit, sizeof(lit)) != sizeof(lit)) {
-	return Fstrerror(fd);
-    }
-
-    bytesRead = sizeof(lit);
-
-    if (lit.m1 != 0xed || lit.m2 != 0xab || lit.m3 != 0xee ||
-	lit.m4 != 0xdb) {
-	return "bad magic for RPM package";
-    }
-
-    specOffset = htonl(lit.specOffset);
-    header->specLength = htonl(lit.specLength);
-    archiveOffset = htonl(lit.archiveOffset);
-    header->size = htonl(lit.size);
-    header->os = htonl(lit.os);
-    groupLength = htonl(lit.groupLength);
-    header->iconLength = htonl(lit.iconLength);
-
-    header->spec = xmalloc(header->specLength);
-    header->name = xmalloc(strlen(lit.labelstr) + 1);
-    if (!header->spec || !header->name) {
-	if (header->spec) free(header->spec);
-	if (header->name) free(header->name);
-	return "out of memory";
-    }
-
-    strcpy(header->name, lit.labelstr);
-    chptr = header->name + strlen(header->name);
-    while (*chptr != '-') chptr--;
-    *chptr = '\0';
-    header->release = chptr + 1;
-    while (*chptr != '-') chptr--;
-    *chptr = '\0';
-    header->version = chptr + 1;
-
-    if (groupLength) {
-        header->group = xmalloc(groupLength + 1);
-	if (!header->group) {
-	    free(header->spec);
-	    free(header->name);
-	    return "out of memory";
-	}
-
-	if (timedRead(fd, header->group, groupLength) != groupLength) {
-	    oldhdrFree(header);
-	    return Fstrerror(fd);
-	}
-	header->group[groupLength] = '\0';
-	bytesRead += groupLength;
-    } else {
-	header->group = NULL;
-    }
-	
-    if (header->iconLength) {
-	header->icon = xmalloc(header->iconLength);
-	if (!header->icon) {
-	    free(header->spec);
-	    free(header->name);
-	    free(header->icon);
-	    return "out of memory";
-	}
-	if (timedRead(fd, header->icon, header->iconLength) != 
-			header->iconLength) {
-	    oldhdrFree(header);
-	    return Fstrerror(fd);
-	}
-	bytesRead += header->iconLength;
-    } else {
-	header->icon = NULL;
-    }
-
-    while (bytesRead < specOffset) {
-	if (timedRead(fd, &ch, 1) != 1) {
-	    oldhdrFree(header);
-	    return Fstrerror(fd);
-	}
-	bytesRead++;
-    }
-
-    if (timedRead(fd, header->spec, header->specLength) != header->specLength) {
-	oldhdrFree(header);
-	return Fstrerror(fd);
-    }
-    bytesRead += header->specLength;
-
-    while (bytesRead < archiveOffset) {
-	if (timedRead(fd, &ch, 1) != 1) {
-	    oldhdrFree(header);
-	    return Fstrerror(fd);
-	}
-	bytesRead++;
-    }
-
-    return NULL;
-}
-
-char * oldhdrReadFromFile(char * filename, struct oldrpmHeader * header) {
-    char * rc;
-    FD_t fd;
-
-    fd = Fopen(filename, "r.fdio");
-    if (Ferror(fd))
-	/* XXX Fstrerror */
-	return strerror(errno);
-    
-    rc = oldhdrReadFromStream(fd, header);
-    Fclose(fd);
-    
-    return rc;
-}
-
-void oldhdrFree(struct oldrpmHeader * header) {
-    free(header->name);
-    free(header->spec);
-    if (header->icon) free(header->icon);
-    if (header->group) free(header->group);
-}
-
-void oldhdrSpecFree(struct oldrpmHeaderSpec * spec) {
-    free(spec->copyright);
-    free(spec->description);
-    free(spec->vendor);
-    free(spec->distribution);
-    free(spec->buildHost);
-    if (spec->postun) free(spec->postun);
-    if (spec->postin) free(spec->postin);
-    if (spec->preun) free(spec->preun);
-    if (spec->prein) free(spec->prein);
-
-    while (spec->fileCount) {
-	spec->fileCount--;
-	oldrpmfileFree(spec->files + spec->fileCount);
-    }
-
-    free(spec->files);
-}
-
-char * oldhdrParseSpec(struct oldrpmHeader * header, struct oldrpmHeaderSpec * spec) {
-    char ** lines;
-    char ** strptr;
-    char ** files = NULL;
-    char ** str = NULL;
-    int strlength = 0;
-    int i;
-    enum { FILELIST, PREIN, POSTIN, PREUN, POSTUN, PREAMBLE } state = PREAMBLE;
-
-    lines = splitString(header->spec, header->specLength, '\n');
-    if (!lines) {
-	return "out of memory";
-    }
-
-    /* these are optional */
-    spec->distribution = NULL;
-    spec->vendor = NULL;
-    spec->description = NULL;
-    spec->copyright = NULL;
-    spec->prein = spec->postin = NULL;
-    spec->preun = spec->postun = NULL;
-
-    spec->fileCount = 0;
-    for (strptr = lines; *strptr; strptr++) {
-	if (!strncmp("%speci", *strptr, sizeof("%speci")-1)) {
-	    state = FILELIST;
-	    files = strptr + 1;
-	} else if (!strncmp("%postun", *strptr, sizeof("%postun")-1)) {
-	    state = POSTUN;
-	    str = &spec->postun;
-	}
-	else if (!strncmp("%preun", *strptr, sizeof("%preun")-1)) {
-	    state = PREUN;
-	    str = &spec->preun;
-	}
-	else if (!strncmp("%post", *strptr, sizeof("%post")-1)) {
-	    state = POSTIN;
-	    str = &spec->postin;
-	}
-	else if (!strncmp("%pre", *strptr, sizeof("%pre")-1)) {
-	    state = PREIN;
-	    str = &spec->prein;
-	}
-	else {
-	    switch (state) {
-	      case FILELIST: 
-		if (**strptr) 
-		    spec->fileCount++;
-		break;
-
-	      case PREAMBLE:
-		if (!strncmp("Description: ", *strptr, 13))
-		    spec->description = xstrdup((*strptr) + 13);
-		else if (!strncmp("Distribution: ", *strptr, 14))
-		    spec->distribution = xstrdup((*strptr) + 14);
-		else if (!strncmp("Vendor: ", *strptr, 8))
-		    spec->vendor = xstrdup((*strptr) + 8);
-		else if (!strncmp("BuildHost: ", *strptr, 11))
-		    spec->buildHost = xstrdup((*strptr) + 11);
-		else if (!strncmp("BuildDate: ", *strptr, 11))
-		    spec->buildTime = atoi((*strptr) + 11);
-		else if (!strncmp("Copyright: ", *strptr, 11))
-		    spec->copyright = xstrdup((*strptr) + 11);
-		break;
-
-	      case PREUN: case PREIN: case POSTIN: case POSTUN:
-		if (!*str)  {
-		    *str = xmalloc(strlen(*strptr) + 2);
-		    strlength = 0;
-		    (*str)[0] = '\0';
-		}
-		else
-		    *str = xrealloc(*str, strlength + strlen(*strptr) + 2);
-		strcat(*str, *strptr);
-		strcat(*str, "\n");
-		strlength += strlen(*strptr) + 1;
-	    }
-		
-	}
-    }
-
-    spec->files = xmalloc(sizeof(struct oldrpmFileInfo) * spec->fileCount);
-    if (!spec->files) {
-	freeSplitString(lines);
-	return "out of memory";
-    }
-
-    for (strptr = files, i = 0; *strptr; strptr++, i++) {
-	if (**strptr) 
-	    oldrpmfileFromSpecLine(*strptr, spec->files + i);
-    }
-
-    freeSplitString(lines);
-
-    if (!spec->vendor) spec->vendor = xstrdup("");
-    if (!spec->description) spec->description = xstrdup("");
-    if (!spec->distribution) spec->distribution = xstrdup("");
-    if (!spec->copyright) spec->copyright = xstrdup("");
-
-    return NULL;
-}
-
-static void infoFromFields(char ** fields, struct oldrpmFileInfo * fi);
-
-void oldrpmfileFromInfoLine(char * path, char * state, char * str, 
-			struct oldrpmFileInfo * fi) {
-    char ** fields;
-
-    fields = splitString(str, strlen(str), ' ');
-
-    fi->path = xstrdup(path);
-    if (!strcmp(state, "normal"))
-	fi->state = RPMFILE_STATE_NORMAL;
-    else if (!strcmp(state, "replaced"))
-	fi->state = RPMFILE_STATE_REPLACED;
-    else 
-	rpmError(RPMERR_INTERNAL, _("bad file state: %s"), state);
-
-    infoFromFields(fields, fi);
-
-    freeSplitString(fields);
-}
-
-void oldrpmfileFromSpecLine(char * str, struct oldrpmFileInfo * fi) {
-    char ** fields;
-
-    fields = splitString(str, strlen(str), ' ');
-
-    fi->path = xstrdup(fields[0]);
-    fi->state = RPMFILE_STATE_NORMAL;
-
-    infoFromFields(fields + 1, fi);
-
-    freeSplitString(fields);
-}
-
-void infoFromFields(char ** fields, struct oldrpmFileInfo * fi) {
-    fi->size = strtol(fields[0], NULL, 10);
-    fi->mtime = strtol(fields[1], NULL, 10);
-    strcpy(fi->md5, fields[2]);
-    fi->mode = strtol(fields[3], NULL, 8);
-    fi->uid = strtol(fields[4], NULL, 10);
-    fi->gid = strtol(fields[5], NULL, 10);
-    fi->isconf = fields[6][0] != '0';
-    fi->isdoc = fields[7][0] != '0';
-    fi->rdev = strtol(fields[8], NULL, 16);
-   
-    if (S_ISLNK(fi->mode)) {
-	fi->linkto = xstrdup(fields[9]);
-    } else {
-	fi->linkto = NULL;
-    }
-}
-
-void oldrpmfileFree(struct oldrpmFileInfo * fi) {
-    free(fi->path);
-    if (fi->linkto) free(fi->linkto);
-}
-
-char * oldrpmfileToInfoStr(struct oldrpmFileInfo * fi) {
-    char * buf;
-
-    if (fi->linkto) 
-	buf = xmalloc(strlen(fi->linkto) + 100);
-    else
-	buf = xmalloc(100);
-
-    sprintf(buf, "%ld %ld %s %o %d %d %s %s %x ", (long)fi->size, (long)fi->mtime,
-		fi->md5, fi->mode, (int)fi->uid, (int)fi->gid,
-		fi->isconf ? "1" : "0", fi->isdoc ? "1" : "0",
-		fi->rdev);
-    
-    if (fi->linkto) 
-	strcat(buf, fi->linkto);
-    else
-	strcat(buf, "X");
- 
-    return buf;
-}
diff --git a/lib/oldheader.h b/lib/oldheader.h
deleted file mode 100644
index 99614a044..000000000
--- a/lib/oldheader.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef H_OLDHEADER
-#define H_OLDHEADER
-
-#include <stdio.h>
-
-struct oldrpmFileInfo {
-    char * path;
-    int state;
-    unsigned short mode;
-    unsigned short uid;
-    unsigned short gid;
-    unsigned short rdev;
-    unsigned long size;
-    unsigned long mtime;
-    char md5[32];
-    char * linkto;
-    int isconf;
-    int isdoc;
-} ;
-
-struct oldrpmHeader {
-    unsigned short type, cpu;
-    unsigned int size;
-    unsigned int os;
-    unsigned int iconLength;
-
-    char * name, * version, * release, * group;
-    char * icon;
-
-    unsigned int specLength;
-    char * spec;
-} ;
-
-struct oldrpmHeaderSpec {
-    char * description;
-    char * vendor;
-    char * distribution;
-    char * buildHost;
-    char * copyright;
-    char * prein, * postin, * preun, * postun;
-
-    int buildTime;
-
-    int fileCount;
-    struct oldrpmFileInfo * files;
-} ;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void oldrpmfileFromSpecLine(char * str, struct oldrpmFileInfo * fi);
-void oldrpmfileFromInfoLine(char * path, char * state, char * str,
-			struct oldrpmFileInfo * fi);
-void oldrpmfileFree(struct oldrpmFileInfo * fi);
-char * oldrpmfileToInfoStr(struct oldrpmFileInfo * fi);
-
-/*@observer@*/ char * oldhdrReadFromStream(FD_t fd, /*@out@*/ struct oldrpmHeader * header);
-/*@observer@*/ char * oldhdrReadFromFile(char * filename, /*@out@*/ struct oldrpmHeader * header);
-/*@observer@*/ char * oldhdrParseSpec(struct oldrpmHeader * header, /*@out@*/struct oldrpmHeaderSpec * spec);
-void   oldhdrFree( /*@only@*/ struct oldrpmHeader * header);
-void   oldhdrSpecFree( /*@only@*/ struct oldrpmHeaderSpec * spec);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* H_OLDHEADER */
diff --git a/lib/package.c b/lib/package.c
index 2246ef050..4414e4857 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -12,7 +12,6 @@
 #include <rpmlib.h>
 
 #include "misc.h"
-#include "oldheader.h"
 #include "rpmlead.h"
 #include "signature.h"
 
@@ -51,7 +50,7 @@ static int readPackageHeaders(FD_t fd, /*@out@*/struct rpmlead * leadPtr,
     switch (lead->major) {
     case 1:
 	rpmError(RPMERR_NEWPACKAGE, _("packaging version 1 is not"
-		"supported by this version of RPM"));
+		" supported by this version of RPM"));
 	return 2;
 	/*@notreached@*/ break;
     case 2:
diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index dcee73347..7d1dc7d10 100644
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -1407,7 +1407,7 @@ int rpmShowRC(FILE *fp)
     fprintf(fp, "\n");
 
     fprintf(fp, "Features supported by rpmlib:\n");
-    rpmShowRpmlibProvides(stdout);
+    rpmShowRpmlibProvides(fp);
     fprintf(fp, "\n");
 
     rpmDumpMacroTable(NULL, fp);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3e604efb3..3ec58c651 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -39,7 +39,6 @@ lib/install.c
 lib/md5.c
 lib/md5sum.c
 lib/misc.c
-lib/oldheader.c
 lib/package.c
 lib/poptBT.c
 lib/poptQV.c
diff --git a/po/cs.po b/po/cs.po
index b3e5ce48a..e048ff0fb 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: 1998-10-10 10:10+0200\n"
 "Last-Translator: Pavel Makovec <pavelm@terminal.cz>\n"
 "Language-Team: Czech <pavelm@terminal.cz>\n"
@@ -66,50 +66,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "chyba pøi hledání balíèku %s\n"
 
-#: convertdb.c:40
-#, fuzzy
-msgid "RPM database already exists"
-msgstr "doèasná databáze %s ji¾ existuje"
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr ""
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr ""
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr ""
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr ""
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr ""
-
-#: oldrpmdb.c:454
-#, fuzzy, c-format
-msgid "pulling %s from database\n"
-msgstr "otevírá se stará databáze\n"
-
-#: oldrpmdb.c:461
-#, fuzzy
-msgid "package not found in database"
-msgstr "balíèek %s nenalezen v %s"
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr ""
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2418,39 +2374,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "¾ádnı balíèek nevlastní soubor %s\n"
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "¾ádnı balíèek nevlastní soubor %s\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "polo¾ka 'vy¾aduje' balíèku %s není splnìna: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balíèek %s koliduje: %s\n"
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "smyèka v øetìzu podmínek: %s"
@@ -2719,90 +2675,90 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "probíhá instalace binárních balíèkù\n"
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "nelze otevøít soubor %s: "
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "nelze otevøít soubor %s: "
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "nelze otevøít soubor %s: "
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "soubor %s: %s\n"
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "balíèek %s neobsahuje soubory"
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, fuzzy, c-format
 msgid "renaming %s to %s\n"
 msgstr "Probíhá získávání %s jako %s\n"
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "%s nelze pøejmenovat na %s: %s"
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "balíèek %s-%s-%s obsahuje sdílení soubory\n"
 
-#: lib/install.c:970
+#: lib/install.c:973
 #, fuzzy
 msgid "stopping install as we're running --test\n"
 msgstr "probíhá zastavení zdrojové instalace, nebo» jde jen o testování\n"
 
-#: lib/install.c:975
+#: lib/install.c:978
 #, fuzzy
 msgid "running preinstall script (if any)\n"
 msgstr "spou¹tí se pøípadnı poinstalaèní skript\n"
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 #, fuzzy
 msgid "running postinstall scripts (if any)\n"
 msgstr "spou¹tí se pøípadnı poinstalaèní skript\n"
@@ -2812,18 +2768,13 @@ msgstr "spou¹tí se pøípadnı poinstalaèní skript\n"
 msgid "error creating temporary file %s"
 msgstr "chyba pøi vytváøení adresáøe %s: %s"
 
-#: lib/oldheader.c:301
-#, fuzzy, c-format
-msgid "bad file state: %s"
-msgstr "nelze provést statistiku %s: %s"
-
-#: lib/package.c:53
+#: lib/package.c:52
 #, fuzzy
-msgid "packaging version 1 is notsupported by this version of RPM"
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 "tato verze RPM podporuje jen balíèky, které mají hlavní (major) èísla <= 3"
 
-#: lib/package.c:113
+#: lib/package.c:112
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -4111,6 +4062,22 @@ msgid "failed to create %s: %s\n"
 msgstr "%s nelze vytvoøit\n"
 
 #, fuzzy
+#~ msgid "RPM database already exists"
+#~ msgstr "doèasná databáze %s ji¾ existuje"
+
+#, fuzzy
+#~ msgid "pulling %s from database\n"
+#~ msgstr "otevírá se stará databáze\n"
+
+#, fuzzy
+#~ msgid "package not found in database"
+#~ msgstr "balíèek %s nenalezen v %s"
+
+#, fuzzy
+#~ msgid "bad file state: %s"
+#~ msgstr "nelze provést statistiku %s: %s"
+
+#, fuzzy
 #~ msgid "line %d: Invalid tag value: %s"
 #~ msgstr "neplatné èíslo balíèku: %s\n"
 
diff --git a/po/da.po b/po/da.po
index a98c7a638..01aa4777c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\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"
@@ -60,48 +60,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr "RPM-database eksisterer allerede"
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr ""
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr ""
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr ""
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr "rpmconvert: ingen argumenter forventet"
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr "rpmconvert 1.0 - konverterer database i /var/lib/rpm\n"
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr ""
-
-#: oldrpmdb.c:461
-msgid "package not found in database"
-msgstr "pakke ikke fundet i databasen"
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr "ingen ophavsret!\n"
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2249,16 +2207,6 @@ msgstr ""
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:887
-#, c-format
-msgid "%s: %-45s YES (added package)\n"
-msgstr ""
-
-#: lib/depends.c:891
-#, c-format
-msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
-msgstr ""
-
 #: lib/depends.c:874
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
@@ -2274,49 +2222,44 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:994
-#, c-format
-msgid "%s: %-45s YES (db files)\n"
-msgstr ""
-
 #: lib/depends.c:951
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2585,86 +2528,86 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2673,16 +2616,11 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/oldheader.c:301
-#, c-format
-msgid "bad file state: %s"
-msgstr ""
-
-#: lib/package.c:53
-msgid "packaging version 1 is notsupported by this version of RPM"
+#: lib/package.c:52
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:113
+#: lib/package.c:112
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3916,6 +3854,21 @@ msgstr ""
 msgid "failed to create %s: %s\n"
 msgstr ""
 
+#~ msgid "RPM database already exists"
+#~ msgstr "RPM-database eksisterer allerede"
+
+#~ msgid "rpmconvert: no arguments expected"
+#~ msgstr "rpmconvert: ingen argumenter forventet"
+
+#~ msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
+#~ msgstr "rpmconvert 1.0 - konverterer database i /var/lib/rpm\n"
+
+#~ msgid "package not found in database"
+#~ msgstr "pakke ikke fundet i databasen"
+
+#~ msgid "no copyright!\n"
+#~ msgstr "ingen ophavsret!\n"
+
 #~ msgid ""
 #~ "       rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
 #~ "<file>]"
diff --git a/po/de.po b/po/de.po
index 119bf448f..bdf45a020 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.5.2\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -101,50 +101,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: convertdb.c:40
-#, fuzzy
-msgid "RPM database already exists"
-msgstr "die temporäre Datenbank %s existiert schon"
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr ""
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr ""
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr ""
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr ""
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr ""
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr ""
-
-#: oldrpmdb.c:461
-#, fuzzy
-msgid "package not found in database"
-msgstr "Paket %s in %s nicht gefunden"
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr ""
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2510,39 +2466,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2819,90 +2775,90 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "Paket installieren"
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "kann Datei %s nicht öffnen: "
 
 # , c-format
-#: lib/install.c:682
+#: lib/install.c:685
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "umbennen von %s nach %s fehlgeschlagen: %s"
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/install.c:910
+#: lib/install.c:913
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2911,19 +2867,13 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-# , c-format
-#: lib/oldheader.c:301
-#, fuzzy, c-format
-msgid "bad file state: %s"
-msgstr "Öffnen von %s fehlgeschlagen: %s"
-
-#: lib/package.c:53
+#: lib/package.c:52
 #, fuzzy
-msgid "packaging version 1 is notsupported by this version of RPM"
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
 
-#: lib/package.c:113
+#: lib/package.c:112
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -4238,6 +4188,19 @@ msgid "failed to create %s: %s\n"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
 #, fuzzy
+#~ msgid "RPM database already exists"
+#~ msgstr "die temporäre Datenbank %s existiert schon"
+
+#, fuzzy
+#~ msgid "package not found in database"
+#~ msgstr "Paket %s in %s nicht gefunden"
+
+# , c-format
+#, fuzzy
+#~ msgid "bad file state: %s"
+#~ msgstr "Öffnen von %s fehlgeschlagen: %s"
+
+#, fuzzy
 #~ msgid "line %d: Invalid tag value: %s"
 #~ msgstr "ungültige Paket-Nummer: %s\n"
 
diff --git a/po/es.po b/po/es.po
index 83e3aa2d9..10f7c89e1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,48 +65,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr ""
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr ""
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr ""
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr ""
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr ""
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr ""
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr ""
-
-#: oldrpmdb.c:461
-msgid "package not found in database"
-msgstr ""
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr ""
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2248,39 +2206,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2549,86 +2507,86 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2637,16 +2595,11 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/oldheader.c:301
-#, c-format
-msgid "bad file state: %s"
-msgstr ""
-
-#: lib/package.c:53
-msgid "packaging version 1 is notsupported by this version of RPM"
+#: lib/package.c:52
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:113
+#: lib/package.c:112
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 83f52b503..2b646188f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -72,50 +72,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: convertdb.c:40
-#, fuzzy
-msgid "RPM database already exists"
-msgstr "väliaikainen tietokanta %s on jo olemassa"
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr ""
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr ""
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr ""
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr ""
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr ""
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr ""
-
-#: oldrpmdb.c:461
-#, fuzzy
-msgid "package not found in database"
-msgstr "paketti %s ei ole %s:ssä"
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr ""
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2450,39 +2406,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "silmukka edellytysten ketjussa: %s"
@@ -2753,88 +2709,88 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "asenna paketti"
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "%s:n nimeäminen %s:ksi epäonnistui: %s"
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2843,18 +2799,13 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/oldheader.c:301
-#, fuzzy, c-format
-msgid "bad file state: %s"
-msgstr "en voinut avata %s: %s"
-
-#: lib/package.c:53
+#: lib/package.c:52
 #, fuzzy
-msgid "packaging version 1 is notsupported by this version of RPM"
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
 
-#: lib/package.c:113
+#: lib/package.c:112
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -4149,6 +4100,18 @@ msgid "failed to create %s: %s\n"
 msgstr "%s:n luonti epäonnistui\n"
 
 #, fuzzy
+#~ msgid "RPM database already exists"
+#~ msgstr "väliaikainen tietokanta %s on jo olemassa"
+
+#, fuzzy
+#~ msgid "package not found in database"
+#~ msgstr "paketti %s ei ole %s:ssä"
+
+#, fuzzy
+#~ msgid "bad file state: %s"
+#~ msgstr "en voinut avata %s: %s"
+
+#, fuzzy
 #~ msgid "line %d: Invalid tag value: %s"
 #~ msgstr "virheellinen paketin numero: %s\n"
 
diff --git a/po/fr.po b/po/fr.po
index fb82fd83d..6c6eaaae9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-07-15 14:15-0400\n"
+msgstr "POT-Creation-Date: 2000-07-16 20:18-0400\n"
 
 #: build.c:25 lib/rpminstall.c:451
 #, c-format
@@ -53,49 +53,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr ""
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr ""
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr ""
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr ""
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr ""
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr ""
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr ""
-
-#: oldrpmdb.c:461
-#, fuzzy
-msgid "package not found in database"
-msgstr "aucun package n'a été spécifié pour la désinstallation"
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr ""
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2443,39 +2400,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2746,88 +2703,88 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2836,16 +2793,11 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/oldheader.c:301
-#, fuzzy, c-format
-msgid "bad file state: %s"
-msgstr "impossible d'ouvrir: %s\n"
-
-#: lib/package.c:53
-msgid "packaging version 1 is notsupported by this version of RPM"
+#: lib/package.c:52
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:113
+#: lib/package.c:112
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -4123,6 +4075,14 @@ msgid "failed to create %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #, fuzzy
+#~ msgid "package not found in database"
+#~ msgstr "aucun package n'a été spécifié pour la désinstallation"
+
+#, fuzzy
+#~ msgid "bad file state: %s"
+#~ msgstr "impossible d'ouvrir: %s\n"
+
+#, fuzzy
 #~ msgid "line %d: Invalid tag value: %s"
 #~ msgstr "impossible d'ouvrir: %s\n"
 
diff --git a/po/gl.po b/po/gl.po
index 83e3aa2d9..10f7c89e1 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,48 +65,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr ""
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr ""
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr ""
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr ""
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr ""
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr ""
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr ""
-
-#: oldrpmdb.c:461
-msgid "package not found in database"
-msgstr ""
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr ""
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2248,39 +2206,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2549,86 +2507,86 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2637,16 +2595,11 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/oldheader.c:301
-#, c-format
-msgid "bad file state: %s"
-msgstr ""
-
-#: lib/package.c:53
-msgid "packaging version 1 is notsupported by this version of RPM"
+#: lib/package.c:52
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:113
+#: lib/package.c:112
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 83e3aa2d9..10f7c89e1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,48 +65,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr ""
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr ""
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr ""
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr ""
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr ""
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr ""
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr ""
-
-#: oldrpmdb.c:461
-msgid "package not found in database"
-msgstr ""
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr ""
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2248,39 +2206,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2549,86 +2507,86 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2637,16 +2595,11 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/oldheader.c:301
-#, c-format
-msgid "bad file state: %s"
-msgstr ""
-
-#: lib/package.c:53
-msgid "packaging version 1 is notsupported by this version of RPM"
+#: lib/package.c:52
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:113
+#: lib/package.c:112
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 83e3aa2d9..10f7c89e1 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,48 +65,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr ""
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr ""
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr ""
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr ""
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr ""
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr ""
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr ""
-
-#: oldrpmdb.c:461
-msgid "package not found in database"
-msgstr ""
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr ""
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2248,39 +2206,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2549,86 +2507,86 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2637,16 +2595,11 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/oldheader.c:301
-#, c-format
-msgid "bad file state: %s"
-msgstr ""
-
-#: lib/package.c:53
-msgid "packaging version 1 is notsupported by this version of RPM"
+#: lib/package.c:52
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:113
+#: lib/package.c:112
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 5f4c20c93..4c87617e5 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 1.0\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: 2000-06-16 02:20+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -60,48 +60,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr "RPM gagnagrunnur er şegar til"
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr "Gamla gagnagrunninn vantar"
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr "gat ekki búiğ til RPM gagnagrunninn /var/lib/rpm"
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr "Gamli gagnagrunnurinn er skemmdur"
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr ""
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr ""
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr ""
-
-#: oldrpmdb.c:461
-msgid "package not found in database"
-msgstr ""
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr ""
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2243,39 +2201,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2544,86 +2502,86 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2632,16 +2590,11 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/oldheader.c:301
-#, c-format
-msgid "bad file state: %s"
-msgstr ""
-
-#: lib/package.c:53
-msgid "packaging version 1 is notsupported by this version of RPM"
+#: lib/package.c:52
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:113
+#: lib/package.c:112
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3874,3 +3827,15 @@ msgstr ""
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
+
+#~ msgid "RPM database already exists"
+#~ msgstr "RPM gagnagrunnur er şegar til"
+
+#~ msgid "Old db is missing"
+#~ msgstr "Gamla gagnagrunninn vantar"
+
+#~ msgid "failed to create RPM database /var/lib/rpm"
+#~ msgstr "gat ekki búiğ til RPM gagnagrunninn /var/lib/rpm"
+
+#~ msgid "Old db is corrupt"
+#~ msgstr "Gamli gagnagrunnurinn er skemmdur"
diff --git a/po/it.po b/po/it.po
index 83e3aa2d9..10f7c89e1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,48 +65,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr ""
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr ""
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr ""
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr ""
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr ""
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr ""
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr ""
-
-#: oldrpmdb.c:461
-msgid "package not found in database"
-msgstr ""
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr ""
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2248,39 +2206,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2549,86 +2507,86 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2637,16 +2595,11 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/oldheader.c:301
-#, c-format
-msgid "bad file state: %s"
-msgstr ""
-
-#: lib/package.c:53
-msgid "packaging version 1 is notsupported by this version of RPM"
+#: lib/package.c:52
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:113
+#: lib/package.c:112
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index d2c0d157c..1891f42d1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.4\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -66,50 +66,6 @@ msgstr "ºîÀ®Ã楿¡¼¥²¥Ã¥È¥×¥é¥Ã¥È¥Õ¥©¡¼¥à: %s\n"
 msgid "Building for target %s\n"
 msgstr "¥¿¡¼¥²¥Ã¥È %s ÍѤ˺îÀ®Ãæ\n"
 
-#: convertdb.c:40
-#, fuzzy
-msgid "RPM database already exists"
-msgstr "RPM ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Ş¤¹"
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr "¸Å¤¤ db ¤¬¸«Åö¤¿¤ê¤Ş¤»¤ó"
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr "/var/lib/rpm ¤Ë RPM ¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºîÀ®¤¹¤ë¤Î¤Ë¼ºÇÔ¤·¤Ş¤·¤¿"
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr "¸Å¤¤ db ¤¬²õ¤ì¤Æ¤¤¤Ş¤¹"
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr "oldrpmdbGetPackageInfo ¤Î¼ºÇÔ &olddb = %p olddb.packages = %p\n"
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr "rpmconvert: °ú¿ô¤Ï¤³¤³¤ËÍè¤Ş¤»¤ó"
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr "rpmconvert 1.0 - /var/lib/rpm Ãæ¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÊÑ´¹Ãæ\n"
-
-#: oldrpmdb.c:454
-#, fuzzy, c-format
-msgid "pulling %s from database\n"
-msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é %s ¤ò°ú¤­½Ğ¤·¤Æ¤¤¤Ş¤¹\n"
-
-#: oldrpmdb.c:461
-#, fuzzy
-msgid "package not found in database"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Ë¸«¤Ä¤«¤ê¤Ş¤»¤ó"
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr "copyright ¤¬¤¢¤ê¤Ş¤»¤ó!\n"
-
 # rpm-2.5.5
 # Ìõ¸ìÂбş
 # query[Ì䤤¹ç¤ï¤»]
@@ -127,7 +83,7 @@ msgstr "copyright ¤¬¤¢¤ê¤Ş¤»¤ó!\n"
 # build root [BuildRoot]
 # net share [¥Í¥Ã¥È¶¦Í­]
 # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.96 2000/07/15 18:22:25 jbj Exp $
+# $Id: ja.po,v 1.97 2000/07/17 00:40:17 jbj Exp $
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2392,39 +2348,39 @@ msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëş¤¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Ş¤¹: %s\n"
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "prerequisite ¥Á¥§¡¼¥ó¤Î¥ë¡¼¥×: %s"
@@ -2701,87 +2657,87 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s"
 
-#: lib/install.c:578
+#: lib/install.c:581
 #, fuzzy
 msgid " on file "
 msgstr "¥Õ¥¡¥¤¥ë¾å"
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Ş¤¹\n"
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "%s ¤òºîÀ®¤Ç¤­¤Ş¤»¤ó: %s"
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr "%s ¤Ø½ñ¤­¹ş¤á¤Ş¤»¤ó"
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr "¥½¡¼¥¹¤Ï: %s\n"
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "%s ¤òºîÀ®¤Ç¤­¤Ş¤»¤ó: %s"
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "spec ¥Õ¥¡¥¤¥ë¤Ï: %s\n"
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Ş¤ó¤Ç¤¤¤Ş¤»¤ó"
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Ş¤¹\n"
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "%s ¤ò %s ¤Ë¤¹¤ë̾Á°¤ÎÊѹ¹¤Ë¼ºÇÔ: %s"
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Ş¤¹¡¢¥Ğ¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Ş¤·¤¿"
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n"
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr "--test ¤ò¼Â¹Ô¤¹¤ë¤è¤¦¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤òÃæ»ß¤·¤Æ¤¤¤Ş¤¹\n"
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr "¥×¥ê¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ğ)¤ò¼Â¹Ô¤·¤Ş¤¹\n"
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "·Ù¹ğ: %s ¤Ï %s ¤È¤·¤ÆºîÀ®¤µ¤ì¤Ş¤¹"
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "·Ù¹ğ: %s ¤Ï %s ¤È¤·¤ÆÊݸ¤µ¤ì¤Ş¤¹"
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 #, fuzzy
 msgid "running postinstall scripts (if any)\n"
 msgstr "¥İ¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ğ)¤ò¼Â¹Ô¤·¤Ş¤¹\n"
@@ -2791,18 +2747,13 @@ msgstr "¥İ¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ğ)¤ò¼Â¹Ô¤·¤Ş¤¹\n"
 msgid "error creating temporary file %s"
 msgstr "°ì»ş¥Õ¥¡¥¤¥ë %s ¤ÎºîÀ®¥¨¥é¡¼"
 
-#: lib/oldheader.c:301
-#, fuzzy, c-format
-msgid "bad file state: %s"
-msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s"
-
-#: lib/package.c:53
+#: lib/package.c:52
 #, fuzzy
-msgid "packaging version 1 is notsupported by this version of RPM"
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ğ¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤¹"
 
-#: lib/package.c:113
+#: lib/package.c:112
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -4107,6 +4058,43 @@ msgid "failed to create %s: %s\n"
 msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
 #, fuzzy
+#~ msgid "RPM database already exists"
+#~ msgstr "RPM ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Ş¤¹"
+
+#~ msgid "Old db is missing"
+#~ msgstr "¸Å¤¤ db ¤¬¸«Åö¤¿¤ê¤Ş¤»¤ó"
+
+#~ msgid "failed to create RPM database /var/lib/rpm"
+#~ msgstr "/var/lib/rpm ¤Ë RPM ¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºîÀ®¤¹¤ë¤Î¤Ë¼ºÇÔ¤·¤Ş¤·¤¿"
+
+#~ msgid "Old db is corrupt"
+#~ msgstr "¸Å¤¤ db ¤¬²õ¤ì¤Æ¤¤¤Ş¤¹"
+
+#~ msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
+#~ msgstr "oldrpmdbGetPackageInfo ¤Î¼ºÇÔ &olddb = %p olddb.packages = %p\n"
+
+#~ msgid "rpmconvert: no arguments expected"
+#~ msgstr "rpmconvert: °ú¿ô¤Ï¤³¤³¤ËÍè¤Ş¤»¤ó"
+
+#~ msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
+#~ msgstr "rpmconvert 1.0 - /var/lib/rpm Ãæ¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÊÑ´¹Ãæ\n"
+
+#, fuzzy
+#~ msgid "pulling %s from database\n"
+#~ msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é %s ¤ò°ú¤­½Ğ¤·¤Æ¤¤¤Ş¤¹\n"
+
+#, fuzzy
+#~ msgid "package not found in database"
+#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Ë¸«¤Ä¤«¤ê¤Ş¤»¤ó"
+
+#~ msgid "no copyright!\n"
+#~ msgstr "copyright ¤¬¤¢¤ê¤Ş¤»¤ó!\n"
+
+#, fuzzy
+#~ msgid "bad file state: %s"
+#~ msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s"
+
+#, fuzzy
 #~ msgid "line %d: Invalid tag value: %s"
 #~ msgstr "%d ¹ÔÌÜ: ÉÔ´°Á´¤Ê·Á¤Î¥¿¥°: %s"
 
diff --git a/po/ko.po b/po/ko.po
index 83e3aa2d9..10f7c89e1 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,48 +65,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr ""
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr ""
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr ""
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr ""
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr ""
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr ""
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr ""
-
-#: oldrpmdb.c:461
-msgid "package not found in database"
-msgstr ""
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr ""
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2248,39 +2206,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2549,86 +2507,86 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2637,16 +2595,11 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/oldheader.c:301
-#, c-format
-msgid "bad file state: %s"
-msgstr ""
-
-#: lib/package.c:53
-msgid "packaging version 1 is notsupported by this version of RPM"
+#: lib/package.c:52
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:113
+#: lib/package.c:112
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index e110a2245..b3f7d9aaa 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: 2000-06-22 21:59+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -60,48 +60,6 @@ msgstr "Bygger målplattformene: %s\n"
 msgid "Building for target %s\n"
 msgstr "Bygger for mål %s\n"
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr "RPM-databasen eksisterer allerede"
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr "Gammel db mangler"
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr "feilet å opprette RPM-database i /var/lib/rpm"
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr "Gammel db er korrupt"
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr "oldrpmdbGetPackageInfo feilet &olddb = %p olddb.packages = %p\n"
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr "rpmconvert: ingen argumenter forventet"
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr "rpmconvert 1.0 - konverterer database i /var/lib/rpm\n"
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr "henter %s fra databasen\n"
-
-#: oldrpmdb.c:461
-msgid "package not found in database"
-msgstr "pakke ikke funnet i databasen"
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr "ingen lisens!\n"
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2273,39 +2231,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2574,86 +2532,86 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2662,16 +2620,11 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/oldheader.c:301
-#, c-format
-msgid "bad file state: %s"
+#: lib/package.c:52
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:53
-msgid "packaging version 1 is notsupported by this version of RPM"
-msgstr ""
-
-#: lib/package.c:113
+#: lib/package.c:112
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3905,6 +3858,36 @@ msgstr ""
 msgid "failed to create %s: %s\n"
 msgstr ""
 
+#~ msgid "RPM database already exists"
+#~ msgstr "RPM-databasen eksisterer allerede"
+
+#~ msgid "Old db is missing"
+#~ msgstr "Gammel db mangler"
+
+#~ msgid "failed to create RPM database /var/lib/rpm"
+#~ msgstr "feilet å opprette RPM-database i /var/lib/rpm"
+
+#~ msgid "Old db is corrupt"
+#~ msgstr "Gammel db er korrupt"
+
+#~ msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
+#~ msgstr "oldrpmdbGetPackageInfo feilet &olddb = %p olddb.packages = %p\n"
+
+#~ msgid "rpmconvert: no arguments expected"
+#~ msgstr "rpmconvert: ingen argumenter forventet"
+
+#~ msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
+#~ msgstr "rpmconvert 1.0 - konverterer database i /var/lib/rpm\n"
+
+#~ msgid "pulling %s from database\n"
+#~ msgstr "henter %s fra databasen\n"
+
+#~ msgid "package not found in database"
+#~ msgstr "pakke ikke funnet i databasen"
+
+#~ msgid "no copyright!\n"
+#~ msgstr "ingen lisens!\n"
+
 #~ msgid ""
 #~ "       rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
 #~ "<file>]"
diff --git a/po/pl.po b/po/pl.po
index bb983710e..d1647eb26 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.2\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -67,50 +67,6 @@ msgstr "Budowanie dla platform: %s\n"
 msgid "Building for target %s\n"
 msgstr "Budowanie dla %s\n"
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr "Baza RPM'a ju¿ istnieje"
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr "Brak starej bazy"
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr "Nie mo¿na utworzyæ bazy w /var/lib/rpm"
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr "Stara baza jest uszkodzona"
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-"Wykonanie oldrpmdbGetPackageInfo nie powiod³o siê &olddb = %p olddb.packages "
-"= %p\n"
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr "rpmconvert nie wymaga argumentów"
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr "rpmconvert 1.0 - konwersja bazy w /var/lib/rpm\n"
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr "wyci±gam %s z bazy danych\n"
-
-#: oldrpmdb.c:461
-msgid "package not found in database"
-msgstr "nie znaleziono pakietu w bazie danych"
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr "brak praw autorskich!\n"
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2393,39 +2349,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakiet %s jest w konflikcie: %s\n"
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2694,86 +2650,86 @@ msgstr "warto¶æ %%instchangelog w pliku makra powinna byæ liczb±, a nie jest"
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "rozpakowanie archiwum nie powiod³o siê %s%s: %s"
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr " na pliku "
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr "instacja pakietu ¼ród³owego\n"
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "nie mo¿na utworzyæ %s"
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr "nie mo¿na zapisaæ do %s"
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr "¼ród³a w: %s\n"
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "nie mo¿na utworzyæ %s"
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "plik spec w: %s\n"
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "zmiana nazwy z %s na %s nie powiod³a sie: %s"
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr "spodziewany pakiet ¼ród³owy a nie binarny"
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "pakiet: %s-%s-%s test plików = %d\n"
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr "przebieg testowy - instalacja zatrzymana\n"
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr "uruchamianie skryptu preinstall (je¶li istnieje)\n"
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "ostrze¿enie: %s utworzony jako %s"
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "ostrze¿enie: %s zapisany jako %s"
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 #, fuzzy
 msgid "running postinstall scripts (if any)\n"
 msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n"
@@ -2783,18 +2739,13 @@ msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n"
 msgid "error creating temporary file %s"
 msgstr "b³±d w tworzeniu pliku tymczasowego %s"
 
-#: lib/oldheader.c:301
-#, c-format
-msgid "bad file state: %s"
-msgstr "b³êdny status pliku: %s"
-
-#: lib/package.c:53
+#: lib/package.c:52
 #, fuzzy
-msgid "packaging version 1 is notsupported by this version of RPM"
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 "tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a"
 
-#: lib/package.c:113
+#: lib/package.c:112
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -4057,6 +4008,41 @@ msgstr "port musi byæ liczb±\n"
 msgid "failed to create %s: %s\n"
 msgstr "utworzenie %s nie powiod³o siê\n"
 
+#~ msgid "RPM database already exists"
+#~ msgstr "Baza RPM'a ju¿ istnieje"
+
+#~ msgid "Old db is missing"
+#~ msgstr "Brak starej bazy"
+
+#~ msgid "failed to create RPM database /var/lib/rpm"
+#~ msgstr "Nie mo¿na utworzyæ bazy w /var/lib/rpm"
+
+#~ msgid "Old db is corrupt"
+#~ msgstr "Stara baza jest uszkodzona"
+
+#~ msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
+#~ msgstr ""
+#~ "Wykonanie oldrpmdbGetPackageInfo nie powiod³o siê &olddb = %p olddb.packages "
+#~ "= %p\n"
+
+#~ msgid "rpmconvert: no arguments expected"
+#~ msgstr "rpmconvert nie wymaga argumentów"
+
+#~ msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
+#~ msgstr "rpmconvert 1.0 - konwersja bazy w /var/lib/rpm\n"
+
+#~ msgid "pulling %s from database\n"
+#~ msgstr "wyci±gam %s z bazy danych\n"
+
+#~ msgid "package not found in database"
+#~ msgstr "nie znaleziono pakietu w bazie danych"
+
+#~ msgid "no copyright!\n"
+#~ msgstr "brak praw autorskich!\n"
+
+#~ msgid "bad file state: %s"
+#~ msgstr "b³êdny status pliku: %s"
+
 #, fuzzy
 #~ msgid "line %d: Invalid tag value: %s"
 #~ msgstr "linia %d: Niepoprawna forma etykiety: %s"
diff --git a/po/pt.po b/po/pt.po
index 83e3aa2d9..10f7c89e1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,48 +65,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr ""
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr ""
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr ""
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr ""
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr ""
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr ""
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr ""
-
-#: oldrpmdb.c:461
-msgid "package not found in database"
-msgstr ""
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr ""
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2248,39 +2206,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2549,86 +2507,86 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2637,16 +2595,11 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/oldheader.c:301
-#, c-format
-msgid "bad file state: %s"
-msgstr ""
-
-#: lib/package.c:53
-msgid "packaging version 1 is notsupported by this version of RPM"
+#: lib/package.c:52
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:113
+#: lib/package.c:112
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0be526a30..7e2020ef6 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: 2000-07-15 14:15-0400\n"
+msgstr "POT-Creation-Date: 2000-07-16 20:18-0400\n"
 
 #: build.c:25 lib/rpminstall.c:451
 #, c-format
@@ -60,49 +60,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "instale pacote"
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr ""
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr ""
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr ""
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr ""
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr ""
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr ""
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr ""
-
-#: oldrpmdb.c:461
-#, fuzzy
-msgid "package not found in database"
-msgstr "não foi passado pacote para desinstalação"
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr ""
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2510,39 +2467,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "não foi passado pacote para instalação"
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2817,91 +2774,91 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "instale pacote"
 
 # , c-format
-#: lib/install.c:642
+#: lib/install.c:645
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
 # , c-format
-#: lib/install.c:672
+#: lib/install.c:675
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "não foi passado pacote para instalação"
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2910,17 +2867,11 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr ""
 
-# , c-format
-#: lib/oldheader.c:301
-#, fuzzy, c-format
-msgid "bad file state: %s"
-msgstr "Não consegui abrir: %s\n"
-
-#: lib/package.c:53
-msgid "packaging version 1 is notsupported by this version of RPM"
+#: lib/package.c:52
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:113
+#: lib/package.c:112
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -4250,6 +4201,15 @@ msgstr ""
 msgid "failed to create %s: %s\n"
 msgstr "Não consegui abrir o pipe tar: %s\n"
 
+#, fuzzy
+#~ msgid "package not found in database"
+#~ msgstr "não foi passado pacote para desinstalação"
+
+# , c-format
+#, fuzzy
+#~ msgid "bad file state: %s"
+#~ msgstr "Não consegui abrir: %s\n"
+
 # , c-format
 #, fuzzy
 #~ msgid "line %d: Invalid tag value: %s"
diff --git a/po/ro.po b/po/ro.po
index 392108177..f0469b4a5 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -60,48 +60,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr ""
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr ""
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr ""
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr ""
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr ""
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr ""
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr ""
-
-#: oldrpmdb.c:461
-msgid "package not found in database"
-msgstr ""
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr ""
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2243,39 +2201,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2544,86 +2502,86 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2632,16 +2590,11 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/oldheader.c:301
-#, c-format
-msgid "bad file state: %s"
-msgstr ""
-
-#: lib/package.c:53
-msgid "packaging version 1 is notsupported by this version of RPM"
+#: lib/package.c:52
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:113
+#: lib/package.c:112
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 83e3aa2d9..10f7c89e1 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,48 +65,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr ""
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr ""
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr ""
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr ""
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr ""
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr ""
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr ""
-
-#: oldrpmdb.c:461
-msgid "package not found in database"
-msgstr ""
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr ""
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2248,39 +2206,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2549,86 +2507,86 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2637,16 +2595,11 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/oldheader.c:301
-#, c-format
-msgid "bad file state: %s"
-msgstr ""
-
-#: lib/package.c:53
-msgid "packaging version 1 is notsupported by this version of RPM"
+#: lib/package.c:52
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:113
+#: lib/package.c:112
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 2e240a81c..8dc9e476e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -59,50 +59,6 @@ msgstr "ãÅÌÅ×ÙÅ ĞÌÁÔÆÏÒÍÙ: %s\n"
 msgid "Building for target %s\n"
 msgstr "óÂÏÒËÁ ÄÌÑ ÃÅÌÅ×ÏÊ ĞÌÁÔÆÏÒÍÙ %s\n"
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr "âÁÚÁ ÄÁÎÎÙÈ RPM ÕÖÅ ÓÕİÅÓÔ×ÕÅÔ"
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr "ïÔÓÕÔÓÔ×ÕÅÔ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ"
-
-#: convertdb.c:56
-#, fuzzy
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr "ÎÅÕÄÁŞÁ ÓÏÚÄÁÎÉÑ ÂÁÚÙ ÄÁÎÎÙÈ RPM /var/state/rpm"
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr "óÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ĞÏ×ÒÅÖÄÅÎÁ"
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr "ÎÅÕÄÁŞÁ oldrpmdbGetPackageInfo: &olddb = %p olddb.packages = %p\n"
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr "rpmconvert: ÁÒÇÕÍÅÎÔÙ ÎÅ ÎÕÖÎÙ"
-
-#: convertdb.c:211
-#, fuzzy
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr "rpmconvert 1.0 - ËÏÎ×ÅÒÔÉÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ × /var/state/rpm\n"
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr "ÉÚ×ÌÅËÁÀ %s ÉÚ ÂÁÚÙ ÄÁÎÎÙÈ\n"
-
-#: oldrpmdb.c:461
-msgid "package not found in database"
-msgstr "ĞÁËÅÔ ÎÅ ÎÁÊÄÅÎ × ÂÁÚÅ ÄÁÎÎÙÈ"
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr "ÎÅÔ ËÏĞÉÒÁÊÔÁ!\n"
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2397,39 +2353,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "ÆÁÊÌ %s ÎÅ ĞÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ĞÁËÅÔÏ×\n"
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "ÆÁÊÌ %s ÎÅ ĞÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ĞÁËÅÔÏ×\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ %s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "ĞÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n"
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "ÚÁÍËÎÕÔÙÊ ÃÉËÌ × ÃÅĞÏŞËÅ ÔÒÅÂÏ×ÁÎÉÊ ÄÌÑ ÕÓÔÁÎÏ×ËÉ: %s"
@@ -2698,86 +2654,86 @@ msgstr "ÚÎÁŞÅÎÉÅ %%instchangelog × ÍÁËÒÏÆÁÊÌÅ ÄÏÌÖÎÏ ÂÙÔØ ŞÉÓÌÏÍ, Á ÏÎÏ ÎÅÔ..."
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "ÒÁÓĞÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s"
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr " ÎÁ ÆÁÊÌÅ "
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÉÓÈÏÄÎÙÊ ĞÁËÅÔ\n"
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s"
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr "ÎÅ ÍÏÇÕ ĞÉÓÁÔØ × %s"
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr "ÉÓÈÏÄÎÉËÉ ×: %s\n"
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s"
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "ÆÁÊÌ spec ×: %s\n"
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr "ÉÓÈÏÄÎÙÊ ĞÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ .spec"
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "ĞÅÒÅÉÍÅÎÏ×Ù×ÁÀ %s × %s\n"
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "ÏÛÉÂËÁ ĞÅÒÅÉÍÅÎÏ×ÁÎÉÑ %s × %s: %s"
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr "ÏÖÉÄÁÌÓÑ ÉÓÈÏÄÎÙÊ ĞÁËÅÔ, ÎÁÊÄÅÎ ÂÉÎÁÒÎÙÊ"
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "ĞÁËÅÔ: %s-%s-%s ÆÁÊÌÏ×; test = %d\n"
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr "ÏÓÔÁÎÁ×ÌÉ×ÁÀ ÕÓÔÁÎÏ×ËÕ, Ô.Ë. ÍÙ ÉÓĞÏÌÎÑÅÍ --test\n"
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr "ÉÓĞÏÌÎÑÀ ÓËÒÉĞÔ preinstall (ÅÓÌÉ ÅÓÔØ)\n"
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "ĞÒÅÄÕĞÒÅÖÄÅÎÉÅ: %s ÓÏÚÄÁÎ ËÁË %s"
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "ĞÒÅÄÕĞÒÅÖÄÅÎÉÅ: %s ÓÏÈÒÁÎÅÎ ËÁË %s"
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 #, fuzzy
 msgid "running postinstall scripts (if any)\n"
 msgstr "ÉÓĞÏÌÎÑÀ ÓËÒÉĞÔ postinstall (ÅÓÌÉ ÅÓÔØ)\n"
@@ -2787,17 +2743,12 @@ msgstr "ÉÓĞÏÌÎÑÀ ÓËÒÉĞÔ postinstall (ÅÓÌÉ ÅÓÔØ)\n"
 msgid "error creating temporary file %s"
 msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ %s"
 
-#: lib/oldheader.c:301
-#, c-format
-msgid "bad file state: %s"
-msgstr "ÎÅ×ÅÒÎÏÅ ÓÏÓÔÏÑÎÉÅ ÆÁÊÌÁ: %s"
-
-#: lib/package.c:53
+#: lib/package.c:52
 #, fuzzy
-msgid "packaging version 1 is notsupported by this version of RPM"
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ĞÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ĞÁËÅÔÙ ×ÅÒÓÉÉ <= 3"
 
-#: lib/package.c:113
+#: lib/package.c:112
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -4056,6 +4007,41 @@ msgstr "url port ÄÏÌÖÅÎ ÂÙÔØ ŞÉÓÌÏÍ\n"
 msgid "failed to create %s: %s\n"
 msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s\n"
 
+#~ msgid "RPM database already exists"
+#~ msgstr "âÁÚÁ ÄÁÎÎÙÈ RPM ÕÖÅ ÓÕİÅÓÔ×ÕÅÔ"
+
+#~ msgid "Old db is missing"
+#~ msgstr "ïÔÓÕÔÓÔ×ÕÅÔ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ"
+
+#, fuzzy
+#~ msgid "failed to create RPM database /var/lib/rpm"
+#~ msgstr "ÎÅÕÄÁŞÁ ÓÏÚÄÁÎÉÑ ÂÁÚÙ ÄÁÎÎÙÈ RPM /var/state/rpm"
+
+#~ msgid "Old db is corrupt"
+#~ msgstr "óÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ĞÏ×ÒÅÖÄÅÎÁ"
+
+#~ msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
+#~ msgstr "ÎÅÕÄÁŞÁ oldrpmdbGetPackageInfo: &olddb = %p olddb.packages = %p\n"
+
+#~ msgid "rpmconvert: no arguments expected"
+#~ msgstr "rpmconvert: ÁÒÇÕÍÅÎÔÙ ÎÅ ÎÕÖÎÙ"
+
+#, fuzzy
+#~ msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
+#~ msgstr "rpmconvert 1.0 - ËÏÎ×ÅÒÔÉÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ × /var/state/rpm\n"
+
+#~ msgid "pulling %s from database\n"
+#~ msgstr "ÉÚ×ÌÅËÁÀ %s ÉÚ ÂÁÚÙ ÄÁÎÎÙÈ\n"
+
+#~ msgid "package not found in database"
+#~ msgstr "ĞÁËÅÔ ÎÅ ÎÁÊÄÅÎ × ÂÁÚÅ ÄÁÎÎÙÈ"
+
+#~ msgid "no copyright!\n"
+#~ msgstr "ÎÅÔ ËÏĞÉÒÁÊÔÁ!\n"
+
+#~ msgid "bad file state: %s"
+#~ msgstr "ÎÅ×ÅÒÎÏÅ ÓÏÓÔÏÑÎÉÅ ÆÁÊÌÁ: %s"
+
 #, fuzzy
 #~ msgid "line %d: Invalid tag value: %s"
 #~ msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÔÜÇ: %s"
diff --git a/po/sk.po b/po/sk.po
index 70f8f0666..796be4a66 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.93\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -61,48 +61,6 @@ msgstr "predefinova» cieµovú platformu"
 msgid "Building for target %s\n"
 msgstr "vyhµadáva sa balík %s\n"
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr "RPM databáza u¾ existuje"
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr "Stará databáza neexistuje"
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr "Nepodarilo sa vytvori» RPM databázu /var/lib/rpm"
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr "Stará databáze je po¹kodená"
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr "oldrpmdbGetPackageInfo zlyhal &olddb = %p olddb.packages = %p\n"
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr "rpmconvert: argumenty nie sú oèakávané"
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr "rpmconvert 1.0 - konverzia databázy v /var/lib/rpm\n"
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr "naèíta sa %s z databázy\n"
-
-#: oldrpmdb.c:461
-msgid "package not found in database"
-msgstr "balík nebol nájdenı v databáze"
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr "¾iadny copyright!\n"
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2400,39 +2358,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balík %s koliduje: %s\n"
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "sluèka v re»azi po¾iadaviek: %s"
@@ -2701,86 +2659,86 @@ msgstr "hodnota %%instchangelog v makro-súbore by mala by» èíselná, ale nie je"
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "rozbalenie archívu zlyhalo%s%s: %s"
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr " pre súbor "
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr "in¹taluje sa zdrojovı balík\n"
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "nie je mo¾né zapísa» do %s: "
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr "nie je mo¾né zapísa» do %s: "
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr "zdroje v: %s\n"
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "nie je mo¾né zapísa» do %s: "
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "spec-súbor v: %s\n"
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr "zdrojovı balík neobsahuje ¾iadny .spec súbor"
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "premenovanie %s na %s zlyhalo: %s"
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr "oèakávanı zdrojovı balík, nájdenı binárny"
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "balík: %s-%s-%s test súborov = %d\n"
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr "in¹talácia zastavená kvôli re¾imu --test\n"
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr "vykonávajú sa predin¹talaèné skripty (ak existujú)\n"
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "varovanie: %s vytvorené ako %s"
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "varovanie: %s uchovanı ako %s"
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 #, fuzzy
 msgid "running postinstall scripts (if any)\n"
 msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n"
@@ -2790,17 +2748,12 @@ msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n"
 msgid "error creating temporary file %s"
 msgstr "chyba pri vytváraní doèasného súboru %s"
 
-#: lib/oldheader.c:301
-#, c-format
-msgid "bad file state: %s"
-msgstr "chybnı stav súboru: %s"
-
-#: lib/package.c:53
+#: lib/package.c:52
 #, fuzzy
-msgid "packaging version 1 is notsupported by this version of RPM"
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr "táto verzia RPM podporuje iba balíky s hlavnım èíslom <= 3"
 
-#: lib/package.c:113
+#: lib/package.c:112
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -4064,6 +4017,39 @@ msgstr "url port musí by» èíslo\n"
 msgid "failed to create %s: %s\n"
 msgstr "nepodarilo sa vytvori» %s\n"
 
+#~ msgid "RPM database already exists"
+#~ msgstr "RPM databáza u¾ existuje"
+
+#~ msgid "Old db is missing"
+#~ msgstr "Stará databáza neexistuje"
+
+#~ msgid "failed to create RPM database /var/lib/rpm"
+#~ msgstr "Nepodarilo sa vytvori» RPM databázu /var/lib/rpm"
+
+#~ msgid "Old db is corrupt"
+#~ msgstr "Stará databáze je po¹kodená"
+
+#~ msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
+#~ msgstr "oldrpmdbGetPackageInfo zlyhal &olddb = %p olddb.packages = %p\n"
+
+#~ msgid "rpmconvert: no arguments expected"
+#~ msgstr "rpmconvert: argumenty nie sú oèakávané"
+
+#~ msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
+#~ msgstr "rpmconvert 1.0 - konverzia databázy v /var/lib/rpm\n"
+
+#~ msgid "pulling %s from database\n"
+#~ msgstr "naèíta sa %s z databázy\n"
+
+#~ msgid "package not found in database"
+#~ msgstr "balík nebol nájdenı v databáze"
+
+#~ msgid "no copyright!\n"
+#~ msgstr "¾iadny copyright!\n"
+
+#~ msgid "bad file state: %s"
+#~ msgstr "chybnı stav súboru: %s"
+
 #, fuzzy
 #~ msgid "line %d: Invalid tag value: %s"
 #~ msgstr "riadok %d: Znetvorenı popis: %s"
diff --git a/po/sl.po b/po/sl.po
index 7093bbfe2..32d0e36ad 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.81 2000/07/15 18:22:26 jbj Exp $
+# $Id: sl.po,v 1.82 2000/07/17 00:40:18 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: 2000-02-17 22:25+01:00\n"
 "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -65,48 +65,6 @@ msgstr "Izgradnja za ciljna strojna okolja: %s\n"
 msgid "Building for target %s\n"
 msgstr "Izgradnja za ciljni sistem %s\n"
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr "Podatovna zbirka RPM ¾e obstaja"
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr "Stara podatkovna zbirka manjka"
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr "podatkovne zbirke RPM /var/lib/rpm ni uspelo ustvariti"
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr "Stara podatkovna zbirka je po¹kodovana"
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr "oldrpmdbGetPackageInfo neuspe¹en &olddb = %p olddb.packages = %p\n"
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr "rpmconvert: argumentov ne prièakujemo"
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr "rpmconvert 1.0 - pretvorba podatkovne zbirke v /var/lib/rpm\n"
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr "izvlaèimo %s iz podatkovne zbirke\n"
-
-#: oldrpmdb.c:461
-msgid "package not found in database"
-msgstr "paketa ni najti v podatkovni zbirki"
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr "ni copyrighta!\n"
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2385,39 +2343,39 @@ msgstr "%s: %s zadovoljen ob dodatnem ponudbi rpmrc.\n"
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %s zadovoljen ob dodatnem ponudbi rpmrc.\n"
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %s zadovoljen ob ponudbi db.\n"
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: %s zadovoljen ob dodatnem paketu.\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s zahteva, a ni zadovoljeno: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s v sporu: %s\n"
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "zanka v predpogojevani verigi: %s"
@@ -2690,86 +2648,86 @@ msgstr "vrednost %%instchangelog v makrodatoteki bi morala biti ¹tevilo, pa ni"
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "razpakiranje arhiva neuspe¹no%s%s: %s"
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr " pri datoteki "
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr "name¹èanje izvornega paketa\n"
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr "ni mo¾no ustvariti izvornega imenika %s"
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr "ni mo¾no pisanje na %s"
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr "izvori v: %s\n"
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, c-format
 msgid "cannot create specdir %s"
 msgstr "ni mo¾no ustvariti imenika z doloèili spec %s"
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "datoteka spec v: %s\n"
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr "izvorni paket ne vsebuje datoteke .spec"
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "preimenujemo %s v %s\n"
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "preimenovanje %s v %s neuspe¹no: %s"
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr "prièakovan izvorni paket, najden binarni"
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "paket: %s-%s-%s datoteke test = %d\n"
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr "ustavljamo namestitev ker teèemo kot --test\n"
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr "poganjamo prednamestitvene skripte (èe obstajajo)\n"
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "opozorilo: %s ustvarjen kot %s"
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "opozorilo: %s shranjen kot %s"
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr "poganjamo ponamestitvene skripte (èe obstajajo)\n"
 
@@ -2778,17 +2736,12 @@ msgstr "poganjamo ponamestitvene skripte (èe obstajajo)\n"
 msgid "error creating temporary file %s"
 msgstr "napaka pri ustvarjanju zaèasne datoteke %s"
 
-#: lib/oldheader.c:301
-#, c-format
-msgid "bad file state: %s"
-msgstr "okvarjeno stanje datoteke: %s"
-
-#: lib/package.c:53
+#: lib/package.c:52
 #, fuzzy
-msgid "packaging version 1 is notsupported by this version of RPM"
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <= 3"
 
-#: lib/package.c:113
+#: lib/package.c:112
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -4043,6 +3996,39 @@ msgstr "vrata URL morajo biti ¹tevilka\n"
 msgid "failed to create %s: %s\n"
 msgstr "neuspe¹no ustvarjanje %s: %s\n"
 
+#~ msgid "RPM database already exists"
+#~ msgstr "Podatovna zbirka RPM ¾e obstaja"
+
+#~ msgid "Old db is missing"
+#~ msgstr "Stara podatkovna zbirka manjka"
+
+#~ msgid "failed to create RPM database /var/lib/rpm"
+#~ msgstr "podatkovne zbirke RPM /var/lib/rpm ni uspelo ustvariti"
+
+#~ msgid "Old db is corrupt"
+#~ msgstr "Stara podatkovna zbirka je po¹kodovana"
+
+#~ msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
+#~ msgstr "oldrpmdbGetPackageInfo neuspe¹en &olddb = %p olddb.packages = %p\n"
+
+#~ msgid "rpmconvert: no arguments expected"
+#~ msgstr "rpmconvert: argumentov ne prièakujemo"
+
+#~ msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
+#~ msgstr "rpmconvert 1.0 - pretvorba podatkovne zbirke v /var/lib/rpm\n"
+
+#~ msgid "pulling %s from database\n"
+#~ msgstr "izvlaèimo %s iz podatkovne zbirke\n"
+
+#~ msgid "package not found in database"
+#~ msgstr "paketa ni najti v podatkovni zbirki"
+
+#~ msgid "no copyright!\n"
+#~ msgstr "ni copyrighta!\n"
+
+#~ msgid "bad file state: %s"
+#~ msgstr "okvarjeno stanje datoteke: %s"
+
 #, fuzzy
 #~ msgid "line %d: Invalid tag value: %s"
 #~ msgstr "vrstica %d: Deformirana znaèka: %s"
diff --git a/po/sr.po b/po/sr.po
index 1235948ad..58281014e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -70,50 +70,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "gre¹ka potrage za paketom %s\n"
 
-#: convertdb.c:40
-#, fuzzy
-msgid "RPM database already exists"
-msgstr "privremena baza podataka %s veæ postoji"
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr ""
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr ""
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr ""
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr ""
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr ""
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr ""
-
-#: oldrpmdb.c:461
-#, fuzzy
-msgid "package not found in database"
-msgstr "paket %s nije nağen u %s"
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr ""
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2407,39 +2363,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s nije naveden u %s"
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "petlja u lancu: %s"
@@ -2710,88 +2666,88 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "instaliraj paket"
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "preimenovanje %s u %s nije uspelo: %s"
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2800,17 +2756,12 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/oldheader.c:301
-#, fuzzy, c-format
-msgid "bad file state: %s"
-msgstr "neuspelo otvaranje %s: %s"
-
-#: lib/package.c:53
+#: lib/package.c:52
 #, fuzzy
-msgid "packaging version 1 is notsupported by this version of RPM"
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a"
 
-#: lib/package.c:113
+#: lib/package.c:112
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -4104,6 +4055,18 @@ msgid "failed to create %s: %s\n"
 msgstr "neuspelo kreiranje %s\n"
 
 #, fuzzy
+#~ msgid "RPM database already exists"
+#~ msgstr "privremena baza podataka %s veæ postoji"
+
+#, fuzzy
+#~ msgid "package not found in database"
+#~ msgstr "paket %s nije nağen u %s"
+
+#, fuzzy
+#~ msgid "bad file state: %s"
+#~ msgstr "neuspelo otvaranje %s: %s"
+
+#, fuzzy
 #~ msgid "line %d: Invalid tag value: %s"
 #~ msgstr "pogre¹an broj paketa: %s\n"
 
diff --git a/po/sv.po b/po/sv.po
index 1ea9fae94..a588aca72 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: 2000-06-22 23:35+0200\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -60,48 +60,6 @@ msgstr "Bygger målplattformar: %s\n"
 msgid "Building for target %s\n"
 msgstr "Bygger för mål %s\n"
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr "RPM-databasen existerar redan"
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr "Gammal db saknas"
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr "misslyckades att skapa RPM-databasen /var/lib/rpm"
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr "Gammal db är trasig"
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr "oldrpmdbGetPackageInfo misslyckades &olddb = %p olddb.packages = %p\n"
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr "rpmconvert: tar inga argument"
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr "rpmconvert 1.0 - konverterar databasen i /var/lib/rpm\n"
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr "tar %s från databasen\n"
-
-#: oldrpmdb.c:461
-msgid "package not found in database"
-msgstr "paketet inte funnet i databas"
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr "ingen copyright!\n"
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2302,39 +2260,39 @@ msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n"
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n"
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s JA (db-filer)\n"
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s JA (db tillhandahållande)\n"
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NEJ\n"
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tillagt till beroendecachen.\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s behov inte uppfyllda: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s står i konflikt: %s\n"
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "cirkularitet i kedja av förutsättningar: %s"
@@ -2608,86 +2566,86 @@ msgstr "%%instchangelog-värde i makrofil skall vara ett tal, men är inte det"
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "uppackning av arkiv misslyckades%s%s: %s"
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr " vid fil "
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr "installerar källpaket\n"
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr "kan inte skapa källkatalog %s"
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr "kan inte skriva till %s"
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr "källkod i: %s\n"
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, c-format
 msgid "cannot create specdir %s"
 msgstr "kan inte skapa spec-katalog %s"
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "spec-fil i: %s\n"
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr "källpaket innehåller ingen spec-fil"
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "byter namn på %s till %s\n"
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "namnbyte från %s till %s misslyckades: %s"
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr "källpaket förväntades, fann binärpaket"
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "paket: %s-%s-%s filtest = %d\n"
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr "avbryter installation eftersom vi kör --test\n"
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr "kör (eventuellt) preinstalltionsskript\n"
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "varning: %s skapades som %s"
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "varning: %s sparades som %s"
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr "kör (eventuellt) postinstallationsskript\n"
 
@@ -2696,17 +2654,12 @@ msgstr "kör (eventuellt) postinstallationsskript\n"
 msgid "error creating temporary file %s"
 msgstr "fel när tämporärfil %s skapades"
 
-#: lib/oldheader.c:301
-#, c-format
-msgid "bad file state: %s"
-msgstr "felaktig filstatus: %s"
-
-#: lib/package.c:53
+#: lib/package.c:52
 #, fuzzy
-msgid "packaging version 1 is notsupported by this version of RPM"
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr "endast paket med huvudnummer <= 3 stöds av denna version av RPM"
 
-#: lib/package.c:113
+#: lib/package.c:112
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -3973,6 +3926,40 @@ msgstr "url-port måste vara ett tal\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunde inte skapa %s: %s\n"
 
+#~ msgid "RPM database already exists"
+#~ msgstr "RPM-databasen existerar redan"
+
+#~ msgid "Old db is missing"
+#~ msgstr "Gammal db saknas"
+
+#~ msgid "failed to create RPM database /var/lib/rpm"
+#~ msgstr "misslyckades att skapa RPM-databasen /var/lib/rpm"
+
+#~ msgid "Old db is corrupt"
+#~ msgstr "Gammal db är trasig"
+
+#~ msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
+#~ msgstr ""
+#~ "oldrpmdbGetPackageInfo misslyckades &olddb = %p olddb.packages = %p\n"
+
+#~ msgid "rpmconvert: no arguments expected"
+#~ msgstr "rpmconvert: tar inga argument"
+
+#~ msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
+#~ msgstr "rpmconvert 1.0 - konverterar databasen i /var/lib/rpm\n"
+
+#~ msgid "pulling %s from database\n"
+#~ msgstr "tar %s från databasen\n"
+
+#~ msgid "package not found in database"
+#~ msgstr "paketet inte funnet i databas"
+
+#~ msgid "no copyright!\n"
+#~ msgstr "ingen copyright!\n"
+
+#~ msgid "bad file state: %s"
+#~ msgstr "felaktig filstatus: %s"
+
 #~ msgid ""
 #~ "\n"
 #~ "--> An rpm database in db1 format exists in %s.\n"
diff --git a/po/tr.po b/po/tr.po
index 33c11131c..d2cf8d1af 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,50 +67,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "%s paketi bulunamadı\n"
 
-#: convertdb.c:40
-#, fuzzy
-msgid "RPM database already exists"
-msgstr "geçici veritabanı %s mevcut"
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr ""
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr ""
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr ""
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr ""
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr ""
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr ""
-
-#: oldrpmdb.c:461
-#, fuzzy
-msgid "package not found in database"
-msgstr "%s pakedi %s içerisinde bulunamadı"
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr ""
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2449,39 +2405,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s dosyası, hiç bir pakete ait değil\n"
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s dosyası, hiç bir pakete ait değil\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "%s paketi %s altında gözükmüyor"
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s paketi %s altında gözükmüyor"
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "gerekenler zincirinde döngü: %s"
@@ -2752,88 +2708,88 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "paket yüklemek"
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "%s dosyası açılamıyor: "
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "%s dosyası açılamıyor: "
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "%s dosyası açılamıyor: "
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "%s açılamadı: %s"
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "<dosya> isimli dosyayı içeren paketi sorgulamak"
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "%s 'nin isminin  %s 'ye çevrilmesinde belirtilen hata oluştu: %s"
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n"
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2842,18 +2798,13 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr "%s dizinin oluşturulmasında hata: %s"
 
-#: lib/oldheader.c:301
-#, fuzzy, c-format
-msgid "bad file state: %s"
-msgstr "%s açılamadı: %s"
-
-#: lib/package.c:53
+#: lib/package.c:52
 #, fuzzy
-msgid "packaging version 1 is notsupported by this version of RPM"
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 "RPM'in bu sürümünde sadece major numarası <= 3 olan paketler destekleniyor"
 
-#: lib/package.c:113
+#: lib/package.c:112
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -4150,6 +4101,18 @@ msgid "failed to create %s: %s\n"
 msgstr "%s yaratılamıyor\n"
 
 #, fuzzy
+#~ msgid "RPM database already exists"
+#~ msgstr "geçici veritabanı %s mevcut"
+
+#, fuzzy
+#~ msgid "package not found in database"
+#~ msgstr "%s pakedi %s içerisinde bulunamadı"
+
+#, fuzzy
+#~ msgid "bad file state: %s"
+#~ msgstr "%s açılamadı: %s"
+
+#, fuzzy
 #~ msgid "line %d: Invalid tag value: %s"
 #~ msgstr "geçersiz paket numarsı: %s\n"
 
diff --git a/po/uk.po b/po/uk.po
index 83e3aa2d9..10f7c89e1 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 14:15-0400\n"
+"POT-Creation-Date: 2000-07-16 20:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,48 +65,6 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:40
-msgid "RPM database already exists"
-msgstr ""
-
-#: convertdb.c:45
-msgid "Old db is missing"
-msgstr ""
-
-#: convertdb.c:56
-msgid "failed to create RPM database /var/lib/rpm"
-msgstr ""
-
-#: convertdb.c:62
-msgid "Old db is corrupt"
-msgstr ""
-
-#: convertdb.c:71
-#, c-format
-msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
-msgstr ""
-
-#: convertdb.c:205
-msgid "rpmconvert: no arguments expected"
-msgstr ""
-
-#: convertdb.c:211
-msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
-msgstr ""
-
-#: oldrpmdb.c:454
-#, c-format
-msgid "pulling %s from database\n"
-msgstr ""
-
-#: oldrpmdb.c:461
-msgid "package not found in database"
-msgstr ""
-
-#: oldrpmdb.c:522
-msgid "no copyright!\n"
-msgstr ""
-
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2248,39 +2206,39 @@ msgstr ""
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:971
+#: lib/depends.c:972
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:984
+#: lib/depends.c:985
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:997
+#: lib/depends.c:998
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1018
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1072
+#: lib/depends.c:1073
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1139
+#: lib/depends.c:1140
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1265
+#: lib/depends.c:1266
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2549,86 +2507,86 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:577
+#: lib/install.c:580
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:578
+#: lib/install.c:581
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:625
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:642
+#: lib/install.c:645
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:648 lib/install.c:678
+#: lib/install.c:651 lib/install.c:681
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:655
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:672
+#: lib/install.c:675
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:682
+#: lib/install.c:685
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:716 lib/install.c:744
+#: lib/install.c:719 lib/install.c:747
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:766
+#: lib/install.c:769
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:768 lib/install.c:1041 lib/uninstall.c:28
+#: lib/install.c:771 lib/install.c:1044 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:860
+#: lib/install.c:863
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:910
+#: lib/install.c:913
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:970
+#: lib/install.c:973
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:975
+#: lib/install.c:978
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1000
+#: lib/install.c:1003
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1037
+#: lib/install.c:1040
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1125
+#: lib/install.c:1128
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2637,16 +2595,11 @@ msgstr ""
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/oldheader.c:301
-#, c-format
-msgid "bad file state: %s"
-msgstr ""
-
-#: lib/package.c:53
-msgid "packaging version 1 is notsupported by this version of RPM"
+#: lib/package.c:52
+msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:113
+#: lib/package.c:112
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""